diff --git a/types/ace/index.d.ts b/types/ace/index.d.ts
index 456727756c..822c394a32 100644
--- a/types/ace/index.d.ts
+++ b/types/ace/index.d.ts
@@ -345,18 +345,47 @@ declare namespace AceAjax {
         insert(position: Position, text: string): any;
 
         /**
-         * Inserts the elements in `lines` into the document, starting at the row index given by `row`. This method also triggers the `'change'` event.
-         * @param row The index of the row to insert at
-         * @param lines An array of strings
-        **/
+         * @deprecated Use the insertFullLines method instead.
+         */
         insertLines(row: number, lines: string[]): any;
 
         /**
-         * Inserts a new line into the document at the current row's `position`. This method also triggers the `'change'` event.
-         * @param position The position to insert at
-        **/
+         * Inserts the elements in `lines` into the document as full lines (does not merge with existing line), starting at the row index given by `row`. This method also triggers the `"change"` event.
+         * @param {Number} row The index of the row to insert at
+         * @param {Array} lines An array of strings
+         * @returns {Object} Contains the final row and column, like this:
+         *   ```
+         *   {row: endRow, column: 0}
+         *   ```
+         *   If `lines` is empty, this function returns an object containing the current row, and column, like this:
+         *   ```
+         *   {row: row, column: 0}
+         *   ```
+         *
+         **/
+        insertFullLines(row: number, lines: string[]): any;
+
+        /**
+         * @deprecated Use insertMergedLines(position, ['', '']) instead.
+         */
         insertNewLine(position: Position): any;
 
+        /**
+         * Inserts the elements in `lines` into the document, starting at the position index given by `row`. This method also triggers the `"change"` event.
+         * @param {Number} row The index of the row to insert at
+         * @param {Array} lines An array of strings
+         * @returns {Object} Contains the final row and column, like this:
+         *   ```
+         *   {row: endRow, column: 0}
+         *   ```
+         *   If `lines` is empty, this function returns an object containing the current row, and column, like this:
+         *   ```
+         *   {row: row, column: 0}
+         *   ```
+         *
+         **/
+        insertMergedLines(row: number, lines: string[]): any;
+
         /**
          * Inserts `text` into the `position` at the current row. This method also triggers the `'change'` event.
          * @param position The position to insert at
@@ -379,12 +408,19 @@ declare namespace AceAjax {
         removeInLine(row: number, startColumn: number, endColumn: number): any;
 
         /**
-         * Removes a range of full lines. This method also triggers the `'change'` event.
-         * @param firstRow The first row to be removed
-         * @param lastRow The last row to be removed
-        **/
+         * @deprecated Use the removeFullLines method instead.
+         */
         removeLines(firstRow: number, lastRow: number): string[];
 
+        /**
+         * Removes a range of full lines. This method also triggers the `"change"` event.
+         * @param {Number} firstRow The first row to be removed
+         * @param {Number} lastRow The last row to be removed
+         * @returns {[String]} Returns all the removed lines.
+         *
+         **/
+        removeFullLines(firstRow: number, lastRow: number): string[];
+
         /**
          * Removes the new line between `row` and the row immediately following it. This method also triggers the `'change'` event.
          * @param row The row to check
@@ -474,9 +510,9 @@ declare namespace AceAjax {
         removeFold(arg: any): void;
 
         expandFold(arg: any): void;
-        
+
         foldAll(startRow?: number, endRow?: number, depth?: number): void
-        
+
         unfold(arg1: any, arg2: boolean): void;
 
         screenToDocumentColumn(row: number, column: number): void;
@@ -2659,9 +2695,9 @@ declare namespace AceAjax {
         characterWidth: number;
 
         lineHeight: number;
-        
+
         setScrollMargin(top:number, bottom:number, left: number, right: number): void;
-        
+
         screenToTextCoordinates(left: number, top: number): void;
 
         /**
diff --git a/types/actions-on-google/actions-sdk-app.d.ts b/types/actions-on-google/actions-sdk-app.d.ts
index 8de0de0cfb..09a4fbe0ad 100644
--- a/types/actions-on-google/actions-sdk-app.d.ts
+++ b/types/actions-on-google/actions-sdk-app.d.ts
@@ -35,6 +35,7 @@ export class ActionsSdkApp extends AssistantApp {
     constructor(options: ActionsSdkAppOptions);
 
     /**
+     * @deprecated
      * Validates whether request is from Assistant through signature verification.
      * Uses Google-Auth-Library to verify authorization token against given
      * Google Cloud Project ID. Auth token is given in request header with key,
@@ -58,6 +59,30 @@ export class ActionsSdkApp extends AssistantApp {
      */
     isRequestFromAssistant(projectId: string): Promise<object>;
 
+    /**
+     * Validates whether request is from Google through signature verification.
+     * Uses Google-Auth-Library to verify authorization token against given
+     * Google Cloud Project ID. Auth token is given in request header with key,
+     * "Authorization".
+     *
+     * @example
+     * const app = new ActionsSdkApp({request, response});
+     * app.isRequestFromGoogle('nodejs-cloud-test-project-1234')
+     *   .then(() => {
+     *     app.ask('Hey there, thanks for stopping by!');
+     *   })
+     *   .catch(err => {
+     *     response.status(400).send();
+     *   });
+     *
+     * @param projectId Google Cloud Project ID for the Assistant app.
+     * @return Promise resolving with google-auth-library LoginTicket
+     *     if request is from a valid source, otherwise rejects with the error reason
+     *     for an invalid token.
+     * @actionssdk
+     */
+    isRequestFromGoogle(projectId: string): Promise<object>;
+
     /**
      * Gets the request Conversation API version.
      *
diff --git a/types/actions-on-google/assistant-app.d.ts b/types/actions-on-google/assistant-app.d.ts
index d33f447a2e..caed5cf6cb 100644
--- a/types/actions-on-google/assistant-app.d.ts
+++ b/types/actions-on-google/assistant-app.d.ts
@@ -10,58 +10,36 @@ import { ActionPaymentTransactionConfig, Cart, GooglePaymentTransactionConfig, L
  * @dialogflow
  */
 export enum StandardIntents {
-    /**
-     * App fires MAIN intent for queries like [talk to $app].
-     */
+    /** App fires MAIN intent for queries like [talk to $app]. */
     MAIN,
-    /**
-     * App fires TEXT intent when action issues ask intent.
-     */
+    /** App fires TEXT intent when action issues ask intent. */
     TEXT,
-    /**
-     * App fires PERMISSION intent when action invokes askForPermission.
-     */
+    /** App fires PERMISSION intent when action invokes askForPermission. */
     PERMISSION,
-    /**
-     * App fires OPTION intent when user chooses from options provided.
-     */
+    /** App fires OPTION intent when user chooses from options provided. */
     OPTION,
-    /**
-     * App fires TRANSACTION_REQUIREMENTS_CHECK intent when action sets up transaction.
-     */
+    /** App fires TRANSACTION_REQUIREMENTS_CHECK intent when action sets up transaction. */
     TRANSACTION_REQUIREMENTS_CHECK,
-    /**
-     * App fires DELIVERY_ADDRESS intent when action asks for delivery address.
-     */
+    /** App fires DELIVERY_ADDRESS intent when action asks for delivery address. */
     DELIVERY_ADDRESS,
-    /**
-     * App fires TRANSACTION_DECISION intent when action asks for transaction decision.
-     */
+    /** App fires TRANSACTION_DECISION intent when action asks for transaction decision. */
     TRANSACTION_DECISION,
-    /**
-     * App fires CONFIRMATION intent when requesting affirmation from user.
-     */
+    /** App fires CONFIRMATION intent when requesting affirmation from user. */
     CONFIRMATION,
-    /**
-     * App fires DATETIME intent when requesting date/time from user.
-     */
+    /** App fires DATETIME intent when requesting date/time from user. */
     DATETIME,
-    /**
-     * App fires SIGN_IN intent when requesting sign-in from user.
-     */
+    /** App fires SIGN_IN intent when requesting sign-in from user. */
     SIGN_IN,
-    /**
-     * App fires NO_INPUT intent when user doesn't provide input.
-     */
+    /** App fires NO_INPUT intent when user doesn't provide input. */
     NO_INPUT,
-    /**
-     * App fires CANCEL intent when user exits app mid-dialog.
-     */
+    /** App fires CANCEL intent when user exits app mid-dialog. */
     CANCEL,
-    /**
-     * App fires NEW_SURFACE intent when requesting handoff to a new surface from user.
-     */
+    /** App fires NEW_SURFACE intent when requesting handoff to a new surface from user. */
     NEW_SURFACE,
+    /** App fires REGISTER_UPDATE intent when requesting the user to register for proactive updates. */
+    REGISTER_UPDATE,
+    /** App receives CONFIGURE_UPDATES intent to indicate a custom REGISTER_UPDATE intent should be sent. */
+    CONFIGURE_UPDATES
 }
 
 /**
@@ -85,6 +63,10 @@ export enum SupportedPermissions {
      * {@link https://developers.google.com/actions/reference/conversation#Location|Location object}.
      */
     DEVICE_COARSE_LOCATION,
+    /**
+     * Confirmation to receive proactive content at any time from the app.
+     */
+    UPDATE
 }
 
 /**
@@ -137,6 +119,8 @@ export enum BuiltInArgNames {
      * New surface value argument.
      */
     NEW_SURFACE,
+    /** Update registration value argument. */
+    REGISTER_UPDATE
 }
 
 /**
@@ -144,8 +128,17 @@ export enum BuiltInArgNames {
  * {@link https://developers.google.com/actions/reference/conversation#Conversation|Conversation object}.
  * @actionssdk
  * @dialogflow
+ * @deprecated Use {@link ConversationTypes} instead.
  */
-export enum ConversationStages {
+export type ConversationStages = ConversationTypes;
+
+/**
+ * List of possible conversation types, as defined in the
+ * {@link https://developers.google.com/actions/reference/conversation#Conversation|Conversation object}.
+ * @actionssdk
+ * @dialogflow
+ */
+export enum ConversationTypes {
     /**
      * Unspecified conversation state.
      */
@@ -224,6 +217,13 @@ export enum SignInStatus {
     ERROR
 }
 
+/**
+ * Possible update trigger time context frequencies.
+ */
+export enum TimeContextFrequency {
+    DAILY
+}
+
 /**
  * User provided date/time info.
  */
@@ -277,6 +277,17 @@ export interface User {
     userName: UserName;
     /** Unique Oauth2 token. Only available with account linking. */
     accessToken: string;
+    /**
+     * Timestamp for the last access from the user.
+     * Retrieve using app.getLastSeen() to get a Date object or null if never seen.
+     */
+    lastSeen: string;
+    /**
+     * A string persistent across sessions.
+     * Retrieved and set using app.userStorage which allows you to store it like an JSON object
+     * which is abstracted for convenience by the client library.
+     */
+    userStorage: string;
 }
 
 /**
@@ -295,6 +306,17 @@ export interface Capability {
     name: string;
 }
 
+/**
+ * Intent Argument. For incoming intents, the argument value can be retrieved
+ * using {@link AssistantApp#getArgument}.
+ */
+export interface IntentArgument {
+    /** Name of the argument. */
+    name: string;
+    /** Text value of the argument. */
+    textValue: string;
+}
+
 /**
  * The Actions on Google client library AssistantApp base class.
  *
@@ -313,6 +335,20 @@ export class AssistantApp {
      */
     data: object;
 
+    /**
+     * The data persistent across sessions in JSON format.
+     * It exists in the same context as getUser().userId
+     *
+     * @example
+     * // Actions SDK
+     * const app = new ActionsSdkApp({request: request, response: response});
+     * app.userStorage.someProperty = 'someValue';
+     * // Dialogflow
+     * const app = new DialogflowApp({request: request, response: response});
+     * app.userStorage.someProperty = 'someValue';
+     */
+    userStorage: object;
+
     /**
      * List of standard intents that the app provides.
      * @actionssdk
@@ -339,8 +375,17 @@ export class AssistantApp {
      * {@link https://developers.google.com/actions/reference/conversation#Conversation|Conversation object}.
      * @actionssdk
      * @dialogflow
+     * @deprecated Use {@link ConversationTypes} instead.
      */
-    readonly ConversationStages: typeof ConversationStages;
+    readonly ConversationStages: typeof ConversationTypes;
+
+    /**
+     * List of possible conversation types, as defined in the
+     * {@link https://developers.google.com/actions/reference/conversation#Conversation|Conversation object}.
+     * @actionssdk
+     * @dialogflow
+     */
+    readonly ConversationTypes: typeof ConversationTypes;
 
     /**
      * List of surface capabilities supported by the app.
@@ -368,6 +413,11 @@ export class AssistantApp {
      */
     readonly Transactions: typeof TransactionValues;
 
+    /**
+     * Possible update trigger time context frequencies.
+     */
+    readonly TimeContextFrequency: typeof TimeContextFrequency;
+
     // ---------------------------------------------------------------------------
     //                   Public APIs
     // ---------------------------------------------------------------------------
@@ -477,7 +527,7 @@ export class AssistantApp {
      * @param permissions Array of permissions App supports, each of
      *     which comes from AssistantApp.SupportedPermissions.
      * @param dialogState JSON object the app uses to hold dialog state that
-     *     will be circulated back by Assistant. Used in {@link ActionsSdkAssistant}.
+     *     will be circulated back by Assistant. Used in {@link ActionsSdkApp}.
      * @return A response is sent to Assistant to ask for the user's permission; for any
      *     invalid input, we return null.
      * @actionssdk
@@ -485,6 +535,58 @@ export class AssistantApp {
      */
     askForPermissions(context: string, permissions: string[], dialogState?: object): express.Response | null;
 
+    /**
+     * Prompts the user for permission to send proactive updates at any time.
+     *
+     * @example
+     * const app = new DialogflowApp({request, response});
+     * const REQUEST_PERMISSION_ACTION = 'request.permission';
+     * const PERMISSION_REQUESTED = 'permission.requested';
+     * const SHOW_IMAGE = 'show.image';
+     *
+     * function requestPermission (app) {
+     *   app.askForUpdatePermission('show.image', [
+     *     {
+     *       name: 'image_to_show',
+     *       textValue: 'image_type_1'
+     *     }
+     *   ]);
+     * }
+     *
+     * function checkPermission (app) {
+     *   if (app.isPermissionGranted()) {
+     *     app.tell(`Great, I'll send an update whenever I notice a change`);
+     *   } else {
+     *     // Response shows that user did not grant permission
+     *     app.tell('Alright, just let me know whenever you need the weather!');
+     *   }
+     * }
+     *
+     * function showImage (app) {
+     *   showPicture(app.getArgument('image_to_show'));
+     * }
+     *
+     * const actionMap = new Map();
+     * actionMap.set(REQUEST_PERMISSION_ACTION, requestPermission);
+     * actionMap.set(PERMISSION_REQUESTED, checkPermission);
+     * actionMap.set(SHOW_IMAGE, showImage);
+     * app.handleRequest(actionMap);
+     *
+     * @param intent If using Dialogflow, the action name of the intent
+     *     to be triggered when the update is received. If using Actions SDK, the
+     *     intent name to be triggered when the update is received.
+     * @param intentArguments The necessary arguments
+     *     to fulfill the intent triggered on update. These can be retrieved using
+     *     {@link AssistantApp#getArgument}.
+     * @param dialogState JSON object the app uses to hold dialog state that
+     *     will be circulated back by Assistant. Used in {@link ActionsSdkApp}.
+     * @return A response is sent to Assistant to ask for the user's permission; for any
+     *     invalid input, we return null.
+     * @actionssdk
+     * @dialogflow
+     */
+    askForUpdatePermission(intent: string, intentArguments: IntentArgument[], dialogState?: object): express.Response | null;
+
     /**
      * Checks whether user is in transactable state.
      *
@@ -520,7 +622,7 @@ export class AssistantApp {
      *     options and order options. Optional if order has no payment or
      *     delivery.
      * @param dialogState JSON object the app uses to hold dialog state that
-     *     will be circulated back by Assistant. Used in {@link ActionsSdkAssistant}.
+     *     will be circulated back by Assistant. Used in {@link ActionsSdkApp}.
      * @return HTTP response.
      * @actionssdk
      * @dialogflow
@@ -562,7 +664,7 @@ export class AssistantApp {
      *     transactionConfig Configuration for the transaction. Includes payment
      *     options and order options.
      * @param dialogState JSON object the app uses to hold dialog state that
-     *     will be circulated back by Assistant. Used in {@link ActionsSdkAssistant}.
+     *     will be circulated back by Assistant. Used in {@link ActionsSdkApp}.
      * @return HTTP response
      * @dialogflow
      */
@@ -737,7 +839,7 @@ export class AssistantApp {
      *     query for an affirmative or negative response. If undefined or null,
      *     Google will use a generic yes/no prompt.
      * @param dialogState JSON object the app uses to hold dialog state that
-     *     will be circulated back by Assistant. Used in {@link ActionsSdkAssistant}.
+     *     will be circulated back by Assistant. Used in {@link ActionsSdkApp}.
      * @return HTTP response.
      * @actionssdk
      * @dialogflow
@@ -782,7 +884,7 @@ export class AssistantApp {
      *     time if not provided by user. If undefined or null, Google will use a
      *     generic prompt.
      * @param dialogState JSON object the app uses to hold dialog state that
-     *     will be circulated back by Assistant. Used in {@link ActionsSdkAssistant}.
+     *     will be circulated back by Assistant. Used in {@link ActionsSdkApp}.
      * @return HTTP response.
      * @actionssdk
      * @dialogflow
@@ -795,11 +897,6 @@ export class AssistantApp {
      * Retrieve the access token in subsequent intents using
      * app.getUser().accessToken.
      *
-     * Note: Currently this API requires enabling the app for Transactions APIs.
-     * To do this, fill out the App Info section of the Actions Console project
-     * and check the box indicating the use of Transactions under "Privacy and
-     * consent".
-     *
      * @example
      * const app = new DialogflowApp({ request, response });
      * const WELCOME_INTENT = 'input.welcome';
@@ -824,7 +921,7 @@ export class AssistantApp {
      * app.handleRequest(actionMap);
      *
      * @param dialogState JSON object the app uses to hold dialog state that
-     *     will be circulated back by Assistant. Used in {@link ActionsSdkAssistant}.
+     *     will be circulated back by Assistant. Used in {@link ActionsSdkApp}.
      * @return HTTP response.
      * @actionssdk
      * @dialogflow
@@ -872,13 +969,53 @@ export class AssistantApp {
      * @param capabilities The list of capabilities required in
      *     the surface.
      * @param dialogState JSON object the app uses to hold dialog state that
-     *     will be circulated back by Assistant. Used in {@link ActionsSdkAssistant}.
+     *     will be circulated back by Assistant. Used in {@link ActionsSdkApp}.
      * @return HTTP response.
      * @dialogflow
      * @actionssdk
      */
     askForNewSurface(context: string, notificationTitle: string, capabilities: SurfaceCapabilities[], dialogState?: object): express.Response | null;
 
+    /**
+     * Requests the user to register for daily updates.
+     *
+     * @example
+     * const app = new DialogflowApp({ request, response });
+     * const WELCOME_INTENT = 'input.welcome';
+     * const SHOW_IMAGE = 'show.image';
+     *
+     * function welcomeIntent (app) {
+     *   app.askToRegisterDailyUpdate('show.image', [
+     *     {
+     *       name: 'image_to_show',
+     *       textValue: 'image_type_1'
+     *     }
+     *   ]);
+     * }
+     *
+     * function showImage (app) {
+     *   showPicture(app.getArgument('image_to_show'));
+     * }
+     *
+     * const actionMap = new Map();
+     * actionMap.set(WELCOME_INTENT, welcomeIntent);
+     * actionMap.set(SHOW_IMAGE, showImage);
+     * app.handleRequest(actionMap);
+     *
+     * @param intent If using Dialogflow, the action name of the intent
+     *     to be triggered when the update is received. If using Actions SDK, the
+     *     intent name to be triggered when the update is received.
+     * @param intentArguments The necessary arguments
+     *     to fulfill the intent triggered on update. These can be retrieved using
+     *     {@link AssistantApp#getArgument}.
+     * @param dialogState JSON object the app uses to hold dialog state that
+     *     will be circulated back by Assistant. Used in {@link ActionsSdkApp}.
+     * @return HTTP response.
+     * @dialogflow
+     * @actionssdk
+     */
+    askToRegisterDailyUpdate(intent: string, intentArguments: IntentArgument[], dialogState?: object): express.Response | null;
+
     /**
      * Gets the {@link User} object.
      * The user object contains information about the user, including
@@ -945,6 +1082,18 @@ export class AssistantApp {
      */
     getUserLocale(): string;
 
+    /**
+     * Get the user's last seen time as a Date object.
+     * Not supported in V1.
+     *
+     * @example
+     * const app = new DialogflowApp({request, response});
+     * const lastSeen = app.getLastSeen();
+     *
+     * @return User's last seen date or null if never seen
+     */
+    getLastSeen(): Date | null;
+
     /**
      * If granted permission to device's location in previous intent, returns device's
      * location (see {@link AssistantApp#askForPermissions|askForPermissions}).
@@ -1225,6 +1374,16 @@ export class AssistantApp {
      */
     isFinalReprompt(): boolean;
 
+    /**
+     * Returns true if user accepted update registration request. Used with
+     * {@link AssistantApp#askToRegisterDailyUpdate}
+     *
+     * @return True if user accepted update registration request.
+     * @dialogflow
+     * @actionssdk
+     */
+    isUpdateRegistered(): boolean;
+
     // ---------------------------------------------------------------------------
     //                   Response Builders
     // ---------------------------------------------------------------------------
diff --git a/types/actions-on-google/index.d.ts b/types/actions-on-google/index.d.ts
index 5f7baba3b8..378604411f 100644
--- a/types/actions-on-google/index.d.ts
+++ b/types/actions-on-google/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for actions-on-google 1.5
+// Type definitions for actions-on-google 1.6
 // Project: https://github.com/actions-on-google/actions-on-google-nodejs
 // Definitions by: Joel Hegg <https://github.com/joelhegg>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/actions-on-google/response-builder.d.ts b/types/actions-on-google/response-builder.d.ts
index 1e11984551..5b6e3d7522 100644
--- a/types/actions-on-google/response-builder.d.ts
+++ b/types/actions-on-google/response-builder.d.ts
@@ -70,6 +70,24 @@ export interface OptionInfo {
     synonyms: string[];
 }
 
+export interface StructuredResponse {
+    orderUpdate: OrderUpdate;
+}
+
+export interface RichResponseItemBasicCard {
+    basicCard: BasicCard;
+}
+
+export interface RichResponseItemSimpleResponse {
+    simpleResponse: SimpleResponse;
+}
+
+export interface RichResponseItemStructuredResponse {
+    structuredResponse: StructuredResponse;
+}
+
+export type RichResponseItem = RichResponseItemBasicCard | RichResponseItemSimpleResponse | RichResponseItemStructuredResponse;
+
 /**
  * Class for initializing and constructing Rich Responses with chainable interface.
  */
@@ -85,7 +103,7 @@ export class RichResponse {
      * Ordered list of either SimpleResponse objects or BasicCard objects.
      * First item must be SimpleResponse. There can be at most one card.
      */
-    items: Array<SimpleResponse | BasicCard>;
+    items: RichResponseItem[];
 
     /**
      * Ordered list of text suggestions to display. Optional.
diff --git a/types/actions-on-google/transactions.d.ts b/types/actions-on-google/transactions.d.ts
index 8cc26165db..b4a4285fe9 100644
--- a/types/actions-on-google/transactions.d.ts
+++ b/types/actions-on-google/transactions.d.ts
@@ -25,8 +25,8 @@ export interface Price {
  * Order rejection info.
  */
 export interface RejectionInfo {
-    /** One of Transaction.RejectionType. */
-    type: RejectionType;
+    /** One of Transaction.ReasonType. */
+    type: ReasonType;
     /** Reason for the order rejection. */
     reason: string;
 }
@@ -51,26 +51,16 @@ export interface CancellationInfo {
  * Order transit info.
  */
 export interface TransitInfo {
-    /** UTC timestamp of the transit update. */
-    updatedTime: {
-        /** Seconds since Unix epoch. */
-        seconds: number;
-        /** Partial seconds since Unix epoch. */
-        nanos?: number;
-    };
+    /** UTC timestamp of the transit update as an RFC 3339 string. */
+    updatedTime: string;
 }
 
 /**
  * Order fulfillment info.
  */
 export interface FulfillmentInfo {
-    /** UTC timestamp of the fulfillment update. */
-    deliveryTime: {
-        /** Seconds since Unix epoch. */
-        seconds: number;
-        /** Partial seconds since Unix epoch. */
-        nanos?: number;
-    };
+    /** UTC timestamp of the fulfillment update as an RFC 3339 string. */
+    deliveryTime: string;
 }
 
 /**
@@ -140,7 +130,7 @@ export interface Location {
  */
 export interface TransactionDecision {
     /** One of Transactions.ConfirmationDecision. */
-    userDecision: ConfirmationDecision;
+    userDecision: TransactionUserDecision;
     checkResult: {
         /** One of Transactions.ResultType. */
         resultType: ResultType;
@@ -175,32 +165,61 @@ export interface TransactionDecision {
 export const TransactionValues: {
     /** List of transaction card networks available when paying with Google. */
     readonly CardNetwork: typeof CardNetwork;
+    /**
+     * List of possible item types.
+     * @deprecated Use {@link TransactionValues.LineItemType} instead.
+     */
+    readonly ItemType: typeof LineItemType;
     /** List of possible item types. */
-    readonly ItemType: typeof ItemType;
+    readonly LineItemType: typeof LineItemType;
     /** List of price types. */
     readonly PriceType: typeof PriceType;
     /** List of possible item types. */
     readonly PaymentType: typeof PaymentType;
     /** List of customer information properties that can be requested. */
     readonly CustomerInfoProperties: typeof CustomerInfoProperties;
+    /**
+     * List of possible order confirmation user decisions
+     * @deprecated Use {@link TransactionValues.TransactionUserDecision} instead.
+     */
+    readonly ConfirmationDecision: typeof TransactionUserDecision;
     /** List of possible order confirmation user decisions */
-    readonly ConfirmationDecision: typeof ConfirmationDecision;
+    readonly TransactionUserDecision: typeof TransactionUserDecision;
     /** List of possible order states. */
     readonly OrderState: typeof OrderState;
+    /**
+     * List of possible actions to take on the order.
+     * @deprecated Use {@link TransactionValues.ActionType} instead.
+     */
+    readonly OrderAction: typeof ActionType;
     /** List of possible actions to take on the order. */
-    readonly OrderAction: typeof OrderAction;
+    readonly ActionType: typeof ActionType;
+    /**
+     * List of possible types of order rejection.
+     * @deprecated Use {@link TransactionValues.ReasonType} instead.
+     */
+    readonly RejectionType: typeof ReasonType;
     /** List of possible types of order rejection. */
-    readonly RejectionType: typeof RejectionType;
+    readonly ReasonType: typeof ReasonType;
     /** List of possible order state objects. */
     readonly OrderStateInfo: typeof OrderStateInfo;
     /** List of possible order transaction requirements check result types. */
     readonly ResultType: typeof ResultType;
     /** List of possible user decisions to give delivery address. */
-    readonly DeliveryAddressDecision: typeof DeliveryAddressDecision;
+    readonly DeliveryAddressDecision: typeof DeliveryAddressUserDecision;
+    /** List of possible user decisions to give delivery address. */
+    readonly DeliveryAddressUserDecision: typeof DeliveryAddressUserDecision;
+    /**
+     * List of possible order location types.
+     * @deprecated Use {@link TransactionValues.OrderLocationType} instead.
+     */
+    readonly LocationType: typeof OrderLocationType;
     /** List of possible order location types. */
-    readonly LocationType: typeof LocationType;
+    readonly OrderLocationType: typeof OrderLocationType;
     /** List of possible order time types. */
     readonly TimeType: typeof TimeType;
+    /** List of possible tokenization types for the payment method */
+    readonly PaymentMethodTokenizationType: typeof PaymentMethodTokenizationType;
 };
 
 /**
@@ -235,8 +254,14 @@ export enum CardNetwork {
 
 /**
  * List of possible item types.
+ * @deprecated Use {@link TransactionValues.LineItemType} instead.
  */
-export enum ItemType {
+export type ItemType = LineItemType;
+
+/**
+ * List of possible item types.
+ */
+export enum LineItemType {
     /**
      * Unspecified.
      */
@@ -323,13 +348,24 @@ export enum PaymentType {
  * List of customer information properties that can be requested.
  */
 export enum CustomerInfoProperties {
+    CUSTOMER_INFO_PROPERTY_UNSPECIFIED,
     EMAIL
 }
 
 /**
  * List of possible order confirmation user decisions
+ * @deprecated Use {@link TransactionValues.TransactionUserDecision} instead.
  */
-export enum ConfirmationDecision {
+export type ConfirmationDecision = TransactionUserDecision;
+
+/**
+ * List of possible order confirmation user decisions
+ */
+export enum TransactionUserDecision {
+    /**
+     * Unspecified user decision.
+     */
+    UNKNOWN_USER_DECISION,
     /**
      * Order was approved by user.
      */
@@ -353,6 +389,10 @@ export enum ConfirmationDecision {
  * List of possible order states.
  */
 export enum OrderState {
+    /**
+     * Order was created at the integrator's system.
+     */
+    CREATED,
     /**
      * Order was rejected.
      */
@@ -381,8 +421,18 @@ export enum OrderState {
 
 /**
  * List of possible actions to take on the order.
+ * @deprecated Use {@link TransactionValues.ActionType} instead.
  */
-export enum OrderAction {
+export type OrderAction = ActionType;
+
+/**
+ * List of possible actions to take on the order.
+ */
+export enum ActionType {
+    /**
+     * Unknown action.
+     */
+    UNKNOWN,
     /**
      * View details.
      */
@@ -418,13 +468,23 @@ export enum OrderAction {
     /**
      * Review.
      */
-    REVIEW
+    REVIEW,
+    /**
+     * Customer Service.
+     */
+    CUSTOMER_SERVICE
 }
 
 /**
  * List of possible types of order rejection.
+ * @deprecated Use {@link TransactionValues.ReasonType} instead.
  */
-export enum RejectionType {
+export type RejectionType = ReasonType;
+
+/**
+ * List of possible types of order rejection.
+ */
+export enum ReasonType {
     /**
      * Unknown
      */
@@ -494,8 +554,14 @@ export enum ResultType {
 
 /**
  * List of possible user decisions to give delivery address.
+ * @deprecated Use {@link TransactionValues.DeliveryAddressUserDecision} instead.
  */
-export enum DeliveryAddressDecision {
+export type DeliveryAddressDecision = DeliveryAddressUserDecision;
+
+/**
+ * List of possible user decisions to give delivery address.
+ */
+export enum DeliveryAddressUserDecision {
     /**
      * Unknown.
      */
@@ -512,8 +578,14 @@ export enum DeliveryAddressDecision {
 
 /**
  * List of possible order location types.
+ * @deprecated Use {@link TransactionValues.OrderLocationType} instead.
  */
-export enum LocationType {
+export type LocationType = OrderLocationType;
+
+/**
+ * List of possible order location types.
+ */
+export enum OrderLocationType {
     /**
      * Unknown.
      */
@@ -533,7 +605,11 @@ export enum LocationType {
     /**
      * Destination of the order.
      */
-    DESTINATION
+    DESTINATION,
+    /**
+     * Pick up location of the order.
+     */
+    PICK_UP
 }
 
 /**
@@ -558,6 +634,20 @@ export enum TimeType {
     RESERVATION_SLOT
 }
 
+/**
+ * List of possible tokenization types for the payment method
+ */
+export enum PaymentMethodTokenizationType {
+    /**
+     * Unspecified tokenization type.
+     */
+    UNSPECIFIED_TOKENIZATION_TYPE,
+    /**
+     * Use external payment gateway tokenization API to tokenize selected payment method.
+     */
+    PAYMENT_GATEWAY
+}
+
 /**
  * Class for initializing and constructing Order with chainable interface.
  */
@@ -655,11 +745,11 @@ export class Order {
     /**
      * Adds an associated location to the order. Up to 2 locations can be added.
      *
-     * @param type One of TransactionValues.LocationType.
+     * @param type One of TransactionValues.OrderLocationType.
      * @param location Location to add.
      * @return Returns current constructed Order.
      */
-    addLocation(type: LocationType, location: Location): Order;
+    addLocation(type: OrderLocationType, location: Location): Order;
 
     /**
      * Sets an associated time to the order.
@@ -780,9 +870,9 @@ export class LineItem {
     image?: Image;
 
     /**
-     * Type of the item. One of TransactionValues.ItemType.
+     * Type of the item. One of TransactionValues.LineItemType.
      */
-    type?: ItemType;
+    type?: LineItemType;
 
     /**
      * Quantity of the item.
@@ -834,10 +924,10 @@ export class LineItem {
     /**
      * Set the type of the item.
      *
-     * @param type Type of the item. One of TransactionValues.ItemType.
+     * @param type Type of the item. One of TransactionValues.LineItemType.
      * @return Returns current constructed LineItem.
      */
-    setType(type: ItemType): LineItem;
+    setType(type: LineItemType): LineItem;
 
     /**
      * Set the quantity of the item.
@@ -898,9 +988,9 @@ export class OrderUpdate {
     lineItemUpdates: object;
 
     /**
-     * UTC timestamp of the order update.
+     * UTC timestamp of the order update as an RFC 3339 string.
      */
-    updateTime?: object;
+    updateTime?: string;
 
     /**
      * Actionable items presented to the user to manage the order.
@@ -946,7 +1036,7 @@ export class OrderUpdate {
      * Set the update time of the order.
      *
      * @param seconds Seconds since Unix epoch.
-     * @param nanos Partial time units.
+     * @param nanos Partial time units. It is rounded to the nearest millisecond.
      * @return Returns current constructed OrderUpdate.
      */
     setUpdateTime(seconds: number, nanos?: number): OrderUpdate;
@@ -974,12 +1064,12 @@ export class OrderUpdate {
     /**
      * Adds an actionable item for the user to manage the order.
      *
-     * @param type One of TransactionValues.OrderActions.
+     * @param type One of TransactionValues.ActionType.
      * @param label Button label.
      * @param url URL to open when button is clicked.
      * @return Returns current constructed OrderUpdate.
      */
-    addOrderManagementAction(type: OrderAction, label: string, url: string): OrderUpdate;
+    addOrderManagementAction(type: ActionType, label: string, url: string): OrderUpdate;
 
     /**
      * Adds a single price update for a particular line item in the order.
diff --git a/types/aframe/aframe-tests.ts b/types/aframe/aframe-tests.ts
index 439d314f4a..5af66a09d1 100644
--- a/types/aframe/aframe-tests.ts
+++ b/types/aframe/aframe-tests.ts
@@ -1,5 +1,4 @@
 // Global
-
 const threeCamera = new AFRAME.THREE.Camera();
 AFRAME.TWEEN.Easing;
 
@@ -42,9 +41,18 @@ entity.addEventListener('child-detached', (event) => {
 const Component = AFRAME.registerComponent('test', {});
 
 // Scene
-
 const scene = document.querySelector('a-scene');
 scene.hasLoaded;
 
 // System
 const system = scene.systems['systemName'];
+
+// Register Custom Geometry
+AFRAME.registerGeometry('a-test-geometry', {
+	schema: {
+		groupIndex: { default: 0 }
+	},
+	init(data) {
+		this.geometry = new THREE.Geometry();
+	}
+});
diff --git a/types/aframe/index.d.ts b/types/aframe/index.d.ts
index f1f5cd7a20..803318a754 100644
--- a/types/aframe/index.d.ts
+++ b/types/aframe/index.d.ts
@@ -1,6 +1,7 @@
-// Type definitions for AFRAME 0.5
+// Type definitions for AFRAME 0.7
 // Project: https://aframe.io/
 // Definitions by: Paul Shannon <https://github.com/devpaul>
+//                 Roberto Ritger <https://github.com/bertoritger>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -40,7 +41,7 @@ declare namespace AFrame {
 		primitives: { [ key: string ]: Entity };
 		registerComponent(name: string, component: ComponentDefinition): ComponentConstructor;
 		registerElement(name: string, element: ANode): void;
-		registerGeometry(name: string, geometery: THREE.Geometry): Geometry;
+		registerGeometry(name: string, geometry: GeometryDefinition): Geometry;
 		registerPrimitive(name: string, primitive: PrimitiveDefinition): void;
 		registerShader(name: string, shader: any): void;
 		registerSystem(name: string, definition: SystemDefinition): void;
@@ -101,7 +102,7 @@ declare namespace AFrame {
 		name: string;
 		schema: Schema;
 
-		init(): void;
+		init(data?: any): void;
 		pause(): void;
 		play(): void;
 		remove(): void;
@@ -124,7 +125,7 @@ declare namespace AFrame {
 		multiple?: boolean;
 		schema?: Schema;
 
-		init?(): void;
+		init?(data?: any): void;
 		pause?(): void;
 		play?(): void;
 		remove?(): void;
@@ -222,6 +223,10 @@ declare namespace AFrame {
 		[ key: string ]: any;
 	}
 
+	interface GeometryDefinition extends ComponentDefinition {
+		geometry?: THREE.Geometry;
+	}
+
 	interface GeometryDescriptor {
 		Geometry: Geometry;
 		schema: Schema;
diff --git a/types/amcharts/index.d.ts b/types/amcharts/index.d.ts
index 85abd11f5c..0dae492a76 100644
--- a/types/amcharts/index.d.ts
+++ b/types/amcharts/index.d.ts
@@ -2191,27 +2191,45 @@ If you do not set properties such as dashLength, lineAlpha, lineColor, etc - val
             chart.addGraph(graph);
     */
     class AmGraph {
+        /** Text which screen readers will read if user rolls-over the bullet/column or sets focus using tab key (this is possible only if tabIndex property of AmGraph is set to some number). Text is added as aria-label tag. Note - not all screen readers and browsers support this.
+            @default "[[title]] [[category]] [[value]]"
+        */
+        accessibleLabel: string;
         /** Name of the alpha field in your dataProvider. */
         alphaField: string;
+        /** If you set this to true before chart is drawn, the animation of this graph won't be played.
+            @default false
+        */
+        animationPlayed: boolean;
+        /** Allows customizing graphs balloons individually (only when ChartCursor is used). Note: the balloon object is not created automatically, you should create it before setting properties */
+        balloon: AmBalloon;
         /** Value balloon color. Will use graph or data item color if not set. */
         balloonColor: string;
-        /**	If you set some function, the graph will call it and pass GraphDataItem and AmGraph object to it. This function should return a string which will be displayed in a balloon.  */
+        /** If you set some function, the graph will call it and pass GraphDataItem and AmGraph objects to it. This function should return a string which will be displayed in a balloon. */
         balloonFunction(graphDataItem: GraphDataItem, amGraph: AmGraph): string;
-        /** Balloon text. You can use tags like [[value]], [[description]], [[percents]], [[open]], [[category]] [[value]] */
+        /** Balloon text. You can use tags like [[value]], [[description]], [[percents]], [[open]], [[category]] or any other field name from your data provider. HTML tags can also be used.
+            @default [[value]]
+        */
         balloonText: string;
-        /** Specifies if the line graph should be placed behind column graphs */
+        /** Specifies if the line graph should be placed behind column graphs
+            @default false
+        */
         behindColumns: boolean;
-        /** Type of the bullets. Possible values are: "none", "round", "square", "triangleUp", "triangleDown", "bubble", "custom". none */
+        /** Type of the bullets. Possible values are: "none", "round", "square", "triangleUp", "triangleDown", "triangleLeft", "triangleRight", "bubble", "diamond", "xError", "yError" and "custom".
+            @default "none"
+        */
         bullet: string;
         /** Opacity of bullets. Value range is 0 - 1.
             @default 1
         */
         bulletAlpha: number;
+        /** bulletAxis value is used when you are building error chart. Error chart is a regular serial or XY chart with bullet type set to "xError" or "yError". The graph should know which axis should be used to determine the size of this bullet - that's when bulletAxis should be set. Besides that, you should also set graph.errorField. You can also use other bullet types with this feature too. For example, if you set bulletAxis for XY chart, the size of a bullet will change as you zoom the chart. */
+        bulletAxis: ValueAxis;
         /** Bullet border opacity.
-            @default 1
+            @default 0
         */
         bulletBorderAlpha: number;
-        /** Bullet border color. Will use lineColor if not set.   */
+        /** Bullet border color. Will use lineColor if not set. */
         bulletBorderColor: string;
         /** Bullet border thickness.
             @default 2
@@ -2221,7 +2239,11 @@ If you do not set properties such as dashLength, lineAlpha, lineColor, etc - val
         bulletColor: string;
         /** Name of the bullet field in your dataProvider. */
         bulletField: string;
-        /** Bullet offset. Distance from the actual data point to the bullet. Can be used to place custom bullets above the columns. */
+        /** Useful for touch devices - if you set it to 20 or so, the bullets of a graph will have invisible circle around the actual bullet (bullets should still be enabled), which will be easier to touch (bullets usually are smaller and hard to hit). */
+        bulletHitAreaSize: number;
+        /** Bullet offset. Distance from the actual data point to the bullet. Can be used to place custom bullets above the columns.
+            @default 0
+        */
         bulletOffset: number;
         /** Bullet size.
             @default 8
@@ -2229,17 +2251,31 @@ If you do not set properties such as dashLength, lineAlpha, lineColor, etc - val
         bulletSize: number;
         /** Name of the bullet size field in your dataProvider. */
         bulletSizeField: string;
+        /** If this field is set and addClassNames is enabled, the chart will look for a class name string in data using this setting and apply additional class names to elements of the particular data points, such as bullets. */
+        classNameField: string;
         /** Name of the close field (used by candlesticks and ohlc) in your dataProvider. */
         closeField: string;
+        /** In case you want to place this graph's columns in front of other columns, set this to false. In case "true", the columns will be clustered next to each other.
+
+         NOTE: clustering works only for graphs of type "column".
+            @default true
+        */
+        clustered: boolean;
         /** Color of value labels. Will use chart's color if not set. */
         color: string;
         /** Name of the color field in your dataProvider. */
         colorField: string;
-        /** Specifies whether to connect data points if data is missing. The default value is true.
+        /** You can use this property with non-stacked column graphs and specify order of columns of each category (starting from 0). Important: this feature does not work in stacked columns scenarios as well as with graph toggling enabled in legend. */
+        columnIndexField: string;
+        /** You can specify custom column width for each graph individually. Value range is 0 - 1 (we set relative width, not pixel width here). */
+        columnWidth: number;
+        /** Specifies whether to connect data points if data is missing. The default value is true. This feature does not work with XY chart.
             @default true
         */
         connect: boolean;
-        /** Corner radius of column. It can be set both in pixels or in percents. The chart's depth and angle styles must be set to 0. The default value is 0. Note, cornerRadiusTop will be applied for all corners of the column, JavaScript charts do not have a possibility to set separate corner radius for top and bottom. As we want all the property names to be the same both on JS and Flex, we didn't change this too. */
+        /** Corner radius of column. It can be set both in pixels or in percents. The chart's depth and angle styles must be set to 0. The default value is 0. Note, cornerRadiusTop will be applied for all corners of the column, JavaScript charts do not have a possibility to set separate corner radius for top and bottom. As we want all the property names to be the same both on JS and Flex, we didn't change this too.
+            @default 0
+        */
         cornerRadiusTop: number;
         /** If bulletsEnabled of ChartCurosor is true, a bullet on each graph follows the cursor. You can set opacity of each graphs bullet. In case you want to disable these bullets for a certain graph, set opacity to 0.
             @default 1
@@ -2249,55 +2285,108 @@ If you do not set properties such as dashLength, lineAlpha, lineColor, etc - val
         customBullet: string;
         /** Name of the custom bullet field in your dataProvider. */
         customBulletField: string;
-        /** Dash length. If you set it to a value greater than 0, the graph line will be dashed. */
+        /** Path to the image for legend marker. */
+        customMarker: string;
+        /** Dash length. If you set it to a value greater than 0, the graph line (or columns border) will be dashed.
+            @default 0
+        */
         dashLength: number;
+        /** Name of the dash length field in your dataProvider. This property adds a possibility to change graphs’ line from solid to dashed on any data point. You can also make columns border dashed using this setting. Note, this won't work with smoothedLineGraph. */
+        dashLengthField: string;
+        /** Used to format balloons if value axis is date-based.
+            @default "MMM DD, YYYY"
+        */
+        dateFormat: string;
         /** Name of the description field in your dataProvider. */
         descriptionField: string;
-        /** Opacity of fill. Plural form is used to keep the same property names as our Flex charts'. Flex charts can accept array of numbers to generate gradients. Although you can set array here, only first value of this array will be used. */
+        /** Name of error value field in your data provider. */
+        errorField: string;
+        /** Opacity of fill. Plural form is used to keep the same property names as our Flex charts'. Flex charts can accept array of numbers to generate gradients. Although you can set array here, only first value of this array will be used.
+            @default 0
+        */
         fillAlphas: number;
-        /** Fill color. Will use lineColor if not set. */
-        fillColors: any;
-        /** Name of the fill colors field in your dataProvider. */
+        /** Fill color. Will use lineColor if not set. You can also set array of colors here. */
+        fillColors: string;
+        /** Name of the fill colors field in your dataProvider. This property adds a possibility to change line graphs’ fill color on any data point to create highlighted sections of the graph. Works only with AmSerialChart. */
         fillColorsField: string;
-        /** You can set another graph here and if fillAlpha is >0, the area from this graph to fillToGraph will be filled (instead of filling the area to the X axis). */
+        /** XY chart only. If you set this property to id or reference of your X or Y axis, and the fillAlphas is > 0, the area between graph and axis will be filled with color, like in this demo. */
+        fillToAxis: ValueAxis;
+        /** You can set another graph here and if fillAlpha is >0, the area from this graph to fillToGraph will be filled (instead of filling the area to the X axis). This feature is not supported by smoothedLine graphs and Radar chart. */
         fillToGraph: AmGraph;
+        /** Column width in pixels. If you set this property, columns will be of a fixed width and won't adjust to the available space. */
+        fixedColumnWidth: number;
         /** Size of value labels text. Will use chart's fontSize if not set. */
-        fontSize: string;
-        /** Orientation of the gradient fills (only for "column" graph type). Possible values are "vertical" and "horizontal". vertical */
+        fontSize: number;
+        /** If this is set `true`, the graph will always break the line if the distance in time between two adjacent data points is bigger than `gapPeriod x minPeriod`, even if `connect` is set to `true`.
+            @default false
+        */
+        forceGap: boolean;
+        /** Name of the gap field in your dataProvider. You can force graph to show gap at a desired data point using this feature. This feature does not work with XY chart. */
+        gapField: string;
+        /** Using this property you can specify when graph should display gap - if the time difference between data points is bigger than duration of minPeriod * gapPeriod, and connect property of a graph is set to false, graph will display gap.
+            @default 1.1
+        */
+        gapPeriod: number;
+        /** Orientation of the gradient fills (only for "column" graph type). Possible values are "vertical" and "horizontal".
+            @default "vertical"
+        */
         gradientOrientation: string;
-        /** Specifies whether the graph is hidden. Do not use this to show/hide the graph, use hideGraph(graph) and showGraph(graph) methods instead. */
+        /** Specifies whether the graph is hidden. Do not use this to show/hide the graph, use hideGraph(graph) and showGraph(graph) methods instead.
+            @default false
+        */
         hidden: boolean;
-        /** If there are more data points than hideBulletsCount, the bullets will not be shown. 0 means the bullets will always be visible. */
+        /** If there are more data points than hideBulletsCount, the bullets will not be shown. 0 means the bullets will always be visible.
+            @default 0
+        */
         hideBulletsCount: number;
         /** Name of the high field (used by candlesticks and ohlc) in your dataProvider. */
         highField: string;
-
-         /** Unique id of a graph. It is not required to set one, unless you want to use this graph for as your scrollbar's graph and need to indicate which graph should be used.*/
-        id?: string;
-
+        /** Unique id of a graph. It is not required to set one, unless you want to use this graph for as your scrollbar's graph and need to indicate which graph should be used. */
+        id: string;
         /** Whether to include this graph when calculating min and max value of the axis.
             @default true
         */
         includeInMinMax: boolean;
+        /** Data label text anchor.
+            @default "auto"
+        */
+        labelAnchor: string;
         /** Name of label color field in data provider. */
         labelColorField: string;
-        /** Position of value label. Possible values are: "bottom", "top", "right", "left", "inside", "middle". Sometimes position is changed by the chart, depending on a graph type, rotation, etc. top */
+        /** You can use it to format labels of data items in any way you want. Graph will call this function and pass reference to GraphDataItem and formatted text as attributes. This function should return string which will be displayed as label. */
+        labelFunction(value: number, valueText: string, valueAxis: ValueAxis): string;
+        labelFunction(valueText: string, data: Date, valueAxis: ValueAxis): string;
+        /** Offset of data label.
+            @default 0
+        */
+        labelOffset: number;
+        /** Position of value label. Possible values are: "bottom", "top", "right", "left", "inside", "middle". Sometimes position is changed by the chart, depending on a graph type, rotation, etc.
+            @default "top"
+        */
         labelPosition: string;
+        /** Rotation of a data label.
+            @default 0
+        */
+        labelRotation: number;
         /** Value label text. You can use tags like [[value]], [[description]], [[percents]], [[open]], [[category]]. */
         labelText: string;
         /** Legend marker opacity. Will use lineAlpha if not set. Value range is 0 - 1. */
         legendAlpha: number;
         /** Legend marker color. Will use lineColor if not set. */
         legendColor: string;
+        /** It is called and the following attributes are passed: dataItem, formattedText, periodValues, periodPercentValues. It should return hex color code which will be used for legend marker. */
+        legendColorFunction: Object;
+        /** The text which will be displayed in the value portion of the legend when user is not hovering above any data point. The tags should be made out of two parts - the name of a field (value / open / close / high / low) and the value of the period you want to be show - open / close / high / low / sum / average / count. For example: [[value.sum]] means that sum of all data points of value field in the selected period will be displayed. */
+        legendPeriodValueText: string;
         /** Legend value text. You can use tags like [[value]], [[description]], [[percents]], [[open]], [[category]] You can also use custom fields from your dataProvider. If not set, uses Legend's valueText. */
         legendValueText: string;
         /** Opacity of the line (or column border). Value range is 0 - 1.
             @default 1
         */
         lineAlpha: number;
-        /** Color of the line (or column border). If you do not set any, the color from [[AmCoordinateChart */
+        /** Color of the line (or column border). If you do not set any, the color from AmCoordinateChart.colors array will be used for each subsequent graph. */
         lineColor: string;
-        /** Name of the line color field (used by columns and candlesticks only) in your dataProvider. */
+        /** Name of the line color field in your dataProvider. This property adds a possibility to change graphs’ line color on any data point to create highlighted sections of the graph. Works only with AmSerialChart. */
         lineColorField: string;
         /** Specifies thickness of the graph line (or column border).
             @default 1
@@ -2305,55 +2394,125 @@ If you do not set properties such as dashLength, lineAlpha, lineColor, etc - val
         lineThickness: number;
         /** Name of the low field (used by candlesticks and ohlc) in your dataProvider. */
         lowField: string;
-        /** Legend marker type. You can set legend marker (key) type for individual graphs. Possible values are: "square", "circle", "line", "dashedLine", "triangleUp", "triangleDown", "bubble". */
+        /** Legend marker type. You can set legend marker (key) type for individual graphs. Possible values are: square, circle, diamond, triangleUp, triangleDown, triangleLeft, triangleDown, bubble, line, none. */
         markerType: string;
         /** Specifies size of the bullet which value is the biggest (XY chart).
             @default 50
         */
         maxBulletSize: number;
-        /** Specifies minimum size of the bullet (XY chart). */
+        /** Specifies minimum size of the bullet (XY chart).
+            @default 4
+        */
         minBulletSize: number;
-        /** If you use different colors for your negative values, a graph below zero line is filled with negativeColor. With this property you can define a different base value at which colors should be changed to negative colors. */
+        /** It is useful if you have really lots of data points. Based on this property the graph will omit some of the lines (if the distance between points is less that minDistance, in pixels). This will not affect the bullets or indicator in anyway, so the user will not see any difference (unless you set minValue to a bigger value, let say 5), but will increase performance as less lines will be drawn. By setting value to a bigger number you can also make your lines look less jagged.
+            @default 1
+        */
+        minDistance: number;
+        /** If you use different colors for your negative values, a graph below zero line is filled with negativeColor. With this property you can define a different base value at which colors should be changed to negative colors.
+            @default 0
+        */
         negativeBase: number;
         /** Fill opacity of negative part of the graph. Will use fillAlphas if not set. */
         negativeFillAlphas: number;
         /** Fill color of negative part of the graph. Will use fillColors if not set. */
-        negativeFillColors: any; //String /Array;
+        negativeFillColors: string;
+        /** Opacity of the negative portion of the line (or column border). Value range is 0 - 1.
+            @default 1
+        */
+        negativeLineAlpha: number;
         /** Color of the line (or column) when the values are negative. In case the graph type is candlestick or ohlc, negativeLineColor is used when close value is less then open value. */
         negativeLineColor: string;
-        /** Example: {precision:-1, decimalSeparator:'.', thousandsSeparator:','}. The graph uses this object's values to format the numbers. Uses chart's numberFormatter if not defined. */
-        numberFormatter: Object;
-        /** If you set it to true, column chart will begin new stack. This allows having Clustered and Stacked column/bar chart. */
-        newStack: boolean;
-        /** Name of the open field (used by floating columns, candlesticks and ohlc) in your dataProvider.
-            @default 50
+        /** If you set it to true, column chart will begin new stack. This allows having Clustered and Stacked column/bar chart.
+            @default false
         */
+        newStack: boolean;
+        /** In case you want to have a step line graph without risers, you should set this to true.
+            @default false
+        */
+        noStepRisers: boolean;
+        /** Name of the open field (used by floating columns, candlesticks and ohlc) in your dataProvider. */
         openField: string;
-        /**Precision of values. Will use chart's precision if not set any.*/
-        precision: number;
-        /** Specifies where data points should be placed - on the beginning of the period (day, hour, etc) or in the middle (only when parseDates property of categoryAxis is set to true). This setting affects Serial chart only. Possible values are "start" and "middle". middle */
+        /** Value of pattern should be object with url, width, height of an image, optionally it might have x, y, randomX and randomY values. For example: {"url":"../amcharts/patterns/black/pattern1.png", "width":4, "height":4}. If you want to have individual patterns for each column, define patterns in data provider and set graph.patternField property. Check amcharts/patterns folder for some patterns. You can create your own patterns and use them. Note, x, y, randomX and randomY properties won't work with IE8 and older. 3D bar/Pie charts won't work properly with patterns.  */
+        pattern: Object;
+        /** Field name in your data provider which holds pattern information. Value of pattern should be object with url, width, height of an image, optionally it might have x, y, randomX and randomY values. For example: {"url":"../amcharts/patterns/black/pattern1.png", "width":4, "height":4}. Check amcharts/patterns folder for some patterns. You can create your own patterns and use them. Note, x, y, randomX and randomY properties won't work with IE8 and older. 3D bar/Pie charts won't work properly with patterns. */
+        patternField: string;
+        /** This property can be used by step graphs - you can set how many periods one horizontal line should span.
+            @default 1
+        */
+        periodSpan: number;
+        /** Specifies where data points should be placed - on the beginning of the period (day, hour, etc) or in the middle (only when parseDates property of categoryAxis is set to true). This setting affects Serial chart only. Possible values are "start", "middle" and "end"
+            @default "middle"
+        */
         pointPosition: string;
-        /** If graph's type is column and labelText is set, graph hides labels which do not fit into the column's space. If you don't want these labels to be hidden, set this to true. */
+        /** Precision of values. Will use chart's precision if not set any. */
+        precision: number;
+        /**  If this is set to true, candlesticks will be colored in a different manner - if current close is less than current open, the candlestick will be empty, otherwise - filled with color. If previous close is less than current close, the candlestick will use positive color, otherwise - negative color.
+            @default false
+        */
+        proCandlesticks: boolean;
+        /** Gantt chart only. Contains unmodified segment object from data provider. */
+        segmentData: Object;
+        /** If graph's type is column and labelText is set, graph hides labels which do not fit into the column's space or go outside plot area. If you don't want these labels to be hidden, set this to true.
+            @default false
+        */
         showAllValueLabels: boolean;
         /** Specifies whether the value balloon of this graph is shown when mouse is over data item or chart's indicator is over some series.
             @default true
         */
         showBalloon: boolean;
-        /** Specifies graphs value at which cursor is showed. This is only important for candlestick and ohlc charts, also if column chart has "open" value. Possible values are: "open", "close", "high", "low". close */
+        /** Specifies graphs value at which cursor is showed. This is only important for candlestick and ohlc charts, also if column chart has "open" value. Possible values are: "open", "close", "high", "low". "top" and "bottom" values will glue the balloon to top/bottom of the plot area.
+            @default "close"
+        */
         showBalloonAt: string;
+        /** Works with candlestick graph type, you can set it to open, close, high, low. If you set it to high, the events will be shown at the tip of the high line.
+            @default "close"
+        */
+        showBulletsAt: string;
+        /** If you want mouse pointer to change to hand when hovering the graph, set this property to true.
+            @default false
+        */
+        showHandOnHover: boolean;
+        /**  It can only be used together with topRadius (when columns look like cylinders). If you set it to true, the cylinder will be lowered down so that the center of it's bottom circle would be right on category axis.
+            @default false
+        */
+        showOnAxis: boolean;
         /** If the value axis of this graph has stack types like "regular" or "100%" You can exclude this graph from stacking.
             @default true
         */
         stackable: boolean;
+        /** Step graph only. Specifies to which direction step should be drawn.
+            @default "right"
+        */
+        stepDirection: string;
+        /** If you set it to false, the graph will not be hidden when user clicks on legend entry.
+            @default true
+        */
+        switchable: boolean;
+        /** In case you set it to some number, the chart will set focus on bullet/column (starting from first) when user clicks tab key. When a focus is set, screen readers like NVDA Screen reader will read label which is set using accessibleLabel property of AmGraph. Note, not all browsers and readers support this.  */
+        tabIndex: number;
         /** Graph title. */
         title: string;
-        /** Type of the graph. Possible values are: "line", "column", "step", "smoothedLine", "candlestick", "ohlc". XY and Radar charts can only display "line" type graphs. line */
+        /** If you set this to 1, columns will become cylinders (must set depth3D and angle properties of a chart to >0 values in order this to be visible). you can make columns look like cones (set topRadius to 0) or even like some glasses (set to bigger than 1). We strongly recommend setting grid opacity to 0 in order this to look good.  */
+        topRadius: number;
+        /** Type of the graph. Possible values are: "line", "column", "step", "smoothedLine", "candlestick", "ohlc". XY and Radar charts can only display "line" type graphs.
+            @default "line"
+        */
         type: string;
         /** Name of the url field in your dataProvider. */
         urlField: string;
         /** Target to open URLs in, i.e. _blank, _top, etc. */
         urlTarget: string;
-        /** Specifies which value axis the graph will use. Will use the first value axis if not set. */
+        /** If set to true, the bullet border will take the same color as graph line.
+            @default false
+        */
+        useLineColorForBulletBorder: boolean;
+        /**  If negativeLineColor and/or negativeFillColors are set and useNegativeColorIfDown is set to true (default is false), the line, step and column graphs will use these colors for lines, bullets or columns if previous value is bigger than current value. In case you set openField for the graph, the graph will compare current value with openField value instead of comparing to previous value. Here is a demo.
+            @default false
+        */
+        useNegativeColorIfDown: boolean;
+        /** Specifies which value axis the graph will use. Will use the first value axis if not set. You can use reference to the real ValueAxis object or set value axis id.
+            @default ValueAxis
+        */
         valueAxis: ValueAxis;
         /** Name of the value field in your dataProvider. */
         valueField: string;
@@ -2361,11 +2520,15 @@ If you do not set properties such as dashLength, lineAlpha, lineColor, etc - val
             @default true
         */
         visibleInLegend: boolean;
-        /** XY chart only. A horizontal value axis object to attach graph to. */
+        /** XY chart only. A horizontal value axis object to attach graph to.
+            @default ValueAxis
+        */
         xAxis: ValueAxis;
         /** XY chart only. Name of the x field in your dataProvider. */
         xField: string;
-        /** XY chart only. A vertical value axis object to attach graph to. */
+        /** XY chart only. A vertical value axis object to attach graph to.
+            @default ValueAxis
+        */
         yAxis: ValueAxis;
         /** XY chart only. Name of the y field in your dataProvider. */
         yField: string;
diff --git a/types/amqplib/index.d.ts b/types/amqplib/index.d.ts
index 91060d23b0..2d5cb3ba99 100644
--- a/types/amqplib/index.d.ts
+++ b/types/amqplib/index.d.ts
@@ -63,4 +63,4 @@ export interface ConfirmChannel extends Channel {
     waitForConfirms(): Promise<void>;
 }
 
-export function connect(url: string, socketOptions?: any): Promise<Connection>;
+export function connect(url: string | Options.Connect, socketOptions?: any): Promise<Connection>;
diff --git a/types/amqplib/properties.d.ts b/types/amqplib/properties.d.ts
index 12514d7810..af90909d8c 100644
--- a/types/amqplib/properties.d.ts
+++ b/types/amqplib/properties.d.ts
@@ -21,6 +21,64 @@ export namespace Replies {
 }
 
 export namespace Options {
+    interface Connect {
+        /**
+         * The to be used protocol
+         *
+         * Default value: 'amqp'
+         */
+        protocol?: string;
+        /**
+         * Hostname used for connecting to the server.
+         *
+         * Default value: 'localhost'
+         */
+        hostname?: string;
+        /**
+         * Port used for connecting to the server.
+         *
+         * Default value: 5672
+         */
+        port?: number;
+        /**
+         * Username used for authenticating against the server.
+         *
+         * Default value: 'guest'
+         */
+        username?: string;
+        /**
+         * Password used for authenticating against the server.
+         *
+         * Default value: 'guest'
+         */
+        password?: string;
+        /**
+         * The desired locale for error messages. RabbitMQ only ever uses en_US
+         *
+         * Default value: 'en_US'
+         */
+        locale?: string;
+        /**
+         * The size in bytes of the maximum frame allowed over the connection. 0 means
+         * no limit (but since frames have a size field which is an unsigned 32 bit integer, it’s perforce 2^32 - 1).
+         *
+         * Default value: 0x1000 (4kb) - That's the allowed minimum, it will fit many purposes
+         */
+        frameMax?: number;
+        /**
+         * The period of the connection heartbeat in seconds.
+         *
+         * Default value: 0
+         */
+        heartbeat?: number;
+        /**
+         * What VHost shall be used.
+         *
+         * Default value: '/'
+         */
+        vhost?: string;
+    }
+
     interface AssertQueue {
         exclusive?: boolean;
         durable?: boolean;
@@ -85,4 +143,4 @@ export interface Message {
     content: Buffer;
     fields: any;
     properties: any;
-}
\ No newline at end of file
+}
diff --git a/types/angular-material/angular-material-tests.ts b/types/angular-material/angular-material-tests.ts
index ce5a9bf71e..ac4a1386cd 100644
--- a/types/angular-material/angular-material-tests.ts
+++ b/types/angular-material/angular-material-tests.ts
@@ -140,6 +140,9 @@ myApp.controller('DialogController', ($scope: TestScope, $mdDialog: ng.material.
     $scope['promptDialog'] = () => {
         $mdDialog.show($mdDialog.prompt().initialValue('Buddy'));
     };
+    $scope['promptDialog'] = () => {
+        $mdDialog.show($mdDialog.prompt().required(true));
+    };
     $scope['prerenderedDialog'] = () => {
         $mdDialog.show({
             template: '<md-dialog>Hello!</md-dialog>',
diff --git a/types/angular-material/index.d.ts b/types/angular-material/index.d.ts
index 2dca0c66da..92f6d46751 100644
--- a/types/angular-material/index.d.ts
+++ b/types/angular-material/index.d.ts
@@ -80,6 +80,7 @@ declare module 'angular' {
 
         interface IPromptDialog extends IPresetDialog<IPromptDialog> {
             cancel(cancel: string): IPromptDialog;
+            required(required: boolean): IPromptDialog; // default: false
             placeholder(placeholder: string): IPromptDialog;
             initialValue(initialValue: string): IPromptDialog;
         }
diff --git a/types/angular-sanitize/angular-sanitize-tests.ts b/types/angular-sanitize/angular-sanitize-tests.ts
index b093f2bbb0..51d48db90d 100644
--- a/types/angular-sanitize/angular-sanitize-tests.ts
+++ b/types/angular-sanitize/angular-sanitize-tests.ts
@@ -4,5 +4,6 @@ declare var $sanitizeService: ng.sanitize.ISanitizeService;
 shouldBeString = $sanitizeService(shouldBeString);
 
 declare var $linky: ng.sanitize.filter.ILinky;
+shouldBeString = $linky(shouldBeString);
 shouldBeString = $linky(shouldBeString, "target");
 shouldBeString = $linky(shouldBeString, shouldBeString);
diff --git a/types/angular-sanitize/index.d.ts b/types/angular-sanitize/index.d.ts
index ad42ec362e..b9d16aaeb2 100644
--- a/types/angular-sanitize/index.d.ts
+++ b/types/angular-sanitize/index.d.ts
@@ -36,7 +36,7 @@ declare module 'angular' {
              * see https://docs.angularjs.org/api/ngSanitize/filter/linky
              */
             interface ILinky {
-                (text: string, target: string, attributes?: { [attribute: string]: string } | ((url: string) => { [attribute: string]: string })): string;
+                (text: string, target?: string, attributes?: { [attribute: string]: string } | ((url: string) => { [attribute: string]: string })): string;
             }
         }
 
diff --git a/types/applicationinsights-js/index.d.ts b/types/applicationinsights-js/index.d.ts
index 17137d67dd..4214837ddf 100644
--- a/types/applicationinsights-js/index.d.ts
+++ b/types/applicationinsights-js/index.d.ts
@@ -777,7 +777,7 @@ declare module Microsoft.ApplicationInsights {
          * @param authenticatedUserId {string} - The authenticated user id. A unique and persistent string that represents each authenticated user in the service.
          * @param accountId {string} - An optional string to represent the account associated with the authenticated user.
          */
-        setAuthenticatedUserContext(authenticatedUserId: string, accountId?: string): any;
+        setAuthenticatedUserContext(authenticatedUserId: string, accountId?: string, storeInCookie?: boolean): any;
         /**
          * Clears the authenticated user id and the account id from the user context.
          */
diff --git a/types/atom/index.d.ts b/types/atom/index.d.ts
index 0db2ab0002..2a13373b7d 100644
--- a/types/atom/index.d.ts
+++ b/types/atom/index.d.ts
@@ -5265,7 +5265,7 @@ export interface CursorPositionChangedEvent {
     newBufferPosition: Point;
     newScreenPosition: Point;
     textChanged: boolean;
-    Cursor:	Cursor;
+    cursor:	Cursor;
 }
 
 export interface DecorationPropsChangedEvent {
diff --git a/types/autobahn/index.d.ts b/types/autobahn/index.d.ts
index 7f01a53e3a..969c703478 100644
--- a/types/autobahn/index.d.ts
+++ b/types/autobahn/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for AutobahnJS v0.9.7
 // Project: http://autobahn.ws/js/
-// Definitions by: Elad Zelingher <https://github.com/darkl>, Andy Hawkins <https://github.com/a904guy/,http://a904guy.com/,http://www.bmbsqd.com>, Wladimir Totino <https://github.com/valepu>
+// Definitions by: Elad Zelingher <https://github.com/darkl>, Andy Hawkins <https://github.com/a904guy/,http://a904guy.com/,http://www.bmbsqd.com>, Wladimir Totino <https://github.com/valepu>, Mathias Teier <https://github.com/glenroy37/,http://kagent.at>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="when" />
@@ -179,6 +179,7 @@ declare namespace autobahn {
 
     interface ISubscribeOptions {
         match?: string;
+        get_retained?: boolean;
     }
 
     interface IRegisterOptions {
diff --git a/types/babel-traverse/index.d.ts b/types/babel-traverse/index.d.ts
index 682550b161..df420c17bd 100644
--- a/types/babel-traverse/index.d.ts
+++ b/types/babel-traverse/index.d.ts
@@ -600,185 +600,185 @@ export class NodePath<T = Node> {
     addComments(type: string, comments: any[]): void;
 
     // ------------------------- isXXX -------------------------
-    isArrayExpression(opts?: object): boolean;
-    isAssignmentExpression(opts?: object): boolean;
-    isBinaryExpression(opts?: object): boolean;
-    isDirective(opts?: object): boolean;
-    isDirectiveLiteral(opts?: object): boolean;
-    isBlockStatement(opts?: object): boolean;
-    isBreakStatement(opts?: object): boolean;
-    isCallExpression(opts?: object): boolean;
-    isCatchClause(opts?: object): boolean;
-    isConditionalExpression(opts?: object): boolean;
-    isContinueStatement(opts?: object): boolean;
-    isDebuggerStatement(opts?: object): boolean;
-    isDoWhileStatement(opts?: object): boolean;
-    isEmptyStatement(opts?: object): boolean;
-    isExpressionStatement(opts?: object): boolean;
-    isFile(opts?: object): boolean;
-    isForInStatement(opts?: object): boolean;
-    isForStatement(opts?: object): boolean;
-    isFunctionDeclaration(opts?: object): boolean;
-    isFunctionExpression(opts?: object): boolean;
-    isIdentifier(opts?: object): boolean;
-    isIfStatement(opts?: object): boolean;
-    isLabeledStatement(opts?: object): boolean;
-    isStringLiteral(opts?: object): boolean;
-    isNumericLiteral(opts?: object): boolean;
-    isNullLiteral(opts?: object): boolean;
-    isBooleanLiteral(opts?: object): boolean;
-    isRegExpLiteral(opts?: object): boolean;
-    isLogicalExpression(opts?: object): boolean;
-    isMemberExpression(opts?: object): boolean;
-    isNewExpression(opts?: object): boolean;
-    isProgram(opts?: object): boolean;
-    isObjectExpression(opts?: object): boolean;
-    isObjectMethod(opts?: object): boolean;
-    isObjectProperty(opts?: object): boolean;
-    isRestElement(opts?: object): boolean;
-    isReturnStatement(opts?: object): boolean;
-    isSequenceExpression(opts?: object): boolean;
-    isSwitchCase(opts?: object): boolean;
-    isSwitchStatement(opts?: object): boolean;
-    isThisExpression(opts?: object): boolean;
-    isThrowStatement(opts?: object): boolean;
-    isTryStatement(opts?: object): boolean;
-    isUnaryExpression(opts?: object): boolean;
-    isUpdateExpression(opts?: object): boolean;
-    isVariableDeclaration(opts?: object): boolean;
-    isVariableDeclarator(opts?: object): boolean;
-    isWhileStatement(opts?: object): boolean;
-    isWithStatement(opts?: object): boolean;
-    isAssignmentPattern(opts?: object): boolean;
-    isArrayPattern(opts?: object): boolean;
-    isArrowFunctionExpression(opts?: object): boolean;
-    isClassBody(opts?: object): boolean;
-    isClassDeclaration(opts?: object): boolean;
-    isClassExpression(opts?: object): boolean;
-    isExportAllDeclaration(opts?: object): boolean;
-    isExportDefaultDeclaration(opts?: object): boolean;
-    isExportNamedDeclaration(opts?: object): boolean;
-    isExportSpecifier(opts?: object): boolean;
-    isForOfStatement(opts?: object): boolean;
-    isImportDeclaration(opts?: object): boolean;
-    isImportDefaultSpecifier(opts?: object): boolean;
-    isImportNamespaceSpecifier(opts?: object): boolean;
-    isImportSpecifier(opts?: object): boolean;
-    isMetaProperty(opts?: object): boolean;
-    isClassMethod(opts?: object): boolean;
-    isObjectPattern(opts?: object): boolean;
-    isSpreadElement(opts?: object): boolean;
-    isSuper(opts?: object): boolean;
-    isTaggedTemplateExpression(opts?: object): boolean;
-    isTemplateElement(opts?: object): boolean;
-    isTemplateLiteral(opts?: object): boolean;
-    isYieldExpression(opts?: object): boolean;
-    isAnyTypeAnnotation(opts?: object): boolean;
-    isArrayTypeAnnotation(opts?: object): boolean;
-    isBooleanTypeAnnotation(opts?: object): boolean;
-    isBooleanLiteralTypeAnnotation(opts?: object): boolean;
-    isNullLiteralTypeAnnotation(opts?: object): boolean;
-    isClassImplements(opts?: object): boolean;
-    isClassProperty(opts?: object): boolean;
-    isDeclareClass(opts?: object): boolean;
-    isDeclareFunction(opts?: object): boolean;
-    isDeclareInterface(opts?: object): boolean;
-    isDeclareModule(opts?: object): boolean;
-    isDeclareTypeAlias(opts?: object): boolean;
-    isDeclareVariable(opts?: object): boolean;
-    isExistentialTypeParam(opts?: object): boolean;
-    isFunctionTypeAnnotation(opts?: object): boolean;
-    isFunctionTypeParam(opts?: object): boolean;
-    isGenericTypeAnnotation(opts?: object): boolean;
-    isInterfaceExtends(opts?: object): boolean;
-    isInterfaceDeclaration(opts?: object): boolean;
-    isIntersectionTypeAnnotation(opts?: object): boolean;
-    isMixedTypeAnnotation(opts?: object): boolean;
-    isNullableTypeAnnotation(opts?: object): boolean;
-    isNumericLiteralTypeAnnotation(opts?: object): boolean;
-    isNumberTypeAnnotation(opts?: object): boolean;
-    isStringLiteralTypeAnnotation(opts?: object): boolean;
-    isStringTypeAnnotation(opts?: object): boolean;
-    isThisTypeAnnotation(opts?: object): boolean;
-    isTupleTypeAnnotation(opts?: object): boolean;
-    isTypeofTypeAnnotation(opts?: object): boolean;
-    isTypeAlias(opts?: object): boolean;
-    isTypeAnnotation(opts?: object): boolean;
-    isTypeCastExpression(opts?: object): boolean;
-    isTypeParameterDeclaration(opts?: object): boolean;
-    isTypeParameterInstantiation(opts?: object): boolean;
-    isObjectTypeAnnotation(opts?: object): boolean;
-    isObjectTypeCallProperty(opts?: object): boolean;
-    isObjectTypeIndexer(opts?: object): boolean;
-    isObjectTypeProperty(opts?: object): boolean;
-    isQualifiedTypeIdentifier(opts?: object): boolean;
-    isUnionTypeAnnotation(opts?: object): boolean;
-    isVoidTypeAnnotation(opts?: object): boolean;
-    isJSXAttribute(opts?: object): boolean;
-    isJSXClosingElement(opts?: object): boolean;
-    isJSXElement(opts?: object): boolean;
-    isJSXEmptyExpression(opts?: object): boolean;
-    isJSXExpressionContainer(opts?: object): boolean;
-    isJSXIdentifier(opts?: object): boolean;
-    isJSXMemberExpression(opts?: object): boolean;
-    isJSXNamespacedName(opts?: object): boolean;
-    isJSXOpeningElement(opts?: object): boolean;
-    isJSXSpreadAttribute(opts?: object): boolean;
-    isJSXText(opts?: object): boolean;
-    isNoop(opts?: object): boolean;
-    isParenthesizedExpression(opts?: object): boolean;
-    isAwaitExpression(opts?: object): boolean;
-    isBindExpression(opts?: object): boolean;
-    isDecorator(opts?: object): boolean;
-    isDoExpression(opts?: object): boolean;
-    isExportDefaultSpecifier(opts?: object): boolean;
-    isExportNamespaceSpecifier(opts?: object): boolean;
-    isRestProperty(opts?: object): boolean;
-    isSpreadProperty(opts?: object): boolean;
-    isExpression(opts?: object): boolean;
-    isBinary(opts?: object): boolean;
-    isScopable(opts?: object): boolean;
-    isBlockParent(opts?: object): boolean;
-    isBlock(opts?: object): boolean;
-    isStatement(opts?: object): boolean;
-    isTerminatorless(opts?: object): boolean;
-    isCompletionStatement(opts?: object): boolean;
-    isConditional(opts?: object): boolean;
-    isLoop(opts?: object): boolean;
-    isWhile(opts?: object): boolean;
-    isExpressionWrapper(opts?: object): boolean;
-    isFor(opts?: object): boolean;
-    isForXStatement(opts?: object): boolean;
-    isFunction(opts?: object): boolean;
-    isFunctionParent(opts?: object): boolean;
-    isPureish(opts?: object): boolean;
-    isDeclaration(opts?: object): boolean;
-    isLVal(opts?: object): boolean;
-    isLiteral(opts?: object): boolean;
-    isImmutable(opts?: object): boolean;
-    isUserWhitespacable(opts?: object): boolean;
-    isMethod(opts?: object): boolean;
-    isObjectMember(opts?: object): boolean;
-    isProperty(opts?: object): boolean;
-    isUnaryLike(opts?: object): boolean;
-    isPattern(opts?: object): boolean;
-    isClass(opts?: object): boolean;
-    isModuleDeclaration(opts?: object): boolean;
-    isExportDeclaration(opts?: object): boolean;
-    isModuleSpecifier(opts?: object): boolean;
-    isFlow(opts?: object): boolean;
-    isFlowBaseAnnotation(opts?: object): boolean;
-    isFlowDeclaration(opts?: object): boolean;
-    isJSX(opts?: object): boolean;
-    isNumberLiteral(opts?: object): boolean;
-    isRegexLiteral(opts?: object): boolean;
-    isReferencedIdentifier(opts?: object): boolean;
-    isReferencedMemberExpression(opts?: object): boolean;
-    isBindingIdentifier(opts?: object): boolean;
-    isScope(opts?: object): boolean;
+    isArrayExpression(opts?: object): this is NodePath<t.ArrayExpression> ;
+    isAssignmentExpression(opts?: object): this is NodePath<t.AssignmentExpression>;
+    isBinaryExpression(opts?: object): this is NodePath<t.BinaryExpression>;
+    isDirective(opts?: object): this is NodePath<t.Directive>;
+    isDirectiveLiteral(opts?: object): this is NodePath<t.DirectiveLiteral>;
+    isBlockStatement(opts?: object): this is NodePath<t.BlockStatement>;
+    isBreakStatement(opts?: object): this is NodePath<t.BreakStatement>;
+    isCallExpression(opts?: object): this is NodePath<t.CallExpression>;
+    isCatchClause(opts?: object): this is NodePath<t.CatchClause>;
+    isConditionalExpression(opts?: object): this is NodePath<t.ConditionalExpression>;
+    isContinueStatement(opts?: object): this is NodePath<t.ContinueStatement>;
+    isDebuggerStatement(opts?: object): this is NodePath<t.DebuggerStatement>;
+    isDoWhileStatement(opts?: object): this is NodePath<t.DoWhileStatement>;
+    isEmptyStatement(opts?: object): this is NodePath<t.EmptyStatement>;
+    isExpressionStatement(opts?: object): this is NodePath<t.ExpressionStatement>;
+    isFile(opts?: object): this is NodePath<t.File>;
+    isForInStatement(opts?: object): this is NodePath<t.ForInStatement>;
+    isForStatement(opts?: object): this is NodePath<t.ForStatement>;
+    isFunctionDeclaration(opts?: object): this is NodePath<t.FunctionDeclaration>;
+    isFunctionExpression(opts?: object): this is NodePath<t.FunctionExpression>;
+    isIdentifier(opts?: object): this is NodePath<t.Identifier>;
+    isIfStatement(opts?: object): this is NodePath<t.IfStatement>;
+    isLabeledStatement(opts?: object): this is NodePath<t.LabeledStatement>;
+    isStringLiteral(opts?: object): this is NodePath<t.StringLiteral>;
+    isNumericLiteral(opts?: object): this is NodePath<t.NumericLiteral>;
+    isNullLiteral(opts?: object): this is NodePath<t.NullLiteral>;
+    isBooleanLiteral(opts?: object): this is NodePath<t.BooleanLiteral>;
+    isRegExpLiteral(opts?: object): this is NodePath<t.RegExpLiteral>;
+    isLogicalExpression(opts?: object): this is NodePath<t.LogicalExpression>;
+    isMemberExpression(opts?: object): this is NodePath<t.MemberExpression>;
+    isNewExpression(opts?: object): this is NodePath<t.NewExpression>;
+    isProgram(opts?: object): this is NodePath<t.Program>;
+    isObjectExpression(opts?: object): this is NodePath<t.ObjectExpression>;
+    isObjectMethod(opts?: object): this is NodePath<t.ObjectMethod>;
+    isObjectProperty(opts?: object): this is NodePath<t.ObjectProperty>;
+    isRestElement(opts?: object): this is NodePath<t.RestElement>;
+    isReturnStatement(opts?: object): this is NodePath<t.ReturnStatement>;
+    isSequenceExpression(opts?: object): this is NodePath<t.SequenceExpression>;
+    isSwitchCase(opts?: object): this is NodePath<t.SwitchCase>;
+    isSwitchStatement(opts?: object): this is NodePath<t.SwitchStatement>;
+    isThisExpression(opts?: object): this is NodePath<t.ThisExpression>;
+    isThrowStatement(opts?: object): this is NodePath<t.ThrowStatement>;
+    isTryStatement(opts?: object): this is NodePath<t.TryStatement>;
+    isUnaryExpression(opts?: object): this is NodePath<t.UnaryExpression>;
+    isUpdateExpression(opts?: object): this is NodePath<t.UpdateExpression>;
+    isVariableDeclaration(opts?: object): this is NodePath<t.VariableDeclaration>;
+    isVariableDeclarator(opts?: object): this is NodePath<t.VariableDeclarator>;
+    isWhileStatement(opts?: object): this is NodePath<t.WhileStatement>;
+    isWithStatement(opts?: object): this is NodePath<t.WithStatement>;
+    isAssignmentPattern(opts?: object): this is NodePath<t.AssignmentPattern>;
+    isArrayPattern(opts?: object): this is NodePath<t.ArrayPattern>;
+    isArrowFunctionExpression(opts?: object): this is NodePath<t.ArrowFunctionExpression>;
+    isClassBody(opts?: object): this is NodePath<t.ClassBody>;
+    isClassDeclaration(opts?: object): this is NodePath<t.ClassDeclaration>;
+    isClassExpression(opts?: object): this is NodePath<t.ClassExpression>;
+    isExportAllDeclaration(opts?: object): this is NodePath<t.ExportAllDeclaration>;
+    isExportDefaultDeclaration(opts?: object): this is NodePath<t.ExportDefaultDeclaration>;
+    isExportNamedDeclaration(opts?: object): this is NodePath<t.ExportNamedDeclaration>;
+    isExportSpecifier(opts?: object): this is NodePath<t.ExportSpecifier>;
+    isForOfStatement(opts?: object): this is NodePath<t.ForOfStatement>;
+    isImportDeclaration(opts?: object): this is NodePath<t.ImportDeclaration>;
+    isImportDefaultSpecifier(opts?: object): this is NodePath<t.ImportDefaultSpecifier>;
+    isImportNamespaceSpecifier(opts?: object): this is NodePath<t.ImportNamespaceSpecifier>;
+    isImportSpecifier(opts?: object): this is NodePath<t.ImportSpecifier>;
+    isMetaProperty(opts?: object): this is NodePath<t.MetaProperty>;
+    isClassMethod(opts?: object): this is NodePath<t.ClassMethod>;
+    isObjectPattern(opts?: object): this is NodePath<t.ObjectPattern>;
+    isSpreadElement(opts?: object): this is NodePath<t.SpreadElement>;
+    isSuper(opts?: object): this is NodePath<t.Super>;
+    isTaggedTemplateExpression(opts?: object): this is NodePath<t.TaggedTemplateExpression>;
+    isTemplateElement(opts?: object): this is NodePath<t.TemplateElement>;
+    isTemplateLiteral(opts?: object): this is NodePath<t.TemplateLiteral>;
+    isYieldExpression(opts?: object): this is NodePath<t.YieldExpression>;
+    isAnyTypeAnnotation(opts?: object): this is NodePath<t.AnyTypeAnnotation>;
+    isArrayTypeAnnotation(opts?: object): this is NodePath<t.ArrayTypeAnnotation>;
+    isBooleanTypeAnnotation(opts?: object): this is NodePath<t.BooleanTypeAnnotation>;
+    isBooleanLiteralTypeAnnotation(opts?: object): this is NodePath<t.BooleanLiteralTypeAnnotation>;
+    isNullLiteralTypeAnnotation(opts?: object): this is NodePath<t.NullLiteralTypeAnnotation>;
+    isClassImplements(opts?: object): this is NodePath<t.ClassImplements>;
+    isClassProperty(opts?: object): this is NodePath<t.ClassProperty>;
+    isDeclareClass(opts?: object): this is NodePath<t.DeclareClass>;
+    isDeclareFunction(opts?: object): this is NodePath<t.DeclareFunction>;
+    isDeclareInterface(opts?: object): this is NodePath<t.DeclareInterface>;
+    isDeclareModule(opts?: object): this is NodePath<t.DeclareModule>;
+    isDeclareTypeAlias(opts?: object): this is NodePath<t.DeclareTypeAlias>;
+    isDeclareVariable(opts?: object): this is NodePath<t.DeclareVariable>;
+    isExistentialTypeParam(opts?: object): this is NodePath<t.ExistentialTypeParam>;
+    isFunctionTypeAnnotation(opts?: object): this is NodePath<t.FunctionTypeAnnotation>;
+    isFunctionTypeParam(opts?: object): this is NodePath<t.FunctionTypeParam>;
+    isGenericTypeAnnotation(opts?: object): this is NodePath<t.GenericTypeAnnotation>;
+    isInterfaceExtends(opts?: object): this is NodePath<t.InterfaceExtends>;
+    isInterfaceDeclaration(opts?: object): this is NodePath<t.InterfaceDeclaration>;
+    isIntersectionTypeAnnotation(opts?: object): this is NodePath<t.IntersectionTypeAnnotation>;
+    isMixedTypeAnnotation(opts?: object): this is NodePath<t.MixedTypeAnnotation>;
+    isNullableTypeAnnotation(opts?: object): this is NodePath<t.NullableTypeAnnotation>;
+    isNumericLiteralTypeAnnotation(opts?: object): this is NodePath<t.NumericLiteralTypeAnnotation>;
+    isNumberTypeAnnotation(opts?: object): this is NodePath<t.NumberTypeAnnotation>;
+    isStringLiteralTypeAnnotation(opts?: object): this is NodePath<t.StringLiteralTypeAnnotation>;
+    isStringTypeAnnotation(opts?: object): this is NodePath<t.StringTypeAnnotation>;
+    isThisTypeAnnotation(opts?: object): this is NodePath<t.ThisTypeAnnotation>;
+    isTupleTypeAnnotation(opts?: object): this is NodePath<t.TupleTypeAnnotation>;
+    isTypeofTypeAnnotation(opts?: object): this is NodePath<t.TypeofTypeAnnotation>;
+    isTypeAlias(opts?: object): this is NodePath<t.TypeAlias>;
+    isTypeAnnotation(opts?: object): this is NodePath<t.TypeAnnotation>;
+    isTypeCastExpression(opts?: object): this is NodePath<t.TypeCastExpression>;
+    isTypeParameterDeclaration(opts?: object): this is NodePath<t.TypeParameterDeclaration>;
+    isTypeParameterInstantiation(opts?: object): this is NodePath<t.TypeParameterInstantiation>;
+    isObjectTypeAnnotation(opts?: object): this is NodePath<t.ObjectTypeAnnotation>;
+    isObjectTypeCallProperty(opts?: object): this is NodePath<t.ObjectTypeCallProperty>;
+    isObjectTypeIndexer(opts?: object): this is NodePath<t.ObjectTypeIndexer>;
+    isObjectTypeProperty(opts?: object): this is NodePath<t.ObjectTypeProperty>;
+    isQualifiedTypeIdentifier(opts?: object): this is NodePath<t.QualifiedTypeIdentifier>;
+    isUnionTypeAnnotation(opts?: object): this is NodePath<t.UnionTypeAnnotation>;
+    isVoidTypeAnnotation(opts?: object): this is NodePath<t.VoidTypeAnnotation>;
+    isJSXAttribute(opts?: object): this is NodePath<t.JSXAttribute>;
+    isJSXClosingElement(opts?: object): this is NodePath<t.JSXClosingElement>;
+    isJSXElement(opts?: object): this is NodePath<t.JSXElement>;
+    isJSXEmptyExpression(opts?: object): this is NodePath<t.JSXEmptyExpression>;
+    isJSXExpressionContainer(opts?: object): this is NodePath<t.JSXExpressionContainer>;
+    isJSXIdentifier(opts?: object): this is NodePath<t.JSXIdentifier>;
+    isJSXMemberExpression(opts?: object): this is NodePath<t.JSXMemberExpression>;
+    isJSXNamespacedName(opts?: object): this is NodePath<t.JSXNamespacedName>;
+    isJSXOpeningElement(opts?: object): this is NodePath<t.JSXOpeningElement>;
+    isJSXSpreadAttribute(opts?: object): this is NodePath<t.JSXSpreadAttribute>;
+    isJSXText(opts?: object): this is NodePath<t.JSXText>;
+    isNoop(opts?: object): this is NodePath<t.Noop>;
+    isParenthesizedExpression(opts?: object): this is NodePath<t.ParenthesizedExpression>;
+    isAwaitExpression(opts?: object): this is NodePath<t.AwaitExpression>;
+    isBindExpression(opts?: object): this is NodePath<t.BindExpression>;
+    isDecorator(opts?: object): this is NodePath<t.Decorator>;
+    isDoExpression(opts?: object): this is NodePath<t.DoExpression>;
+    isExportDefaultSpecifier(opts?: object): this is NodePath<t.ExportDefaultSpecifier>;
+    isExportNamespaceSpecifier(opts?: object): this is NodePath<t.ExportNamespaceSpecifier>;
+    isRestProperty(opts?: object): this is NodePath<t.RestProperty>;
+    isSpreadProperty(opts?: object): this is NodePath<t.SpreadProperty>;
+    isExpression(opts?: object): this is NodePath<t.Expression>;
+    isBinary(opts?: object): this is NodePath<t.Binary>;
+    isScopable(opts?: object): this is NodePath<t.Scopable>;
+    isBlockParent(opts?: object): this is NodePath<t.BlockParent>;
+    isBlock(opts?: object): this is NodePath<t.Block>;
+    isStatement(opts?: object): this is NodePath<t.Statement>;
+    isTerminatorless(opts?: object): this is NodePath<t.Terminatorless>;
+    isCompletionStatement(opts?: object): this is NodePath<t.CompletionStatement>;
+    isConditional(opts?: object): this is NodePath<t.Conditional>;
+    isLoop(opts?: object): this is NodePath<t.Loop>;
+    isWhile(opts?: object): this is NodePath<t.While>;
+    isExpressionWrapper(opts?: object): this is NodePath<t.ExpressionWrapper>;
+    isFor(opts?: object): this is NodePath<t.For>;
+    isForXStatement(opts?: object): this is NodePath<t.ForXStatement>;
+    isFunction(opts?: object): this is NodePath<t.Function>;
+    isFunctionParent(opts?: object): this is NodePath<t.FunctionParent>;
+    isPureish(opts?: object): this is NodePath<t.Pureish>;
+    isDeclaration(opts?: object): this is NodePath<t.Declaration>;
+    isLVal(opts?: object): this is NodePath<t.LVal>;
+    isLiteral(opts?: object): this is NodePath<t.Literal>;
+    isImmutable(opts?: object): this is NodePath<t.Immutable>;
+    isUserWhitespacable(opts?: object): this is NodePath<t.UserWhitespacable>;
+    isMethod(opts?: object): this is NodePath<t.Method>;
+    isObjectMember(opts?: object): this is NodePath<t.ObjectMember>;
+    isProperty(opts?: object): this is NodePath<t.Property>;
+    isUnaryLike(opts?: object): this is NodePath<t.UnaryLike>;
+    isPattern(opts?: object): this is NodePath<t.Pattern>;
+    isClass(opts?: object): this is NodePath<t.Class>;
+    isModuleDeclaration(opts?: object): this is NodePath<t.ModuleDeclaration>;
+    isExportDeclaration(opts?: object): this is NodePath<t.ExportDeclaration>;
+    isModuleSpecifier(opts?: object): this is NodePath<t.ModuleSpecifier>;
+    isFlow(opts?: object): this is NodePath<t.Flow>;
+    isFlowBaseAnnotation(opts?: object): this is NodePath<t.FlowBaseAnnotation>;
+    isFlowDeclaration(opts?: object): this is NodePath<t.FlowDeclaration>;
+    isJSX(opts?: object): this is NodePath<t.JSX>;
+    isNumberLiteral(opts?: object): this is NodePath<t.NumericLiteral>;
+    isRegexLiteral(opts?: object): this is NodePath<t.RegExpLiteral>;
+    isReferencedIdentifier(opts?: object): this is NodePath<t.Identifier | t.JSXIdentifier>;
+    isReferencedMemberExpression(opts?: object): this is NodePath<t.MemberExpression>;
+    isBindingIdentifier(opts?: object): this is NodePath<t.Identifier>;
+    isScope(opts?: object): this is NodePath<t.Scopable>;
     isReferenced(opts?: object): boolean;
-    isBlockScoped(opts?: object): boolean;
-    isVar(opts?: object): boolean;
+    isBlockScoped(opts?: object): this is NodePath<t.FunctionDeclaration | t.ClassDeclaration | t.VariableDeclaration>;
+    isVar(opts?: object): this is NodePath<t.VariableDeclaration>;
     isUser(opts?: object): boolean;
     isGenerated(opts?: object): boolean;
     isPure(opts?: object): boolean;
diff --git a/types/babel-types/index.d.ts b/types/babel-types/index.d.ts
index 1879c81e85..a49909ed4a 100644
--- a/types/babel-types/index.d.ts
+++ b/types/babel-types/index.d.ts
@@ -1265,13 +1265,13 @@ export function isJSX(node: object, opts?: object): node is JSX;
 export function isNumberLiteral(node: object, opts?: object): node is NumericLiteral;
 export function isRegexLiteral(node: object, opts?: object): node is RegExpLiteral;
 
-export function isReferencedIdentifier(node: object, opts?: object): boolean;
-export function isReferencedMemberExpression(node: object, opts?: object): boolean;
-export function isBindingIdentifier(node: object, opts?: object): boolean;
-export function isScope(node: object, opts?: object): boolean;
+export function isReferencedIdentifier(node: object, opts?: object): node is Identifier | JSXIdentifier;
+export function isReferencedMemberExpression(node: object, opts?: object): node is MemberExpression;
+export function isBindingIdentifier(node: object, opts?: object): node is Identifier;
+export function isScope(node: object, opts?: object): node is Scopable;
 export function isReferenced(node: object, opts?: object): boolean;
-export function isBlockScoped(node: object, opts?: object): boolean;
-export function isVar(node: object, opts?: object): boolean;
+export function isBlockScoped(node: object, opts?: object): node is FunctionDeclaration | ClassDeclaration | VariableDeclaration;
+export function isVar(node: object, opts?: object): node is VariableDeclaration;
 export function isUser(node: object, opts?: object): boolean;
 export function isGenerated(node: object, opts?: object): boolean;
 export function isPure(node: object, opts?: object): boolean;
diff --git a/types/backbone/index.d.ts b/types/backbone/index.d.ts
index 607f6413fc..1a186d9924 100644
--- a/types/backbone/index.d.ts
+++ b/types/backbone/index.d.ts
@@ -460,8 +460,7 @@ declare namespace Backbone {
     }
 
     // SYNC
-    function sync(method: string, model: Model, options?: JQueryAjaxSettings): any;
-    function sync(method: string, collection: Collection<Model>, options?: JQueryAjaxSettings): any;
+    function sync(method: string, model: Model | Collection<Model>, options?: JQueryAjaxSettings): any;
     function ajax(options?: JQueryAjaxSettings): JQueryXHR;
     var emulateHTTP: boolean;
     var emulateJSON: boolean;
diff --git a/types/beats/beats-tests.ts b/types/beats/beats-tests.ts
new file mode 100644
index 0000000000..00659af2e5
--- /dev/null
+++ b/types/beats/beats-tests.ts
@@ -0,0 +1,11 @@
+import beats = require('beats');
+
+const bins: beats.Bin[] = [
+    { lo: 0, hi: 512, threshold: 0, decay: 0.005 },
+    { lo: 512, hi: 1024, threshold: 0, decay: 0.005 },
+];
+
+const detect = beats(bins, 1);
+
+const frequencies = new Uint8Array(1024);
+const result = detect(frequencies);
diff --git a/types/beats/index.d.ts b/types/beats/index.d.ts
new file mode 100644
index 0000000000..e95f008c1f
--- /dev/null
+++ b/types/beats/index.d.ts
@@ -0,0 +1,17 @@
+// Type definitions for beats 0.0
+// Project: https://github.com/hughsk/beats/
+// Definitions by: Uri Shaked <https://github.com/urish>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = beats;
+
+declare function beats(bins: ReadonlyArray<beats.Bin>, minSeparation?: number): (frequencies: Uint8Array | Float32Array | ReadonlyArray<number>, dt?: number) => Float32Array;
+
+declare namespace beats {
+    interface Bin {
+        lo: number;
+        hi: number;
+        threshold: number;
+        decay: number;
+    }
+}
diff --git a/types/beats/tsconfig.json b/types/beats/tsconfig.json
new file mode 100644
index 0000000000..89bd0b5995
--- /dev/null
+++ b/types/beats/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",
+        "beats-tests.ts"
+    ]
+}
diff --git a/types/beats/tslint.json b/types/beats/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/beats/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/chai/chai-tests.ts b/types/chai/chai-tests.ts
index 0076396422..401e5f468a 100644
--- a/types/chai/chai-tests.ts
+++ b/types/chai/chai-tests.ts
@@ -1357,6 +1357,56 @@ suite('assert', () => {
         assert.notInclude(undefined, 'bar');
     });
 
+    test('deepInclude', () => {
+        assert.deepInclude('foobar', 'bar');
+        assert.deepInclude([1, 2, 3], 3);
+        assert.deepInclude('foobar', 'baz');
+        assert.deepInclude(undefined, 'bar');
+    });
+
+    test('notDeepInclude', () => {
+        assert.notDeepInclude('foobar', 'baz');
+        assert.notDeepInclude([1, 2, 3], 4);
+        assert.notDeepInclude('foobar', 'bar');
+        assert.notDeepInclude(undefined, 'bar');
+    });
+
+    test('nestedInclude', () => {
+        assert.nestedInclude({'.a': {'b': 'x'}}, {'\\.a.[b]': 'x'});
+        assert.nestedInclude({'a': {'[b]': 'x'}}, {'a.\\[b\\]': 'x'});
+    });
+
+    test('notNestedInclude', () => {
+        assert.notNestedInclude({'.a': {'b': 'x'}}, {'\\.a.b': 'y'});
+        assert.notNestedInclude({'a': {'[b]': 'x'}}, {'a.\\[b\\]': 'y'});
+    });
+
+    test('deepNestedInclude', () => {
+        assert.deepNestedInclude({a: {b: [{x: 1}]}}, {'a.b[0]': {x: 1}});
+        assert.deepNestedInclude({'.a': {'[b]': {x: 1}}}, {'\\.a.\\[b\\]': {x: 1}});
+    });
+
+    test('notDeepNestedInclude', () => {
+        assert.notDeepNestedInclude({a: {b: [{x: 1}]}}, {'a.b[0]': {y: 1}})
+        assert.notDeepNestedInclude({'.a': {'[b]': {x: 1}}}, {'\\.a.\\[b\\]': {y: 2}});
+    });
+
+    test('ownInclude', () => {
+        assert.ownInclude({ a: 1 }, { a: 1 });
+    });
+
+    test('notOwnInclude', () => {
+        assert.notOwnInclude({ a: 1 }, { a: 1 });
+    });
+
+    test('deepOwnInclude', () => {
+        assert.deepOwnInclude({a: {b: 2}}, {a: {b: 2}});
+    });
+
+    test('notDeepOwnInclude', () => {
+        assert.notDeepOwnInclude({a: {b: 2}}, {a: {c: 3}});
+    });
+
     test('lengthOf', () => {
         assert.lengthOf([1, 2, 3], 3);
         assert.lengthOf('foobar', 6);
diff --git a/types/chai/index.d.ts b/types/chai/index.d.ts
index 340d69f7cd..faafa3b2a8 100644
--- a/types/chai/index.d.ts
+++ b/types/chai/index.d.ts
@@ -7,6 +7,7 @@
 //                 Matt Wistrand <https://github.com/mwistrand>,
 //                 Josh Goldberg <https://github.com/joshuakgoldberg>
 //                 Shaun Luttin <https://github.com/shaunluttin>
+//                 Gintautas Miselis <https://github.com/Naktibalda>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 // <reference types="assertion-error"/>
@@ -706,13 +707,145 @@ declare namespace Chai {
         /**
          * Asserts that haystack does not include needle.
          *
-         * @type T   Type of values in haystack.
          * @param haystack   Container array.
          * @param needle   Potential value contained in haystack.
          * @param message   Message to display on error.
          */
         notInclude(haystack: any[], needle: any, message?: string): void;
 
+
+        /**
+         * Asserts that haystack includes needle. Can be used to assert the inclusion of a value in an array or a subset of properties in an object. Deep equality is used.
+         *
+         * @param haystack   Container string.
+         * @param needle   Potential expected substring of haystack.
+         * @param message   Message to display on error.
+         */
+        deepInclude(haystack: string, needle: string, message?: string): void;
+
+        /**
+         * Asserts that haystack includes needle. Can be used to assert the inclusion of a value in an array or a subset of properties in an object. Deep equality is used.
+         *
+         * @param haystack
+         * @param needle
+         * @param message   Message to display on error.
+         */
+        deepInclude<T>(haystack: any, needle: any, message?: string): void;
+
+        /**
+         * Asserts that haystack does not include needle. Can be used to assert the absence of a value in an array or a subset of properties in an object. Deep equality is used.
+         *
+         * @param haystack   Container string.
+         * @param needle   Potential expected substring of haystack.
+         * @param message   Message to display on error.
+         */
+        notDeepInclude(haystack: string, needle: any, message?: string): void;
+
+        /**
+         * Asserts that haystack does not include needle. Can be used to assert the absence of a value in an array or a subset of properties in an object. Deep equality is used.
+         *
+         * @param haystack
+         * @param needle
+         * @param message   Message to display on error.
+         */
+        notDeepInclude(haystack: any[], needle: any, message?: string): void;
+
+        /**
+         * Asserts that ‘haystack’ includes ‘needle’. Can be used to assert the inclusion of a subset of properties in an object.
+         *
+         * Enables the use of dot- and bracket-notation for referencing nested properties.
+         * ‘[]’ and ‘.’ in property names can be escaped using double backslashes.Asserts that ‘haystack’ includes ‘needle’.
+         * Can be used to assert the inclusion of a subset of properties in an object.
+         * Enables the use of dot- and bracket-notation for referencing nested properties.
+         * ‘[]’ and ‘.’ in property names can be escaped using double backslashes.
+         *
+         * @param haystack
+         * @param needle
+         * @param message   Message to display on error.
+         */
+        nestedInclude(haystack: any, needle: any, message?: string): void;
+
+        /**
+         * Asserts that ‘haystack’ does not include ‘needle’. Can be used to assert the absence of a subset of properties in an object.
+         *
+         * Enables the use of dot- and bracket-notation for referencing nested properties.
+         * ‘[]’ and ‘.’ in property names can be escaped using double backslashes.Asserts that ‘haystack’ includes ‘needle’.
+         * Can be used to assert the inclusion of a subset of properties in an object.
+         * Enables the use of dot- and bracket-notation for referencing nested properties.
+         * ‘[]’ and ‘.’ in property names can be escaped using double backslashes.
+         *
+         * @param haystack
+         * @param needle
+         * @param message   Message to display on error.
+         */
+        notNestedInclude(haystack: any, needle: any, message?: string): void;
+
+        /**
+         * Asserts that ‘haystack’ includes ‘needle’. Can be used to assert the inclusion of a subset of properties in an object while checking for deep equality
+         *
+         * Enables the use of dot- and bracket-notation for referencing nested properties.
+         * ‘[]’ and ‘.’ in property names can be escaped using double backslashes.Asserts that ‘haystack’ includes ‘needle’.
+         * Can be used to assert the inclusion of a subset of properties in an object.
+         * Enables the use of dot- and bracket-notation for referencing nested properties.
+         * ‘[]’ and ‘.’ in property names can be escaped using double backslashes.
+         *
+         * @param haystack
+         * @param needle
+         * @param message   Message to display on error.
+         */
+        deepNestedInclude(haystack: any, needle: any, message?: string): void;
+
+        /**
+         * Asserts that ‘haystack’ does not include ‘needle’. Can be used to assert the absence of a subset of properties in an object while checking for deep equality.
+         *
+         * Enables the use of dot- and bracket-notation for referencing nested properties.
+         * ‘[]’ and ‘.’ in property names can be escaped using double backslashes.Asserts that ‘haystack’ includes ‘needle’.
+         * Can be used to assert the inclusion of a subset of properties in an object.
+         * Enables the use of dot- and bracket-notation for referencing nested properties.
+         * ‘[]’ and ‘.’ in property names can be escaped using double backslashes.
+         *
+         * @param haystack
+         * @param needle
+         * @param message   Message to display on error.
+         */
+        notDeepNestedInclude(haystack: any, needle: any, message?: string): void;
+
+        /**
+         * Asserts that ‘haystack’ includes ‘needle’. Can be used to assert the inclusion of a subset of properties in an object while ignoring inherited properties.
+         *
+         * @param haystack
+         * @param needle
+         * @param message   Message to display on error.
+         */
+        ownInclude(haystack: any, needle: any, message?: string): void;
+
+        /**
+         * Asserts that ‘haystack’ includes ‘needle’. Can be used to assert the absence of a subset of properties in an object while ignoring inherited properties.
+         *
+         * @param haystack
+         * @param needle
+         * @param message   Message to display on error.
+         */
+        notOwnInclude(haystack: any, needle: any, message?: string): void;
+
+        /**
+         * Asserts that ‘haystack’ includes ‘needle’. Can be used to assert the inclusion of a subset of properties in an object while ignoring inherited properties and checking for deep
+         *
+         * @param haystack
+         * @param needle
+         * @param message   Message to display on error.
+         */
+        deepOwnInclude(haystack: any, needle: any, message?: string): void;
+
+        /**
+         * Asserts that ‘haystack’ includes ‘needle’. Can be used to assert the absence of a subset of properties in an object while ignoring inherited properties and checking for deep equality.
+         *
+         * @param haystack
+         * @param needle
+         * @param message   Message to display on error.
+         */
+        notDeepOwnInclude(haystack: any, needle: any, message?: string): void;
+
         /**
          * Asserts that value matches the regular expression regexp.
          *
diff --git a/types/chart.js/index.d.ts b/types/chart.js/index.d.ts
index f4f4bda40d..049488f8db 100644
--- a/types/chart.js/index.d.ts
+++ b/types/chart.js/index.d.ts
@@ -159,6 +159,7 @@ declare namespace Chart {
     interface ChartOptions {
         responsive?: boolean;
         responsiveAnimationDuration?: number;
+        aspectRatio?: number;
         maintainAspectRatio?: boolean;
         events?: string[];
         onClick?(event?: MouseEvent, activeElements?: Array<{}>): any;
diff --git a/types/cheerio/index.d.ts b/types/cheerio/index.d.ts
index 511fce354d..8250848374 100644
--- a/types/cheerio/index.d.ts
+++ b/types/cheerio/index.d.ts
@@ -263,6 +263,7 @@ interface CheerioElement {
     parent: CheerioElement;
     parentNode: CheerioElement;
     nodeValue: string;
+    data?: string;
 }
 
 interface CheerioAPI extends CheerioSelector, CheerioStatic {
diff --git a/types/ckeditor/index.d.ts b/types/ckeditor/index.d.ts
index f26a08a725..20882269fd 100644
--- a/types/ckeditor/index.d.ts
+++ b/types/ckeditor/index.d.ts
@@ -602,13 +602,17 @@ declare namespace CKEDITOR {
         browserContextMenuOnCtrl?: boolean;
 
         clipboard_defaultContentType?: string; // html | text
+        clipboard_notificationDuration?: number;
         codeSnippet_codeClass?: string;
         codeSnippet_languages?: Object;
         coceSnippet_theme?: string;
         colorButton_backStyle?: config.styleObject;
         colorButton_colors?: string;
+        colorButton_colorsPerRow?: number;
+        colorButton_enableAutomatic?: boolean;
         colorButton_enableMore?: boolean;
         colorButton_foreStyle?: config.styleObject;
+        colorButton_normalizeBackground?: boolean;
         contentsCss?: string | string[];
         contentsLangDirection?: string;
         contentsLanguage?: string;
diff --git a/types/codemirror/index.d.ts b/types/codemirror/index.d.ts
index 126eafe013..4f479b29d0 100644
--- a/types/codemirror/index.d.ts
+++ b/types/codemirror/index.d.ts
@@ -105,9 +105,9 @@ declare namespace CodeMirror {
     function signal(target: any, name: string, ...args: any[]): void;
 
     type DOMEvent = 'mousedown' | 'dblclick' | 'touchstart' | 'contextmenu' | 'keydown' | 'keypress' | 'keyup' | 'cut' | 'copy' | 'paste' | 'dragstart' | 'dragenter' | 'dragover' | 'dragleave' | 'drop';
-    
+
     type CoordsMode = 'window' | 'page' | 'local';
-    
+
     interface Token {
         /** The character(on the given line) at which the token starts. */
         start: number;
@@ -202,10 +202,10 @@ declare namespace CodeMirror {
         /** Compute the line at the given pixel height. mode is the relative element
         to use to compute this line, it may be "window", "page" (the default), or "local" */
         lineAtHeight(height: number, mode?: CoordsMode): number;
-        
-        /** Computes the height of the top of a line, in the coordinate system specified by mode, it may be "window", 
-        "page" (the default), or "local". When a line below the bottom of the document is specified, the returned value 
-        is the bottom of the last line in the document. By default, the position of the actual text is returned. 
+
+        /** Computes the height of the top of a line, in the coordinate system specified by mode, it may be "window",
+        "page" (the default), or "local". When a line below the bottom of the document is specified, the returned value
+        is the bottom of the last line in the document. By default, the position of the actual text is returned.
         If includeWidgets is true and the line has line widgets, the position above the first line widget is returned. */
         heightAtLine(line: any, mode?: CoordsMode, includeWidgets?: boolean): number;
 
@@ -292,7 +292,7 @@ declare namespace CodeMirror {
         charCoords(pos: CodeMirror.Position, mode?: CoordsMode): { left: number; right: number; top: number; bottom: number; };
 
         /** Given an { left , top } object , returns the { line , ch } position that corresponds to it.
-        The optional mode parameter determines relative to what the coordinates are interpreted. 
+        The optional mode parameter determines relative to what the coordinates are interpreted.
         It may be "window", "page" (the default), or "local". */
         coordsChar(object: { left: number; top: number; }, mode?: CoordsMode): CodeMirror.Position;
 
@@ -512,7 +512,7 @@ declare namespace CodeMirror {
 
         /** Get the currently selected code. */
         getSelection(): string;
-        
+
         /** Returns an array containing a string for each selection, representing the content of the selections. */
         getSelections(lineSep?: string): Array<string>;
 
@@ -535,8 +535,14 @@ declare namespace CodeMirror {
         /** Set the cursor position.You can either pass a single { line , ch } object , or the line and the character as two separate parameters. */
         setCursor(pos: CodeMirror.Position): void;
 
-        /** Set the selection range.anchor and head should be { line , ch } objects.head defaults to anchor when not given. */
-        setSelection(anchor: CodeMirror.Position, head: CodeMirror.Position): void;
+        /** Set a single selection range. anchor and head should be {line, ch} objects. head defaults to anchor when not given. */
+        setSelection(anchor: CodeMirror.Position, head: CodeMirror.Position, options?: { bias?: number, origin?: string, scroll?: boolean }): void;
+
+        /** Sets a new set of selections. There must be at least one selection in the given array. When primary is a
+        number, it determines which selection is the primary one. When it is not given, the primary index is taken from
+        the previous selection, or set to the last range if the previous selection had less ranges than the new one.
+        Supports the same options as setSelection. */
+        setSelections(ranges: Array<{ anchor: CodeMirror.Position, head: CodeMirror.Position }>, primary?: number, options?: { bias?: number, origin?: string, scroll?: boolean }): void;
 
         /** Similar to setSelection , but will, if shift is held or the extending flag is set,
         move the head of the selection while leaving the anchor at its current place.
@@ -779,7 +785,7 @@ declare namespace CodeMirror {
         /** Determines whether the gutter scrolls along with the content horizontally (false)
         or whether it stays fixed during horizontal scrolling (true, the default). */
         fixedGutter?: boolean;
-        
+
         /**
          * Chooses a scrollbar implementation. The default is "native", showing native scrollbars. The core library also
          * provides the "null" style, which completely hides the scrollbars. Addons can implement additional scrollbar models.
@@ -1141,6 +1147,7 @@ declare namespace CodeMirror {
     interface LintStateOptions {
         async: boolean;
         hasGutters: boolean;
+        onUpdateLinting?: (annotationsNotSorted: Annotation[], annotations: Annotation[], codeMirror: Editor) => void;
     }
 
     /**
diff --git a/types/cordova-plugin-device/index.d.ts b/types/cordova-plugin-device/index.d.ts
index cb75703d1a..0451afb4de 100644
--- a/types/cordova-plugin-device/index.d.ts
+++ b/types/cordova-plugin-device/index.d.ts
@@ -2,9 +2,9 @@
 // Project: https://github.com/apache/cordova-plugin-device
 // Definitions by: Microsoft Open Technologies Inc <http://msopentech.com>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// 
+//
 // Copyright (c) Microsoft Open Technologies Inc
-// Licensed under the MIT license 
+// Licensed under the MIT license
 
 /**
  * This plugin defines a global device object, which describes the device's hardware and software.
@@ -26,11 +26,16 @@ interface Device {
     uuid: string;
     /** Get the operating system version. */
     version: string;
-	/** Get the device's manufacturer. */
-	manufacturer: string;
-	/** Whether the device is running on a simulator. */
-	isVirtual: boolean;
-	/** Get the device hardware serial number. */
-	serial: string;}
+    /** Get the device's manufacturer. */
+    manufacturer: string;
+    /** Whether the device is running on a simulator. */
+    isVirtual: boolean;
+    /** Get the device hardware serial number. */
+    serial: string;
+}
+
+interface Window {
+    device: Device;
+}
 
 declare var device: Device;
diff --git a/types/cordova-plugin-keyboard/cordova-plugin-keyboard-tests.ts b/types/cordova-plugin-keyboard/cordova-plugin-keyboard-tests.ts
index 767eaa6ed2..fa5cf72a30 100644
--- a/types/cordova-plugin-keyboard/cordova-plugin-keyboard-tests.ts
+++ b/types/cordova-plugin-keyboard/cordova-plugin-keyboard-tests.ts
@@ -1,23 +1,31 @@
 Keyboard.shrinkView(true);
 Keyboard.shrinkView(false);
+Keyboard.shrinkView(null, (currentValue) => console.log(currentValue));
+
 Keyboard.hideFormAccessoryBar(true);
 Keyboard.hideFormAccessoryBar(false);
+Keyboard.hideFormAccessoryBar(null, (currentValue) => console.log(currentValue));
+
 Keyboard.disableScrollingInShrinkView(true);
 Keyboard.disableScrollingInShrinkView(false);
+Keyboard.disableScrollingInShrinkView(null, (currentValue) => console.log(currentValue));
+
+Keyboard.hide();
+
+Keyboard.show();
+
 if (Keyboard.isVisible) {
     console.log('Keyboard is visible');
 }
-Keyboard.automaticScrollToTopOnHiding = true;
-Keyboard.onshow = function () {
-    console.log('onshow');
-};
-Keyboard.onhide = function () {
-    console.log('onhide');
-};
-Keyboard.onshowing = function () {
-    console.log('onshowing');
-};
-Keyboard.onhiding= function () {
-    console.log('onhiding');
-};
 
+Keyboard.automaticScrollToTopOnHiding = true;
+
+window.addEventListener('keyboardDidShow', () => console.log('keyboardDidShow'));
+
+window.addEventListener('keyboardDidHide', () => console.log('keyboardDidHide'));
+
+window.addEventListener('keyboardWillShow', () => console.log('keyboardWillShow'));
+
+window.addEventListener('keyboardWillHide', () => console.log('keyboardWillHide'));
+
+window.addEventListener('keyboardHeightWillChange', (event: CordovaKeyboardEvent) => console.log(`keyboardHeightWillChange - keyboard height: ${event.keyboardHeight}`));
diff --git a/types/cordova-plugin-keyboard/index.d.ts b/types/cordova-plugin-keyboard/index.d.ts
index 427a5425e5..af880d732a 100644
--- a/types/cordova-plugin-keyboard/index.d.ts
+++ b/types/cordova-plugin-keyboard/index.d.ts
@@ -1,32 +1,9 @@
-// Type definitions for Apache Cordova Keyboard plugin v0.1.2
-// Project: https://github.com/apache/cordova-plugins/tree/master/keyboard
-// Definitions by: Dan Manastireanu <https://github.com/danmana>
+// Type definitions for Apache Cordova Keyboard plugin v1.2.0
+// Project: https://github.com/cjpearson/cordova-plugin-keyboard
+// Definitions by:  Dan Manastireanu <https://github.com/danmana>
+//                  Jochen Becker <https://github.com/jkfb>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/**
- * The Keyboard object provides some functions to customize the iOS keyboard.
- *
- * <i>Supported Platforms: iOS</i>
- *
- * This plugin has only been tested in Cordova 3.2 or greater,
- * and its use in previous Cordova versions is not recommended
- * (potential conflict with keyboard customization code present in the core in previous Cordova versions).
- *
- * If you do use this plugin in an older Cordova version (again, not recommended),
- * you have to make sure the HideKeyboardFormAccessoryBar and KeyboardShrinksView preference values are always false,
- * and only use the API functions to turn things on/off.
- *
- * This plugin supports the HideKeyboardFormAccessoryBar (boolean)
- * and KeyboardShrinksView (boolean) preferences in config.xml.
- *
- * Permissions in config.xml
- * <code>
- *     <feature name="Keyboard">
- *         <param name="ios-package" value="CDVKeyboard" onload="true" />
- *     </feature>
- * </code>
- *
- */
 interface Keyboard {
 
     // Methods
@@ -39,15 +16,20 @@ interface Keyboard {
      * This applies to apps that position their elements relative to the bottom of the WebView.
      * This is the default behaviour on Android, and makes a lot of sense when building apps as opposed to webpages.
      *
+     * Supported Platforms:
+     *  - iOS
+     *
      * Example:
      * <code>
      * Keyboard.shrinkView(true);
      * Keyboard.shrinkView(false);
+     * Keyboard.shrinkView(null, function (currentValue) { console.log(currentValue); });
      * </code>
      *
      * @param shrink
+     * @param successCallback A success callbackfunction
      */
-    shrinkView(shrink:boolean): void,
+    shrinkView(shrink: boolean, successCallback?: (currentValue: any) => void): void,
 
     /**
      * Hide the keyboard toolbar.
@@ -55,21 +37,29 @@ interface Keyboard {
      * Set to true to hide the additional toolbar that is on top of the keyboard.
      * This toolbar features the Prev, Next, and Done buttons.
      *
+     * Supported Platforms:
+     *  - iOS
+     *
      * Example:
      * <code>
      * Keyboard.hideFormAccessoryBar(true);
      * Keyboard.hideFormAccessoryBar(false);
+     * Keyboard.hideFormAccessoryBar(null, function (currentValue) { console.log(currentValue); });
      * </code>
      *
      * @param hide
+     * @param successCallback A success callbackfunction
      */
-    hideFormAccessoryBar(hide:boolean): void,
+    hideFormAccessoryBar(hide: boolean, successCallback?: (currentValue: any) => void): void,
 
     /**
      * Disable scrolling when the the WebView is shrunk.
      *
      * Set to true to disable scrolling when the WebView is shrunk.
      *
+     * Supported Platforms:
+     *  - iOS
+     *
      * Example:
      * <code>
      * Keyboard.disableScrollingInShrinkView(true);
@@ -77,8 +67,40 @@ interface Keyboard {
      * </code>
      *
      * @param disable
+     * @param successCallback A success callbackfunction
      */
-    disableScrollingInShrinkView(disable:boolean): void,
+    disableScrollingInShrinkView(disable: boolean, successCallback?: (currentValue: any) => void): void,
+
+    /**
+     * Hide the keyboard
+     *
+     * Call this method to hide the keyboard
+     *
+     * Supported Platforms:
+     *  - iOS
+     *  - Android
+     *
+     * Example:
+     * <code>
+     * Keyboard.hide();
+     * </code>
+     */
+    hide(): void,
+
+    /**
+     * Show the keyboard
+     *
+     * Call this method to show the keyboard.
+     *
+     * Supported Platforms:
+     *  - Android
+     *
+     * Example:
+     * <code>
+     * Keyboard.show();
+     * </code>
+     */
+    show(): void,
 
     // Properties
 
@@ -87,6 +109,9 @@ interface Keyboard {
      *
      * Read this property to determine if the keyboard is visible.
      *
+     * Supported Platforms:
+     *  - iOS
+     *
      * Example:
      * <code>
      * if (Keyboard.isVisible) {
@@ -102,6 +127,9 @@ interface Keyboard {
      * Set this to true if you need that page scroll to beginning when keyboard is hiding.
      * This is allows to fix issue with elements declared with position: fixed, after keyboard is hiding.
      *
+     * Supported Platforms:
+     *  - iOS
+     *
      * Example:
      * <code>
      *     Keyboard.automaticScrollToTopOnHiding = true;
@@ -110,65 +138,48 @@ interface Keyboard {
      */
     automaticScrollToTopOnHiding: boolean,
 
-    // Events
+    /**
+     * Deprecated Events
+     */
+    onshow(): void,
 
-    /**
-     * If defined, this function is fired when keyboard fully shown.
-     *
-     * Attach handler to this event to be able to receive notification when keyboard is shown.
-     *
-     * Example:
-     * <code>
-     * Keyboard.onshow = function () {
-     *     // Describe your logic which will be run each time keyboard is shown.
-     * }
-     * </code>
-     *
-     */
-    onshow():void,
-    /**
-     * If defined, this function is fired when keyboard fully closed.
-     *
-     * Attach handler to this event to be able to receive notification when keyboard is closed.
-     *
-     * Example:
-     * <code>
-     * Keyboard.onhide = function () {
-     *     // Describe your logic which will be run each time keyboard is closed.
-     * }
-     * </code>
-     *
-     */
-    onhide():void,
-    /**
-     * If defined, this function is fired before keyboard will be shown.
-     *
-     * Attach handler to this event to be able to receive notification when keyboard is about to be shown on the screen.
-     *
-     * Example:
-     * <code>
-     * Keyboard.onshowing = function () {
-     *     // Describe your logic which will be run each time when keyboard is about to be shown.
-     * }
-     * </code>
-     *
-     */
-    onshowing():void,
-    /**
-     * If defined, this function is fired when keyboard is about to be closed.
-     *
-     * Attach handler to this event to be able to receive notification when keyboard is about to be closed.
-     *
-     * Example:
-     * <code>
-     * Keyboard.onhiding = function () {
-     *     // Describe your logic which will be run each time when keyboard is about to be closed.
-     * }
-     * </code>
-     *
-     */
-    onhiding():void,
+    onhide(): void,
 
+    onhiding(): void,
+
+    onshowing(): void
 }
 
-declare var Keyboard:Keyboard;
+interface CordovaKeyboardEvent extends Event {
+    /** The height of the keyboard */
+    keyboardHeight: number;
+}
+
+interface WindowEventMap {
+    /**
+     * This event is fired when keyboard fully shown.
+     */
+    'keyboardDidShow': Event,
+
+    /**
+     * This event is fired when the keyboard is fully closed.
+     */
+    'keyboardDidHide': Event,
+
+    /**
+     * This event fires before keyboard will be shown.
+     */
+    'keyboardWillShow': Event,
+
+    /**
+     * This event is fired when the keyboard is fully closed.
+     */
+    'keyboardWillHide': Event,
+
+    /**
+     * This event is fired when the keyboard is fully closed.
+     */
+    'keyboardHeightWillChange': CordovaKeyboardEvent
+  }
+
+declare var Keyboard: Keyboard;
diff --git a/types/css/index.d.ts b/types/css/index.d.ts
index c892d5c3a2..be8f1323a0 100644
--- a/types/css/index.d.ts
+++ b/types/css/index.d.ts
@@ -112,7 +112,7 @@ export interface Comment extends Node {
 /** 
  * The @charset at-rule. 
  */
-export interface Charset {
+export interface Charset extends Node {
     /** The part following @charset. */
     charset?: string;
 }
@@ -120,7 +120,7 @@ export interface Charset {
 /**
  * The @custom-media at-rule 
  */
-export interface CustomMedia {
+export interface CustomMedia extends Node {
     /** The ---prefixed name. */
     name?: string;
     /** The part following the name. */
@@ -130,7 +130,7 @@ export interface CustomMedia {
 /**
  * The @document at-rule.
  */
-export interface Document {
+export interface Document extends Node {
     /** The part following @document. */
     document?: string;
     /** The vendor prefix in @document, or undefined if there is none. */
@@ -142,7 +142,7 @@ export interface Document {
 /**
  * The @font-face at-rule.
  */
-export interface FontFace {
+export interface FontFace extends Node {
     /** Array of nodes with the types declaration and comment. */
     declarations?: Array<Declaration | Comment>;
 }
@@ -150,7 +150,7 @@ export interface FontFace {
 /**
  * The @host at-rule.
  */
-export interface Host {
+export interface Host extends Node {
     /** Array of nodes with the types rule, comment and any of the at-rule types. */
     rules?: Array<Rule | Comment | AtRule>;
 }
@@ -158,7 +158,7 @@ export interface Host {
 /**
  * The @import at-rule.
  */
-export interface Import {
+export interface Import extends Node {
     /** The part following @import. */
     import?: string;
 }
@@ -166,7 +166,7 @@ export interface Import {
 /**
  * The @keyframes at-rule.
  */
-export interface KeyFrames {
+export interface KeyFrames extends Node {
     /** The name of the keyframes rule. */
     name?: string;
     /** The vendor prefix in @keyframes, or undefined if there is none. */
@@ -175,7 +175,7 @@ export interface KeyFrames {
     keyframes?: Array<KeyFrame | Comment>;
 }
 
-export interface KeyFrame {
+export interface KeyFrame extends Node {
     /** The list of "selectors" of the keyframe rule, split on commas. Each “selector” is trimmed from whitespace. */
     values?: Array<string>;
     /** Array of nodes with the types declaration and comment. */
@@ -185,7 +185,7 @@ export interface KeyFrame {
 /**
  * The @media at-rule.
  */
-export interface Media {
+export interface Media extends Node {
     /** The part following @media. */
     media?: string;
     /** Array of nodes with the types rule, comment and any of the at-rule types. */
@@ -195,7 +195,7 @@ export interface Media {
 /**
  * The @namespace at-rule.
  */
-export interface Namespace {
+export interface Namespace extends Node {
     /** The part following @namespace. */
     namespace?: string;
 }
@@ -203,7 +203,7 @@ export interface Namespace {
 /**
  * The @page at-rule.
  */
-export interface Page {
+export interface Page extends Node {
     /** The list of selectors of the rule, split on commas. Each selector is trimmed from whitespace and comments. */
     selectors?: Array<string>;
     /** Array of nodes with the types declaration and comment. */
@@ -213,7 +213,7 @@ export interface Page {
 /**
  * The @supports at-rule.
  */
-export interface Supports {
+export interface Supports extends Node {
     /** The part following @supports. */
     supports?: string;
     /** Array of nodes with the types rule, comment and any of the at-rule types. */
@@ -223,16 +223,21 @@ export interface Supports {
 /** All at-rules. */
 export type AtRule = Charset | CustomMedia | Document | FontFace | Host | Import | KeyFrames | Media | Namespace | Page | Supports;
 
+/**
+ * A collection of rules
+ */
+export interface StyleRules {
+    /** Array of nodes with the types rule, comment and any of the at-rule types. */
+    rules: Array<Rule | Comment | AtRule>;
+    /** Array of Errors. Errors collected during parsing when option silent is true. */
+    parsingErrors?: Array<ParserError>
+}
+
 /** 
  * The root node returned by css.parse. 
  */
 export interface Stylesheet extends Node {
-    stylesheet?: {
-        /** Array of nodes with the types rule, comment and any of the at-rule types. */
-        rules?: Array<Rule | Comment | AtRule>;
-        /** Array of Errors. Errors collected during parsing when option silent is true. */
-        parsingErrors?: Array<ParserError>
-    };
+    stylesheet?: StyleRules;
 }
 
 // ---------------------------------------------------------------------------------
diff --git a/types/d3-selection/d3-selection-tests.ts b/types/d3-selection/d3-selection-tests.ts
index 96d421f828..6019084be2 100644
--- a/types/d3-selection/d3-selection-tests.ts
+++ b/types/d3-selection/d3-selection-tests.ts
@@ -1036,6 +1036,19 @@ positions = d3Selection.touches(svg, changedTouches);
 positions = d3Selection.touches(g, changedTouches);
 positions = d3Selection.touches(h, changedTouches);
 
+// clientPoint() ---------------------------------------------------------------------
+
+let clientPoint: [number, number];
+declare let mEvt: MouseEvent;
+declare let tEvt: Touch;
+declare let msgEvt: MSGestureEvent;
+declare let customEvt: {clientX: number, clientY: number}; // minimally conforming  object
+
+clientPoint = d3Selection.clientPoint(svg, mEvt);
+clientPoint = d3Selection.clientPoint(g, tEvt);
+clientPoint = d3Selection.clientPoint(h, msgEvt);
+clientPoint = d3Selection.clientPoint(h, customEvt);
+
 // ---------------------------------------------------------------------------------------
 // Tests of style
 // ---------------------------------------------------------------------------------------
diff --git a/types/d3-selection/index.d.ts b/types/d3-selection/index.d.ts
index abbb14db0f..b5231f37c2 100644
--- a/types/d3-selection/index.d.ts
+++ b/types/d3-selection/index.d.ts
@@ -1,9 +1,9 @@
-// Type definitions for D3JS d3-selection module 1.1
+// Type definitions for D3JS d3-selection module 1.2
 // Project: https://github.com/d3/d3-selection/
 // Definitions by: Tom Wanzek <https://github.com/tomwanzek>, Alex Ford <https://github.com/gustavderdrache>, Boris Yankov <https://github.com/borisyankov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-// Last module patch version validated against: 1.1
+// Last module patch version validated against: 1.2.0
 
 // --------------------------------------------------------------------------
 // Shared Type Definitions and Interfaces
@@ -44,6 +44,14 @@ export interface EnterElement {
  */
 export type ContainerElement = HTMLElement | SVGSVGElement | SVGGElement;
 
+/**
+ * A User interface event (e.g. mouse event, touch or MSGestureEvent) with captured clientX and clientY properties.
+ */
+export interface ClientPointEvent {
+    clientX: number;
+    clientY: number;
+}
+
 /**
  * Interface for optional parameters map, when dispatching custom events
  * on a selection
@@ -670,7 +678,8 @@ export interface Selection<GElement extends BaseType, Datum, PElement extends Ba
      *
      * If a key function is not specified, then the first datum in data is assigned to the first selected element,
      * the second datum to the second selected element, and so on.
-     * A key function may be specified to control which datum is assigned to which element, replacing the default join-by-index.
+     * A key function may be specified to control which datum is assigned to which element, replacing the default join-by-index,
+     * by computing a string identifier for each datum and element.
      *
      * The update and enter selections are returned in data order, while the exit selection preserves the selection
      * order prior to the join. If a key function is specified, the order of elements in the selection may not match
@@ -684,9 +693,9 @@ export interface Selection<GElement extends BaseType, Datum, PElement extends Ba
      *
      * @param data The specified data is an array of arbitrary values (e.g., numbers or objects).
      * @param key An optional key function which is evaluated for each selected element, in order, being passed the
-     * current datum (d), the current index (i), and the current group (nodes), with this as the current DOM element (nodes[i]).
+     * current datum (d), the current index (i), and the current group (nodes), with this as the current DOM element (nodes[i]); the returned string is the element’s key.
      * The key function is then also evaluated for each new datum in data, being passed the current datum (d),
-     * the current index (i), and the group’s new data, with this as the group’s parent DOM element (nodes[i]).
+     * the current index (i), and the group’s new data, with this as the group’s parent DOM element (nodes[i]); the returned string is the datum’s key.
      * The datum for a given key is assigned to the element with the matching key. If multiple elements have the same key,
      * the duplicate elements are put into the exit selection; if multiple data have the same key, the duplicate data are put into the enter selection.
      */
@@ -700,7 +709,8 @@ export interface Selection<GElement extends BaseType, Datum, PElement extends Ba
      *
      * If a key function is not specified, then the first datum in data is assigned to the first selected element,
      * the second datum to the second selected element, and so on.
-     * A key function may be specified to control which datum is assigned to which element, replacing the default join-by-index.
+     * A key function may be specified to control which datum is assigned to which element, replacing the default join-by-index,
+     * by computing a string identifier for each datum and element.
      *
      * The update and enter selections are returned in data order, while the exit selection preserves the selection
      * order prior to the join. If a key function is specified, the order of elements in the selection may not match
@@ -716,9 +726,9 @@ export interface Selection<GElement extends BaseType, Datum, PElement extends Ba
      * (d, which may be undefined), the group index (i), and the selection’s parent nodes (nodes),
      * with this as the group’s parent element. The function returns an array of values for each group.
      * @param key An optional key function which is evaluated for each selected element, in order, being passed the
-     * current datum (d), the current index (i), and the current group (nodes), with this as the current DOM element (nodes[i]).
+     * current datum (d), the current index (i), and the current group (nodes), with this as the current DOM element (nodes[i]); the returned string is the element’s key.
      * The key function is then also evaluated for each new datum in data, being passed the current datum (d),
-     * the current index (i), and the group’s new data, with this as the group’s parent DOM element.
+     * the current index (i), and the group’s new data, with this as the group’s parent DOM element (nodes[i]); the returned string is the datum’s key.
      * The datum for a given key is assigned to the element with the matching key. If multiple elements have the same key,
      * the duplicate elements are put into the exit selection; if multiple data have the same key, the duplicate data are put into the enter selection.
      */
@@ -726,16 +736,13 @@ export interface Selection<GElement extends BaseType, Datum, PElement extends Ba
 
     /**
      * Return the enter selection: placeholder nodes for each datum that had no corresponding DOM element
-     * in the selection. The enter selection is determined by selection.data, and is empty on a selection that
-     * is not joined to data.
+     * in the selection. (The enter selection is empty for selections not returned by selection.data.)
      */
     enter(): Selection<EnterElement, Datum, PElement, PDatum>;
 
     /**
-     * Return the exit selection: existing DOM elements in the selection for which no new datum was found.
-     * The exit selection is determined by the previous selection.data, and is thus empty until the selection is
-     * joined to data. If the exit selection is retrieved more than once after a data join, subsequent calls return
-     * the empty selection.
+     * Returns the exit selection: existing DOM elements in the selection for which no new datum was found.
+     * (The exit selection is empty for selections not returned by selection.data.)
      *
      * IMPORTANT: The generic refers to the type of the old datum associated with the exit selection elements.
      * Ensure you set the generic to the correct type, if you need to access the data on the exit selection in
@@ -972,6 +979,16 @@ export function touch(container: ContainerElement, touches: TouchList, identifie
  */
 export function touches(container: ContainerElement, touches?: TouchList): Array<[number, number]>;
 
+/**
+ * Returns the x and y coordinates of the specified event relative to the specified container.
+ * (The event may also be a touch.) The container may be an HTML or SVG container element, such as a G element or an SVG element.
+ * The coordinates are returned as a two-element array of numbers [x, y].
+ *
+ * @param container Container element relative to which coordinates are calculated.
+ * @param event A User interface event (e.g. mouse event, touch or MSGestureEvent) with captured clientX and clientY properties.
+ */
+export function clientPoint(container: ContainerElement, event: ClientPointEvent): [number, number];
+
 // ---------------------------------------------------------------------------
 // style
 // ---------------------------------------------------------------------------
diff --git a/types/d3/index.d.ts b/types/d3/index.d.ts
index cb48077985..de522828ff 100644
--- a/types/d3/index.d.ts
+++ b/types/d3/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for D3JS d3 standard bundle 4.11
+// Type definitions for D3JS d3 standard bundle 4.12
 // Project: https://github.com/d3/d3
 // Definitions by: Tom Wanzek <https://github.com/tomwanzek>, Alex Ford <https://github.com/gustavderdrache>, Boris Yankov <https://github.com/borisyankov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/dagre/dagre-tests.ts b/types/dagre/dagre-tests.ts
index ae81c2c896..a29cf0128a 100644
--- a/types/dagre/dagre-tests.ts
+++ b/types/dagre/dagre-tests.ts
@@ -1,8 +1,39 @@
-const gDagre = new dagre.graphlib.Graph();
+const gDagre = new dagre.graphlib.Graph({compound: true, multigraph: false});
 gDagre.setGraph({})
   .setDefaultEdgeLabel(() => ({}))
+  .setDefaultNodeLabel(() => ({}))
   .setNode("a", {})
   .setEdge("b", "c")
   .setEdge("c", "d", {class: "class"});
 
 dagre.layout(gDagre);
+
+gDagre.edge({v: 'b', w: 'c'});
+gDagre.hasEdge({v: 'b', w: 'c'});
+gDagre.inEdges('c');
+gDagre.outEdges('c');
+
+gDagre.setParent('a', 'b');
+gDagre.children('b');
+gDagre.hasNode('d');
+gDagre.neighbors('c');
+gDagre.node({});
+gDagre.parent('a');
+gDagre.predecessors('d');
+gDagre.successors('b');
+
+gDagre.removeEdge('c', 'd').removeNode('d');
+
+dagre.graphlib.json.read(dagre.graphlib.json.write(gDagre));
+
+dagre.graphlib.alg.components(gDagre);
+dagre.graphlib.alg.dijkstra(gDagre, 'a', (edge) => 5);
+dagre.graphlib.alg.dijkstraAll(gDagre);
+dagre.graphlib.alg.findCycles(gDagre);
+dagre.graphlib.alg.floydWarchall(gDagre);
+dagre.graphlib.alg.isAcyclic(gDagre);
+dagre.graphlib.alg.postorder(gDagre, 'a');
+dagre.graphlib.alg.preorder(gDagre, ['b', 'c']);
+dagre.graphlib.alg.prim(gDagre);
+dagre.graphlib.alg.tarjam(gDagre);
+dagre.graphlib.alg.topsort(gDagre);
diff --git a/types/dagre/index.d.ts b/types/dagre/index.d.ts
index 852fe33973..6c5e5e00ec 100644
--- a/types/dagre/index.d.ts
+++ b/types/dagre/index.d.ts
@@ -41,7 +41,7 @@ export namespace graphlib {
         predecessors(name: string): Node[]|undefined;
         removeNode(name: string): Graph;
         setDefaultNodeLabel(callback: string|((nodeId: string) => string|Label)): Graph;
-        setNode(id: string, node: NodeConfig): Graph;
+        setNode(name: string, label: string|Label): Graph;
         setParent(childName: string, parentName: string): void;
         sinks(): Node[];
         sources(): Node[];
diff --git a/types/docker-file-parser/docker-file-parser-tests.ts b/types/docker-file-parser/docker-file-parser-tests.ts
new file mode 100644
index 0000000000..21cd715f47
--- /dev/null
+++ b/types/docker-file-parser/docker-file-parser-tests.ts
@@ -0,0 +1,25 @@
+import { parse, CommandEntry, ParseOptions } from 'docker-file-parser';
+
+const file = `
+FROM node:8
+
+ADD . /opt/
+WORKDIR /opt
+
+RUN npm install --production
+
+EXPOSE 8080
+VOLUME /opt/scripts
+
+CMD ["npm", "start"]
+`;
+
+const options: ParseOptions = {
+    includeComments: false
+};
+
+const result: CommandEntry[] = parse(file, options);
+const line1Name = result[0].name;
+const line1Number = result[0].lineno;
+const line1Args = result[0].args;
+const line1Raw = result[0].raw;
diff --git a/types/docker-file-parser/index.d.ts b/types/docker-file-parser/index.d.ts
new file mode 100644
index 0000000000..5263ef3353
--- /dev/null
+++ b/types/docker-file-parser/index.d.ts
@@ -0,0 +1,21 @@
+// Type definitions for docker-file-parser 1.0
+// Project: https://github.com/joyent/docker-file-parse
+// Definitions by: Yash Kulshrestha <https://github.com/yashdalfthegray>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export interface CommandEntry {
+    name: string;
+    args: string[];
+    lineno: number;
+    raw: string;
+    error?: string;
+}
+
+export interface ParseOptions {
+    includeComments: boolean;
+}
+
+export function parse(
+    contents: string,
+    options?: ParseOptions
+): CommandEntry[];
diff --git a/types/docker-file-parser/tsconfig.json b/types/docker-file-parser/tsconfig.json
new file mode 100644
index 0000000000..7c529341c4
--- /dev/null
+++ b/types/docker-file-parser/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",
+        "docker-file-parser-tests.ts"
+    ]
+}
diff --git a/types/docker-file-parser/tslint.json b/types/docker-file-parser/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/docker-file-parser/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/download/download-tests.ts b/types/download/download-tests.ts
new file mode 100644
index 0000000000..7a498ef0dd
--- /dev/null
+++ b/types/download/download-tests.ts
@@ -0,0 +1,30 @@
+import * as fs from 'fs';
+import download = require('download');
+
+download('http://unicorn.com/foo.jpg', 'dist').then(() => {
+	console.log('done!');
+});
+
+download('http://unicorn.com/foo.jpg').then(data => {
+	fs.writeFileSync('dist/foo.jpg', data);
+});
+
+download('unicorn.com/foo.jpg').pipe(fs.createWriteStream('dist/foo.jpg'));
+
+download('unicorn.com/foo.jpg', 'dest', {
+	body: '',
+	decompress: true,
+	encoding: 'utf8',
+	extract: true,
+	filename: 'filename',
+	followRedirect: true,
+	proxy: '',
+	query: '',
+	retries: (retry: number, error: any) => 4,
+	timeout: {
+		connect: 20,
+		request: 20,
+		socket: 20
+	},
+	useElectronNet: true
+});
diff --git a/types/download/index.d.ts b/types/download/index.d.ts
new file mode 100644
index 0000000000..f3af9778bf
--- /dev/null
+++ b/types/download/index.d.ts
@@ -0,0 +1,41 @@
+// Type definitions for download 6.2
+// Project: https://github.com/kevva/download
+// Definitions by: Nico Jansen <https://github.com/nicojs>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+/// <reference types="node" />
+
+interface TimeoutOptions {
+    connect?: number;
+    socket?: number;
+    request?: number;
+}
+type RetryFunction = (retry: number, error: any) => number;
+
+interface DownloadOptions {
+    body?: string | Buffer | NodeJS.ReadableStream;
+    encoding?: string | null;
+    query?: string | object;
+    timeout?: number | TimeoutOptions;
+    retries?: number | RetryFunction;
+    followRedirect?: boolean;
+    decompress?: boolean;
+    useElectronNet?: boolean;
+    /**
+     * If set to true, try extracting the file using decompress.
+     */
+    extract?: boolean;
+    /**
+     * Name of the saved file.
+     */
+    filename?: string;
+    /**
+     * Proxy endpoint
+     */
+    proxy?: string;
+}
+
+declare function download(url: string, destination?: string, options?: DownloadOptions): Promise<Buffer> & NodeJS.WritableStream & NodeJS.ReadableStream;
+
+export = download;
diff --git a/types/download/tsconfig.json b/types/download/tsconfig.json
new file mode 100644
index 0000000000..634ae5ab32
--- /dev/null
+++ b/types/download/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",
+        "download-tests.ts"
+    ]
+}
diff --git a/types/download/tslint.json b/types/download/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/download/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/draft-js/draft-js-tests.tsx b/types/draft-js/draft-js-tests.tsx
index 87172d9471..63821eda98 100644
--- a/types/draft-js/draft-js-tests.tsx
+++ b/types/draft-js/draft-js-tests.tsx
@@ -12,7 +12,17 @@ import {
   SelectionState,
   getDefaultKeyBinding,
   ContentState,
-  convertFromHTML
+  RawDraftInlineStyleRange,
+  RawDraftEntityRange,
+  RawDraftEntity,
+  RawDraftContentBlock,
+  RawDraftContentState,
+  DraftBlockType,
+  DraftInlineStyleType,
+  DraftEntityMutability,
+  DraftEntityType,
+  convertFromHTML,
+  convertToRaw
 } from 'draft-js';
 
 const SPLIT_HEADER_BLOCK = 'split-header-block';
@@ -274,7 +284,7 @@ var INLINE_STYLES = [
 
 const InlineStyleControls = (props: {editorState: EditorState, onToggle: (blockType: string) => void}) => {
   var currentStyle = props.editorState.getCurrentInlineStyle();
-        return (
+  return (
     <div className="RichEditor-controls">
       {INLINE_STYLES.map(type =>
         <StyleButton
@@ -293,3 +303,23 @@ ReactDOM.render(
   <RichEditorExample />,
   document.getElementById('target')
 );
+
+const editorState = EditorState.createEmpty();
+const contentState = editorState.getCurrentContent();
+const rawContentState: RawDraftContentState = convertToRaw(contentState);
+
+rawContentState.blocks.forEach((block: RawDraftContentBlock) => {
+  block.entityRanges.forEach((entityRange: RawDraftEntityRange) => {
+    const { key, offset, length } = entityRange;
+    const entity: RawDraftEntity = rawContentState.entityMap[key];
+    const entityType: DraftEntityType = entity.type;
+    const entityMutability: DraftEntityMutability = entity.mutability;
+    console.log(entityType, entityMutability, offset, length);
+  });
+
+  block.inlineStyleRanges.forEach((inlineStyleRange: RawDraftInlineStyleRange) => {
+    const { offset, length } = inlineStyleRange
+    const inlineStyle: DraftInlineStyleType = inlineStyleRange.style;
+    console.log(inlineStyle, offset, length);
+  });
+});
diff --git a/types/draft-js/index.d.ts b/types/draft-js/index.d.ts
index bf7c2bac71..3eaa05aa30 100644
--- a/types/draft-js/index.d.ts
+++ b/types/draft-js/index.d.ts
@@ -262,9 +262,10 @@ declare namespace Draft {
                  * or block types.
                  */
                 "bold" |
-                "italic" |
-                "underline" |
                 "code" |
+                "italic" |
+                "strikethrough" |
+                "underline" |
 
                 /**
                  * Split a block in two.
@@ -328,6 +329,60 @@ declare namespace Draft {
              * another fragment or if the selected fragment shall be replaced
              */
             type DraftInsertionType = "replace" | "before" | "after";
+
+            /**
+             * Valid inline styles.
+             */
+            type DraftInlineStyleType = (
+                "BOLD" |
+                "CODE" |
+                "ITALIC" |
+                "STRIKETHROUGH" |
+                "UNDERLINE"
+            )
+
+            /**
+             * Default entity types.
+             */
+            type ComposedEntityType = (
+              "LINK" |
+              "TOKEN" |
+              "PHOTO" |
+              "IMAGE"
+            )
+
+            /**
+             * Possible entity types.
+             */
+            type DraftEntityType = string | ComposedEntityType;
+
+            /**
+             * Possible "mutability" options for an entity. This refers to the behavior
+             * that should occur when inserting or removing characters in a text range
+             * with an entity applied to it.
+             *
+             * `MUTABLE`:
+             *   The text range can be modified freely. Generally used in cases where
+             *   the text content and the entity do not necessarily have a direct
+             *   relationship. For instance, the text and URI for a link may be completely
+             *   different. The user is allowed to edit the text as needed, and the entity
+             *   is preserved and applied to any characters added within the range.
+             *
+             * `IMMUTABLE`:
+             *   Not to be confused with immutable data structures used to represent the
+             *   state of the editor. Immutable entity ranges cannot be modified in any
+             *   way. Adding characters within the range will remove the entity from the
+             *   entire range. Deleting characters will delete the entire range. Example:
+             *   Facebook Page mentions.
+             *
+             * `SEGMENTED`:
+             *   Segmented entities allow the removal of partial ranges of text, as
+             *   separated by a delimiter. Adding characters wihin the range will remove
+             *   the entity from the entire range. Deleting characters within a segmented
+             *   entity will delete only the segments affected by the deletion. Example:
+             *   Facebook User mentions.
+             */
+            type DraftEntityMutability = "MUTABLE" | "IMMUTABLE" | "SEGMENTED";
         }
 
         namespace Decorators {
@@ -408,14 +463,24 @@ declare namespace Draft {
         }
 
         namespace Encoding {
+            import DraftInlineStyleType = Draft.Model.Constants.DraftInlineStyleType;
+            import DraftBlockType = Draft.Model.Constants.DraftBlockType;
+            import DraftEntityMutability = Draft.Model.Constants.DraftEntityMutability;
+            import DraftEntityType = Draft.Model.Constants.DraftEntityType;
+
             import ContentBlock = Draft.Model.ImmutableData.ContentBlock;
             import ContentState = Draft.Model.ImmutableData.ContentState;
 
             import DraftBlockRenderMap = Draft.Component.Base.DraftBlockRenderMap;
-            import DraftBlockType = Draft.Model.Constants.DraftBlockType;
 
-            import DraftEntityType = Draft.Model.Entity.DraftEntityType;
-            import DraftEntityMutability = Draft.Model.Entity.DraftEntityMutability;
+            /**
+             * A plain object representation of an inline style range.
+             */
+            interface RawDraftInlineStyleRange {
+                style: DraftInlineStyleType;
+                offset: number;
+                length: number;
+            }
 
             /**
              * A plain object representation of an entity attribution.
@@ -423,21 +488,12 @@ declare namespace Draft {
              * The `key` value corresponds to the key of the entity in the `entityMap` of
              * a `ComposedText` object, not for use with `DraftEntity.get()`.
              */
-            interface EntityRange {
+            interface RawDraftEntityRange {
                 key: number,
                 offset: number,
                 length: number,
             }
 
-            /**
-             * A plain object representation of an inline style range.
-             */
-            interface InlineStyleRange {
-                style: string;
-                offset: number;
-                length: number;
-            }
-
             /**
              * A plain object representation of an EntityInstance.
              */
@@ -456,8 +512,8 @@ declare namespace Draft {
                 type: DraftBlockType;
                 text: string;
                 depth: number;
-                inlineStyleRanges: Array<InlineStyleRange>;
-                entityRanges: Array<EntityRange>;
+                inlineStyleRanges: Array<RawDraftInlineStyleRange>;
+                entityRanges: Array<RawDraftEntityRange>;
                 data?: Object;
             }
 
@@ -481,36 +537,8 @@ declare namespace Draft {
         }
 
         namespace Entity {
-            type ComposedEntityType = "LINK" | "TOKEN" | "PHOTO";
-            type DraftEntityType = string | ComposedEntityType;
-
-            /**
-             * An enum representing the possible "mutability" options for an entity.
-             * This refers to the behavior that should occur when inserting or removing
-             * characters in a text range with an entity applied to it.
-             *
-             * `MUTABLE`:
-             *   The text range can be modified freely. Generally used in cases where
-             *   the text content and the entity do not necessarily have a direct
-             *   relationship. For instance, the text and URI for a link may be completely
-             *   different. The user is allowed to edit the text as needed, and the entity
-             *   is preserved and applied to any characters added within the range.
-             *
-             * `IMMUTABLE`:
-             *   Not to be confused with immutable data structures used to represent the
-             *   state of the editor. Immutable entity ranges cannot be modified in any
-             *   way. Adding characters within the range will remove the entity from the
-             *   entire range. Deleting characters will delete the entire range. Example:
-             *   Facebook Page mentions.
-             *
-             * `SEGMENTED`:
-             *   Segmented entities allow the removal of partial ranges of text, as
-             *   separated by a delimiter. Adding characters wihin the range will remove
-             *   the entity from the entire range. Deleting characters within a segmented
-             *   entity will delete only the segments affected by the deletion. Example:
-             *   Facebook User mentions.
-             */
-            type DraftEntityMutability = "MUTABLE" | "IMMUTABLE" | "SEGMENTED";
+            import DraftEntityMutability = Draft.Model.Constants.DraftEntityMutability;
+            import DraftEntityType = Draft.Model.Constants.DraftEntityType;
 
             /**
              * A "document entity" is an object containing metadata associated with a
@@ -579,10 +607,10 @@ declare namespace Draft {
 
         namespace ImmutableData {
             import DraftBlockType = Draft.Model.Constants.DraftBlockType;
-            import DraftDecoratorType = Draft.Model.Decorators.DraftDecoratorType;
+            import DraftEntityMutability = Draft.Model.Constants.DraftEntityMutability;
+            import DraftEntityType = Draft.Model.Constants.DraftEntityType;
 
-            import DraftEntityType = Draft.Model.Entity.DraftEntityType;
-            import DraftEntityMutability = Draft.Model.Entity.DraftEntityMutability;
+            import DraftDecoratorType = Draft.Model.Decorators.DraftDecoratorType;
 
             type DraftInlineStyle = Immutable.OrderedSet<string>;
             type BlockMap = Immutable.OrderedMap<string, Draft.Model.ImmutableData.ContentBlock>;
@@ -938,6 +966,10 @@ import RichUtils = Draft.Model.Modifier.RichTextEditorUtil;
 import DefaultDraftBlockRenderMap = Draft.Model.ImmutableData.DefaultDraftBlockRenderMap;
 import DefaultDraftInlineStyle = Draft.Model.ImmutableData.DefaultDraftInlineStyle;
 
+import RawDraftInlineStyleRange = Draft.Model.Encoding.RawDraftInlineStyleRange;
+import RawDraftEntityRange = Draft.Model.Encoding.RawDraftEntityRange;
+import RawDraftEntity = Draft.Model.Encoding.RawDraftEntity;
+import RawDraftContentBlock = Draft.Model.Encoding.RawDraftContentBlock;
 import RawDraftContentState = Draft.Model.Encoding.RawDraftContentState;
 import convertFromRaw = Draft.Model.Encoding.convertFromRawToDraftState;
 import convertToRaw = Draft.Model.Encoding.convertFromDraftStateToRaw;
@@ -950,6 +982,9 @@ import getVisibleSelectionRect = Draft.Component.Selection.getVisibleSelectionRe
 import DraftEditorCommand = Draft.Model.Constants.DraftEditorCommand;
 import DraftDragType = Draft.Model.Constants.DraftDragType;
 import DraftBlockType = Draft.Model.Constants.DraftBlockType;
+import DraftInlineStyleType = Draft.Model.Constants.DraftInlineStyleType;
+import DraftEntityMutability = Draft.Model.Constants.DraftEntityMutability;
+import DraftEntityType = Draft.Model.Constants.DraftEntityType;
 import DraftRemovalDirection = Draft.Model.Constants.DraftRemovalDirection;
 import DraftHandleValue = Draft.Model.Constants.DraftHandleValue;
 import DraftInsertionType = Draft.Model.Constants.DraftInsertionType;
@@ -979,6 +1014,10 @@ export {
     DefaultDraftBlockRenderMap,
     DefaultDraftInlineStyle,
 
+    RawDraftInlineStyleRange,
+    RawDraftEntityRange,
+    RawDraftEntity,
+    RawDraftContentBlock,
     RawDraftContentState,
     convertFromRaw,
     convertToRaw,
@@ -991,6 +1030,9 @@ export {
     DraftEditorCommand,
     DraftDragType,
     DraftBlockType,
+    DraftInlineStyleType,
+    DraftEntityType,
+    DraftEntityMutability,
     DraftRemovalDirection,
     DraftHandleValue,
     DraftInsertionType,
diff --git a/types/dygraphs/index.d.ts b/types/dygraphs/index.d.ts
index c8617b18fc..6e45d5ccd7 100644
--- a/types/dygraphs/index.d.ts
+++ b/types/dygraphs/index.d.ts
@@ -526,6 +526,12 @@ declare namespace dygraphs {
          */
         highlightSeriesBackgroundAlpha?: number;
 
+        /**
+         * Sets the background color used to fade out the series in conjunction with 'highlightSeriesBackgroundAlpha'.
+         * Default: rgb(255, 255, 255)
+         */
+        highlightSeriesBackgroundColor?: string;
+
         /**
          * When set, the options from this object are applied to the timeseries closest to the mouse
          * pointer for interactive highlighting. See also 'highlightCallback'. Example:
diff --git a/types/elasticsearch/elasticsearch-tests.ts b/types/elasticsearch/elasticsearch-tests.ts
index 1be3f740bc..3043a1f473 100644
--- a/types/elasticsearch/elasticsearch-tests.ts
+++ b/types/elasticsearch/elasticsearch-tests.ts
@@ -1,6 +1,6 @@
-import elasticsearch = require("elasticsearch");
+import * as elasticsearch from "elasticsearch";
 
-var client = new elasticsearch.Client({
+let client = new elasticsearch.Client({
   host: 'localhost:9200',
   log: 'trace'
 });
@@ -10,26 +10,26 @@ client = new elasticsearch.Client({
     'box1.server.org',
     'box2.server.org'
   ],
-  selector: function (hosts: any) { }
+  selector: (hosts: any) => { }
 });
 
 client.ping({
   requestTimeout: 30000
-}, function (error) {
+}, (error) => {
 });
 
 client.search({
   q: 'pants'
-}).then(function (body) {
-  var hits = body.hits.hits;
-}, function (error) {
+}).then((body) => {
+  const hits = body.hits.hits;
+}, (error) => {
 });
 
 client.indices.delete({
   index: 'test_index',
   ignore: [404]
-}).then(function (body) {
-}, function (error) {
+}).then((body) => {
+}, (error) => {
 });
 
 client.deleteByQuery({
@@ -39,8 +39,8 @@ client.deleteByQuery({
     query: {
     }
   }
-}).then(function (response) {
-}, function (error) {
+}).then((response) => {
+}, (error) => {
 });
 
 client.create({
@@ -103,7 +103,7 @@ client.cluster.stats({
 
 client.count({
   index: 'index_name'
-}, function (error, response) {
+}, (error, response) => {
   // ...
 });
 
@@ -120,7 +120,7 @@ client.count({
       }
     }
   }
-}, function (err, response) {
+}, (err, response) => {
   // ...
 });
 
@@ -132,7 +132,7 @@ client.explain({
 
   // the query to score it against
   q: 'field:value'
-}, function (error, response) {
+}, (error, response) => {
   // ...
 });
 
@@ -145,7 +145,7 @@ client.explain({
       match: { title: 'test' }
     }
   }
-}, function (error, response) {
+}, (error, response) => {
   // ...
 });
 
@@ -158,8 +158,7 @@ client.index({
     tags: ['y', 'z'],
     published: true,
   }
-}, function (error, response) {
-
+}, (error, response) => {
 });
 
 client.mget({
@@ -170,7 +169,7 @@ client.mget({
       { _index: 'indexC', _type: 'typeC', _id: '1' }
     ]
   }
-}, function (error, response) {
+}, (error, response) => {
   // ...
 });
 
@@ -180,14 +179,14 @@ client.mget({
   body: {
     ids: [1, 2, 3]
   }
-}, function (error, response) {
+}, (error, response) => {
   // ...
 });
 
 client.search({
   index: 'myindex',
   q: 'title:test'
-}, function (error, response) {
+}, (error, response) => {
   // ...
 });
 
@@ -207,7 +206,7 @@ client.search({
       }
     }
   }
-}, function (error, response) {
+}, (error, response) => {
   // ...
 });
 
@@ -221,12 +220,11 @@ client.suggest({
       }
     }
   }
-}, function (error, response) {
+}, (error, response) => {
 });
 
-
 // first we do a search, and specify a scroll timeout
-var allTitles: string[] = [];
+const allTitles: string[] = [];
 client.search({
   index: 'myindex',
   // Set to 30 seconds because we are calling right back
@@ -236,14 +234,14 @@ client.search({
   q: 'title:test'
 }, function getMoreUntilDone(error, response) {
   // collect the title from each response
-  response.hits.hits.forEach(function (hit) {
+  response.hits.hits.forEach((hit) => {
     allTitles.push(hit.fields.title);
   });
 
   if (response.hits.total !== allTitles.length) {
     // now we can call scroll over and over
     client.scroll({
-      scrollId: response._scroll_id,
+      scrollId: response._scroll_id!,
       scroll: '30s'
     }, getMoreUntilDone);
   } else {
@@ -258,8 +256,13 @@ client.indices.updateAliases({
       { add: { index: 'logstash-2014.05', alias: 'logstash-current' } }
     ]
   }
-}).then(function (response) {
+}).then((response) => {
   // ...
-}, function (error) {
+}, (error) => {
   // ...
 });
+
+// Errors
+function testErrors() {
+    throw new elasticsearch.errors.AuthenticationException();
+}
diff --git a/types/elasticsearch/index.d.ts b/types/elasticsearch/index.d.ts
index 8acc7e4097..1b45a237e5 100644
--- a/types/elasticsearch/index.d.ts
+++ b/types/elasticsearch/index.d.ts
@@ -1,1608 +1,1659 @@
 // Type definitions for elasticsearch 5.0
 // Project: https://www.elastic.co/guide/en/elasticsearch/client/javascript-api/current/index.html
-// Definitions by: Casper Skydt <https://github.com/CasperSkydt>, Blake Smith <https://github.com/bfsmith>, Dave Dunkin <https://github.com/ddunkin>, Jeffery Grajkowski <https://github.com/pushplay>, Margus Lamp <https://github.com/mlamp>, Ahmad Ferdous Bin Alam <https://github.com/ahmadferdous>
+// Definitions by: Casper Skydt <https://github.com/CasperSkydt>
+//                 Blake Smith <https://github.com/bfsmith>
+//                 Dave Dunkin <https://github.com/ddunkin>
+//                 Jeffery Grajkowski <https://github.com/pushplay>
+//                 Margus Lamp <https://github.com/mlamp>
+//                 Ahmad Ferdous Bin Alam <https://github.com/ahmadferdous>
+//                 Simon Schick <https://github.com/SimonSchick>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
-declare module Elasticsearch {
-    export class Client {
-        constructor(params: ConfigOptions);
-        cat: Cat;
-        cluster: Cluster;
-        indices: Indices;
-        ingest: Ingest;
-        nodes: Nodes;
-        snapshot: Snapshot;
-        tasks: Tasks;
-        bulk(params: BulkIndexDocumentsParams): Promise<any>;
-        bulk(params: BulkIndexDocumentsParams, callback: (error: any, response: any) => void): void;
-        clearScroll(params: ClearScrollParams, callback: (error: any, response: any) => void): void;
-        clearScroll(params: ClearScrollParams): Promise<any>;
-        count(params: CountParams, callback: (error: any, response: CountResponse) => void): void;
-        count(params: CountParams): Promise<CountResponse>;
-        create(params: CreateDocumentParams): Promise<CreateDocumentResponse>;
-        create(params: CreateDocumentParams, callback: (err: any, response: CreateDocumentResponse, status: any) => void): void;
-        delete(params: DeleteDocumentParams): Promise<DeleteDocumentResponse>;
-        delete(params: DeleteDocumentParams, callback: (error: any, response: DeleteDocumentResponse) => void): void;
-        deleteByQuery(params: DeleteDocumentByQueryParams): Promise<DeleteDocumentByQueryResponse>;
-        deleteByQuery(params: DeleteDocumentByQueryParams, callback: (error: any, response: DeleteDocumentByQueryResponse) => void): void;
-        deleteScript(params: DeleteScriptParams): Promise<any>;
-        deleteScript(params: DeleteScriptParams, callback: (error: any, response: any) => void): void;
-        deleteTemplate(params: DeleteTemplateParams): Promise<any>;
-        deleteTemplate(params: DeleteTemplateParams, callback: (error: any, response: any) => void): void;
-        exists(params: ExistsParams): Promise<any>;
-        exists(params: ExistsParams, callback: (error: any, response: any, status?: any) => void): void;
-        explain(params: ExplainParams): Promise<ExplainResponse>;
-        explain(params: ExplainParams, callback: (error: any, response: ExplainResponse) => void): void;
-        fieldStats(params: FieldStatsParams): Promise<FieldStatsResponse>;
-        fieldStats(params: FieldStatsParams, callback: (error: any, response: FieldStatsResponse) => void): void;
-        get<T>(params: GetParams, callback: (error: any, response: GetResponse<T>) => void): void;
-        get<T>(params: GetParams): Promise<GetResponse<T>>;
-        getScript(params: GetScriptParams): Promise<any>;
-        getScript(params: GetScriptParams, callback: (error: any, response: any) => void): void;
-        getSource(params: GetSourceParams): Promise<any>;
-        getSource(params: GetSourceParams, callback: (error: any, response: any) => void): void;
-        getTemplate(params: GetTemplateParams): Promise<any>;
-        getTemplate(params: GetTemplateParams, callback: (error: any, response: any) => void): void;
-        index<T>(params: IndexDocumentParams<T>): Promise<any>;
-        index<T>(params: IndexDocumentParams<T>, callback: (error: any, response: any) => void): void;
-        info(params: InfoParams): Promise<any>;
-        info(params: InfoParams, callback: (error: any, response: any) => void): void;
-        mget<T>(params: MGetParams, callback: (error: any, response: MGetResponse<T>) => void): void;
-        mget<T>(params: MGetParams): Promise<MGetResponse<T>>;
-        msearch<T>(params: MSearchParams, callback: (error: any, response: MSearchResponse<T>) => void): void;
-        msearch<T>(params: MSearchParams): Promise<MSearchResponse<T>>;
-        msearchTemplate<T>(params: MSearchTemplateParams, callback: (error: any, response: MSearchResponse<T>) => void): void;
-        msearchTemplate<T>(params: MSearchTemplateParams): Promise<MSearchResponse<T>>;
-        mtermvectors(params: MTermVectorsParams): Promise<any>;
-        mtermvectors(params: MTermVectorsParams, callback: (error: any, response: any) => void): void;
-        ping(params: PingParams): Promise<any>;
-        ping(params: PingParams, callback: (err: any, response: any, status: any) => void): void;
-        putScript(params: PutScriptParams): Promise<any>;
-        putScript(params: PutScriptParams, callback: (err: any, response: any, status: any) => void): void;
-        putTemplate(params: PutTemplateParams): Promise<any>;
-        putTemplate(params: PutTemplateParams, callback: (err: any, response: any, status: any) => void): void;
-        reindex(params: ReindexParams): Promise<ReindexResponse>;
-        reindex(params: ReindexParams, callback: (error: any, response: ReindexResponse) => void): void;
-        reindexRethrottle(params: ReindexRethrottleParams): Promise<any>;
-        reindexRethrottle(params: ReindexRethrottleParams, callback: (error: any, response: any) => void): void;
-        renderSearchTemplate(params: RenderSearchTemplateParams): Promise<any>;
-        renderSearchTemplate(params: RenderSearchTemplateParams, callback: (error: any, response: any) => void): void;
-        scroll<T>(params: ScrollParams): Promise<SearchResponse<T>>;
-        scroll<T>(params: ScrollParams, callback: (error: any, response: SearchResponse<T>) => void): void;
-        search<T>(params: SearchParams): Promise<SearchResponse<T>>;
-        search<T>(params: SearchParams, callback: (error: any, response: SearchResponse<T>) => void): void;
-        searchShards(params: SearchShardsParams): Promise<SearchShardsResponse>;
-        searchShards(params: SearchShardsParams, callback: (error: any, response: SearchShardsResponse) => void): void;
-        searchTemplate(params: SearchTemplateParams): Promise<any>;
-        searchTemplate(params: SearchTemplateParams, callback: (error: any, response: any) => void): void;
-        suggest(params: SuggestParams): Promise<any>;
-        suggest(params: SuggestParams, callback: (error: any, response: any) => void): void;
-        termvectors(params: TermvectorsParams): Promise<any>;
-        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;
-        close(): void;
-    }
+export class Client {
+    constructor(params: ConfigOptions);
+    cat: Cat;
+    cluster: Cluster;
+    indices: Indices;
+    ingest: Ingest;
+    nodes: Nodes;
+    snapshot: Snapshot;
+    tasks: Tasks;
+    bulk(params: BulkIndexDocumentsParams): Promise<any>;
+    bulk(params: BulkIndexDocumentsParams, callback: (error: any, response: any) => void): void;
+    clearScroll(params: ClearScrollParams, callback: (error: any, response: any) => void): void;
+    clearScroll(params: ClearScrollParams): Promise<any>;
+    count(params: CountParams, callback: (error: any, response: CountResponse) => void): void;
+    count(params: CountParams): Promise<CountResponse>;
+    create(params: CreateDocumentParams): Promise<CreateDocumentResponse>;
+    create(params: CreateDocumentParams, callback: (err: any, response: CreateDocumentResponse, status: any) => void): void;
+    delete(params: DeleteDocumentParams): Promise<DeleteDocumentResponse>;
+    delete(params: DeleteDocumentParams, callback: (error: any, response: DeleteDocumentResponse) => void): void;
+    deleteByQuery(params: DeleteDocumentByQueryParams): Promise<DeleteDocumentByQueryResponse>;
+    deleteByQuery(params: DeleteDocumentByQueryParams, callback: (error: any, response: DeleteDocumentByQueryResponse) => void): void;
+    deleteScript(params: DeleteScriptParams): Promise<any>;
+    deleteScript(params: DeleteScriptParams, callback: (error: any, response: any) => void): void;
+    deleteTemplate(params: DeleteTemplateParams): Promise<any>;
+    deleteTemplate(params: DeleteTemplateParams, callback: (error: any, response: any) => void): void;
+    exists(params: ExistsParams): Promise<any>;
+    exists(params: ExistsParams, callback: (error: any, response: any, status?: any) => void): void;
+    explain(params: ExplainParams): Promise<ExplainResponse>;
+    explain(params: ExplainParams, callback: (error: any, response: ExplainResponse) => void): void;
+    fieldStats(params: FieldStatsParams): Promise<FieldStatsResponse>;
+    fieldStats(params: FieldStatsParams, callback: (error: any, response: FieldStatsResponse) => void): void;
+    get<T>(params: GetParams, callback: (error: any, response: GetResponse<T>) => void): void;
+    get<T>(params: GetParams): Promise<GetResponse<T>>;
+    getScript(params: GetScriptParams): Promise<any>;
+    getScript(params: GetScriptParams, callback: (error: any, response: any) => void): void;
+    getSource(params: GetSourceParams): Promise<any>;
+    getSource(params: GetSourceParams, callback: (error: any, response: any) => void): void;
+    getTemplate(params: GetTemplateParams): Promise<any>;
+    getTemplate(params: GetTemplateParams, callback: (error: any, response: any) => void): void;
+    index<T>(params: IndexDocumentParams<T>): Promise<any>;
+    index<T>(params: IndexDocumentParams<T>, callback: (error: any, response: any) => void): void;
+    info(params: InfoParams): Promise<any>;
+    info(params: InfoParams, callback: (error: any, response: any) => void): void;
+    mget<T>(params: MGetParams, callback: (error: any, response: MGetResponse<T>) => void): void;
+    mget<T>(params: MGetParams): Promise<MGetResponse<T>>;
+    msearch<T>(params: MSearchParams, callback: (error: any, response: MSearchResponse<T>) => void): void;
+    msearch<T>(params: MSearchParams): Promise<MSearchResponse<T>>;
+    msearchTemplate<T>(params: MSearchTemplateParams, callback: (error: any, response: MSearchResponse<T>) => void): void;
+    msearchTemplate<T>(params: MSearchTemplateParams): Promise<MSearchResponse<T>>;
+    mtermvectors(params: MTermVectorsParams): Promise<any>;
+    mtermvectors(params: MTermVectorsParams, callback: (error: any, response: any) => void): void;
+    ping(params: PingParams): Promise<any>;
+    ping(params: PingParams, callback: (err: any, response: any, status: any) => void): void;
+    putScript(params: PutScriptParams): Promise<any>;
+    putScript(params: PutScriptParams, callback: (err: any, response: any, status: any) => void): void;
+    putTemplate(params: PutTemplateParams): Promise<any>;
+    putTemplate(params: PutTemplateParams, callback: (err: any, response: any, status: any) => void): void;
+    reindex(params: ReindexParams): Promise<ReindexResponse>;
+    reindex(params: ReindexParams, callback: (error: any, response: ReindexResponse) => void): void;
+    reindexRethrottle(params: ReindexRethrottleParams): Promise<any>;
+    reindexRethrottle(params: ReindexRethrottleParams, callback: (error: any, response: any) => void): void;
+    renderSearchTemplate(params: RenderSearchTemplateParams): Promise<any>;
+    renderSearchTemplate(params: RenderSearchTemplateParams, callback: (error: any, response: any) => void): void;
+    scroll<T>(params: ScrollParams): Promise<SearchResponse<T>>;
+    scroll<T>(params: ScrollParams, callback: (error: any, response: SearchResponse<T>) => void): void;
+    search<T>(params: SearchParams): Promise<SearchResponse<T>>;
+    search<T>(params: SearchParams, callback: (error: any, response: SearchResponse<T>) => void): void;
+    searchShards(params: SearchShardsParams): Promise<SearchShardsResponse>;
+    searchShards(params: SearchShardsParams, callback: (error: any, response: SearchShardsResponse) => void): void;
+    searchTemplate(params: SearchTemplateParams): Promise<any>;
+    searchTemplate(params: SearchTemplateParams, callback: (error: any, response: any) => void): void;
+    suggest(params: SuggestParams): Promise<any>;
+    suggest(params: SuggestParams, callback: (error: any, response: any) => void): void;
+    termvectors(params: TermvectorsParams): Promise<any>;
+    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;
+    close(): void;
+}
 
-    export interface ConfigOptions {
-        host?: any;
-        hosts?: any;
-        httpAuth?: string;
-        log?: any;
-        apiVersion?: string;
-        plugins?: any;
-        sniffOnStart?: boolean;
-        sniffInterval?: number;
-        sniffOnConnectionFault?: boolean;
-        maxRetries?: number;
-        requestTimeout?: number;
-        deadTimeout?: number;
-        pingTimeout?: number;
-        keepAlive?: boolean;
-        maxSockets?: number;
-        suggestCompression?: boolean;
-        connectionClass?: string;
-        sniffedNodesProtocol?: string;
-        ssl?: Object;
-        selector?: any;
-        defer?: () => void;
-        nodesToHostCallback?: any;
-        createNodeAgent?: any;
-    }
+export interface ConfigOptions {
+    host?: any;
+    hosts?: any;
+    httpAuth?: string;
+    log?: any;
+    apiVersion?: string;
+    plugins?: any;
+    sniffOnStart?: boolean;
+    sniffInterval?: number;
+    sniffOnConnectionFault?: boolean;
+    maxRetries?: number;
+    requestTimeout?: number;
+    deadTimeout?: number;
+    pingTimeout?: number;
+    keepAlive?: boolean;
+    maxSockets?: number;
+    suggestCompression?: boolean;
+    connectionClass?: string;
+    sniffedNodesProtocol?: string;
+    ssl?: object;
+    selector?: any;
+    defer?: () => void;
+    nodesToHostCallback?: any;
+    createNodeAgent?: any;
+}
 
-    export interface Explanation {
-        value: number;
-        description: string;
-        details: Explanation[];
-    }
+export interface Explanation {
+    value: number;
+    description: string;
+    details: Explanation[];
+}
 
-    export interface GenericParams {
-        requestTimeout?: number;
-        maxRetries?: number;
-        method?: string;
-        body?: any;
-        ignore?: number | number[];
-        filterPath?: string | string[];
-    }
+export interface GenericParams {
+    requestTimeout?: number;
+    maxRetries?: number;
+    method?: string;
+    body?: any;
+    ignore?: number | number[];
+    filterPath?: string | string[];
+}
 
-    export interface ShardsResponse {
-        total: number;
-        successful: number;
-        failed: number;
-    }
+export interface ShardsResponse {
+    total: number;
+    successful: number;
+    failed: number;
+}
 
-    /**
-     * A string of a number and a time unit.  A time unit is one of
-     * [d, h, m, s, ms, micros, nanos].  eg: "30s" for 30 seconds.
-     * These are incorrectly identified as `Date | number` in the docs as of 2016-11-15.
-     */
-    export type TimeSpan = string;
+/**
+ * A string of a number and a time unit.  A time unit is one of
+ * [d, h, m, s, ms, micros, nanos].  eg: "30s" for 30 seconds.
+ * These are incorrectly identified as `Date | number` in the docs as of 2016-11-15.
+ */
+export type TimeSpan = string;
 
-    export type NameList = string | string[] | boolean;
-    export type Refresh = boolean | "true" | "false" | "wait_for" | "";
-    export type VersionType = "internal" | "external" | "external_gte" | "force";
-    export type ExpandWildcards = "open" | "closed" | "none" | "all";
-    export type DefaultOperator = "AND" | "OR";
-    export type Conflicts = "abort" | "proceed";
+export type NameList = string | string[] | boolean;
+export type Refresh = boolean | "true" | "false" | "wait_for" | "";
+export type VersionType = "internal" | "external" | "external_gte" | "force";
+export type ExpandWildcards = "open" | "closed" | "none" | "all";
+export type DefaultOperator = "AND" | "OR";
+export type Conflicts = "abort" | "proceed";
 
-    export interface BulkIndexDocumentsParams extends GenericParams {
-        waitForActiveShards?: string;
-        refresh?: Refresh;
-        routing?: string;
-        timeout?: TimeSpan;
-        type?: string;
-        fields?: NameList;
-        _source?: NameList;
-        _sourceExclude?: NameList;
-        _sourceInclude?: NameList;
-        pipeline?: string;
-        index?: string;
-    }
+export interface BulkIndexDocumentsParams extends GenericParams {
+    waitForActiveShards?: string;
+    refresh?: Refresh;
+    routing?: string;
+    timeout?: TimeSpan;
+    type?: string;
+    fields?: NameList;
+    _source?: NameList;
+    _sourceExclude?: NameList;
+    _sourceInclude?: NameList;
+    pipeline?: string;
+    index?: string;
+}
 
-    export interface ClearScrollParams extends GenericParams {
-        scrollId: NameList;
-    }
+export interface ClearScrollParams extends GenericParams {
+    scrollId: NameList;
+}
 
-    export interface CountParams extends GenericParams {
-        ignoreUnavailable?: boolean;
-        allowNoIndices?: boolean;
-        expandWildcards?: ExpandWildcards;
-        minScore?: number;
-        preference?: string;
-        routing?: string;
-        q?: string;
-        analyzer?: string;
-        analyzeWildcard?: boolean;
-        defaultOperator?: DefaultOperator;
-        df?: string;
-        lenient?: boolean;
-        lowercaseExpandedTerms?: boolean;
-        index?: NameList;
-        type?: NameList;
-    }
+export interface CountParams extends GenericParams {
+    ignoreUnavailable?: boolean;
+    allowNoIndices?: boolean;
+    expandWildcards?: ExpandWildcards;
+    minScore?: number;
+    preference?: string;
+    routing?: string;
+    q?: string;
+    analyzer?: string;
+    analyzeWildcard?: boolean;
+    defaultOperator?: DefaultOperator;
+    df?: string;
+    lenient?: boolean;
+    lowercaseExpandedTerms?: boolean;
+    index?: NameList;
+    type?: NameList;
+}
 
-    export interface CountResponse {
-        count: number;
-        _shards: ShardsResponse;
-    }
+export interface CountResponse {
+    count: number;
+    _shards: ShardsResponse;
+}
 
-    export interface CreateDocumentParams extends GenericParams {
-        waitForActiveShards?: string;
-        parent?: string;
-        refresh?: Refresh;
-        timeout?: TimeSpan;
-        timestamp?: Date | number;
-        ttl?: TimeSpan;
-        version?: number;
-        versionType?: VersionType;
-        pipeline?: string;
-        id?: string;
-        index: string;
-        type: string;
-    }
+export interface CreateDocumentParams extends GenericParams {
+    waitForActiveShards?: string;
+    parent?: string;
+    refresh?: Refresh;
+    timeout?: TimeSpan;
+    timestamp?: Date | number;
+    ttl?: TimeSpan;
+    version?: number;
+    versionType?: VersionType;
+    pipeline?: string;
+    id?: string;
+    index: string;
+    type: string;
+}
 
-    export interface CreateDocumentResponse {
-        _shards: ShardsResponse;
-        _index: string;
-        _type: string;
-        _id: string;
-        _version: number;
-        created: boolean;
-        result: string;
-    }
+export interface CreateDocumentResponse {
+    _shards: ShardsResponse;
+    _index: string;
+    _type: string;
+    _id: string;
+    _version: number;
+    created: boolean;
+    result: string;
+}
 
-    export interface DeleteDocumentParams extends GenericParams {
-        waitForActiveShards?: string;
-        parent?: string;
-        refresh?: Refresh;
-        routing?: string;
-        timeout?: TimeSpan;
-        version?: number;
-        versionType?: VersionType;
-        index: string;
-        type: string;
-        id: string;
-    }
+export interface DeleteDocumentParams extends GenericParams {
+    waitForActiveShards?: string;
+    parent?: string;
+    refresh?: Refresh;
+    routing?: string;
+    timeout?: TimeSpan;
+    version?: number;
+    versionType?: VersionType;
+    index: string;
+    type: string;
+    id: string;
+}
 
-    export interface DeleteDocumentResponse {
-        _shards: ShardsResponse;
-        found: boolean;
-        _index: string;
-        _type: string;
-        _id: string;
-        _version: number;
-        result: string;
-    }
+export interface DeleteDocumentResponse {
+    _shards: ShardsResponse;
+    found: boolean;
+    _index: string;
+    _type: string;
+    _id: string;
+    _version: number;
+    result: string;
+}
 
-    export interface DeleteDocumentByQueryParams extends GenericParams {
-        analyzer?: string;
-        analyzeWildcard?: boolean;
-        defaultOperator?: DefaultOperator;
-        df?: string;
-        from?: number;
-        ignoreUnavailable?: boolean;
-        allowNoIndices?: boolean;
-        conflicts?: Conflicts;
-        expandWildcards?: ExpandWildcards;
-        lenient?: boolean;
-        lowercaseExpandedTerms?: boolean;
-        preference?: string;
-        q?: string;
-        routing?: string | string[] | boolean;
-        scroll?: string;
-        searchType?: "query_then_fetch" | "dfs_query_then_fetch";
-        searchTimeout?: TimeSpan;
-        size?: number;
-        sort?: NameList;
-        _source?: NameList;
-        _sourceExclude?: NameList;
-        _sourceInclude?: NameList;
-        terminateAfter?: number;
-        stats?: string | string[] | boolean;
-        version?: number;
-        requestCache?: boolean;
-        refresh?: Refresh;
-        timeout?: TimeSpan;
-        waitForActiveShards?: string;
-        scrollSize?: number;
-        waitForCompletion?: boolean;
-        requestsPerSecond?: number;
-        index?: string;
-        type?: string;
-    }
+export interface DeleteDocumentByQueryParams extends GenericParams {
+    analyzer?: string;
+    analyzeWildcard?: boolean;
+    defaultOperator?: DefaultOperator;
+    df?: string;
+    from?: number;
+    ignoreUnavailable?: boolean;
+    allowNoIndices?: boolean;
+    conflicts?: Conflicts;
+    expandWildcards?: ExpandWildcards;
+    lenient?: boolean;
+    lowercaseExpandedTerms?: boolean;
+    preference?: string;
+    q?: string;
+    routing?: string | string[] | boolean;
+    scroll?: string;
+    searchType?: "query_then_fetch" | "dfs_query_then_fetch";
+    searchTimeout?: TimeSpan;
+    size?: number;
+    sort?: NameList;
+    _source?: NameList;
+    _sourceExclude?: NameList;
+    _sourceInclude?: NameList;
+    terminateAfter?: number;
+    stats?: string | string[] | boolean;
+    version?: number;
+    requestCache?: boolean;
+    refresh?: Refresh;
+    timeout?: TimeSpan;
+    waitForActiveShards?: string;
+    scrollSize?: number;
+    waitForCompletion?: boolean;
+    requestsPerSecond?: number;
+    index?: string;
+    type?: string;
+}
 
-    export interface DeleteDocumentByQueryResponse {
-        took: number;
-        timed_out: boolean;
-        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 DeleteDocumentByQueryResponse {
+    took: number;
+    timed_out: boolean;
+    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 DeleteScriptParams extends GenericParams {
-        id: string;
-        lang: string;
-    }
+export interface DeleteScriptParams extends GenericParams {
+    id: string;
+    lang: string;
+}
 
-    export interface DeleteTemplateParams extends GenericParams {
-        id: string;
-    }
+export interface DeleteTemplateParams extends GenericParams {
+    id: string;
+}
 
-    export interface ExistsParams extends GenericParams {
-        parent?: string;
-        preference?: string;
-        realtime?: boolean;
-        refresh?: boolean;
-        routing?: string;
-        id: string;
-        index: string;
-        type: string;
-    }
+export interface ExistsParams extends GenericParams {
+    parent?: string;
+    preference?: string;
+    realtime?: boolean;
+    refresh?: boolean;
+    routing?: string;
+    id: string;
+    index: string;
+    type: string;
+}
 
-    export interface ExplainParams extends GenericParams {
-        analyzeWildcard?: boolean;
-        analyzer?: string;
-        defaultOperator?: DefaultOperator;
-        df?: string;
-        storedFields?: NameList;
-        lenient?: boolean;
-        lowercaseExpandedTerms?: boolean;
-        parent?: string;
-        preference?: string;
-        q?: string;
-        routing?: string;
-        _source?: NameList;
-        _sourceExclude?: NameList;
-        _sourceInclude?: NameList;
-        id?: string;
-        index?: string;
-        type?: string;
-    }
+export interface ExplainParams extends GenericParams {
+    analyzeWildcard?: boolean;
+    analyzer?: string;
+    defaultOperator?: DefaultOperator;
+    df?: string;
+    storedFields?: NameList;
+    lenient?: boolean;
+    lowercaseExpandedTerms?: boolean;
+    parent?: string;
+    preference?: string;
+    q?: string;
+    routing?: string;
+    _source?: NameList;
+    _sourceExclude?: NameList;
+    _sourceInclude?: NameList;
+    id?: string;
+    index?: string;
+    type?: string;
+}
 
-    export interface ExplainResponse {
-        _index: string;
-        _type: string;
-        _id: string;
-        matched: boolean;
-        explanation: ExplainResponseDetails;
-    }
+export interface ExplainResponse {
+    _index: string;
+    _type: string;
+    _id: string;
+    matched: boolean;
+    explanation: ExplainResponseDetails;
+}
 
-    export interface ExplainResponseDetails {
-        value: number;
-        description: string;
-        details: ExplainResponseDetails[];
-    }
+export interface ExplainResponseDetails {
+    value: number;
+    description: string;
+    details: ExplainResponseDetails[];
+}
 
-    export interface FieldStatsParams extends GenericParams {
-        fields?: NameList;
-        level?: "indices" | "cluster";
-        ignoreUnavailable?: boolean;
-        allowNoIndices?: boolean;
-        expandWildcards?: ExpandWildcards;
-        index?: NameList;
-    }
+export interface FieldStatsParams extends GenericParams {
+    fields?: NameList;
+    level?: "indices" | "cluster";
+    ignoreUnavailable?: boolean;
+    allowNoIndices?: boolean;
+    expandWildcards?: ExpandWildcards;
+    index?: NameList;
+}
 
-    export interface FieldStatsResponse {
-        _shards: ShardsResponse;
-        indices: { [indexName: string]: FieldStatsResponseIndex };
-        conflicts?: { [fieldName: string]: string };
-    }
+export interface FieldStatsResponse {
+    _shards: ShardsResponse;
+    indices: { [indexName: string]: FieldStatsResponseIndex };
+    conflicts?: { [fieldName: string]: string };
+}
 
-    export interface FieldStatsResponseIndex {
-        fields: { [fieldName: string]: FieldStatsResponseField };
-    }
+export interface FieldStatsResponseIndex {
+    fields: { [fieldName: string]: FieldStatsResponseField };
+}
 
-    export interface FieldStatsResponseField {
-        max_doc: number;
-        doc_count: number;
-        density: number;
-        sum_doc_freq: number;
-        sum_total_term_freq: number;
-        min_value: any;
-        max_value: any;
-        is_searchable: string;
-        is_aggregatable: string;
-    }
+export interface FieldStatsResponseField {
+    max_doc: number;
+    doc_count: number;
+    density: number;
+    sum_doc_freq: number;
+    sum_total_term_freq: number;
+    min_value: any;
+    max_value: any;
+    is_searchable: string;
+    is_aggregatable: string;
+}
 
-    export interface GetParams extends GenericParams {
-        storedFields?: NameList;
-        parent?: string;
-        preference?: string;
-        realtime?: boolean;
-        refresh?: boolean;
-        routing?: string;
-        _source?: NameList;
-        _sourceExclude?: NameList;
-        _sourceInclude?: NameList;
-        version?: number;
-        versionType?: VersionType;
-        id: string;
-        index: string;
-        type: string;
-    }
+export interface GetParams extends GenericParams {
+    storedFields?: NameList;
+    parent?: string;
+    preference?: string;
+    realtime?: boolean;
+    refresh?: boolean;
+    routing?: string;
+    _source?: NameList;
+    _sourceExclude?: NameList;
+    _sourceInclude?: NameList;
+    version?: number;
+    versionType?: VersionType;
+    id: string;
+    index: string;
+    type: string;
+}
 
-    export interface GetResponse<T> {
-        _index: string;
-        _type: string;
-        _id: string;
-        _version: number;
-        found: boolean;
-        _source: T;
-    }
+export interface GetResponse<T> {
+    _index: string;
+    _type: string;
+    _id: string;
+    _version: number;
+    found: boolean;
+    _source: T;
+}
 
-    export interface GetScriptParams extends GenericParams {
-        id: string;
-        lang: string;
-    }
+export interface GetScriptParams extends GenericParams {
+    id: string;
+    lang: string;
+}
 
-    export interface GetSourceParams extends GenericParams {
-        preference?: string;
-        realtime?: boolean;
-        refresh?: boolean;
-        routing?: string;
-        _source: NameList;
-        _sourceExclude?: NameList;
-        _sourceInclude?: NameList;
-        version?: number;
-        versionType?: VersionType;
-        id: string;
-        index: string;
-        type: string;
-    }
+export interface GetSourceParams extends GenericParams {
+    preference?: string;
+    realtime?: boolean;
+    refresh?: boolean;
+    routing?: string;
+    _source: NameList;
+    _sourceExclude?: NameList;
+    _sourceInclude?: NameList;
+    version?: number;
+    versionType?: VersionType;
+    id: string;
+    index: string;
+    type: string;
+}
 
-    export interface GetTemplateParams extends GenericParams {
-        id: string;
-    }
+export interface GetTemplateParams extends GenericParams {
+    id: string;
+}
 
-    export interface IndexDocumentParams<T> extends GenericParams {
-        waitForActiveShards?: string;
-        opType?: "index" | "create";
-        parent?: string;
-        refresh?: string;
-        routing?: string;
-        timeout?: TimeSpan;
-        timestamp?: Date | number;
-        ttl?: TimeSpan;
-        version?: number;
-        versionType?: VersionType;
-        pipeline?: string;
-        id?: string;
-        index: string;
-        type: string;
-        body: T;
-    }
+export interface IndexDocumentParams<T> extends GenericParams {
+    waitForActiveShards?: string;
+    opType?: "index" | "create";
+    parent?: string;
+    refresh?: string;
+    routing?: string;
+    timeout?: TimeSpan;
+    timestamp?: Date | number;
+    ttl?: TimeSpan;
+    version?: number;
+    versionType?: VersionType;
+    pipeline?: string;
+    id?: string;
+    index: string;
+    type: string;
+    body: T;
+}
 
-    export interface InfoParams extends GenericParams {
-    }
+export interface InfoParams extends GenericParams {
+}
 
-    export interface MGetParams extends GenericParams {
-        storedFields?: NameList;
-        preference?: string;
-        realtime?: Boolean;
-        refresh?: Boolean;
-        source?: NameList;
-        _sourceExclude?: NameList;
-        _sourceInclude?: NameList;
-        index?: string;
-        type?: string;
-    }
+export interface MGetParams extends GenericParams {
+    storedFields?: NameList;
+    preference?: string;
+    realtime?: boolean;
+    refresh?: boolean;
+    source?: NameList;
+    _sourceExclude?: NameList;
+    _sourceInclude?: NameList;
+    index?: string;
+    type?: string;
+}
 
-    export interface MGetResponse<T> {
-        docs?: GetResponse<T>[];
-    }
+export interface MGetResponse<T> {
+    docs?: Array<GetResponse<T>>;
+}
 
-    export interface MSearchParams extends GenericParams {
-        search_type?: "query_then_fetch" | "query_and_fetch" | "dfs_query_then_fetch" | "dfs_query_and_fetch";
-        maxConcurrentSearches?: number;
-        index?: NameList;
-        type?: NameList;
-    }
+export interface MSearchParams extends GenericParams {
+    search_type?: "query_then_fetch" | "query_and_fetch" | "dfs_query_then_fetch" | "dfs_query_and_fetch";
+    maxConcurrentSearches?: number;
+    index?: NameList;
+    type?: NameList;
+}
 
-    export interface MSearchResponse<T> {
-        responses?: SearchResponse<T>[];
-    }
+export interface MSearchResponse<T> {
+    responses?: Array<SearchResponse<T>>;
+}
 
-    export interface MSearchTemplateParams extends GenericParams {
-        search_type?: "query_then_fetch" | "query_and_fetch" | "dfs_query_then_fetch" | "dfs_query_and_fetch";
-        index?: NameList;
-        type?: NameList;
-    }
+export interface MSearchTemplateParams extends GenericParams {
+    search_type?: "query_then_fetch" | "query_and_fetch" | "dfs_query_then_fetch" | "dfs_query_and_fetch";
+    index?: NameList;
+    type?: NameList;
+}
 
-    export interface MTermVectorsParams extends GenericParams {
-        ids?: NameList;
-        termStatistics?: boolean;
-        fieldStatistics?: boolean;
-        fields?: NameList;
-        offsets?: boolean;
-        positions?: boolean;
-        payloads?: boolean;
-        preference?: string;
-        routing?: string;
-        parent?: string;
-        realtime?: boolean;
-        version?: number;
-        versionType?: VersionType;
-        index: string;
-        type: string;
-    }
+export interface MTermVectorsParams extends GenericParams {
+    ids?: NameList;
+    termStatistics?: boolean;
+    fieldStatistics?: boolean;
+    fields?: NameList;
+    offsets?: boolean;
+    positions?: boolean;
+    payloads?: boolean;
+    preference?: string;
+    routing?: string;
+    parent?: string;
+    realtime?: boolean;
+    version?: number;
+    versionType?: VersionType;
+    index: string;
+    type: string;
+}
 
-    export interface PingParams extends GenericParams {
-    }
+export interface PingParams extends GenericParams {
+}
 
-    export interface PutScriptParams extends GenericParams {
-        id: string;
-        lang: string;
-        body: any;
-    }
+export interface PutScriptParams extends GenericParams {
+    id: string;
+    lang: string;
+    body: any;
+}
 
-    export interface PutTemplateParams extends GenericParams {
-        id: string;
-        body: any;
-    }
+export interface PutTemplateParams extends GenericParams {
+    id: string;
+    body: any;
+}
 
-    export interface ReindexParams extends GenericParams {
-        refresh?: boolean;
-        timeout?: TimeSpan;
-        waitForActiveShards?: string;
-        waitForCompletion?: boolean;
-        requestsPerSecond?: number;
-        body: {
-            conflicts?: string;
-            source: {
-                index: string | string[];
-                type?: string | string[];
-                query?: any;
-                sort?: any;
-                size?: number;
-                remote?: {
-                    host: string;
-                    username?: string;
-                    password?: string;
-                }
-            };
-            dest: {
-                index: string;
-                version_type?: string;
-                op_type?: string;
-                routing?: string;
-                pipeline?: string;
-            };
-            script?: {
-                inline: string;
-                lang: string;
+export interface ReindexParams extends GenericParams {
+    refresh?: boolean;
+    timeout?: TimeSpan;
+    waitForActiveShards?: string;
+    waitForCompletion?: boolean;
+    requestsPerSecond?: number;
+    body: {
+        conflicts?: string;
+        source: {
+            index: string | string[];
+            type?: string | string[];
+            query?: any;
+            sort?: any;
+            size?: number;
+            remote?: {
+                host: string;
+                username?: string;
+                password?: string;
             }
         };
-    }
-
-    export interface ReindexResponse {
-        took: number;
-        updated: number;
-        created: number;
-        batches: number;
-        version_conflicts: number;
-        retries: {
-            bulk: number;
-            search: number;
-        };
-        throttled_millis: number;
-        failures: any[];
-    }
-
-    export interface ReindexRethrottleParams extends GenericParams {
-        requestsPerSecond: number;
-        taskId: string;
-    }
-
-    export interface RenderSearchTemplateParams extends GenericParams {
-        id: string;
-    }
-
-    export interface ScrollParams extends GenericParams {
-        scroll: TimeSpan;
-        scrollId: string;
-    }
-
-    export interface SearchParams extends GenericParams {
-        analyzer?: string;
-        analyzeWildcard?: boolean;
-        defaultOperator?: DefaultOperator;
-        df?: string;
-        explain?: boolean;
-        storedFields?: NameList;
-        docvalueFields?: NameList;
-        fielddataFields?: NameList;
-        from?: number;
-        ignoreUnavailable?: boolean;
-        allowNoIndices?: boolean;
-        expandWildcards?: ExpandWildcards;
-        lenient?: boolean;
-        lowercaseExpandedTerms?: boolean;
-        preference?: string;
-        q?: string;
-        routing?: NameList;
-        scroll?: TimeSpan;
-        searchType?: "query_then_fetch" | "dfs_query_then_fetch";
-        size?: number;
-        sort?: NameList;
-        _source?: NameList;
-        _sourceExclude?: NameList;
-        _sourceInclude?: NameList;
-        terminateAfter?: number;
-        stats?: NameList;
-        suggestField?: string;
-        suggestMode?: "missing" | "popular" | "always";
-        suggestSize?: number;
-        suggestText?: string;
-        timeout?: TimeSpan;
-        trackScores?: boolean;
-        version?: boolean;
-        requestCache?: boolean;
-        index?: NameList;
-        type?: NameList;
-    }
-
-    export interface SearchResponse<T> {
-        took: number;
-        timed_out: boolean;
-        _scroll_id?: string;
-        _shards: ShardsResponse;
-        hits: {
-            total: number;
-            max_score: number;
-            hits: {
-                _index: string;
-                _type: string;
-                _id: string;
-                _score: number;
-                _source: T;
-                _version?: number;
-                _explanation?: Explanation;
-                fields?: any;
-                highlight?: any;
-                inner_hits?: any;
-            }[];
-        };
-        aggregations?: any;
-    }
-
-    export interface SearchShardsParams extends GenericParams {
-        preference?: string;
-        routing?: string;
-        local?: boolean;
-        ignoreUnavailable?: boolean;
-        allowNoIndices?: boolean;
-        expandWildcards?: ExpandWildcards;
-        index: NameList;
-        type: NameList;
-    }
-
-    export interface SearchShardsResponse {
-        nodes: any;
-        shards: SearchShardsResponseShard[][];
-    }
-
-    export interface SearchShardsResponseShard {
-        index: string;
-        node: string;
-        primary: boolean;
-        share: number;
-        state: string;
-        allocation_id: {
-            id: string;
-        };
-        relocating_node: any;
-    }
-
-    export interface SearchTemplateParams extends GenericParams {
-        ignoreUnavailable?: boolean;
-        allowNoIndices?: boolean;
-        expandWildcards?: ExpandWildcards;
-        preference?: string;
-        routing?: NameList;
-        scroll?: TimeSpan;
-        searchType?: "query_then_fetch" | "query_and_fetch" | "dfs_query_then_fetch" | "dfs_query_and_fetch";
-        index: NameList;
-        type: NameList;
-    }
-
-    export interface SuggestParams extends GenericParams {
-        ignoreUnavailable?: boolean;
-        allowNoIndices?: boolean;
-        expandWildcards?: ExpandWildcards;
-        preference?: string;
-        routing?: string;
-        index: NameList;
-    }
-
-    export interface TermvectorsParams extends GenericParams {
-        termStatistics?: boolean;
-        fieldStatistics?: boolean;
-        fields?: NameList;
-        offsets?: boolean;
-        positions?: boolean;
-        payloads?: boolean;
-        preference?: string;
-        routing?: string;
-        parent?: string;
-        realtime?: boolean;
-        version?: number;
-        versionType?: VersionType;
-        index: string;
-        type: string;
-        id?: string;
-    }
-
-    export interface UpdateDocumentParams extends GenericParams {
-        waitForActiveShards?: string;
-        fields?: NameList;
-        _source?: NameList;
-        _sourceExclude?: NameList;
-        _sourceInclude?: NameList;
-        lang?: string;
-        parent?: string;
-        refresh?: Refresh;
-        retryOnConflict?: number;
-        routing?: string;
-        timeout?: TimeSpan;
-        timestamp?: Date | number;
-        ttl?: TimeSpan;
-        version?: number;
-        versionType?: "internal" | "force";
-        id: string;
-        index: string;
-        type: string;
-    }
-
-    export interface UpdateDocumentByQueryParams extends GenericParams {
-        analyzer?: string;
-        analyzeWildcard?: boolean;
-        defaultOperator?: DefaultOperator;
-        df?: string;
-        explain?: boolean;
-        storedFields?: NameList;
-        docvalueFields?: NameList;
-        fielddataFields?: NameList;
-        from?: number;
-        ignoreUnavailable?: boolean;
-        allowNoIndices?: boolean;
-        conflicts?: Conflicts;
-        expandWildcards?: ExpandWildcards;
-        lenient?: boolean;
-        lowercaseExpandedTerms?: boolean;
-        pipeline?: string;
-        preference?: string;
-        q?: string;
-        routing?: NameList;
-        scroll?: TimeSpan;
-        searchType?: "query_then_fetch" | "dfs_query_then_fetch";
-        searchTimeout?: TimeSpan;
-        size?: number;
-        sort?: NameList;
-        _source?: NameList;
-        _sourceExclude?: NameList;
-        _sourceInclude?: NameList;
-        terminateAfter?: number;
-        stats?: NameList;
-        suggestField?: string;
-        suggestMode?: "missing" | "popular" | "always";
-        suggestSize?: number;
-        suggestText?: string;
-        timeout?: TimeSpan;
-        trackScores?: boolean;
-        version?: boolean;
-        versionType?: boolean;
-        requestCache?: boolean;
-        refresh?: boolean;
-        waitForActiveShards?: string;
-        scrollSize?: number;
-        waitForCompletion?: boolean;
-        requestsPerSecond?: number;
-        index: NameList;
-        type: NameList;
-    }
-
-    export interface Cat {
-        aliases(params: CatAliasesParams, callback: (error: any, response: any) => void): void;
-        aliases(params: CatAliasesParams): Promise<any>;
-        allocation(params: CatAllocationParams, callback: (error: any, response: any) => void): void;
-        allocation(params: CatAllocationParams): Promise<any>;
-        count(params: CatCountParams, callback: (error: any, response: any) => void): void;
-        count(params: CatAllocationParams): Promise<any>;
-        fielddata(params: CatFielddataParams, callback: (error: any, response: any) => void): void;
-        fielddata(params: CatFielddataParams): Promise<any>;
-        health(params: CatHealthParams, callback: (error: any, response: any) => void): void;
-        health(params: CatHealthParams): Promise<any>;
-        help(params: CatHelpParams, callback: (error: any, response: any) => void): void;
-        help(params: CatHelpParams): Promise<any>;
-        indices(params: CatIndicesParams, callback: (error: any, response: any) => void): void;
-        indices(params: CatIndicesParams): Promise<any>;
-        master(params: CatCommonParams, callback: (error: any, response: any) => void): void;
-        master(params: CatCommonParams): Promise<any>;
-        nodeattrs(params: CatCommonParams, callback: (error: any, response: any) => void): void;
-        nodeattrs(params: CatCommonParams): Promise<any>;
-        nodes(params: CatCommonParams, callback: (error: any, response: any) => void): void;
-        nodes(params: CatCommonParams): Promise<any>;
-        pendingTasks(params: CatCommonParams, callback: (error: any, response: any) => void): void;
-        pendingTasks(params: CatCommonParams): Promise<any>;
-        plugins(params: CatCommonParams, callback: (error: any, response: any) => void): void;
-        plugins(params: CatCommonParams): Promise<any>;
-        recovery(params: CatRecoveryParams, callback: (error: any, response: any) => void): void;
-        recovery(params: CatRecoveryParams): Promise<any>;
-        repositories(params: CatCommonParams, callback: (error: any, response: any) => void): void;
-        repositories(params: CatCommonParams): Promise<any>;
-        segments(params: CatSegmentsParams, callback: (error: any, response: any) => void): void;
-        segments(params: CatSegmentsParams): Promise<any>;
-        shards(params: CatShardsParams, callback: (error: any, response: any) => void): void;
-        shards(params: CatShardsParams): Promise<any>;
-        snapshots(params: CatSnapshotsParams, callback: (error: any, response: any) => void): void;
-        snapshots(params: CatSnapshotsParams): Promise<any>;
-        tasks(params: CatTasksParams, callback: (error: any, response: any) => void): void;
-        tasks(params: CatTasksParams): Promise<any>;
-        threadPool(params: CatThreadPoolParams, callback: (error: any, response: any) => void): void;
-        threadPool(params: CatThreadPoolParams): Promise<any>;
-    }
-
-    export type CatBytes = "b" | "k" | "kb" | "m" | "mb" | "g" | "gb" | "t" | "tb" | "p" | "pb";
-
-    export interface CatCommonParams extends GenericParams {
-        format: string;
-        local?: boolean;
-        masterTimeout?: TimeSpan;
-        h?: NameList;
-        help?: boolean;
-        v?: boolean;
-    }
-
-    export interface CatAliasesParams extends CatCommonParams {
-        name?: NameList;
-    }
-
-    export interface CatAllocationParams extends CatCommonParams {
-        bytes?: CatBytes;
-        nodeId?: NameList;
-    }
-
-    export interface CatCountParams extends CatCommonParams {
-        index?: NameList;
-    }
-
-    export interface CatFielddataParams extends CatCommonParams {
-        bytes?: CatBytes;
-        fields?: NameList;
-    }
-
-    export interface CatHealthParams extends CatCommonParams {
-        ts?: boolean;
-    }
-
-    export interface CatHelpParams extends GenericParams {
-        help?: boolean;
-    }
-
-    export interface CatIndicesParams extends CatCommonParams {
-        bytes?: CatBytes;
-        health?: "green" | "yellow" | "red";
-        pri?: boolean;
-        index?: NameList;
-    }
-
-    export interface CatRecoveryParams extends GenericParams {
-        format: string;
-        bytes?: CatBytes;
-        masterTimeout?: TimeSpan;
-        h?: NameList;
-        help?: boolean;
-        v?: boolean;
-    }
-
-    export interface CatSegmentsParams extends GenericParams {
-        format: string;
-        h?: NameList;
-        help?: boolean;
-        v?: boolean;
-        index?: NameList;
-    }
-
-    export interface CatShardsParams extends CatCommonParams {
-        index?: NameList;
-    }
-
-    export interface CatSnapshotsParams extends GenericParams {
-        format: string;
-        ignoreUnavailable?: boolean;
-        masterTimeout?: TimeSpan;
-        h?: NameList;
-        help?: boolean;
-        v?: boolean;
-        repository?: NameList;
-    }
-
-    export interface CatTasksParams extends GenericParams {
-        format: string;
-        nodeId?: NameList;
-        actions?: NameList;
-        detailed?: boolean;
-        parentNode?: string;
-        parentTask?: number;
-        h?: NameList;
-        help?: boolean;
-        v?: boolean;
-    }
-
-    export interface CatThreadPoolParams extends CatCommonParams {
-        size?: "" | "k" | "m" | "g" | "t" | "p";
-        threadPoolPatterns?: NameList;
-    }
-
-    export interface Cluster {
-        allocationExplain(params: ClusterAllocationExplainParams, callback: (error: any, response: any) => void): void;
-        allocationExplain(params: ClusterAllocationExplainParams): Promise<any>;
-        getSettings(params: ClusterGetSettingsParams, callback: (error: any, response: any) => void): void;
-        getSettings(params: ClusterGetSettingsParams): Promise<any>;
-        health(params: ClusterHealthParams, callback: (error: any, response: any) => void): void;
-        health(params: ClusterHealthParams): Promise<any>;
-        pendingTasks(params: ClusterPendingTasksParams, callback: (error: any, response: any) => void): void;
-        pendingTasks(params: ClusterPendingTasksParams): Promise<any>;
-        putSettings(params: ClusterPutSettingsParams, callback: (error: any, response: any) => void): void;
-        putSettings(params: ClusterPutSettingsParams): Promise<any>;
-        reroute(params: ClusterRerouteParams, callback: (error: any, response: any) => void): void;
-        reroute(params: ClusterRerouteParams): Promise<any>;
-        state(params: ClusterStateParams, callback: (error: any, response: any) => void): void;
-        state(params: ClusterStateParams): Promise<any>;
-        stats(params: ClusterStatsParams, callback: (error: any, response: any) => void): void;
-        stats(params: ClusterStatsParams): Promise<any>;
-    }
-
-    export interface ClusterAllocationExplainParams extends GenericParams {
-        includeYesDecisions?: boolean;
-        includeDiskInfo?: boolean;
-    }
-
-    export interface ClusterGetSettingsParams extends GenericParams {
-        flatSettings?: boolean;
-        masterTimeout?: TimeSpan;
-        timeout?: TimeSpan;
-        includeDefaults?: boolean;
-    }
-
-    export interface ClusterHealthParams extends GenericParams {
-        level?: "cluster" | "indices" | "shards";
-        local?: boolean;
-        masterTimeout?: TimeSpan;
-        waitForActiveShards?: string;
-        waitForNodes?: string;
-        waitForEvents?: "immediate" | "urgent" | "high" | "normal" | "low" | "languid";
-        waitForRelocatingShards?: boolean;
-        waitForStatus?: "green" | "yellow" | "red";
-        index?: NameList;
-    }
-
-    export interface ClusterPendingTasksParams extends GenericParams {
-        local?: boolean;
-        masterTimeout?: TimeSpan;
-    }
-
-    export interface ClusterPutSettingsParams extends GenericParams {
-        flatSettings?: boolean;
-        masterTimeout?: TimeSpan;
-        timeout?: TimeSpan;
-    }
-
-    export interface ClusterRerouteParams extends GenericParams {
-        dryRun?: boolean;
-        explain?: boolean;
-        retryFailed?: boolean;
-        metric?: NameList;
-        masterTimeout?: TimeSpan;
-        timeout?: TimeSpan;
-    }
-
-    export interface ClusterStateParams extends GenericParams {
-        local?: boolean;
-        masterTimeout?: TimeSpan;
-        flatSettings?: boolean;
-        ignoreUnavailable?: boolean;
-        allowNoIndices?: boolean;
-        expandWildcards?: ExpandWildcards;
-        index?: NameList;
-        metric?: NameList;
-    }
-
-    export interface ClusterStatsParams extends GenericParams {
-        flatSettings?: boolean;
-        human?: boolean;
-        timeout?: TimeSpan;
-        nodeId?: NameList;
-    }
-
-    export class Indices {
-        analyze(params: IndicesAnalyzeParams, callback: (error: any, response: any, status: any) => void): void;
-        analyze(params: IndicesAnalyzeParams): Promise<any>;
-        clearCache(params: IndicesClearCacheParams, callback: (error: any, response: any, status: any) => void): void;
-        clearCache(params: IndicesClearCacheParams): Promise<any>;
-        close(params: IndicesCloseParams, callback: (error: any, response: any, status: any) => void): void;
-        close(params: IndicesCloseParams): Promise<any>;
-        create(params: IndicesCreateParams, callback: (error: any, response: any, status: any) => void): void;
-        create(params: IndicesCreateParams): Promise<any>;
-        delete(params: IndicesDeleteParams, callback: (error: any, response: any, status: any) => void): void;
-        delete(params: IndicesDeleteParams): Promise<any>;
-        deleteAlias(params: IndicesDeleteAliasParams, callback: (error: any, response: any, status: any) => void): void;
-        deleteAlias(params: IndicesDeleteAliasParams): Promise<any>;
-        deleteTemplate(params: IndicesDeleteTemplateParams, callback: (error: any, response: any, status: any) => void): void;
-        deleteTemplate(params: IndicesDeleteTemplateParams): Promise<any>;
-        exists(params: IndicesExistsParams, callback: (error: any, response: any, status: any) => void): void;
-        exists(params: IndicesExistsParams): Promise<any>;
-        existsAlias(params: IndicesExistsAliasParams, callback: (error: any, response: any, status: any) => void): void;
-        existsAlias(params: IndicesExistsAliasParams): Promise<any>;
-        existsTemplate(params: IndicesExistsTemplateParams, callback: (error: any, response: any, status: any) => void): void;
-        existsTemplate(params: IndicesExistsTemplateParams): Promise<any>;
-        existsType(params: IndicesExistsTypeParams, callback: (error: any, response: any, status: any) => void): void;
-        existsType(params: IndicesExistsTypeParams): Promise<any>;
-        flush(params: IndicesFlushParams, callback: (error: any, response: any, status: any) => void): void;
-        flush(params: IndicesFlushParams): Promise<any>;
-        flushSynced(params: IndicesFlushSyncedParams, callback: (error: any, response: any, status: any) => void): void;
-        flushSynced(params: IndicesFlushSyncedParams): Promise<any>;
-        forcemerge(params: IndicesForcemergeParams, callback: (error: any, response: any, status: any) => void): void;
-        forcemerge(params: IndicesForcemergeParams): Promise<any>;
-        get(params: IndicesGetParams, callback: (error: any, response: any, status: any) => void): void;
-        get(params: IndicesGetParams): Promise<any>;
-        getAlias(params: IndicesGetAliasParams, callback: (error: any, response: any, status: any) => void): void;
-        getAlias(params: IndicesGetAliasParams): Promise<any>;
-        getFieldMapping(params: IndicesGetFieldMappingParams, callback: (error: any, response: any, status: any) => void): void;
-        getFieldMapping(params: IndicesGetFieldMappingParams): Promise<any>;
-        getMapping(params: IndicesGetMappingParams, callback: (error: any, response: any, status: any) => void): void;
-        getMapping(params: IndicesGetMappingParams): Promise<any>;
-        getSettings(params: IndicesGetSettingsParams, callback: (error: any, response: any, status: any) => void): void;
-        getSettings(params: IndicesGetSettingsParams): Promise<any>;
-        getTemplate(params: IndicesGetTemplateParams, callback: (error: any, response: any, status: any) => void): void;
-        getTemplate(params: IndicesGetTemplateParams): Promise<any>;
-        getUpgrade(params: IndicesGetUpgradeParams, callback: (error: any, response: any, status: any) => void): void;
-        getUpgrade(params: IndicesGetUpgradeParams): Promise<any>;
-        open(params: IndicesOpenParams, callback: (error: any, response: any, status: any) => void): void;
-        open(params: IndicesOpenParams): Promise<any>;
-        putAlias(params: IndicesPutAliasParams, callback: (error: any, response: any, status: any) => void): void;
-        putAlias(params: IndicesPutAliasParams): Promise<any>;
-        putMapping(params: IndicesPutMappingParams, callback: (error: any, response: any, status: any) => void): void;
-        putMapping(params: IndicesPutMappingParams): Promise<any>;
-        putSettings(params: IndicesPutSettingsParams, callback: (error: any, response: any, status: any) => void): void;
-        putSettings(params: IndicesPutSettingsParams): Promise<any>;
-        putTemplate(params: IndicesPutTemplateParams, callback: (error: any, response: any) => void): void;
-        putTemplate(params: IndicesPutTemplateParams): Promise<any>;
-        recovery(params: IndicesRecoveryParams, callback: (error: any, response: any) => void): void;
-        recovery(params: IndicesRecoveryParams): Promise<any>;
-        refresh(params: IndicesRefreshParams, callback: (error: any, response: any) => void): void;
-        refresh(params: IndicesRefreshParams): Promise<any>;
-        rollover(params: IndicesRolloverParams, callback: (error: any, response: IndicesRolloverResponse) => void): void;
-        rollover(params: IndicesRolloverParams): Promise<IndicesRolloverResponse>;
-        segments(params: IndicesSegmentsParams, callback: (error: any, response: any) => void): void;
-        segments(params: IndicesSegmentsParams): Promise<any>;
-        shardStores(params: IndicesShardStoresParams, callback: (error: any, response: any) => void): void;
-        shardStores(params: IndicesShardStoresParams): Promise<any>;
-        shrink(params: IndicesShrinkParams, callback: (error: any, response: any) => void): void;
-        shrink(params: IndicesShrinkParams): Promise<any>;
-        stats(params: IndicesStatsParams, callback: (error: any, response: any) => void): void;
-        stats(params: IndicesStatsParams): Promise<any>;
-        updateAliases(params: IndicesUpdateAliasesParams, callback: (error: any, response: any) => void): void;
-        updateAliases(params: IndicesUpdateAliasesParams): Promise<any>;
-        upgrade(params: IndicesUpgradeParams, callback: (error: any, response: any) => void): void;
-        upgrade(params: IndicesUpgradeParams): Promise<any>;
-        validateQuery(params: IndicesValidateQueryParams, callback: (error: any, response: any) => void): void;
-        validateQuery(params: IndicesValidateQueryParams): Promise<any>;
-    }
-
-    export interface IndicesAnalyzeParams extends GenericParams {
-        analyzer?: string;
-        charFilter?: NameList;
-        field?: string;
-        filter?: NameList;
-        index?: string;
-        perferLocal?: boolean;
-        text?: NameList;
-        tokenizer?: string;
-        explain?: boolean;
-        attributes?: NameList;
-        format?: "";
-    }
-
-    export interface IndicesClearCacheParams extends GenericParams {
-        fieldData?: boolean;
-        fielddata?: boolean;    // yes the docs really have both
-        fields?: NameList;
-        query?: boolean;
-        ignoreUnavailable?: boolean;
-        allowNoIndices?: boolean;
-        expandWildcards?: ExpandWildcards;
-        index?: NameList;
-        recycler?: boolean;
-        request?: boolean;
-    }
-
-    export interface IndicesCloseParams extends GenericParams {
-        timeout?: TimeSpan;
-        masterTimeout?: TimeSpan;
-        ignoreUnavailable?: boolean;
-        allowNoIndices?: boolean;
-        expandWildcards?: ExpandWildcards;
-        index: NameList;
-    }
-
-    export interface IndicesCreateParams extends GenericParams {
-        waitForActiveShards?: string;
-        timeout?: TimeSpan;
-        masterTimeout?: TimeSpan;
-        updateAllTypes?: boolean;
-        index: string;
-    }
-
-    export interface IndicesDeleteParams extends GenericParams {
-        timeout?: TimeSpan;
-        masterTimeout?: TimeSpan;
-        index: NameList;
-    }
-
-    export interface IndicesDeleteAliasParams extends GenericParams {
-        timeout?: TimeSpan;
-        masterTimeout?: TimeSpan;
-        index: NameList;
-        name: NameList;
-    }
-
-    export interface IndicesDeleteTemplateParams extends GenericParams {
-        timeout?: TimeSpan;
-        masterTimeout?: TimeSpan;
-        name: string;
-    }
-
-    export interface IndicesExistsParams extends GenericParams {
-        ignoreUnavailable?: boolean;
-        allowNoIndices?: boolean;
-        expandWildcards?: ExpandWildcards;
-        local?: boolean;
-        index: NameList;
-    }
-
-    export interface IndicesExistsAliasParams extends IndicesExistsParams {
-        name: NameList;
-    }
-
-    export interface IndicesExistsTemplateParams extends GenericParams {
-        timeout?: TimeSpan;
-        masterTimeout?: TimeSpan;
-        name: NameList;
-    }
-
-    export interface IndicesExistsTypeParams extends IndicesExistsParams {
-        type: NameList;
-    }
-
-    export interface IndicesFlushParams extends GenericParams {
-        force?: boolean;
-        waitIfOngoing?: boolean;
-        ignoreUnavailable?: boolean;
-        allowNoIndices?: boolean;
-        expandWildcards?: ExpandWildcards;
-        index: NameList;
-    }
-
-    export interface IndicesFlushSyncedParams extends GenericParams {
-        ignoreUnavailable?: boolean;
-        allowNoIndices?: boolean;
-        expandWildcards?: ExpandWildcards;
-        index: NameList;
-    }
-
-    export interface IndicesForcemergeParams extends GenericParams {
-        flush?: boolean;
-        ignoreUnavailable?: boolean;
-        allowNoIndices?: boolean;
-        expandWildcards?: ExpandWildcards;
-        maxNumSegments?: number;
-        onlyExpungeDeletes?: boolean;
-        operationThreading?: any;   // even the docs don't know what this does
-        waitForMerge?: boolean;
-        index: NameList;
-    }
-
-    export interface IndicesGetParams extends GenericParams {
-        local?: boolean;
-        ignoreUnavailable?: boolean;
-        allowNoIndices?: boolean;
-        expandWildcards?: ExpandWildcards;
-        flatSettings?: boolean;
-        human?: boolean;
-        includeDefaults?: boolean;
-        index?: NameList;
-        feature?: NameList;
-    }
-
-    export interface IndicesGetAliasParams extends GenericParams {
-        ignoreUnavailable?: boolean;
-        allowNoIndices?: boolean;
-        expandWildcards?: ExpandWildcards;
-        local?: boolean;
-        index?: NameList;
-        name?: NameList;
-    }
-
-    export interface IndicesGetFieldMappingParams extends GenericParams {
-        includeDefaults?: boolean;
-        ignoreUnavailable?: boolean;
-        allowNoIndices?: boolean;
-        expandWildcards?: ExpandWildcards;
-        local?: boolean;
-        index?: NameList;
-        type?: NameList;
-        fields?: NameList;
-    }
-
-    export interface IndicesGetMappingParams extends GenericParams {
-        ignoreUnavailable?: boolean;
-        allowNoIndices?: boolean;
-        expandWildcards?: ExpandWildcards;
-        local?: boolean;
-        index?: NameList;
-        type?: NameList;
-    }
-
-    export interface IndicesGetSettingsParams extends GenericParams {
-        ignoreUnavailable?: boolean;
-        allowNoIndices?: boolean;
-        expandWildcards?: ExpandWildcards;
-        flatSettings?: boolean;
-        local?: boolean;
-        human?: boolean;
-        includeDefaults?: boolean;
-        index?: NameList;
-        name?: NameList;
-    }
-
-    export interface IndicesGetTemplateParams extends GenericParams {
-        flatSettings?: boolean;
-        masterTimeout?: TimeSpan;
-        local?: boolean;
-        name?: NameList;
-    }
-
-    export interface IndicesGetUpgradeParams extends GenericParams {
-        ignoreUnavailable?: boolean;
-        allowNoIndices?: boolean;
-        expandWildcards?: ExpandWildcards;
-        human?: boolean;
-        index?: NameList;
-    }
-
-    export interface IndicesOpenParams extends GenericParams {
-        timeout?: TimeSpan;
-        masterTimeout?: TimeSpan;
-        ignoreUnavailable?: boolean;
-        allowNoIndices?: boolean;
-        expandWildcards?: ExpandWildcards;
-        index?: NameList;
-    }
-
-    export interface IndicesPutAliasParams extends GenericParams {
-        timeout?: TimeSpan;
-        masterTimeout?: TimeSpan;
-        index?: NameList;
-        name: NameList;
-    }
-
-    export interface IndicesPutMappingParams extends GenericParams {
-        timeout?: TimeSpan;
-        masterTimeout?: TimeSpan;
-        ignoreUnavailable?: boolean;
-        allowNoIndices?: boolean;
-        expandWildcards?: ExpandWildcards;
-        updateAllTypes?: boolean;
-        index: NameList;
-        type: string;
-        body: any;
-    }
-
-    export interface IndicesPutSettingsParams extends GenericParams {
-        masterTimeout?: TimeSpan;
-        preserveExisting?: boolean;
-        ignoreUnavailable?: boolean;
-        allowNoIndices?: boolean;
-        expandWildcards?: ExpandWildcards;
-        flatSettings?: boolean;
-        index: NameList;
-        body: any;
-    }
-
-    export interface IndicesPutTemplateParams extends GenericParams {
-        order?: number;
-        create?: boolean;
-        timeout?: TimeSpan;
-        masterTimeout?: TimeSpan;
-        flatSettings?: boolean;
-        name: string;
-        body: any;
-    }
-
-    export interface IndicesRecoveryParams extends GenericParams {
-        detailed?: boolean;
-        activeOnly?: boolean;
-        human?: boolean;
-        index: NameList;
-    }
-
-    export interface IndicesRefreshParams extends GenericParams {
-        ignoreUnavailable?: boolean;
-        allowNoIndices?: boolean;
-        expandWildcards?: ExpandWildcards;
-        force?: boolean;
-        operationThreading?: any;   // even the docs don't know what this does
-        index: NameList;
-    }
-
-    export interface IndicesRolloverParams extends GenericParams {
-        timeout?: TimeSpan;
-        masterTimeout?: TimeSpan;
-        waitForActiveShards?: number | string;
-        alias?: string;
-        newIndex?: string;
-    }
-
-    export interface IndicesRolloverResponse {
-        acknowledged: boolean;
-        shards_acknowledged: boolean;
-        old_index: string;
-        new_index: string;
-        rolled_over: boolean;
-        dry_run: boolean;
-        conditions: { [condition: string]: boolean };
-    }
-
-    export interface IndicesSegmentsParams extends GenericParams {
-        ignoreUnavailable?: boolean;
-        allowNoIndices?: boolean;
-        expandWildcards?: ExpandWildcards;
-        human?: boolean;
-        operationThreading?: any;   // even the docs don't know what this does
-        verbose?: boolean;
-        index: NameList;
-    }
-
-    export interface IndicesShardStoresParams extends GenericParams {
-        status?: NameList;
-        ignoreUnavailable?: boolean;
-        allowNoIndices?: boolean;
-        expandWildcards?: ExpandWildcards;
-        operationThreading?: any;   // even the docs don't know what this does
-        index: NameList;
-    }
-
-    export interface IndicesShrinkParams extends GenericParams {
-        timeout?: TimeSpan;
-        masterTimeout?: TimeSpan;
-        waitForActiveShards?: string | number;
-        index: string;
-        target: string;
-    }
-
-    export interface IndicesStatsParams extends GenericParams {
-        completionFields?: NameList;
-        fielddataFields?: NameList;
-        fields?: NameList;
-        groups?: NameList;
-        human?: boolean;
-        level?: "cluster" | "indices" | "shards";
-        types?: NameList;
-        index: NameList;
-        metric?: NameList;
-    }
-
-    export interface IndicesUpdateAliasesParams extends GenericParams {
-        timeout?: TimeSpan;
-        masterTimeout?: TimeSpan;
-        body: {
-            actions: IndicesUpdateAliasesParamsAction[];
-        };
-    }
-
-    export interface IndicesUpdateAliasesParamsAction {
-        add?: {
-            index?: string;
-            indices?: string[];
-            alias: string;
-        };
-        remove?: {
-            index?: string;
-            indices?: string[];
-            alias: string;
-        };
-        remove_index?: {
+        dest: {
             index: string;
+            version_type?: string;
+            op_type?: string;
+            routing?: string;
+            pipeline?: string;
         };
-    }
-
-    export interface IndicesUpgradeParams extends GenericParams {
-        expandWildcards?: ExpandWildcards;
-        ignoreUnavailable?: boolean;
-        waitForCompletion?: boolean;
-        onlyAncientSegments?: boolean;
-        index: NameList;
-    }
-
-    export interface IndicesValidateQueryParams extends GenericParams {
-        explain?: boolean;
-        ignoreUnavailable?: boolean;
-        allowNoIndices?: boolean;
-        expandWildcards?: ExpandWildcards;
-        operationThreading?: any;   // even the docs don't know what this does
-        q?: string;
-        analyzer?: string;
-        analyzeWildcard?: boolean;
-        defaultOperator?: DefaultOperator;
-        df?: string;
-        lenient?: boolean;
-        lowercaseExpandedTerms?: boolean;
-        rewrite?: boolean;
-        index: NameList;
-        type?: NameList;
-    }
-
-    export class Ingest {
-        deletePipeline(params: IngestDeletePipelineParams, callback: (error: any, response: any, status: any) => void): void;
-        deletePipeline(params: IngestDeletePipelineParams): Promise<any>;
-        getPipeline(params: IngestGetPipelineParams, callback: (error: any, response: any, status: any) => void): void;
-        getPipeline(params: IngestGetPipelineParams): Promise<any>;
-        putPipeline(params: IngestPutPipelineParams, callback: (error: any, response: any, status: any) => void): void;
-        putPipeline(params: IngestPutPipelineParams): Promise<any>;
-        simulate(params: IngestSimulateParams, callback: (error: any, response: any, status: any) => void): void;
-        simulate(params: IngestSimulateParams): Promise<any>;
-    }
-
-    export interface IngestDeletePipelineParams extends GenericParams {
-        masterTimeout?: number;
-        timeout?: number;
-        id: string;
-    }
-
-    export interface IngestGetPipelineParams extends GenericParams {
-        masterTimeout?: number;
-        id: string;
-    }
-
-    export interface IngestPutPipelineParams extends GenericParams {
-        masterTimeout?: number;
-        timeout?: number;
-        id: string;
-        body: any;
-    }
-
-    export interface IngestSimulateParams extends GenericParams {
-        verbose?: boolean;
-        id: string;
-    }
-
-    export class Nodes {
-        hotThreads(params: NodesHotThreadsParams, callback: (error: any, response: any, status: any) => void): void;
-        hotThreads(params: NodesHotThreadsParams): Promise<any>;
-        info(params: NodesInfoParams, callback: (error: any, response: any, status: any) => void): void;
-        info(params: NodesInfoParams): Promise<any>;
-        stats(params: NodesStatsParams, callback: (error: any, response: any, status: any) => void): void;
-        stats(params: NodesStatsParams): Promise<any>;
-    }
-
-    export interface NodesHotThreadsParams extends GenericParams {
-        interval?: TimeSpan;
-        snapshots?: number;
-        threads?: number;
-        ignoreIdleThreads?: boolean;
-        type?: "cpu" | "wait" | "blocked";
-        timeout?: TimeSpan;
-        nodeId: NameList;
-    }
-
-    export interface NodesInfoParams extends GenericParams {
-        flatSettings?: boolean;
-        human?: boolean;
-        timeout?: TimeSpan;
-        nodeId: NameList;
-        metric?: NameList;
-    }
-
-    export interface NodesStatsParams extends GenericParams {
-        completionFields?: NameList;
-        fielddataFields?: NameList;
-        fields?: NameList;
-        groups?: boolean;
-        human?: boolean;
-        level?: "indices" | "node" | "shards";
-        types?: NameList;
-        timeout?: TimeSpan;
-        metric?: NameList;
-        indexMetric?: NameList;
-        nodeId?: NameList;
-    }
-
-    export class Snapshot {
-        create(params: SnapshotCreateParams, callback: (error: any, response: any, status: any) => void): void;
-        create(params: SnapshotCreateParams): Promise<any>;
-        createRepository(params: SnapshotCreateRepositoryParams, callback: (error: any, response: any, status: any) => void): void;
-        createRepository(params: SnapshotCreateRepositoryParams): Promise<any>;
-        delete(params: SnapshotDeleteParams, callback: (error: any, response: any, status: any) => void): void;
-        delete(params: SnapshotDeleteParams): Promise<any>;
-        deleteRepository(params: SnapshotDeleteRepositoryParams, callback: (error: any, response: any, status: any) => void): void;
-        deleteRepository(params: SnapshotDeleteRepositoryParams): Promise<any>;
-        get(params: SnapshotGetParams, callback: (error: any, response: any, status: any) => void): void;
-        get(params: SnapshotGetParams): Promise<any>;
-        getRepository(params: SnapshotGetRepositoryParams, callback: (error: any, response: any, status: any) => void): void;
-        getRepository(params: SnapshotGetRepositoryParams): Promise<any>;
-        restore(params: SnapshotRestoreParams, callback: (error: any, response: any, status: any) => void): void;
-        restore(params: SnapshotRestoreParams): Promise<any>;
-        status(params: SnapshotStatusParams, callback: (error: any, response: any, status: any) => void): void;
-        status(params: SnapshotStatusParams): Promise<any>;
-        verifyRepository(params: SnapshotVerifyRepositoryParams, callback: (error: any, response: any, status: any) => void): void;
-        verifyRepository(params: SnapshotVerifyRepositoryParams): Promise<any>;
-    }
-
-    export interface SnapshotCreateParams extends GenericParams {
-        masterTimeout?: TimeSpan;
-        waitForCompletion?: boolean;
-        repository: string;
-        snapshot: string;
-    }
-
-    export interface SnapshotCreateRepositoryParams extends GenericParams {
-        masterTimeout?: TimeSpan;
-        timeout?: TimeSpan;
-        verify?: boolean;
-        repository: string;
-    }
-
-    export interface SnapshotDeleteParams extends GenericParams {
-        masterTimeout?: TimeSpan;
-        repository: string;
-        snapshot: string;
-    }
-
-    export interface SnapshotDeleteRepositoryParams extends GenericParams {
-        masterTimeout?: TimeSpan;
-        timeout?: TimeSpan;
-        repository: string;
-    }
-
-    export interface SnapshotGetParams extends GenericParams {
-        masterTimeout?: TimeSpan;
-        ignoreUnavailable?: boolean;
-        repository: string;
-        snapshot: NameList;
-    }
-
-    export interface SnapshotGetRepositoryParams extends GenericParams {
-        masterTimeout?: TimeSpan;
-        local?: boolean;
-        repository: NameList;
-    }
-
-    export interface SnapshotRestoreParams extends GenericParams {
-        masterTimeout?: TimeSpan;
-        waitForCompletion?: boolean;
-        repository: string;
-        snapshot: string;
-    }
-
-    export interface SnapshotStatusParams extends GenericParams {
-        masterTimeout?: TimeSpan;
-        ignoreUnavailable?: boolean;
-        repository: string;
-        snapshot: NameList;
-    }
-
-    export interface SnapshotVerifyRepositoryParams extends GenericParams {
-        masterTimeout?: TimeSpan;
-        timeout?: TimeSpan;
-        repository: string;
-    }
-
-    export class Tasks {
-        cancel(params: TasksCancelParams, callback: (error: any, response: any, status: any) => void): void;
-        cancel(params: TasksCancelParams): Promise<any>;
-        get(params: TasksGetParams, callback: (error: any, response: any, status: any) => void): void;
-        get(params: TasksGetParams): Promise<any>;
-        list(params: TasksListParams, callback: (error: any, response: any, status: any) => void): void;
-        list(params: TasksListParams): Promise<any>;
-    }
-
-    export interface TasksCancelParams extends GenericParams {
-        nodeId?: NameList;
-        actions?: NameList;
-        parentNode?: string;
-        parentTask?: string;
-        taskId?: string;
-    }
-
-    export interface TasksGetParams extends GenericParams {
-        waitForCompletion?: boolean;
-        taskId?: string;
-    }
-
-    export interface TasksListParams extends GenericParams {
-        nodeId?: NameList;
-        actions?: NameList;
-        detailed?: boolean;
-        parentNode?: string;
-        parentTask?: string;
-        waitForCompletion?: boolean;
-        groupBy?: "nodes" | "parents";
-    }
+        script?: {
+            inline: string;
+            lang: string;
+        }
+    };
 }
 
-declare module "elasticsearch" {
-    export = Elasticsearch;
+export interface ReindexResponse {
+    took: number;
+    updated: number;
+    created: number;
+    batches: number;
+    version_conflicts: number;
+    retries: {
+        bulk: number;
+        search: number;
+    };
+    throttled_millis: number;
+    failures: any[];
+}
+
+export interface ReindexRethrottleParams extends GenericParams {
+    requestsPerSecond: number;
+    taskId: string;
+}
+
+export interface RenderSearchTemplateParams extends GenericParams {
+    id: string;
+}
+
+export interface ScrollParams extends GenericParams {
+    scroll: TimeSpan;
+    scrollId: string;
+}
+
+export interface SearchParams extends GenericParams {
+    analyzer?: string;
+    analyzeWildcard?: boolean;
+    defaultOperator?: DefaultOperator;
+    df?: string;
+    explain?: boolean;
+    storedFields?: NameList;
+    docvalueFields?: NameList;
+    fielddataFields?: NameList;
+    from?: number;
+    ignoreUnavailable?: boolean;
+    allowNoIndices?: boolean;
+    expandWildcards?: ExpandWildcards;
+    lenient?: boolean;
+    lowercaseExpandedTerms?: boolean;
+    preference?: string;
+    q?: string;
+    routing?: NameList;
+    scroll?: TimeSpan;
+    searchType?: "query_then_fetch" | "dfs_query_then_fetch";
+    size?: number;
+    sort?: NameList;
+    _source?: NameList;
+    _sourceExclude?: NameList;
+    _sourceInclude?: NameList;
+    terminateAfter?: number;
+    stats?: NameList;
+    suggestField?: string;
+    suggestMode?: "missing" | "popular" | "always";
+    suggestSize?: number;
+    suggestText?: string;
+    timeout?: TimeSpan;
+    trackScores?: boolean;
+    version?: boolean;
+    requestCache?: boolean;
+    index?: NameList;
+    type?: NameList;
+}
+
+export interface SearchResponse<T> {
+    took: number;
+    timed_out: boolean;
+    _scroll_id?: string;
+    _shards: ShardsResponse;
+    hits: {
+        total: number;
+        max_score: number;
+        hits: Array<{
+            _index: string;
+            _type: string;
+            _id: string;
+            _score: number;
+            _source: T;
+            _version?: number;
+            _explanation?: Explanation;
+            fields?: any;
+            highlight?: any;
+            inner_hits?: any;
+        }>;
+    };
+    aggregations?: any;
+}
+
+export interface SearchShardsParams extends GenericParams {
+    preference?: string;
+    routing?: string;
+    local?: boolean;
+    ignoreUnavailable?: boolean;
+    allowNoIndices?: boolean;
+    expandWildcards?: ExpandWildcards;
+    index: NameList;
+    type: NameList;
+}
+
+export interface SearchShardsResponse {
+    nodes: any;
+    shards: SearchShardsResponseShard[][];
+}
+
+export interface SearchShardsResponseShard {
+    index: string;
+    node: string;
+    primary: boolean;
+    share: number;
+    state: string;
+    allocation_id: {
+        id: string;
+    };
+    relocating_node: any;
+}
+
+export interface SearchTemplateParams extends GenericParams {
+    ignoreUnavailable?: boolean;
+    allowNoIndices?: boolean;
+    expandWildcards?: ExpandWildcards;
+    preference?: string;
+    routing?: NameList;
+    scroll?: TimeSpan;
+    searchType?: "query_then_fetch" | "query_and_fetch" | "dfs_query_then_fetch" | "dfs_query_and_fetch";
+    index: NameList;
+    type: NameList;
+}
+
+export interface SuggestParams extends GenericParams {
+    ignoreUnavailable?: boolean;
+    allowNoIndices?: boolean;
+    expandWildcards?: ExpandWildcards;
+    preference?: string;
+    routing?: string;
+    index: NameList;
+}
+
+export interface TermvectorsParams extends GenericParams {
+    termStatistics?: boolean;
+    fieldStatistics?: boolean;
+    fields?: NameList;
+    offsets?: boolean;
+    positions?: boolean;
+    payloads?: boolean;
+    preference?: string;
+    routing?: string;
+    parent?: string;
+    realtime?: boolean;
+    version?: number;
+    versionType?: VersionType;
+    index: string;
+    type: string;
+    id?: string;
+}
+
+export interface UpdateDocumentParams extends GenericParams {
+    waitForActiveShards?: string;
+    fields?: NameList;
+    _source?: NameList;
+    _sourceExclude?: NameList;
+    _sourceInclude?: NameList;
+    lang?: string;
+    parent?: string;
+    refresh?: Refresh;
+    retryOnConflict?: number;
+    routing?: string;
+    timeout?: TimeSpan;
+    timestamp?: Date | number;
+    ttl?: TimeSpan;
+    version?: number;
+    versionType?: "internal" | "force";
+    id: string;
+    index: string;
+    type: string;
+}
+
+export interface UpdateDocumentByQueryParams extends GenericParams {
+    analyzer?: string;
+    analyzeWildcard?: boolean;
+    defaultOperator?: DefaultOperator;
+    df?: string;
+    explain?: boolean;
+    storedFields?: NameList;
+    docvalueFields?: NameList;
+    fielddataFields?: NameList;
+    from?: number;
+    ignoreUnavailable?: boolean;
+    allowNoIndices?: boolean;
+    conflicts?: Conflicts;
+    expandWildcards?: ExpandWildcards;
+    lenient?: boolean;
+    lowercaseExpandedTerms?: boolean;
+    pipeline?: string;
+    preference?: string;
+    q?: string;
+    routing?: NameList;
+    scroll?: TimeSpan;
+    searchType?: "query_then_fetch" | "dfs_query_then_fetch";
+    searchTimeout?: TimeSpan;
+    size?: number;
+    sort?: NameList;
+    _source?: NameList;
+    _sourceExclude?: NameList;
+    _sourceInclude?: NameList;
+    terminateAfter?: number;
+    stats?: NameList;
+    suggestField?: string;
+    suggestMode?: "missing" | "popular" | "always";
+    suggestSize?: number;
+    suggestText?: string;
+    timeout?: TimeSpan;
+    trackScores?: boolean;
+    version?: boolean;
+    versionType?: boolean;
+    requestCache?: boolean;
+    refresh?: boolean;
+    waitForActiveShards?: string;
+    scrollSize?: number;
+    waitForCompletion?: boolean;
+    requestsPerSecond?: number;
+    index: NameList;
+    type: NameList;
+}
+
+export interface Cat {
+    aliases(params: CatAliasesParams, callback: (error: any, response: any) => void): void;
+    aliases(params: CatAliasesParams): Promise<any>;
+    allocation(params: CatAllocationParams, callback: (error: any, response: any) => void): void;
+    allocation(params: CatAllocationParams): Promise<any>;
+    count(params: CatCountParams, callback: (error: any, response: any) => void): void;
+    count(params: CatAllocationParams): Promise<any>;
+    fielddata(params: CatFielddataParams, callback: (error: any, response: any) => void): void;
+    fielddata(params: CatFielddataParams): Promise<any>;
+    health(params: CatHealthParams, callback: (error: any, response: any) => void): void;
+    health(params: CatHealthParams): Promise<any>;
+    help(params: CatHelpParams, callback: (error: any, response: any) => void): void;
+    help(params: CatHelpParams): Promise<any>;
+    indices(params: CatIndicesParams, callback: (error: any, response: any) => void): void;
+    indices(params: CatIndicesParams): Promise<any>;
+    master(params: CatCommonParams, callback: (error: any, response: any) => void): void;
+    master(params: CatCommonParams): Promise<any>;
+    nodeattrs(params: CatCommonParams, callback: (error: any, response: any) => void): void;
+    nodeattrs(params: CatCommonParams): Promise<any>;
+    nodes(params: CatCommonParams, callback: (error: any, response: any) => void): void;
+    nodes(params: CatCommonParams): Promise<any>;
+    pendingTasks(params: CatCommonParams, callback: (error: any, response: any) => void): void;
+    pendingTasks(params: CatCommonParams): Promise<any>;
+    plugins(params: CatCommonParams, callback: (error: any, response: any) => void): void;
+    plugins(params: CatCommonParams): Promise<any>;
+    recovery(params: CatRecoveryParams, callback: (error: any, response: any) => void): void;
+    recovery(params: CatRecoveryParams): Promise<any>;
+    repositories(params: CatCommonParams, callback: (error: any, response: any) => void): void;
+    repositories(params: CatCommonParams): Promise<any>;
+    segments(params: CatSegmentsParams, callback: (error: any, response: any) => void): void;
+    segments(params: CatSegmentsParams): Promise<any>;
+    shards(params: CatShardsParams, callback: (error: any, response: any) => void): void;
+    shards(params: CatShardsParams): Promise<any>;
+    snapshots(params: CatSnapshotsParams, callback: (error: any, response: any) => void): void;
+    snapshots(params: CatSnapshotsParams): Promise<any>;
+    tasks(params: CatTasksParams, callback: (error: any, response: any) => void): void;
+    tasks(params: CatTasksParams): Promise<any>;
+    threadPool(params: CatThreadPoolParams, callback: (error: any, response: any) => void): void;
+    threadPool(params: CatThreadPoolParams): Promise<any>;
+}
+
+export type CatBytes = "b" | "k" | "kb" | "m" | "mb" | "g" | "gb" | "t" | "tb" | "p" | "pb";
+
+export interface CatCommonParams extends GenericParams {
+    format: string;
+    local?: boolean;
+    masterTimeout?: TimeSpan;
+    h?: NameList;
+    help?: boolean;
+    v?: boolean;
+}
+
+export interface CatAliasesParams extends CatCommonParams {
+    name?: NameList;
+}
+
+export interface CatAllocationParams extends CatCommonParams {
+    bytes?: CatBytes;
+    nodeId?: NameList;
+}
+
+export interface CatCountParams extends CatCommonParams {
+    index?: NameList;
+}
+
+export interface CatFielddataParams extends CatCommonParams {
+    bytes?: CatBytes;
+    fields?: NameList;
+}
+
+export interface CatHealthParams extends CatCommonParams {
+    ts?: boolean;
+}
+
+export interface CatHelpParams extends GenericParams {
+    help?: boolean;
+}
+
+export interface CatIndicesParams extends CatCommonParams {
+    bytes?: CatBytes;
+    health?: "green" | "yellow" | "red";
+    pri?: boolean;
+    index?: NameList;
+}
+
+export interface CatRecoveryParams extends GenericParams {
+    format: string;
+    bytes?: CatBytes;
+    masterTimeout?: TimeSpan;
+    h?: NameList;
+    help?: boolean;
+    v?: boolean;
+}
+
+export interface CatSegmentsParams extends GenericParams {
+    format: string;
+    h?: NameList;
+    help?: boolean;
+    v?: boolean;
+    index?: NameList;
+}
+
+export interface CatShardsParams extends CatCommonParams {
+    index?: NameList;
+}
+
+export interface CatSnapshotsParams extends GenericParams {
+    format: string;
+    ignoreUnavailable?: boolean;
+    masterTimeout?: TimeSpan;
+    h?: NameList;
+    help?: boolean;
+    v?: boolean;
+    repository?: NameList;
+}
+
+export interface CatTasksParams extends GenericParams {
+    format: string;
+    nodeId?: NameList;
+    actions?: NameList;
+    detailed?: boolean;
+    parentNode?: string;
+    parentTask?: number;
+    h?: NameList;
+    help?: boolean;
+    v?: boolean;
+}
+
+export interface CatThreadPoolParams extends CatCommonParams {
+    size?: "" | "k" | "m" | "g" | "t" | "p";
+    threadPoolPatterns?: NameList;
+}
+
+export interface Cluster {
+    allocationExplain(params: ClusterAllocationExplainParams, callback: (error: any, response: any) => void): void;
+    allocationExplain(params: ClusterAllocationExplainParams): Promise<any>;
+    getSettings(params: ClusterGetSettingsParams, callback: (error: any, response: any) => void): void;
+    getSettings(params: ClusterGetSettingsParams): Promise<any>;
+    health(params: ClusterHealthParams, callback: (error: any, response: any) => void): void;
+    health(params: ClusterHealthParams): Promise<any>;
+    pendingTasks(params: ClusterPendingTasksParams, callback: (error: any, response: any) => void): void;
+    pendingTasks(params: ClusterPendingTasksParams): Promise<any>;
+    putSettings(params: ClusterPutSettingsParams, callback: (error: any, response: any) => void): void;
+    putSettings(params: ClusterPutSettingsParams): Promise<any>;
+    reroute(params: ClusterRerouteParams, callback: (error: any, response: any) => void): void;
+    reroute(params: ClusterRerouteParams): Promise<any>;
+    state(params: ClusterStateParams, callback: (error: any, response: any) => void): void;
+    state(params: ClusterStateParams): Promise<any>;
+    stats(params: ClusterStatsParams, callback: (error: any, response: any) => void): void;
+    stats(params: ClusterStatsParams): Promise<any>;
+}
+
+export interface ClusterAllocationExplainParams extends GenericParams {
+    includeYesDecisions?: boolean;
+    includeDiskInfo?: boolean;
+}
+
+export interface ClusterGetSettingsParams extends GenericParams {
+    flatSettings?: boolean;
+    masterTimeout?: TimeSpan;
+    timeout?: TimeSpan;
+    includeDefaults?: boolean;
+}
+
+export interface ClusterHealthParams extends GenericParams {
+    level?: "cluster" | "indices" | "shards";
+    local?: boolean;
+    masterTimeout?: TimeSpan;
+    waitForActiveShards?: string;
+    waitForNodes?: string;
+    waitForEvents?: "immediate" | "urgent" | "high" | "normal" | "low" | "languid";
+    waitForRelocatingShards?: boolean;
+    waitForStatus?: "green" | "yellow" | "red";
+    index?: NameList;
+}
+
+export interface ClusterPendingTasksParams extends GenericParams {
+    local?: boolean;
+    masterTimeout?: TimeSpan;
+}
+
+export interface ClusterPutSettingsParams extends GenericParams {
+    flatSettings?: boolean;
+    masterTimeout?: TimeSpan;
+    timeout?: TimeSpan;
+}
+
+export interface ClusterRerouteParams extends GenericParams {
+    dryRun?: boolean;
+    explain?: boolean;
+    retryFailed?: boolean;
+    metric?: NameList;
+    masterTimeout?: TimeSpan;
+    timeout?: TimeSpan;
+}
+
+export interface ClusterStateParams extends GenericParams {
+    local?: boolean;
+    masterTimeout?: TimeSpan;
+    flatSettings?: boolean;
+    ignoreUnavailable?: boolean;
+    allowNoIndices?: boolean;
+    expandWildcards?: ExpandWildcards;
+    index?: NameList;
+    metric?: NameList;
+}
+
+export interface ClusterStatsParams extends GenericParams {
+    flatSettings?: boolean;
+    human?: boolean;
+    timeout?: TimeSpan;
+    nodeId?: NameList;
+}
+
+export class Indices {
+    analyze(params: IndicesAnalyzeParams, callback: (error: any, response: any, status: any) => void): void;
+    analyze(params: IndicesAnalyzeParams): Promise<any>;
+    clearCache(params: IndicesClearCacheParams, callback: (error: any, response: any, status: any) => void): void;
+    clearCache(params: IndicesClearCacheParams): Promise<any>;
+    close(params: IndicesCloseParams, callback: (error: any, response: any, status: any) => void): void;
+    close(params: IndicesCloseParams): Promise<any>;
+    create(params: IndicesCreateParams, callback: (error: any, response: any, status: any) => void): void;
+    create(params: IndicesCreateParams): Promise<any>;
+    delete(params: IndicesDeleteParams, callback: (error: any, response: any, status: any) => void): void;
+    delete(params: IndicesDeleteParams): Promise<any>;
+    deleteAlias(params: IndicesDeleteAliasParams, callback: (error: any, response: any, status: any) => void): void;
+    deleteAlias(params: IndicesDeleteAliasParams): Promise<any>;
+    deleteTemplate(params: IndicesDeleteTemplateParams, callback: (error: any, response: any, status: any) => void): void;
+    deleteTemplate(params: IndicesDeleteTemplateParams): Promise<any>;
+    exists(params: IndicesExistsParams, callback: (error: any, response: any, status: any) => void): void;
+    exists(params: IndicesExistsParams): Promise<any>;
+    existsAlias(params: IndicesExistsAliasParams, callback: (error: any, response: any, status: any) => void): void;
+    existsAlias(params: IndicesExistsAliasParams): Promise<any>;
+    existsTemplate(params: IndicesExistsTemplateParams, callback: (error: any, response: any, status: any) => void): void;
+    existsTemplate(params: IndicesExistsTemplateParams): Promise<any>;
+    existsType(params: IndicesExistsTypeParams, callback: (error: any, response: any, status: any) => void): void;
+    existsType(params: IndicesExistsTypeParams): Promise<any>;
+    flush(params: IndicesFlushParams, callback: (error: any, response: any, status: any) => void): void;
+    flush(params: IndicesFlushParams): Promise<any>;
+    flushSynced(params: IndicesFlushSyncedParams, callback: (error: any, response: any, status: any) => void): void;
+    flushSynced(params: IndicesFlushSyncedParams): Promise<any>;
+    forcemerge(params: IndicesForcemergeParams, callback: (error: any, response: any, status: any) => void): void;
+    forcemerge(params: IndicesForcemergeParams): Promise<any>;
+    get(params: IndicesGetParams, callback: (error: any, response: any, status: any) => void): void;
+    get(params: IndicesGetParams): Promise<any>;
+    getAlias(params: IndicesGetAliasParams, callback: (error: any, response: any, status: any) => void): void;
+    getAlias(params: IndicesGetAliasParams): Promise<any>;
+    getFieldMapping(params: IndicesGetFieldMappingParams, callback: (error: any, response: any, status: any) => void): void;
+    getFieldMapping(params: IndicesGetFieldMappingParams): Promise<any>;
+    getMapping(params: IndicesGetMappingParams, callback: (error: any, response: any, status: any) => void): void;
+    getMapping(params: IndicesGetMappingParams): Promise<any>;
+    getSettings(params: IndicesGetSettingsParams, callback: (error: any, response: any, status: any) => void): void;
+    getSettings(params: IndicesGetSettingsParams): Promise<any>;
+    getTemplate(params: IndicesGetTemplateParams, callback: (error: any, response: any, status: any) => void): void;
+    getTemplate(params: IndicesGetTemplateParams): Promise<any>;
+    getUpgrade(params: IndicesGetUpgradeParams, callback: (error: any, response: any, status: any) => void): void;
+    getUpgrade(params: IndicesGetUpgradeParams): Promise<any>;
+    open(params: IndicesOpenParams, callback: (error: any, response: any, status: any) => void): void;
+    open(params: IndicesOpenParams): Promise<any>;
+    putAlias(params: IndicesPutAliasParams, callback: (error: any, response: any, status: any) => void): void;
+    putAlias(params: IndicesPutAliasParams): Promise<any>;
+    putMapping(params: IndicesPutMappingParams, callback: (error: any, response: any, status: any) => void): void;
+    putMapping(params: IndicesPutMappingParams): Promise<any>;
+    putSettings(params: IndicesPutSettingsParams, callback: (error: any, response: any, status: any) => void): void;
+    putSettings(params: IndicesPutSettingsParams): Promise<any>;
+    putTemplate(params: IndicesPutTemplateParams, callback: (error: any, response: any) => void): void;
+    putTemplate(params: IndicesPutTemplateParams): Promise<any>;
+    recovery(params: IndicesRecoveryParams, callback: (error: any, response: any) => void): void;
+    recovery(params: IndicesRecoveryParams): Promise<any>;
+    refresh(params: IndicesRefreshParams, callback: (error: any, response: any) => void): void;
+    refresh(params: IndicesRefreshParams): Promise<any>;
+    rollover(params: IndicesRolloverParams, callback: (error: any, response: IndicesRolloverResponse) => void): void;
+    rollover(params: IndicesRolloverParams): Promise<IndicesRolloverResponse>;
+    segments(params: IndicesSegmentsParams, callback: (error: any, response: any) => void): void;
+    segments(params: IndicesSegmentsParams): Promise<any>;
+    shardStores(params: IndicesShardStoresParams, callback: (error: any, response: any) => void): void;
+    shardStores(params: IndicesShardStoresParams): Promise<any>;
+    shrink(params: IndicesShrinkParams, callback: (error: any, response: any) => void): void;
+    shrink(params: IndicesShrinkParams): Promise<any>;
+    stats(params: IndicesStatsParams, callback: (error: any, response: any) => void): void;
+    stats(params: IndicesStatsParams): Promise<any>;
+    updateAliases(params: IndicesUpdateAliasesParams, callback: (error: any, response: any) => void): void;
+    updateAliases(params: IndicesUpdateAliasesParams): Promise<any>;
+    upgrade(params: IndicesUpgradeParams, callback: (error: any, response: any) => void): void;
+    upgrade(params: IndicesUpgradeParams): Promise<any>;
+    validateQuery(params: IndicesValidateQueryParams, callback: (error: any, response: any) => void): void;
+    validateQuery(params: IndicesValidateQueryParams): Promise<any>;
+}
+
+export interface IndicesAnalyzeParams extends GenericParams {
+    analyzer?: string;
+    charFilter?: NameList;
+    field?: string;
+    filter?: NameList;
+    index?: string;
+    perferLocal?: boolean;
+    text?: NameList;
+    tokenizer?: string;
+    explain?: boolean;
+    attributes?: NameList;
+    format?: "";
+}
+
+export interface IndicesClearCacheParams extends GenericParams {
+    fieldData?: boolean;
+    fielddata?: boolean;    // yes the docs really have both
+    fields?: NameList;
+    query?: boolean;
+    ignoreUnavailable?: boolean;
+    allowNoIndices?: boolean;
+    expandWildcards?: ExpandWildcards;
+    index?: NameList;
+    recycler?: boolean;
+    request?: boolean;
+}
+
+export interface IndicesCloseParams extends GenericParams {
+    timeout?: TimeSpan;
+    masterTimeout?: TimeSpan;
+    ignoreUnavailable?: boolean;
+    allowNoIndices?: boolean;
+    expandWildcards?: ExpandWildcards;
+    index: NameList;
+}
+
+export interface IndicesCreateParams extends GenericParams {
+    waitForActiveShards?: string;
+    timeout?: TimeSpan;
+    masterTimeout?: TimeSpan;
+    updateAllTypes?: boolean;
+    index: string;
+}
+
+export interface IndicesDeleteParams extends GenericParams {
+    timeout?: TimeSpan;
+    masterTimeout?: TimeSpan;
+    index: NameList;
+}
+
+export interface IndicesDeleteAliasParams extends GenericParams {
+    timeout?: TimeSpan;
+    masterTimeout?: TimeSpan;
+    index: NameList;
+    name: NameList;
+}
+
+export interface IndicesDeleteTemplateParams extends GenericParams {
+    timeout?: TimeSpan;
+    masterTimeout?: TimeSpan;
+    name: string;
+}
+
+export interface IndicesExistsParams extends GenericParams {
+    ignoreUnavailable?: boolean;
+    allowNoIndices?: boolean;
+    expandWildcards?: ExpandWildcards;
+    local?: boolean;
+    index: NameList;
+}
+
+export interface IndicesExistsAliasParams extends IndicesExistsParams {
+    name: NameList;
+}
+
+export interface IndicesExistsTemplateParams extends GenericParams {
+    timeout?: TimeSpan;
+    masterTimeout?: TimeSpan;
+    name: NameList;
+}
+
+export interface IndicesExistsTypeParams extends IndicesExistsParams {
+    type: NameList;
+}
+
+export interface IndicesFlushParams extends GenericParams {
+    force?: boolean;
+    waitIfOngoing?: boolean;
+    ignoreUnavailable?: boolean;
+    allowNoIndices?: boolean;
+    expandWildcards?: ExpandWildcards;
+    index: NameList;
+}
+
+export interface IndicesFlushSyncedParams extends GenericParams {
+    ignoreUnavailable?: boolean;
+    allowNoIndices?: boolean;
+    expandWildcards?: ExpandWildcards;
+    index: NameList;
+}
+
+export interface IndicesForcemergeParams extends GenericParams {
+    flush?: boolean;
+    ignoreUnavailable?: boolean;
+    allowNoIndices?: boolean;
+    expandWildcards?: ExpandWildcards;
+    maxNumSegments?: number;
+    onlyExpungeDeletes?: boolean;
+    operationThreading?: any;   // even the docs don't know what this does
+    waitForMerge?: boolean;
+    index: NameList;
+}
+
+export interface IndicesGetParams extends GenericParams {
+    local?: boolean;
+    ignoreUnavailable?: boolean;
+    allowNoIndices?: boolean;
+    expandWildcards?: ExpandWildcards;
+    flatSettings?: boolean;
+    human?: boolean;
+    includeDefaults?: boolean;
+    index?: NameList;
+    feature?: NameList;
+}
+
+export interface IndicesGetAliasParams extends GenericParams {
+    ignoreUnavailable?: boolean;
+    allowNoIndices?: boolean;
+    expandWildcards?: ExpandWildcards;
+    local?: boolean;
+    index?: NameList;
+    name?: NameList;
+}
+
+export interface IndicesGetFieldMappingParams extends GenericParams {
+    includeDefaults?: boolean;
+    ignoreUnavailable?: boolean;
+    allowNoIndices?: boolean;
+    expandWildcards?: ExpandWildcards;
+    local?: boolean;
+    index?: NameList;
+    type?: NameList;
+    fields?: NameList;
+}
+
+export interface IndicesGetMappingParams extends GenericParams {
+    ignoreUnavailable?: boolean;
+    allowNoIndices?: boolean;
+    expandWildcards?: ExpandWildcards;
+    local?: boolean;
+    index?: NameList;
+    type?: NameList;
+}
+
+export interface IndicesGetSettingsParams extends GenericParams {
+    ignoreUnavailable?: boolean;
+    allowNoIndices?: boolean;
+    expandWildcards?: ExpandWildcards;
+    flatSettings?: boolean;
+    local?: boolean;
+    human?: boolean;
+    includeDefaults?: boolean;
+    index?: NameList;
+    name?: NameList;
+}
+
+export interface IndicesGetTemplateParams extends GenericParams {
+    flatSettings?: boolean;
+    masterTimeout?: TimeSpan;
+    local?: boolean;
+    name?: NameList;
+}
+
+export interface IndicesGetUpgradeParams extends GenericParams {
+    ignoreUnavailable?: boolean;
+    allowNoIndices?: boolean;
+    expandWildcards?: ExpandWildcards;
+    human?: boolean;
+    index?: NameList;
+}
+
+export interface IndicesOpenParams extends GenericParams {
+    timeout?: TimeSpan;
+    masterTimeout?: TimeSpan;
+    ignoreUnavailable?: boolean;
+    allowNoIndices?: boolean;
+    expandWildcards?: ExpandWildcards;
+    index?: NameList;
+}
+
+export interface IndicesPutAliasParams extends GenericParams {
+    timeout?: TimeSpan;
+    masterTimeout?: TimeSpan;
+    index?: NameList;
+    name: NameList;
+}
+
+export interface IndicesPutMappingParams extends GenericParams {
+    timeout?: TimeSpan;
+    masterTimeout?: TimeSpan;
+    ignoreUnavailable?: boolean;
+    allowNoIndices?: boolean;
+    expandWildcards?: ExpandWildcards;
+    updateAllTypes?: boolean;
+    index: NameList;
+    type: string;
+    body: any;
+}
+
+export interface IndicesPutSettingsParams extends GenericParams {
+    masterTimeout?: TimeSpan;
+    preserveExisting?: boolean;
+    ignoreUnavailable?: boolean;
+    allowNoIndices?: boolean;
+    expandWildcards?: ExpandWildcards;
+    flatSettings?: boolean;
+    index: NameList;
+    body: any;
+}
+
+export interface IndicesPutTemplateParams extends GenericParams {
+    order?: number;
+    create?: boolean;
+    timeout?: TimeSpan;
+    masterTimeout?: TimeSpan;
+    flatSettings?: boolean;
+    name: string;
+    body: any;
+}
+
+export interface IndicesRecoveryParams extends GenericParams {
+    detailed?: boolean;
+    activeOnly?: boolean;
+    human?: boolean;
+    index: NameList;
+}
+
+export interface IndicesRefreshParams extends GenericParams {
+    ignoreUnavailable?: boolean;
+    allowNoIndices?: boolean;
+    expandWildcards?: ExpandWildcards;
+    force?: boolean;
+    operationThreading?: any;   // even the docs don't know what this does
+    index: NameList;
+}
+
+export interface IndicesRolloverParams extends GenericParams {
+    timeout?: TimeSpan;
+    masterTimeout?: TimeSpan;
+    waitForActiveShards?: number | string;
+    alias?: string;
+    newIndex?: string;
+}
+
+export interface IndicesRolloverResponse {
+    acknowledged: boolean;
+    shards_acknowledged: boolean;
+    old_index: string;
+    new_index: string;
+    rolled_over: boolean;
+    dry_run: boolean;
+    conditions: { [condition: string]: boolean };
+}
+
+export interface IndicesSegmentsParams extends GenericParams {
+    ignoreUnavailable?: boolean;
+    allowNoIndices?: boolean;
+    expandWildcards?: ExpandWildcards;
+    human?: boolean;
+    operationThreading?: any;   // even the docs don't know what this does
+    verbose?: boolean;
+    index: NameList;
+}
+
+export interface IndicesShardStoresParams extends GenericParams {
+    status?: NameList;
+    ignoreUnavailable?: boolean;
+    allowNoIndices?: boolean;
+    expandWildcards?: ExpandWildcards;
+    operationThreading?: any;   // even the docs don't know what this does
+    index: NameList;
+}
+
+export interface IndicesShrinkParams extends GenericParams {
+    timeout?: TimeSpan;
+    masterTimeout?: TimeSpan;
+    waitForActiveShards?: string | number;
+    index: string;
+    target: string;
+}
+
+export interface IndicesStatsParams extends GenericParams {
+    completionFields?: NameList;
+    fielddataFields?: NameList;
+    fields?: NameList;
+    groups?: NameList;
+    human?: boolean;
+    level?: "cluster" | "indices" | "shards";
+    types?: NameList;
+    index: NameList;
+    metric?: NameList;
+}
+
+export interface IndicesUpdateAliasesParams extends GenericParams {
+    timeout?: TimeSpan;
+    masterTimeout?: TimeSpan;
+    body: {
+        actions: IndicesUpdateAliasesParamsAction[];
+    };
+}
+
+export interface IndicesUpdateAliasesParamsAction {
+    add?: {
+        index?: string;
+        indices?: string[];
+        alias: string;
+    };
+    remove?: {
+        index?: string;
+        indices?: string[];
+        alias: string;
+    };
+    remove_index?: {
+        index: string;
+    };
+}
+
+export interface IndicesUpgradeParams extends GenericParams {
+    expandWildcards?: ExpandWildcards;
+    ignoreUnavailable?: boolean;
+    waitForCompletion?: boolean;
+    onlyAncientSegments?: boolean;
+    index: NameList;
+}
+
+export interface IndicesValidateQueryParams extends GenericParams {
+    explain?: boolean;
+    ignoreUnavailable?: boolean;
+    allowNoIndices?: boolean;
+    expandWildcards?: ExpandWildcards;
+    operationThreading?: any;   // even the docs don't know what this does
+    q?: string;
+    analyzer?: string;
+    analyzeWildcard?: boolean;
+    defaultOperator?: DefaultOperator;
+    df?: string;
+    lenient?: boolean;
+    lowercaseExpandedTerms?: boolean;
+    rewrite?: boolean;
+    index: NameList;
+    type?: NameList;
+}
+
+export class Ingest {
+    deletePipeline(params: IngestDeletePipelineParams, callback: (error: any, response: any, status: any) => void): void;
+    deletePipeline(params: IngestDeletePipelineParams): Promise<any>;
+    getPipeline(params: IngestGetPipelineParams, callback: (error: any, response: any, status: any) => void): void;
+    getPipeline(params: IngestGetPipelineParams): Promise<any>;
+    putPipeline(params: IngestPutPipelineParams, callback: (error: any, response: any, status: any) => void): void;
+    putPipeline(params: IngestPutPipelineParams): Promise<any>;
+    simulate(params: IngestSimulateParams, callback: (error: any, response: any, status: any) => void): void;
+    simulate(params: IngestSimulateParams): Promise<any>;
+}
+
+export interface IngestDeletePipelineParams extends GenericParams {
+    masterTimeout?: number;
+    timeout?: number;
+    id: string;
+}
+
+export interface IngestGetPipelineParams extends GenericParams {
+    masterTimeout?: number;
+    id: string;
+}
+
+export interface IngestPutPipelineParams extends GenericParams {
+    masterTimeout?: number;
+    timeout?: number;
+    id: string;
+    body: any;
+}
+
+export interface IngestSimulateParams extends GenericParams {
+    verbose?: boolean;
+    id: string;
+}
+
+export class Nodes {
+    hotThreads(params: NodesHotThreadsParams, callback: (error: any, response: any, status: any) => void): void;
+    hotThreads(params: NodesHotThreadsParams): Promise<any>;
+    info(params: NodesInfoParams, callback: (error: any, response: any, status: any) => void): void;
+    info(params: NodesInfoParams): Promise<any>;
+    stats(params: NodesStatsParams, callback: (error: any, response: any, status: any) => void): void;
+    stats(params: NodesStatsParams): Promise<any>;
+}
+
+export interface NodesHotThreadsParams extends GenericParams {
+    interval?: TimeSpan;
+    snapshots?: number;
+    threads?: number;
+    ignoreIdleThreads?: boolean;
+    type?: "cpu" | "wait" | "blocked";
+    timeout?: TimeSpan;
+    nodeId: NameList;
+}
+
+export interface NodesInfoParams extends GenericParams {
+    flatSettings?: boolean;
+    human?: boolean;
+    timeout?: TimeSpan;
+    nodeId: NameList;
+    metric?: NameList;
+}
+
+export interface NodesStatsParams extends GenericParams {
+    completionFields?: NameList;
+    fielddataFields?: NameList;
+    fields?: NameList;
+    groups?: boolean;
+    human?: boolean;
+    level?: "indices" | "node" | "shards";
+    types?: NameList;
+    timeout?: TimeSpan;
+    metric?: NameList;
+    indexMetric?: NameList;
+    nodeId?: NameList;
+}
+
+export class Snapshot {
+    create(params: SnapshotCreateParams, callback: (error: any, response: any, status: any) => void): void;
+    create(params: SnapshotCreateParams): Promise<any>;
+    createRepository(params: SnapshotCreateRepositoryParams, callback: (error: any, response: any, status: any) => void): void;
+    createRepository(params: SnapshotCreateRepositoryParams): Promise<any>;
+    delete(params: SnapshotDeleteParams, callback: (error: any, response: any, status: any) => void): void;
+    delete(params: SnapshotDeleteParams): Promise<any>;
+    deleteRepository(params: SnapshotDeleteRepositoryParams, callback: (error: any, response: any, status: any) => void): void;
+    deleteRepository(params: SnapshotDeleteRepositoryParams): Promise<any>;
+    get(params: SnapshotGetParams, callback: (error: any, response: any, status: any) => void): void;
+    get(params: SnapshotGetParams): Promise<any>;
+    getRepository(params: SnapshotGetRepositoryParams, callback: (error: any, response: any, status: any) => void): void;
+    getRepository(params: SnapshotGetRepositoryParams): Promise<any>;
+    restore(params: SnapshotRestoreParams, callback: (error: any, response: any, status: any) => void): void;
+    restore(params: SnapshotRestoreParams): Promise<any>;
+    status(params: SnapshotStatusParams, callback: (error: any, response: any, status: any) => void): void;
+    status(params: SnapshotStatusParams): Promise<any>;
+    verifyRepository(params: SnapshotVerifyRepositoryParams, callback: (error: any, response: any, status: any) => void): void;
+    verifyRepository(params: SnapshotVerifyRepositoryParams): Promise<any>;
+}
+
+export interface SnapshotCreateParams extends GenericParams {
+    masterTimeout?: TimeSpan;
+    waitForCompletion?: boolean;
+    repository: string;
+    snapshot: string;
+}
+
+export interface SnapshotCreateRepositoryParams extends GenericParams {
+    masterTimeout?: TimeSpan;
+    timeout?: TimeSpan;
+    verify?: boolean;
+    repository: string;
+}
+
+export interface SnapshotDeleteParams extends GenericParams {
+    masterTimeout?: TimeSpan;
+    repository: string;
+    snapshot: string;
+}
+
+export interface SnapshotDeleteRepositoryParams extends GenericParams {
+    masterTimeout?: TimeSpan;
+    timeout?: TimeSpan;
+    repository: string;
+}
+
+export interface SnapshotGetParams extends GenericParams {
+    masterTimeout?: TimeSpan;
+    ignoreUnavailable?: boolean;
+    repository: string;
+    snapshot: NameList;
+}
+
+export interface SnapshotGetRepositoryParams extends GenericParams {
+    masterTimeout?: TimeSpan;
+    local?: boolean;
+    repository: NameList;
+}
+
+export interface SnapshotRestoreParams extends GenericParams {
+    masterTimeout?: TimeSpan;
+    waitForCompletion?: boolean;
+    repository: string;
+    snapshot: string;
+}
+
+export interface SnapshotStatusParams extends GenericParams {
+    masterTimeout?: TimeSpan;
+    ignoreUnavailable?: boolean;
+    repository: string;
+    snapshot: NameList;
+}
+
+export interface SnapshotVerifyRepositoryParams extends GenericParams {
+    masterTimeout?: TimeSpan;
+    timeout?: TimeSpan;
+    repository: string;
+}
+
+export class Tasks {
+    cancel(params: TasksCancelParams, callback: (error: any, response: any, status: any) => void): void;
+    cancel(params: TasksCancelParams): Promise<any>;
+    get(params: TasksGetParams, callback: (error: any, response: any, status: any) => void): void;
+    get(params: TasksGetParams): Promise<any>;
+    list(params: TasksListParams, callback: (error: any, response: any, status: any) => void): void;
+    list(params: TasksListParams): Promise<any>;
+}
+
+export interface TasksCancelParams extends GenericParams {
+    nodeId?: NameList;
+    actions?: NameList;
+    parentNode?: string;
+    parentTask?: string;
+    taskId?: string;
+}
+
+export interface TasksGetParams extends GenericParams {
+    waitForCompletion?: boolean;
+    taskId?: string;
+}
+
+export interface TasksListParams extends GenericParams {
+    nodeId?: NameList;
+    actions?: NameList;
+    detailed?: boolean;
+    parentNode?: string;
+    parentTask?: string;
+    waitForCompletion?: boolean;
+    groupBy?: "nodes" | "parents";
+}
+
+export namespace errors {
+    class _Abstract extends Error {}
+    class Generic extends _Abstract {}
+    class ConnectionFault extends _Abstract {}
+    class NoConnections extends _Abstract {}
+    class Serialization extends _Abstract {}
+    class RequestTypeError extends _Abstract {}
+
+    class AuthenticationException extends _Abstract {}
+    class AuthorizationException extends _Abstract {}
+    class BadGateway extends _Abstract {}
+    class BadRequest extends _Abstract {}
+    class BlockedByWindowsParentalControls extends _Abstract {}
+    class ClientClosedRequest extends _Abstract {}
+    class Conflict extends _Abstract {}
+    class ExpectationFailed extends _Abstract {}
+    class GatewayTimeout extends _Abstract {}
+    class HTTPToHTTPS extends _Abstract {}
+    class HTTPVersionNotSupported extends _Abstract {}
+    class ImATeapot extends _Abstract {}
+    class InternalServerError extends _Abstract {}
+    class LengthRequired extends _Abstract {}
+    class MethodNotAllowed extends _Abstract {}
+    class MovedPermanently extends _Abstract {}
+    class MultipleChoices extends _Abstract {}
+    class NotAcceptable extends _Abstract {}
+    class NotExtended extends _Abstract {}
+    class NotFound extends _Abstract {}
+    class NotImplemented extends _Abstract {}
+    class NotModified extends _Abstract {}
+    class PaymentRequired extends _Abstract {}
+    class PermanentRedirect extends _Abstract {}
+    class PreconditionFailed extends _Abstract {}
+    class ProxyAuthenticationRequired extends _Abstract {}
+    class RequestedRangeNotSatisfiable extends _Abstract {}
+    class RequestEntityTooLarge extends _Abstract {}
+    class RequestHeaderTooLarge extends _Abstract {}
+    class RequestTimeout extends _Abstract {}
+    class RequestURITooLong extends _Abstract {}
+    class SeeOther extends _Abstract {}
+    class ServiceUnavailable extends _Abstract {}
+    class TemporaryRedirect extends _Abstract {}
+    class TooManyConnectionsFromThisIP extends _Abstract {}
+    class TooManyRequests extends _Abstract {}
+    class UnsupportedMediaType extends _Abstract {}
+    class UpgradeRequired extends _Abstract {}
+    class UseProxy extends _Abstract {}
+    class VariantAlsoNegotiates extends _Abstract {}
 }
diff --git a/types/elasticsearch/tsconfig.json b/types/elasticsearch/tsconfig.json
index 2d62eac43d..21ac20d7e9 100644
--- a/types/elasticsearch/tsconfig.json
+++ b/types/elasticsearch/tsconfig.json
@@ -7,7 +7,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
@@ -21,4 +21,4 @@
         "index.d.ts",
         "elasticsearch-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/elasticsearch/tslint.json b/types/elasticsearch/tslint.json
index a41bf5d19a..e9003e412b 100644
--- a/types/elasticsearch/tslint.json
+++ b/types/elasticsearch/tslint.json
@@ -1,79 +1,7 @@
 {
     "extends": "dtslint/dt.json",
     "rules": {
-        "adjacent-overload-signatures": false,
-        "array-type": false,
-        "arrow-return-shorthand": false,
-        "ban-types": false,
-        "callable-types": false,
-        "comment-format": false,
-        "dt-header": false,
-        "eofline": false,
-        "export-just-namespace": false,
-        "import-spacing": false,
-        "interface-name": false,
-        "interface-over-type-literal": false,
-        "jsdoc-format": false,
-        "max-line-length": false,
-        "member-access": false,
-        "new-parens": false,
-        "no-any-union": false,
-        "no-boolean-literal-compare": false,
-        "no-conditional-assignment": false,
-        "no-consecutive-blank-lines": false,
-        "no-construct": false,
-        "no-declare-current-package": false,
-        "no-duplicate-imports": false,
-        "no-duplicate-variable": false,
-        "no-empty-interface": false,
-        "no-for-in-array": false,
-        "no-inferrable-types": false,
-        "no-internal-module": false,
-        "no-irregular-whitespace": false,
-        "no-mergeable-namespace": false,
-        "no-misused-new": false,
-        "no-namespace": false,
-        "no-object-literal-type-assertion": false,
-        "no-padding": false,
-        "no-redundant-jsdoc": false,
-        "no-redundant-jsdoc-2": false,
-        "no-redundant-undefined": false,
-        "no-reference-import": false,
-        "no-relative-import-in-test": false,
-        "no-self-import": false,
-        "no-single-declare-module": false,
-        "no-string-throw": false,
-        "no-unnecessary-callback-wrapper": false,
-        "no-unnecessary-class": false,
         "no-unnecessary-generics": false,
-        "no-unnecessary-qualifier": false,
-        "no-unnecessary-type-assertion": false,
-        "no-useless-files": false,
-        "no-var-keyword": false,
-        "no-var-requires": false,
-        "no-void-expression": false,
-        "no-trailing-whitespace": false,
-        "object-literal-key-quotes": false,
-        "object-literal-shorthand": false,
-        "one-line": false,
-        "one-variable-per-declaration": false,
-        "only-arrow-functions": false,
-        "prefer-conditional-expression": false,
-        "prefer-const": false,
-        "prefer-declare-function": false,
-        "prefer-for-of": false,
-        "prefer-method-signature": false,
-        "prefer-template": false,
-        "radix": false,
-        "semicolon": false,
-        "space-before-function-paren": false,
-        "space-within-parens": false,
-        "strict-export-declare-modifiers": false,
-        "trim-file": false,
-        "triple-equals": false,
-        "typedef-whitespace": false,
-        "unified-signatures": false,
-        "void-return": false,
-        "whitespace": false
+        "no-empty-interface": false
     }
 }
diff --git a/types/ember-data/index.d.ts b/types/ember-data/index.d.ts
new file mode 100644
index 0000000000..0e0678e7d7
--- /dev/null
+++ b/types/ember-data/index.d.ts
@@ -0,0 +1,1693 @@
+// Type definitions for ember-data 2.14
+// Project: https://github.com/emberjs/data
+// Definitions by: Derek Wickern <https://github.com/dwickern>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+import Ember from 'ember';
+
+declare namespace DS {
+  /**
+   * Convert an hash of errors into an array with errors in JSON-API format.
+   */
+  function errorsHashToArray(errors: {}): any[];
+  /**
+   * Convert an array of errors in JSON-API format into an object.
+   */
+  function errorsArrayToHash(errors: any[]): {};
+  /**
+   * `DS.belongsTo` is used to define One-To-One and One-To-Many
+   * relationships on a [DS.Model](/api/data/classes/DS.Model.html).
+   */
+  function belongsTo<T extends Model>(modelName: string, options: {
+      async: false,
+      inverse?: string | null,
+      polymorphic?: boolean
+  }): Ember.ComputedProperty<T>;
+  function belongsTo<T extends Model>(modelName: string, options?: {
+      async?: true,
+      inverse?: string | null,
+      polymorphic?: boolean
+  }): Ember.ComputedProperty<T & PromiseObject<T>>;
+  /**
+   * `DS.hasMany` is used to define One-To-Many and Many-To-Many
+   * relationships on a [DS.Model](/api/data/classes/DS.Model.html).
+   */
+  function hasMany<T extends Model>(type: string, options: {
+      async: false,
+      inverse?: string | null,
+      polymorphic?: boolean
+  }): Ember.ComputedProperty<ManyArray<T>>;
+  function hasMany<T extends Model>(type: string, options?: {
+      async?: true,
+      inverse?: string | null,
+      polymorphic?: boolean
+  }): Ember.ComputedProperty<PromiseManyArray<T>>;
+  /**
+   * This method normalizes a modelName into the format Ember Data uses
+   * internally.
+   */
+  function normalizeModelName(modelName: string): string;
+  const VERSION: string;
+
+  interface AttrOptions<T = any> {
+      defaultValue?: T | (() => T);
+  }
+
+  /**
+   * `DS.attr` defines an attribute on a [DS.Model](/api/data/classes/DS.Model.html).
+   * By default, attributes are passed through as-is, however you can specify an
+   * optional type to have the value automatically transformed.
+   * Ember Data ships with four basic transform types: `string`, `number`,
+   * `boolean` and `date`. You can define your own transforms by subclassing
+   * [DS.Transform](/api/data/classes/DS.Transform.html).
+   */
+  function attr(type: 'string', options?: AttrOptions<string>): Ember.ComputedProperty<string>;
+  function attr(type: 'boolean', options?: AttrOptions<boolean>): Ember.ComputedProperty<boolean>;
+  function attr(type: 'number', options?: AttrOptions<number>): Ember.ComputedProperty<number>;
+  function attr(type: 'date', options?: AttrOptions<Date>): Ember.ComputedProperty<Date>;
+  function attr<T>(type: string, options?: AttrOptions<T>): Ember.ComputedProperty<T>;
+  function attr<T>(options?: AttrOptions<T>): Ember.ComputedProperty<T>;
+  /**
+   * WARNING: This interface is likely to change in order to accomodate https://github.com/emberjs/rfcs/pull/4
+   * ## Using BuildURLMixin
+   * To use url building, include the mixin when extending an adapter, and call `buildURL` where needed.
+   * The default behaviour is designed for RESTAdapter.
+   * ### Example
+   * ```javascript
+   * export default DS.Adapter.extend(BuildURLMixin, {
+   * findRecord: function(store, type, id, snapshot) {
+   * var url = this.buildURL(type.modelName, id, snapshot, 'findRecord');
+   * return this.ajax(url, 'GET');
+   * }
+   * });
+   * ```
+   * ### Attributes
+   * The `host` and `namespace` attributes will be used if defined, and are optional.
+   */
+  class BuildURLMixin {
+    /**
+     * Builds a URL for a given type and optional ID.
+     */
+    buildURL(modelName: string, id: string|any[]|{}, snapshot: Snapshot|any[], requestType: string, query: {}): string;
+    /**
+     * Builds a URL for a `store.findRecord(type, id)` call.
+     */
+    urlForFindRecord(id: string, modelName: string, snapshot: Snapshot): string;
+    /**
+     * Builds a URL for a `store.findAll(type)` call.
+     */
+    urlForFindAll(modelName: string, snapshot: SnapshotRecordArray): string;
+    /**
+     * Builds a URL for a `store.query(type, query)` call.
+     */
+    urlForQuery(query: {}, modelName: string): string;
+    /**
+     * Builds a URL for a `store.queryRecord(type, query)` call.
+     */
+    urlForQueryRecord(query: {}, modelName: string): string;
+    /**
+     * Builds a URL for coalesceing multiple `store.findRecord(type, id)`
+     * records into 1 request when the adapter's `coalesceFindRequests`
+     * property is true.
+     */
+    urlForFindMany(ids: any[], modelName: string, snapshots: any[]): string;
+    /**
+     * Builds a URL for fetching a async hasMany relationship when a url
+     * is not provided by the server.
+     */
+    urlForFindHasMany(id: string, modelName: string, snapshot: Snapshot): string;
+    /**
+     * Builds a URL for fetching a async belongsTo relationship when a url
+     * is not provided by the server.
+     */
+    urlForFindBelongsTo(id: string, modelName: string, snapshot: Snapshot): string;
+    /**
+     * Builds a URL for a `record.save()` call when the record was created
+     * locally using `store.createRecord()`.
+     */
+    urlForCreateRecord(modelName: string, snapshot: Snapshot): string;
+    /**
+     * Builds a URL for a `record.save()` call when the record has been update locally.
+     */
+    urlForUpdateRecord(id: string, modelName: string, snapshot: Snapshot): string;
+    /**
+     * Builds a URL for a `record.save()` call when the record has been deleted locally.
+     */
+    urlForDeleteRecord(id: string, modelName: string, snapshot: Snapshot): string;
+    /**
+     * Determines the pathname for a given type.
+     */
+    pathForType(modelName: string): string;
+  }
+  /**
+   * A `DS.AdapterError` is used by an adapter to signal that an error occurred
+   * during a request to an external API. It indicates a generic error, and
+   * subclasses are used to indicate specific error states. The following
+   * subclasses are provided:
+   */
+  class AdapterError {
+  }
+  /**
+   * A `DS.InvalidError` is used by an adapter to signal the external API
+   * was unable to process a request because the content was not
+   * semantically correct or meaningful per the API. Usually this means a
+   * record failed some form of server side validation. When a promise
+   * from an adapter is rejected with a `DS.InvalidError` the record will
+   * transition to the `invalid` state and the errors will be set to the
+   * `errors` property on the record.
+   */
+  class InvalidError {
+  }
+  /**
+   * A `DS.TimeoutError` is used by an adapter to signal that a request
+   * to the external API has timed out. I.e. no response was received from
+   * the external API within an allowed time period.
+   */
+  class TimeoutError {
+  }
+  /**
+   * A `DS.AbortError` is used by an adapter to signal that a request to
+   * the external API was aborted. For example, this can occur if the user
+   * navigates away from the current page after a request to the external API
+   * has been initiated but before a response has been received.
+   */
+  class AbortError {
+  }
+  /**
+   * A `DS.UnauthorizedError` equates to a HTTP `401 Unauthorized` response
+   * status. It is used by an adapter to signal that a request to the external
+   * API was rejected because authorization is required and has failed or has not
+   * yet been provided.
+   */
+  class UnauthorizedError {
+  }
+  /**
+   * A `DS.ForbiddenError` equates to a HTTP `403 Forbidden` response status.
+   * It is used by an adapter to signal that a request to the external API was
+   * valid but the server is refusing to respond to it. If authorization was
+   * provided and is valid, then the authenticated user does not have the
+   * necessary permissions for the request.
+   */
+  class ForbiddenError {
+  }
+  /**
+   * A `DS.NotFoundError` equates to a HTTP `404 Not Found` response status.
+   * It is used by an adapter to signal that a request to the external API
+   * was rejected because the resource could not be found on the API.
+   */
+  class NotFoundError {
+  }
+  /**
+   * A `DS.ConflictError` equates to a HTTP `409 Conflict` response status.
+   * It is used by an adapter to indicate that the request could not be processed
+   * because of a conflict in the request. An example scenario would be when
+   * creating a record with a client generated id but that id is already known
+   * to the external API.
+   */
+  class ConflictError {
+  }
+  /**
+   * A `DS.ServerError` equates to a HTTP `500 Internal Server Error` response
+   * status. It is used by the adapter to indicate that a request has failed
+   * because of an error in the external API.
+   */
+  class ServerError {
+  }
+  /**
+   * Holds validation errors for a given record, organized by attribute names.
+   */
+  interface Errors extends Ember.Enumerable<any>, Ember.Evented {}
+  class Errors extends Ember.Object {
+    /**
+     * DEPRECATED:
+     * Register with target handler
+     */
+    registerHandlers(target: {}, becameInvalid: Function, becameValid: Function): any;
+    /**
+     * Returns errors for a given attribute
+     */
+    errorsFor(attribute: string): any[];
+    /**
+     * An array containing all of the error messages for this
+     * record. This is useful for displaying all errors to the user.
+     */
+    messages: Ember.ComputedProperty<any[]>;
+    /**
+     * Total number of errors.
+     */
+    length: Ember.ComputedProperty<number>;
+    isEmpty: Ember.ComputedProperty<boolean>;
+    /**
+     * DEPRECATED:
+     * Adds error messages to a given attribute and sends
+     * `becameInvalid` event to the record.
+     */
+    add(attribute: string, messages: any[]|string): any;
+    /**
+     * DEPRECATED:
+     * Removes all error messages from the given attribute and sends
+     * `becameValid` event to the record if there no more errors left.
+     */
+    remove(attribute: string): any;
+    /**
+     * DEPRECATED:
+     * Removes all error messages and sends `becameValid` event
+     * to the record.
+     */
+    clear(): any;
+    /**
+     * Checks if there is error messages for the given attribute.
+     */
+    has(attribute: string): boolean;
+  }
+  /**
+   * The model class that all Ember Data records descend from.
+   * This is the public API of Ember Data models. If you are using Ember Data
+   * in your application, this is the class you should use.
+   * If you are working on Ember Data internals, you most likely want to be dealing
+   * with `InternalModel`
+   */
+  class Model extends Ember.Object {
+    /**
+     * If this property is `true` the record is in the `empty`
+     * state. Empty is the first state all records enter after they have
+     * been created. Most records created by the store will quickly
+     * transition to the `loading` state if data needs to be fetched from
+     * the server or the `created` state if the record is created on the
+     * client. A record can also enter the empty state if the adapter is
+     * unable to locate the record.
+     */
+    isEmpty: Ember.ComputedProperty<boolean>;
+    /**
+     * If this property is `true` the record is in the `loading` state. A
+     * record enters this state when the store asks the adapter for its
+     * data. It remains in this state until the adapter provides the
+     * requested data.
+     */
+    isLoading: Ember.ComputedProperty<boolean>;
+    /**
+     * If this property is `true` the record is in the `loaded` state. A
+     * record enters this state when its data is populated. Most of a
+     * record's lifecycle is spent inside substates of the `loaded`
+     * state.
+     */
+    isLoaded: Ember.ComputedProperty<boolean>;
+    /**
+     * If this property is `true` the record is in the `dirty` state. The
+     * record has local changes that have not yet been saved by the
+     * adapter. This includes records that have been created (but not yet
+     * saved) or deleted.
+     */
+    hasDirtyAttributes: Ember.ComputedProperty<boolean>;
+    /**
+     * If this property is `true` the record is in the `saving` state. A
+     * record enters the saving state when `save` is called, but the
+     * adapter has not yet acknowledged that the changes have been
+     * persisted to the backend.
+     */
+    isSaving: Ember.ComputedProperty<boolean>;
+    /**
+     * If this property is `true` the record is in the `deleted` state
+     * and has been marked for deletion. When `isDeleted` is true and
+     * `hasDirtyAttributes` is true, the record is deleted locally but the deletion
+     * was not yet persisted. When `isSaving` is true, the change is
+     * in-flight. When both `hasDirtyAttributes` and `isSaving` are false, the
+     * change has persisted.
+     */
+    isDeleted: Ember.ComputedProperty<boolean>;
+    /**
+     * If this property is `true` the record is in the `new` state. A
+     * record will be in the `new` state when it has been created on the
+     * client and the adapter has not yet report that it was successfully
+     * saved.
+     */
+    isNew: Ember.ComputedProperty<boolean>;
+    /**
+     * If this property is `true` the record is in the `valid` state.
+     */
+    isValid: Ember.ComputedProperty<boolean>;
+    /**
+     * If the record is in the dirty state this property will report what
+     * kind of change has caused it to move into the dirty
+     * state. Possible values are:
+     */
+    dirtyType: Ember.ComputedProperty<string>;
+    /**
+     * If `true` the adapter reported that it was unable to save local
+     * changes to the backend for any reason other than a server-side
+     * validation error.
+     */
+    isError: boolean;
+    /**
+     * If `true` the store is attempting to reload the record from the adapter.
+     */
+    isReloading: boolean;
+    /**
+     * All ember models have an id property. This is an identifier
+     * managed by an external source. These are always coerced to be
+     * strings before being used internally. Note when declaring the
+     * attributes for a model it is an error to declare an id
+     * attribute.
+     */
+    id: string;
+    /**
+     * When the record is in the `invalid` state this object will contain
+     * any errors returned by the adapter. When present the errors hash
+     * contains keys corresponding to the invalid property names
+     * and values which are arrays of Javascript objects with two keys:
+     */
+    errors: Ember.ComputedProperty<Errors>;
+    /**
+     * This property holds the `DS.AdapterError` object with which
+     * last adapter operation was rejected.
+     */
+    adapterError: AdapterError;
+    /**
+     * Create a JSON representation of the record, using the serialization
+     * strategy of the store's adapter.
+     */
+    serialize(options: {}): {};
+    /**
+     * Use [DS.JSONSerializer](DS.JSONSerializer.html) to
+     * get the JSON representation of a record.
+     */
+    toJSON(options: {}): {};
+    /**
+     * Fired when the record is ready to be interacted with,
+     * that is either loaded from the server or created locally.
+     */
+    ready(): void;
+    /**
+     * Fired when the record is loaded from the server.
+     */
+    didLoad(): void;
+    /**
+     * Fired when the record is updated.
+     */
+    didUpdate(): void;
+    /**
+     * Fired when a new record is commited to the server.
+     */
+    didCreate(): void;
+    /**
+     * Fired when the record is deleted.
+     */
+    didDelete(): void;
+    /**
+     * Fired when the record becomes invalid.
+     */
+    becameInvalid(): void;
+    /**
+     * Fired when the record enters the error state.
+     */
+    becameError(): void;
+    /**
+     * Fired when the record is rolled back.
+     */
+    rolledBack(): void;
+    /**
+     * Marks the record as deleted but does not save it. You must call
+     * `save` afterwards if you want to persist it. You might use this
+     * method if you want to allow the user to still `rollbackAttributes()`
+     * after a delete was made.
+     */
+    deleteRecord(): any;
+    /**
+     * Same as `deleteRecord`, but saves the record immediately.
+     */
+    destroyRecord(options: {}): Promise<any>;
+    /**
+     * Unloads the record from the store. This will cause the record to be destroyed and freed up for garbage collection.
+     */
+    unloadRecord(): any;
+    /**
+     * Returns an object, whose keys are changed properties, and value is
+     * an [oldProp, newProp] array.
+     */
+    changedAttributes(): {};
+    /**
+     * If the model `hasDirtyAttributes` this function will discard any unsaved
+     * changes. If the model `isNew` it will be removed from the store.
+     */
+    rollbackAttributes(): any;
+    /**
+     * Save the record and persist any changes to the record to an
+     * external source via the adapter.
+     */
+    save(options?: {}): Promise<this>;
+    /**
+     * Reload the record from the adapter.
+     */
+    reload(): Promise<any>;
+    /**
+     * Get the reference for the specified belongsTo relationship.
+     */
+    belongsTo(name: string): BelongsToReference;
+    /**
+     * Get the reference for the specified hasMany relationship.
+     */
+    hasMany(name: string): HasManyReference<any>;
+    /**
+     * Given a callback, iterates over each of the relationships in the model,
+     * invoking the callback with the name of each relationship and its relationship
+     * descriptor.
+     */
+    eachRelationship(callback: Function, binding: any): any;
+    /**
+     * Represents the model's class name as a string. This can be used to look up the model's class name through
+     * `DS.Store`'s modelFor method.
+     */
+    static modelName: string;
+    /**
+     * For a given relationship name, returns the model type of the relationship.
+     */
+    static typeForRelationship(name: string, store: Store): Model;
+    /**
+     * Find the relationship which is the inverse of the one asked for.
+     */
+    static inverseFor(name: string, store: Store): {};
+    /**
+     * The model's relationships as a map, keyed on the type of the
+     * relationship. The value of each entry is an array containing a descriptor
+     * for each relationship with that type, describing the name of the relationship
+     * as well as the type.
+     */
+    static relationships: Ember.ComputedProperty<Ember.Map>;
+    /**
+     * A hash containing lists of the model's relationships, grouped
+     * by the relationship kind. For example, given a model with this
+     * definition:
+     */
+    static relationshipNames: Ember.ComputedProperty<{}>;
+    /**
+     * An array of types directly related to a model. Each type will be
+     * included once, regardless of the number of relationships it has with
+     * the model.
+     */
+    static relatedTypes: Ember.ComputedProperty<Ember.NativeArray<string>>;
+    /**
+     * A map whose keys are the relationships of a model and whose values are
+     * relationship descriptors.
+     */
+    static relationshipsByName: Ember.ComputedProperty<Ember.Map>;
+    /**
+     * A map whose keys are the fields of the model and whose values are strings
+     * describing the kind of the field. A model's fields are the union of all of its
+     * attributes and relationships.
+     */
+    static fields: Ember.ComputedProperty<Ember.Map>;
+    /**
+     * Given a callback, iterates over each of the relationships in the model,
+     * invoking the callback with the name of each relationship and its relationship
+     * descriptor.
+     */
+    static eachRelationship(callback: Function, binding: any): any;
+    /**
+     * Given a callback, iterates over each of the types related to a model,
+     * invoking the callback with the related type's class. Each type will be
+     * returned just once, regardless of how many different relationships it has
+     * with a model.
+     */
+    static eachRelatedType(callback: Function, binding: any): any;
+    /**
+     * A map whose keys are the attributes of the model (properties
+     * described by DS.attr) and whose values are the meta object for the
+     * property.
+     */
+    static attributes: Ember.ComputedProperty<Ember.Map>;
+    /**
+     * A map whose keys are the attributes of the model (properties
+     * described by DS.attr) and whose values are type of transformation
+     * applied to each attribute. This map does not include any
+     * attributes that do not have an transformation type.
+     */
+    static transformedAttributes: Ember.ComputedProperty<Ember.Map>;
+    /**
+     * Iterates through the attributes of the model, calling the passed function on each
+     * attribute.
+     */
+    static eachAttribute(callback: Function, binding: {}): any;
+    /**
+     * Iterates through the transformedAttributes of the model, calling
+     * the passed function on each attribute. Note the callback will not be
+     * called for any attributes that do not have an transformation type.
+     */
+    static eachTransformedAttribute(callback: Function, binding: {}): any;
+    /**
+     * Discards any unsaved changes to the given attribute. This feature is not enabled by default. You must enable `ds-rollback-attribute` and be running a canary build.
+     */
+    rollbackAttribute(): any;
+    /**
+     * This Ember.js hook allows an object to be notified when a property
+     * is defined.
+     */
+    didDefineProperty(proto: {}, key: string, value: Ember.ComputedProperty<any>): any;
+  }
+  /**
+   * ### State
+   */
+  class RootState {
+  }
+  /**
+   * Represents an ordered list of records whose order and membership is
+   * determined by the adapter. For example, a query sent to the adapter
+   * may trigger a search on the server, whose results would be loaded
+   * into an instance of the `AdapterPopulatedRecordArray`.
+   */
+  class AdapterPopulatedRecordArray<T> extends RecordArray<T> {
+  }
+  /**
+   * Represents a list of records whose membership is determined by the
+   * store. As records are created, loaded, or modified, the store
+   * evaluates them to determine if they should be part of the record
+   * array.
+   */
+  class FilteredRecordArray<T> extends RecordArray<T> {
+    /**
+     * The filterFunction is a function used to test records from the store to
+     * determine if they should be part of the record array.
+     */
+    filterFunction(record: Model): boolean;
+  }
+  /**
+   * A record array is an array that contains records of a certain modelName. The record
+   * array materializes records as needed when they are retrieved for the first
+   * time. You should not create record arrays yourself. Instead, an instance of
+   * `DS.RecordArray` or its subclasses will be returned by your application's store
+   * in response to queries.
+   */
+  interface RecordArray<T> extends Ember.ArrayProxy<T>, Ember.Evented {}
+  class RecordArray<T> {
+    /**
+     * The flag to signal a `RecordArray` is finished loading data.
+     */
+    isLoaded: boolean;
+    /**
+     * The flag to signal a `RecordArray` is currently loading data.
+     */
+    isUpdating: boolean;
+    /**
+     * The modelClass represented by this record array.
+     */
+    type: Ember.ComputedProperty<Model>;
+    /**
+     * Used to get the latest version of all of the records in this array
+     * from the adapter.
+     */
+    update(): any;
+    /**
+     * Saves all of the records in the `RecordArray`.
+     */
+    save(): PromiseArray<T>;
+  }
+  /**
+   * A BelongsToReference is a low level API that allows users and
+   * addon author to perform meta-operations on a belongs-to
+   * relationship.
+   */
+  class BelongsToReference {
+    /**
+     * This returns a string that represents how the reference will be
+     * looked up when it is loaded. If the relationship has a link it will
+     * use the "link" otherwise it defaults to "id".
+     */
+    remoteType(): string;
+    /**
+     * The `id` of the record that this reference refers to. Together, the
+     * `type()` and `id()` methods form a composite key for the identity
+     * map. This can be used to access the id of an async relationship
+     * without triggering a fetch that would normally happen if you
+     * attempted to use `record.get('relationship.id')`.
+     */
+    id(): string;
+    /**
+     * The link Ember Data will use to fetch or reload this belongs-to
+     * relationship.
+     */
+    link(): string;
+    /**
+     * The meta data for the belongs-to relationship.
+     */
+    meta(): {};
+    /**
+     * `push` can be used to update the data in the relationship and Ember
+     * Data will treat the new data as the conanical value of this
+     * relationship on the backend.
+     */
+    push(objectOrPromise: {}|Promise<any>): Promise<any>;
+    /**
+     * `value()` synchronously returns the current value of the belongs-to
+     * relationship. Unlike `record.get('relationshipName')`, calling
+     * `value()` on a reference does not trigger a fetch if the async
+     * relationship is not yet loaded. If the relationship is not loaded
+     * it will always return `null`.
+     */
+    value(objectOrPromise: {}|Promise<any>): Model;
+    /**
+     * Loads a record in a belongs to relationship if it is not already
+     * loaded. If the relationship is already loaded this method does not
+     * trigger a new load.
+     */
+    load(): Promise<any>;
+    /**
+     * Triggers a reload of the value in this relationship. If the
+     * remoteType is `"link"` Ember Data will use the relationship link to
+     * reload the relationship. Otherwise it will reload the record by its
+     * id.
+     */
+    reload(): Promise<any>;
+  }
+  /**
+   * A HasManyReference is a low level API that allows users and addon
+   * author to perform meta-operations on a has-many relationship.
+   */
+  class HasManyReference<T> {
+    /**
+     * This returns a string that represents how the reference will be
+     * looked up when it is loaded. If the relationship has a link it will
+     * use the "link" otherwise it defaults to "id".
+     */
+    remoteType(): string;
+    /**
+     * The link Ember Data will use to fetch or reload this has-many
+     * relationship.
+     */
+    link(): string;
+    /**
+     * `ids()` returns an array of the record ids in this relationship.
+     */
+    ids(): any[];
+    /**
+     * The meta data for the has-many relationship.
+     */
+    meta(): {};
+    /**
+     * `push` can be used to update the data in the relationship and Ember
+     * Data will treat the new data as the canonical value of this
+     * relationship on the backend.
+     */
+    push(objectOrPromise: T[] | Promise<T[]>): ManyArray<T>;
+    /**
+     * `value()` synchronously returns the current value of the has-many
+     * relationship. Unlike `record.get('relationshipName')`, calling
+     * `value()` on a reference does not trigger a fetch if the async
+     * relationship is not yet loaded. If the relationship is not loaded
+     * it will always return `null`.
+     */
+    value(): ManyArray<T>;
+    /**
+     * Loads the relationship if it is not already loaded.  If the
+     * relationship is already loaded this method does not trigger a new
+     * load.
+     */
+    load(): Promise<any>;
+    /**
+     * Reloads this has-many relationship.
+     */
+    reload(): Promise<any>;
+  }
+  /**
+   * An RecordReference is a low level API that allows users and
+   * addon author to perform meta-operations on a record.
+   */
+  class RecordReference<T extends Model> {
+    /**
+     * The `id` of the record that this reference refers to.
+     */
+    id(): string;
+    /**
+     * How the reference will be looked up when it is loaded: Currently
+     * this always return `identity` to signifying that a record will be
+     * loaded by the `type` and `id`.
+     */
+    remoteType(): string;
+    /**
+     * This API allows you to provide a reference with new data. The
+     * simplest usage of this API is similar to `store.push`: you provide a
+     * normalized hash of data and the object represented by the reference
+     * will update.
+     */
+    push(payload: Promise<any>|{}): PromiseObject<T> & T;
+    /**
+     * If the entity referred to by the reference is already loaded, it is
+     * present as `reference.value`. Otherwise the value returned by this function
+     * is `null`.
+     */
+    value(): T | null;
+    /**
+     * Triggers a fetch for the backing entity based on its `remoteType`
+     * (see `remoteType` definitions per reference type).
+     */
+    load(): PromiseObject<T> & T;
+    /**
+     * Reloads the record if it is already loaded. If the record is not
+     * loaded it will load the record via `store.findRecord`
+     */
+    reload(): PromiseObject<T> & T;
+  }
+  /**
+   * A `ManyArray` is a `MutableArray` that represents the contents of a has-many
+   * relationship.
+   */
+  interface ManyArray<T> extends Ember.MutableArray<T> {}
+  class ManyArray<T> extends Ember.Object.extend(Ember.MutableArray as {}, Ember.Evented) {
+    /**
+     * The loading state of this array
+     */
+    isLoaded: boolean;
+    /**
+     * Metadata associated with the request for async hasMany relationships.
+     */
+    meta: {};
+    /**
+     * Reloads all of the records in the manyArray. If the manyArray
+     * holds a relationship that was originally fetched using a links url
+     * Ember Data will revisit the original links url to repopulate the
+     * relationship.
+     */
+    reload(): PromiseArray<T>;
+    /**
+     * Saves all of the records in the `ManyArray`.
+     */
+    save(): PromiseArray<T>;
+    /**
+     * Create a child record within the owner
+     */
+    createRecord(inputProperties?: {}): T;
+  }
+  /**
+   * A `PromiseArray` is an object that acts like both an `Ember.Array`
+   * and a promise. When the promise is resolved the resulting value
+   * will be set to the `PromiseArray`'s `content` property. This makes
+   * it easy to create data bindings with the `PromiseArray` that will be
+   * updated when the promise resolves.
+   */
+  interface PromiseArray<T> extends Ember.ArrayProxy<T>, Ember.PromiseProxyMixin<PromiseArray<T>> {}
+  class PromiseArray<T> {
+  }
+  /**
+   * A `PromiseObject` is an object that acts like both an `Ember.Object`
+   * and a promise. When the promise is resolved, then the resulting value
+   * will be set to the `PromiseObject`'s `content` property. This makes
+   * it easy to create data bindings with the `PromiseObject` that will
+   * be updated when the promise resolves.
+   */
+  interface PromiseObject<T> extends Ember.ObjectProxy, Ember.PromiseProxyMixin<T & PromiseObject<T>> {}
+  class PromiseObject<T> {
+  }
+  /**
+   * A PromiseManyArray is a PromiseArray that also proxies certain method calls
+   * to the underlying manyArray.
+   * Right now we proxy:
+   */
+  class PromiseManyArray<T extends Model> extends PromiseArray<T> {
+      /**
+       * Reloads all of the records in the manyArray. If the manyArray
+       * holds a relationship that was originally fetched using a links url
+       * Ember Data will revisit the original links url to repopulate the
+       * relationship.
+       */
+      reload(): PromiseManyArray<T>;
+      /**
+       * Create a child record within the owner
+       */
+      createRecord(inputProperties?: {}): T;
+  }
+  class SnapshotRecordArray {
+    /**
+     * Number of records in the array
+     */
+    length: number;
+    /**
+     * Meta objects for the record array.
+     */
+    meta: {};
+    /**
+     * A hash of adapter options passed into the store method for this request.
+     */
+    adapterOptions: {};
+    /**
+     * The relationships to include for this request.
+     */
+    include: string|any[];
+    /**
+     * The type of the underlying records for the snapshots in the array, as a DS.Model
+     */
+    type: Model;
+    /**
+     * Get snapshots of the underlying record array
+     */
+    snapshots(): any[];
+  }
+  class Snapshot {
+    /**
+     * The underlying record for this snapshot. Can be used to access methods and
+     * properties defined on the record.
+     */
+    record: Model;
+    /**
+     * The id of the snapshot's underlying record
+     */
+    id: string;
+    /**
+     * A hash of adapter options
+     */
+    adapterOptions: {};
+    /**
+     * The name of the type of the underlying record for this snapshot, as a string.
+     */
+    modelName: string;
+    /**
+     * The type of the underlying record for this snapshot, as a DS.Model.
+     */
+    type: Model;
+    /**
+     * Returns the value of an attribute.
+     */
+    attr(keyName: string): {};
+    /**
+     * Returns all attributes and their corresponding values.
+     */
+    attributes(): {};
+    /**
+     * Returns all changed attributes and their old and new values.
+     */
+    changedAttributes(): {};
+    /**
+     * Returns the current value of a belongsTo relationship.
+     */
+    belongsTo(keyName: string, options: {}): Snapshot|string|null|undefined;
+    /**
+     * Returns the current value of a hasMany relationship.
+     */
+    hasMany(keyName: string, options: {}): any[]|undefined;
+    /**
+     * Iterates through all the attributes of the model, calling the passed
+     * function on each attribute.
+     */
+    eachAttribute(callback: Function, binding: {}): any;
+    /**
+     * Iterates through all the relationships of the model, calling the passed
+     * function on each relationship.
+     */
+    eachRelationship(callback: Function, binding: {}): any;
+    /**
+     * Serializes the snapshot using the serializer for the model.
+     */
+    serialize(options: {}): {};
+  }
+  /**
+   * The store contains all of the data for records loaded from the server.
+   * It is also responsible for creating instances of `DS.Model` that wrap
+   * the individual data for a record, so that they can be bound to in your
+   * Handlebars templates.
+   */
+  class Store {
+    /**
+     * The default adapter to use to communicate to a backend server or
+     * other persistence layer. This will be overridden by an application
+     * adapter if present.
+     */
+    adapter: string;
+    /**
+     * Create a new record in the current store. The properties passed
+     * to this method are set on the newly created record.
+     */
+    createRecord<T extends Model>(modelName: string, inputProperties?: {}): T;
+    /**
+     * For symmetry, a record can be deleted via the store.
+     */
+    deleteRecord(record: Model): void;
+    /**
+     * For symmetry, a record can be unloaded via the store.
+     * This will cause the record to be destroyed and freed up for garbage collection.
+     */
+    unloadRecord(record: Model): void;
+    /**
+     * This method returns a record for a given type and id combination.
+     */
+    findRecord<T extends Model>(modelName: string, id: string|number, options?: {}): PromiseObject<T> & T;
+    /**
+     * Get the reference for the specified record.
+     */
+    getReference<T extends Model>(modelName: string, id: string|number): RecordReference<T>;
+    /**
+     * Get a record by a given type and ID without triggering a fetch.
+     */
+    peekRecord<T extends Model>(modelName: string, id: string|number): T|null;
+    /**
+     * This method returns true if a record for a given modelName and id is already
+     * loaded in the store. Use this function to know beforehand if a findRecord()
+     * will result in a request or that it will be a cache hit.
+     */
+    hasRecordForId(modelName: string, id: string|number): boolean;
+    /**
+     * This method delegates a query to the adapter. This is the one place where
+     * adapter-level semantics are exposed to the application.
+     */
+    query<T extends Model>(modelName: string, query: any): AdapterPopulatedRecordArray<T> & PromiseArray<T>;
+    /**
+     * This method makes a request for one record, where the `id` is not known
+     * beforehand (if the `id` is known, use [`findRecord`](#method_findRecord)
+     * instead).
+     */
+    queryRecord<T extends Model>(modelName: string, query: any): Promise<T>;
+    /**
+     * `findAll` asks the adapter's `findAll` method to find the records for the
+     * given type, and returns a promise which will resolve with all records of
+     * this type present in the store, even if the adapter only returns a subset
+     * of them.
+     */
+    findAll<T extends Model>(modelName: string, options?: {
+        reload?: boolean,
+        backgroundReload?: boolean,
+        include?: string,
+        adapterOptions?: any
+    }): PromiseArray<T>;
+    /**
+     * This method returns a filtered array that contains all of the
+     * known records for a given type in the store.
+     */
+    peekAll<T extends Model>(modelName: string): RecordArray<T>;
+    /**
+     * This method unloads all records in the store.
+     * It schedules unloading to happen during the next run loop.
+     */
+    unloadAll(modelName: string): void;
+    /**
+     * DEPRECATED:
+     * This method has been deprecated and is an alias for store.hasRecordForId, which should
+     * be used instead.
+     */
+    recordIsLoaded(modelName: string, id: string): boolean;
+    /**
+     * Returns the model class for the particular `modelName`.
+     */
+    modelFor(modelName: string): Model;
+    /**
+     * Push some data for a given type into the store.
+     */
+    push(data: {}): Model|any[];
+    /**
+     * Push some raw data into the store.
+     */
+    pushPayload(modelName: string, inputPayload: {}): any;
+    pushPayload(inputPayload: {}): any;
+    /**
+     * `normalize` converts a json payload into the normalized form that
+     * [push](#method_push) expects.
+     */
+    normalize(modelName: string, payload: {}): {};
+    /**
+     * Returns an instance of the adapter for a given type. For
+     * example, `adapterFor('person')` will return an instance of
+     * `App.PersonAdapter`.
+     */
+    adapterFor(modelName: string): Adapter;
+    /**
+     * Returns an instance of the serializer for a given type. For
+     * example, `serializerFor('person')` will return an instance of
+     * `App.PersonSerializer`.
+     */
+    serializerFor(modelName: string): Serializer;
+  }
+  /**
+   * The `JSONAPIAdapter` is the default adapter used by Ember Data. It
+   * is responsible for transforming the store's requests into HTTP
+   * requests that follow the [JSON API](http://jsonapi.org/format/)
+   * format.
+   */
+  class JSONAPIAdapter extends RESTAdapter {
+    /**
+     * By default the JSONAPIAdapter will send each find request coming from a `store.find`
+     * or from accessing a relationship separately to the server. If your server supports passing
+     * ids as a query string, you can set coalesceFindRequests to true to coalesce all find requests
+     * within a single runloop.
+     */
+    coalesceFindRequests: boolean;
+  }
+  /**
+   * The REST adapter allows your store to communicate with an HTTP server by
+   * transmitting JSON via XHR. Most Ember.js apps that consume a JSON API
+   * should use the REST adapter.
+   */
+  class RESTAdapter extends Adapter implements BuildURLMixin {
+    /**
+     * Takes a URL, an HTTP method and a hash of data, and makes an HTTP request.
+     */
+    ajax(url: string, type: string, options?: object): Promise<any>;
+    /**
+     * Generate ajax options
+     */
+    ajaxOptions(url: string, type: string, options?: object): object;
+    /**
+     * By default, the RESTAdapter will send the query params sorted alphabetically to the
+     * server.
+     */
+    sortQueryParams(obj: {}): {};
+    /**
+     * By default the RESTAdapter will send each find request coming from a `store.find`
+     * or from accessing a relationship separately to the server. If your server supports passing
+     * ids as a query string, you can set coalesceFindRequests to true to coalesce all find requests
+     * within a single runloop.
+     */
+    coalesceFindRequests: boolean;
+    /**
+     * Endpoint paths can be prefixed with a `namespace` by setting the namespace
+     * property on the adapter:
+     */
+    namespace: string;
+    /**
+     * An adapter can target other hosts by setting the `host` property.
+     */
+    host: string;
+    /**
+     * Some APIs require HTTP headers, e.g. to provide an API
+     * key. Arbitrary headers can be set as key/value pairs on the
+     * `RESTAdapter`'s `headers` object and Ember Data will send them
+     * along with each ajax request. For dynamic headers see [headers
+     * customization](/api/data/classes/DS.RESTAdapter.html#toc_headers-customization).
+     */
+    headers: {};
+    /**
+     * Called by the store in order to fetch the JSON for a given
+     * type and ID.
+     */
+    findRecord(store: Store, type: Model, id: string, snapshot: Snapshot): Promise<any>;
+    /**
+     * Called by the store in order to fetch a JSON array for all
+     * of the records for a given type.
+     */
+    findAll(store: Store, type: Model, sinceToken: string, snapshotRecordArray: SnapshotRecordArray): Promise<any>;
+    /**
+     * Called by the store in order to fetch a JSON array for
+     * the records that match a particular query.
+     */
+    query(store: Store, type: Model, query: {}): Promise<any>;
+    /**
+     * Called by the store in order to fetch a JSON object for
+     * the record that matches a particular query.
+     */
+    queryRecord(store: Store, type: Model, query: {}): Promise<any>;
+    /**
+     * Called by the store in order to fetch several records together if `coalesceFindRequests` is true
+     */
+    findMany(store: Store, type: Model, ids: any[], snapshots: any[]): Promise<any>;
+    /**
+     * Called by the store in order to fetch a JSON array for
+     * the unloaded records in a has-many relationship that were originally
+     * specified as a URL (inside of `links`).
+     */
+    findHasMany(store: Store, snapshot: Snapshot, url: string, relationship: {}): Promise<any>;
+    /**
+     * Called by the store in order to fetch the JSON for the unloaded record in a
+     * belongs-to relationship that was originally specified as a URL (inside of
+     * `links`).
+     */
+    findBelongsTo(store: Store, snapshot: Snapshot, url: string): Promise<any>;
+    /**
+     * Called by the store when a newly created record is
+     * saved via the `save` method on a model record instance.
+     */
+    createRecord(store: Store, type: Model, snapshot: Snapshot): Promise<any>;
+    /**
+     * Called by the store when an existing record is saved
+     * via the `save` method on a model record instance.
+     */
+    updateRecord(store: Store, type: Model, snapshot: Snapshot): Promise<any>;
+    /**
+     * Called by the store when a record is deleted.
+     */
+    deleteRecord(store: Store, type: Model, snapshot: Snapshot): Promise<any>;
+    /**
+     * Organize records into groups, each of which is to be passed to separate
+     * calls to `findMany`.
+     */
+    groupRecordsForFindMany(store: Store, snapshots: any[]): any[];
+    /**
+     * Takes an ajax response, and returns the json payload or an error.
+     */
+    handleResponse(status: number, headers: {}, payload: {}, requestData: {}): {};
+    /**
+     * Default `handleResponse` implementation uses this hook to decide if the
+     * response is a success.
+     */
+    isSuccess(status: number, headers: {}, payload: {}): boolean;
+    /**
+     * Default `handleResponse` implementation uses this hook to decide if the
+     * response is an invalid error.
+     */
+    isInvalid(status: number, headers: {}, payload: {}): boolean;
+    /**
+     * Get the data (body or query params) for a request.
+     */
+    dataForRequest(params: {}): {};
+    /**
+     * Get the HTTP method for a request.
+     */
+    methodForRequest(params: {}): string;
+    /**
+     * Get the URL for a request.
+     */
+    urlForRequest(params: {}): string;
+    /**
+     * Get the headers for a request.
+     */
+    headersForRequest(params: {}): {};
+    /**
+     * Builds a URL for a given type and optional ID.
+     */
+    buildURL(modelName: string, id: string|any[]|{}, snapshot: Snapshot|any[], requestType: string, query: {}): string;
+    /**
+     * Builds a URL for a `store.findRecord(type, id)` call.
+     */
+    urlForFindRecord(id: string, modelName: string, snapshot: Snapshot): string;
+    /**
+     * Builds a URL for a `store.findAll(type)` call.
+     */
+    urlForFindAll(modelName: string, snapshot: SnapshotRecordArray): string;
+    /**
+     * Builds a URL for a `store.query(type, query)` call.
+     */
+    urlForQuery(query: {}, modelName: string): string;
+    /**
+     * Builds a URL for a `store.queryRecord(type, query)` call.
+     */
+    urlForQueryRecord(query: {}, modelName: string): string;
+    /**
+     * Builds a URL for coalesceing multiple `store.findRecord(type, id)`
+     * records into 1 request when the adapter's `coalesceFindRequests`
+     * property is true.
+     */
+    urlForFindMany(ids: any[], modelName: string, snapshots: any[]): string;
+    /**
+     * Builds a URL for fetching a async hasMany relationship when a url
+     * is not provided by the server.
+     */
+    urlForFindHasMany(id: string, modelName: string, snapshot: Snapshot): string;
+    /**
+     * Builds a URL for fetching a async belongsTo relationship when a url
+     * is not provided by the server.
+     */
+    urlForFindBelongsTo(id: string, modelName: string, snapshot: Snapshot): string;
+    /**
+     * Builds a URL for a `record.save()` call when the record was created
+     * locally using `store.createRecord()`.
+     */
+    urlForCreateRecord(modelName: string, snapshot: Snapshot): string;
+    /**
+     * Builds a URL for a `record.save()` call when the record has been update locally.
+     */
+    urlForUpdateRecord(id: string, modelName: string, snapshot: Snapshot): string;
+    /**
+     * Builds a URL for a `record.save()` call when the record has been deleted locally.
+     */
+    urlForDeleteRecord(id: string, modelName: string, snapshot: Snapshot): string;
+    /**
+     * Determines the pathname for a given type.
+     */
+    pathForType(modelName: string): string;
+  }
+  /**
+   * ## Using Embedded Records
+   */
+  class EmbeddedRecordsMixin {
+    /**
+     * Normalize the record and recursively normalize/extract all the embedded records
+     * while pushing them into the store as they are encountered
+     */
+    normalize(typeClass: Model, hash: {}, prop: string): {};
+    /**
+     * Serialize `belongsTo` relationship when it is configured as an embedded object.
+     */
+    serializeBelongsTo(snapshot: Snapshot, json: {}, relationship: {}): any;
+    /**
+     * Serializes `hasMany` relationships when it is configured as embedded objects.
+     */
+    serializeHasMany(snapshot: Snapshot, json: {}, relationship: {}): any;
+    /**
+     * When serializing an embedded record, modify the property (in the json payload)
+     * that refers to the parent record (foreign key for relationship).
+     */
+    removeEmbeddedForeignKey(snapshot: Snapshot, embeddedSnapshot: Snapshot, relationship: {}, json: {}): any;
+  }
+  /**
+   * Ember Data 2.0 Serializer:
+   */
+  class JSONAPISerializer extends JSONSerializer {
+    pushPayload(store: Store, payload: {}): any;
+    /**
+     * Dasherizes and singularizes the model name in the payload to match
+     * the format Ember Data uses internally for the model name.
+     */
+    modelNameFromPayloadKey(key: string): string;
+    /**
+     * Converts the model name to a pluralized version of the model name.
+     */
+    payloadKeyFromModelName(modelName: string): string;
+    /**
+     * `keyForAttribute` can be used to define rules for how to convert an
+     * attribute name in your model to a key in your JSON.
+     * By default `JSONAPISerializer` follows the format used on the examples of
+     * http://jsonapi.org/format and uses dashes as the word separator in the JSON
+     * attribute keys.
+     */
+    keyForAttribute(key: string, method: string): string;
+    /**
+     * `keyForRelationship` can be used to define a custom key when
+     * serializing and deserializing relationship properties.
+     * By default `JSONAPISerializer` follows the format used on the examples of
+     * http://jsonapi.org/format and uses dashes as word separators in
+     * relationship properties.
+     */
+    keyForRelationship(key: string, typeClass: string, method: string): string;
+    /**
+     * `modelNameFromPayloadType` can be used to change the mapping for a DS model
+     * name, taken from the value in the payload.
+     */
+    modelNameFromPayloadType(payloadType: string): string;
+    /**
+     * `payloadTypeFromModelName` can be used to change the mapping for the type in
+     * the payload, taken from the model name.
+     */
+    payloadTypeFromModelName(modelname: string): string;
+  }
+  /**
+   * Ember Data 2.0 Serializer:
+   */
+  class JSONSerializer extends Serializer {
+    /**
+     * The `primaryKey` is used when serializing and deserializing
+     * data. Ember Data always uses the `id` property to store the id of
+     * the record. The external source may not always follow this
+     * convention. In these cases it is useful to override the
+     * `primaryKey` property to match the `primaryKey` of your external
+     * store.
+     */
+    primaryKey: string;
+    /**
+     * The `attrs` object can be used to declare a simple mapping between
+     * property names on `DS.Model` records and payload keys in the
+     * serialized JSON object representing the record. An object with the
+     * property `key` can also be used to designate the attribute's key on
+     * the response payload.
+     */
+    attrs: {};
+    /**
+     * The `normalizeResponse` method is used to normalize a payload from the
+     * server to a JSON-API Document.
+     */
+    normalizeResponse(store: Store, primaryModelClass: Model, payload: {}, id: string|number, requestType: string): {};
+    normalizeFindRecordResponse(store: Store, primaryModelClass: Model, payload: {}, id: string|number, requestType: string): {};
+    normalizeQueryRecordResponse(store: Store, primaryModelClass: Model, payload: {}, id: string|number, requestType: string): {};
+    normalizeFindAllResponse(store: Store, primaryModelClass: Model, payload: {}, id: string|number, requestType: string): {};
+    normalizeFindBelongsToResponse(store: Store, primaryModelClass: Model, payload: {}, id: string|number, requestType: string): {};
+    normalizeFindHasManyResponse(store: Store, primaryModelClass: Model, payload: {}, id: string|number, requestType: string): {};
+    normalizeFindManyResponse(store: Store, primaryModelClass: Model, payload: {}, id: string|number, requestType: string): {};
+    normalizeQueryResponse(store: Store, primaryModelClass: Model, payload: {}, id: string|number, requestType: string): {};
+    normalizeCreateRecordResponse(store: Store, primaryModelClass: Model, payload: {}, id: string|number, requestType: string): {};
+    normalizeDeleteRecordResponse(store: Store, primaryModelClass: Model, payload: {}, id: string|number, requestType: string): {};
+    normalizeUpdateRecordResponse(store: Store, primaryModelClass: Model, payload: {}, id: string|number, requestType: string): {};
+    normalizeSaveResponse(store: Store, primaryModelClass: Model, payload: {}, id: string|number, requestType: string): {};
+    normalizeSingleResponse(store: Store, primaryModelClass: Model, payload: {}, id: string|number, requestType: string): {};
+    normalizeArrayResponse(store: Store, primaryModelClass: Model, payload: {}, id: string|number, requestType: string): {};
+    /**
+     * Normalizes a part of the JSON payload returned by
+     * the server. You should override this method, munge the hash
+     * and call super if you have generic normalization to do.
+     */
+    normalize(typeClass: Model, hash: {}): {};
+    /**
+     * Returns the resource's ID.
+     */
+    extractId(modelClass: {}, resourceHash: {}): string;
+    /**
+     * Returns the resource's attributes formatted as a JSON-API "attributes object".
+     */
+    extractAttributes(modelClass: {}, resourceHash: {}): {};
+    /**
+     * Returns a relationship formatted as a JSON-API "relationship object".
+     */
+    extractRelationship(relationshipModelName: {}, relationshipHash: {}): {};
+    /**
+     * Returns a polymorphic relationship formatted as a JSON-API "relationship object".
+     */
+    extractPolymorphicRelationship(relationshipModelName: {}, relationshipHash: {}, relationshipOptions: {}): {};
+    /**
+     * Returns the resource's relationships formatted as a JSON-API "relationships object".
+     */
+    extractRelationships(modelClass: {}, resourceHash: {}): {};
+    modelNameFromPayloadKey(key: string): string;
+    /**
+     * Check if the given hasMany relationship should be serialized
+     */
+    shouldSerializeHasMany(snapshot: Snapshot, key: string, relationshipType: string): boolean;
+    /**
+     * Called when a record is saved in order to convert the
+     * record into JSON.
+     */
+    serialize(snapshot: Snapshot, options: {}): {};
+    /**
+     * You can use this method to customize how a serialized record is added to the complete
+     * JSON hash to be sent to the server. By default the JSON Serializer does not namespace
+     * the payload and just sends the raw serialized JSON object.
+     * If your server expects namespaced keys, you should consider using the RESTSerializer.
+     * Otherwise you can override this method to customize how the record is added to the hash.
+     * The hash property should be modified by reference.
+     */
+    serializeIntoHash(hash: {}, typeClass: Model, snapshot: Snapshot, options: {}): any;
+    /**
+     * `serializeAttribute` can be used to customize how `DS.attr`
+     * properties are serialized
+     */
+    serializeAttribute(snapshot: Snapshot, json: {}, key: string, attribute: {}): any;
+    /**
+     * `serializeBelongsTo` can be used to customize how `DS.belongsTo`
+     * properties are serialized.
+     */
+    serializeBelongsTo(snapshot: Snapshot, json: {}, relationship: {}): any;
+    /**
+     * `serializeHasMany` can be used to customize how `DS.hasMany`
+     * properties are serialized.
+     */
+    serializeHasMany(snapshot: Snapshot, json: {}, relationship: {}): any;
+    /**
+     * You can use this method to customize how polymorphic objects are
+     * serialized. Objects are considered to be polymorphic if
+     * `{ polymorphic: true }` is pass as the second argument to the
+     * `DS.belongsTo` function.
+     */
+    serializePolymorphicType(snapshot: Snapshot, json: {}, relationship: {}): any;
+    /**
+     * `extractMeta` is used to deserialize any meta information in the
+     * adapter payload. By default Ember Data expects meta information to
+     * be located on the `meta` property of the payload object.
+     */
+    extractMeta(store: Store, modelClass: Model, payload: {}): any;
+    /**
+     * `extractErrors` is used to extract model errors when a call
+     * to `DS.Model#save` fails with an `InvalidError`. By default
+     * Ember Data expects error information to be located on the `errors`
+     * property of the payload object.
+     */
+    extractErrors(store: Store, typeClass: Model, payload: {}, id: string|number): {};
+    /**
+     * `keyForAttribute` can be used to define rules for how to convert an
+     * attribute name in your model to a key in your JSON.
+     */
+    keyForAttribute(key: string, method: string): string;
+    /**
+     * `keyForRelationship` can be used to define a custom key when
+     * serializing and deserializing relationship properties. By default
+     * `JSONSerializer` does not provide an implementation of this method.
+     */
+    keyForRelationship(key: string, typeClass: string, method: string): string;
+    /**
+     * `keyForLink` can be used to define a custom key when deserializing link
+     * properties.
+     */
+    keyForLink(key: string, kind: string): string;
+    modelNameFromPayloadType(type: string): string;
+    /**
+     * serializeId can be used to customize how id is serialized
+     * For example, your server may expect integer datatype of id
+     */
+    serializeId(snapshot: Snapshot, json: {}, primaryKey: string): any;
+  }
+  /**
+   * Normally, applications will use the `RESTSerializer` by implementing
+   * the `normalize` method.
+   */
+  class RESTSerializer extends JSONSerializer {
+    /**
+     * `keyForPolymorphicType` can be used to define a custom key when
+     * serializing and deserializing a polymorphic type. By default, the
+     * returned key is `${key}Type`.
+     */
+    keyForPolymorphicType(key: string, typeClass: string, method: string): string;
+    /**
+     * Normalizes a part of the JSON payload returned by
+     * the server. You should override this method, munge the hash
+     * and call super if you have generic normalization to do.
+     */
+    normalize(modelClass: Model, resourceHash: {}, prop?: string): {};
+    /**
+     * This method allows you to push a payload containing top-level
+     * collections of records organized per type.
+     */
+    pushPayload(store: Store, payload: {}): any;
+    /**
+     * This method is used to convert each JSON root key in the payload
+     * into a modelName that it can use to look up the appropriate model for
+     * that part of the payload.
+     */
+    modelNameFromPayloadKey(key: string): string;
+    /**
+     * Called when a record is saved in order to convert the
+     * record into JSON.
+     */
+    serialize(snapshot: Snapshot, options: {}): {};
+    /**
+     * You can use this method to customize the root keys serialized into the JSON.
+     * The hash property should be modified by reference (possibly using something like _.extend)
+     * By default the REST Serializer sends the modelName of a model, which is a camelized
+     * version of the name.
+     */
+    serializeIntoHash(hash: {}, typeClass: Model, snapshot: Snapshot, options: {}): any;
+    /**
+     * You can use `payloadKeyFromModelName` to override the root key for an outgoing
+     * request. By default, the RESTSerializer returns a camelized version of the
+     * model's name.
+     */
+    payloadKeyFromModelName(modelName: string): string;
+    /**
+     * You can use this method to customize how polymorphic objects are serialized.
+     * By default the REST Serializer creates the key by appending `Type` to
+     * the attribute and value from the model's camelcased model name.
+     */
+    serializePolymorphicType(snapshot: Snapshot, json: {}, relationship: {}): any;
+    /**
+     * You can use this method to customize how a polymorphic relationship should
+     * be extracted.
+     */
+    extractPolymorphicRelationship(relationshipType: {}, relationshipHash: {}, relationshipOptions: {}): {};
+    /**
+     * `modelNameFromPayloadType` can be used to change the mapping for a DS model
+     * name, taken from the value in the payload.
+     */
+    modelNameFromPayloadType(payloadType: string): string;
+    /**
+     * `payloadTypeFromModelName` can be used to change the mapping for the type in
+     * the payload, taken from the model name.
+     */
+    payloadTypeFromModelName(modelName: string): string;
+  }
+  /**
+   * The `DS.BooleanTransform` class is used to serialize and deserialize
+   * boolean attributes on Ember Data record objects. This transform is
+   * used when `boolean` is passed as the type parameter to the
+   * [DS.attr](../../data#method_attr) function.
+   */
+  class BooleanTransform extends Transform {
+  }
+  /**
+   * The `DS.DateTransform` class is used to serialize and deserialize
+   * date attributes on Ember Data record objects. This transform is used
+   * when `date` is passed as the type parameter to the
+   * [DS.attr](../../data#method_attr) function. It uses the [`ISO 8601`](https://en.wikipedia.org/wiki/ISO_8601)
+   * standard.
+   */
+  class DateTransform extends Transform {
+  }
+  /**
+   * The `DS.NumberTransform` class is used to serialize and deserialize
+   * numeric attributes on Ember Data record objects. This transform is
+   * used when `number` is passed as the type parameter to the
+   * [DS.attr](../../data#method_attr) function.
+   */
+  class NumberTransform extends Transform {
+  }
+  /**
+   * The `DS.StringTransform` class is used to serialize and deserialize
+   * string attributes on Ember Data record objects. This transform is
+   * used when `string` is passed as the type parameter to the
+   * [DS.attr](../../data#method_attr) function.
+   */
+  class StringTransform extends Transform {
+  }
+  /**
+   * The `DS.Transform` class is used to serialize and deserialize model
+   * attributes when they are saved or loaded from an
+   * adapter. Subclassing `DS.Transform` is useful for creating custom
+   * attributes. All subclasses of `DS.Transform` must implement a
+   * `serialize` and a `deserialize` method.
+   */
+  class Transform extends Ember.Object {
+    /**
+     * When given a deserialized value from a record attribute this
+     * method must return the serialized value.
+     */
+    serialize(deserialized: any, options: AttrOptions): any;
+    /**
+     * When given a serialize value from a JSON object this method must
+     * return the deserialized value for the record attribute.
+     */
+    deserialize(serialized: any, options: AttrOptions): any;
+  }
+  /**
+   * An adapter is an object that receives requests from a store and
+   * translates them into the appropriate action to take against your
+   * persistence layer. The persistence layer is usually an HTTP API, but
+   * may be anything, such as the browser's local storage. Typically the
+   * adapter is not invoked directly instead its functionality is accessed
+   * through the `store`.
+   */
+  class Adapter extends Ember.Object {
+    /**
+     * If you would like your adapter to use a custom serializer you can
+     * set the `defaultSerializer` property to be the name of the custom
+     * serializer.
+     */
+    defaultSerializer: string;
+    /**
+     * The `findRecord()` method is invoked when the store is asked for a record that
+     * has not previously been loaded. In response to `findRecord()` being called, you
+     * should query your persistence layer for a record with the given ID. The `findRecord`
+     * method should return a promise that will resolve to a JavaScript object that will be
+     * normalized by the serializer.
+     */
+    findRecord(store: Store, type: Model, id: string, snapshot: Snapshot): Promise<any>;
+    /**
+     * The `findAll()` method is used to retrieve all records for a given type.
+     */
+    findAll(store: Store, type: Model, sinceToken: string, snapshotRecordArray: SnapshotRecordArray): Promise<any>;
+    /**
+     * This method is called when you call `query` on the store.
+     */
+    query(store: Store, type: Model, query: {}, recordArray: AdapterPopulatedRecordArray<any>): Promise<any>;
+    /**
+     * The `queryRecord()` method is invoked when the store is asked for a single
+     * record through a query object.
+     */
+    queryRecord(store: Store, type: Model, query: {}): Promise<any>;
+    /**
+     * If the globally unique IDs for your records should be generated on the client,
+     * implement the `generateIdForRecord()` method. This method will be invoked
+     * each time you create a new record, and the value returned from it will be
+     * assigned to the record's `primaryKey`.
+     */
+    generateIdForRecord(store: Store, type: Model, inputProperties: {}): string|number;
+    /**
+     * Proxies to the serializer's `serialize` method.
+     */
+    serialize(snapshot: Snapshot, options: {}): {};
+    /**
+     * Implement this method in a subclass to handle the creation of
+     * new records.
+     */
+    createRecord(store: Store, type: Model, snapshot: Snapshot): Promise<any>;
+    /**
+     * Implement this method in a subclass to handle the updating of
+     * a record.
+     */
+    updateRecord(store: Store, type: Model, snapshot: Snapshot): Promise<any>;
+    /**
+     * Implement this method in a subclass to handle the deletion of
+     * a record.
+     */
+    deleteRecord(store: Store, type: Model, snapshot: Snapshot): Promise<any>;
+    /**
+     * By default the store will try to coalesce all `fetchRecord` calls within the same runloop
+     * into as few requests as possible by calling groupRecordsForFindMany and passing it into a findMany call.
+     * You can opt out of this behaviour by either not implementing the findMany hook or by setting
+     * coalesceFindRequests to false.
+     */
+    coalesceFindRequests: boolean;
+    /**
+     * The store will call `findMany` instead of multiple `findRecord`
+     * requests to find multiple records at once if coalesceFindRequests
+     * is true.
+     */
+    findMany(store: Store, type: Model, ids: any[], snapshots: any[]): Promise<any>;
+    /**
+     * Organize records into groups, each of which is to be passed to separate
+     * calls to `findMany`.
+     */
+    groupRecordsForFindMany(store: Store, snapshots: any[]): any[];
+    /**
+     * This method is used by the store to determine if the store should
+     * reload a record from the adapter when a record is requested by
+     * `store.findRecord`.
+     */
+    shouldReloadRecord(store: Store, snapshot: Snapshot): boolean;
+    /**
+     * This method is used by the store to determine if the store should
+     * reload all records from the adapter when records are requested by
+     * `store.findAll`.
+     */
+    shouldReloadAll(store: Store, snapshotRecordArray: SnapshotRecordArray): boolean;
+    /**
+     * This method is used by the store to determine if the store should
+     * reload a record after the `store.findRecord` method resolves a
+     * cached record.
+     */
+    shouldBackgroundReloadRecord(store: Store, snapshot: Snapshot): boolean;
+    /**
+     * This method is used by the store to determine if the store should
+     * reload a record array after the `store.findAll` method resolves
+     * with a cached record array.
+     */
+    shouldBackgroundReloadAll(store: Store, snapshotRecordArray: SnapshotRecordArray): boolean;
+  }
+  /**
+   * `DS.Serializer` is an abstract base class that you should override in your
+   * application to customize it for your backend. The minimum set of methods
+   * that you should implement is:
+   */
+  class Serializer extends Ember.Object {
+    /**
+     * The `store` property is the application's `store` that contains
+     * all records. It can be used to look up serializers for other model
+     * types that may be nested inside the payload response.
+     */
+    store: Store;
+    /**
+     * The `normalizeResponse` method is used to normalize a payload from the
+     * server to a JSON-API Document.
+     */
+    normalizeResponse(store: Store, primaryModelClass: Model, payload: {}, id: string|number, requestType: string): {};
+    /**
+     * The `serialize` method is used when a record is saved in order to convert
+     * the record into the form that your external data source expects.
+     */
+    serialize(snapshot: Snapshot, options: {}): {};
+    /**
+     * The `normalize` method is used to convert a payload received from your
+     * external data source into the normalized form `store.push()` expects. You
+     * should override this method, munge the hash and return the normalized
+     * payload.
+     */
+    normalize(typeClass: Model, hash: {}): {};
+  }
+}
+export default DS;
+
+declare module 'ember' {
+    namespace Ember {
+        /*
+         * The store is automatically injected into these objects
+         *
+         * https://github.com/emberjs/data/blob/05e95280e11c411177f2fbcb65fd83488d6a9d89/addon/setup-container.js#L71-L78
+         */
+        interface Route {
+            store: DS.Store;
+        }
+        interface Controller {
+            store: DS.Store;
+        }
+        interface DataAdapter {
+            store: DS.Store;
+        }
+    }
+}
diff --git a/types/ember-data/test/adapter.ts b/types/ember-data/test/adapter.ts
new file mode 100644
index 0000000000..5d9d45fd4b
--- /dev/null
+++ b/types/ember-data/test/adapter.ts
@@ -0,0 +1,56 @@
+import Ember from 'ember';
+import DS from 'ember-data';
+
+const JsonApi = DS.JSONAPIAdapter.extend({
+    // Application specific overrides go here
+});
+
+const Customized = DS.JSONAPIAdapter.extend({
+    host: 'https://api.example.com',
+    namespace: 'api/v1',
+    headers: {
+        'API_KEY': 'secret key',
+        'ANOTHER_HEADER': 'Some header value'
+    }
+});
+
+const AuthTokenHeader = DS.JSONAPIAdapter.extend({
+    session: Ember.inject.service('session'),
+    headers: Ember.computed('session.authToken', function() {
+        return {
+            'API_KEY': this.get('session.authToken'),
+            'ANOTHER_HEADER': 'Some header value'
+        };
+    })
+});
+
+const UseAjax = DS.JSONAPIAdapter.extend({
+    query(store: DS.Store, type: string, query: object) {
+        const url = 'https://api.example.com/my-api';
+        return this.ajax(url, 'POST', {
+            param: 'foo'
+        });
+    }
+});
+
+const UseAjaxOptions = DS.JSONAPIAdapter.extend({
+    query(store: DS.Store, type: string, query: object) {
+        const url = 'https://api.example.com/my-api';
+        const options = this.ajaxOptions(url, 'DELETE', {
+            foo: 'bar'
+        });
+        return Ember.$.ajax(url, {
+            ...options
+        });
+    }
+});
+
+const UseAjaxOptionsWithOptionalThirdParams = DS.JSONAPIAdapter.extend({
+    query(store: DS.Store, type: string, query: object) {
+        const url = 'https://api.example.com/my-api';
+        const options = this.ajaxOptions(url, 'DELETE');
+        return Ember.$.ajax(url, {
+            ...options
+        });
+    }
+});
diff --git a/types/ember-data/test/belongs-to.ts b/types/ember-data/test/belongs-to.ts
new file mode 100644
index 0000000000..9e59aa6128
--- /dev/null
+++ b/types/ember-data/test/belongs-to.ts
@@ -0,0 +1,16 @@
+import DS from 'ember-data';
+import { assertType } from './lib/assert';
+
+class Folder extends DS.Model {
+    name = DS.attr('string');
+    children = DS.hasMany<Folder>('folder', { inverse: 'parent' });
+    parent = DS.belongsTo<Folder>('folder', { inverse: 'children' });
+}
+
+const folder = Folder.create();
+assertType<Folder>(folder.get('parent'));
+assertType<string>(folder.get('parent').get('name'));
+folder.get('parent').then(parent => {
+    assertType<Folder>(parent);
+    assertType<string>(parent.get('name'));
+});
diff --git a/types/ember-data/test/has-many.ts b/types/ember-data/test/has-many.ts
new file mode 100644
index 0000000000..7fb586ff4a
--- /dev/null
+++ b/types/ember-data/test/has-many.ts
@@ -0,0 +1,43 @@
+import DS from 'ember-data';
+import { assertType } from './lib/assert';
+
+class Comment extends DS.Model {
+    text = DS.attr('string');
+}
+
+class BlogPost extends DS.Model {
+    title = DS.attr('string');
+    commentsAsync = DS.hasMany<Comment>('comment');
+    commentsSync = DS.hasMany<Comment>('comment', { async: false });
+}
+
+const post = BlogPost.create();
+
+assertType<DS.PromiseArray<Comment>>(post.get('commentsSync').reload());
+assertType<Comment>(post.get('commentsSync').createRecord());
+
+const comment = post.get('commentsSync').get('firstObject');
+assertType<Comment | undefined>(comment);
+if (comment) {
+    assertType<string>(comment.get('text'));
+}
+
+assertType<DS.PromiseArray<Comment>>(post.get('commentsAsync').reload());
+assertType<Comment>(post.get('commentsAsync').createRecord());
+assertType<Comment | undefined>(post.get('commentsAsync').get('firstObject'));
+
+const commentAsync = post.get('commentsAsync').get('firstObject');
+assertType<Comment | undefined>(commentAsync);
+if (commentAsync) {
+    assertType<string>(commentAsync.get('text'));
+}
+assertType<boolean>(post.get('commentsAsync').get('isFulfilled'));
+
+post.get('commentsAsync').then(comments => {
+    assertType<Comment | undefined>(comments.get('firstObject'));
+    assertType<string>(comments.get('firstObject')!.get('text'));
+});
+
+class Polymorphic extends DS.Model {
+    paymentMethods = DS.hasMany('payment-method', { polymorphic: true });
+}
diff --git a/types/ember-data/test/injections.ts b/types/ember-data/test/injections.ts
new file mode 100644
index 0000000000..4c0a6e4e6b
--- /dev/null
+++ b/types/ember-data/test/injections.ts
@@ -0,0 +1,22 @@
+import Ember from 'ember';
+import DS from 'ember-data';
+
+Ember.Route.extend({
+    model(): any {
+        return this.store.findAll('my-model');
+    }
+});
+
+Ember.Controller.extend({
+    actions: {
+        create(): any {
+            return this.store.createRecord('my-model');
+        }
+    }
+});
+
+Ember.DataAdapter.extend({
+    test() {
+        this.store.findRecord('my-model', 123);
+    }
+});
diff --git a/types/ember-data/test/lib/assert.ts b/types/ember-data/test/lib/assert.ts
new file mode 100644
index 0000000000..10094b9616
--- /dev/null
+++ b/types/ember-data/test/lib/assert.ts
@@ -0,0 +1,2 @@
+/** Static assertion that `value` has type `T` */
+export declare function assertType<T>(value: T): void;
diff --git a/types/ember-data/test/model.ts b/types/ember-data/test/model.ts
new file mode 100644
index 0000000000..b3fa04e086
--- /dev/null
+++ b/types/ember-data/test/model.ts
@@ -0,0 +1,29 @@
+import Ember from 'ember';
+import DS from 'ember-data';
+import { assertType } from "./lib/assert";
+
+const Person = DS.Model.extend({
+    firstName: DS.attr(),
+    lastName: DS.attr(),
+    title: DS.attr({ defaultValue: "The default" }),
+    title2: DS.attr({ defaultValue: () => "The default" }),
+
+    fullName: Ember.computed('firstName', 'lastName', function() {
+        return `${this.get('firstName')} ${this.get('lastName')}`;
+    })
+});
+
+const User = DS.Model.extend({
+    username: DS.attr('string'),
+    email: DS.attr('string'),
+    verified: DS.attr('boolean', { defaultValue: false }),
+    createdAt: DS.attr('date', {
+        defaultValue() { return new Date(); }
+    })
+});
+
+const user = User.create({ username: 'dwickern' });
+assertType<string>(user.get('id'));
+assertType<string>(user.get('username'));
+assertType<boolean>(user.get('verified'));
+assertType<Date>(user.get('createdAt'));
diff --git a/types/ember-data/test/record-reference.ts b/types/ember-data/test/record-reference.ts
new file mode 100644
index 0000000000..bb4fda42d4
--- /dev/null
+++ b/types/ember-data/test/record-reference.ts
@@ -0,0 +1,38 @@
+import DS from 'ember-data';
+import { assertType } from "./lib/assert";
+
+declare const store: DS.Store;
+
+class User extends DS.Model {
+    username = DS.attr('string');
+}
+
+let userRef = store.getReference<User>('user', 1);
+
+// get the record of the reference (null if not yet available)
+let user = userRef.value();
+if (user !== null) {
+    assertType<User>(user);
+}
+
+// get the identifier of the reference
+if (userRef.remoteType() === 'id') {
+    let id = userRef.id();
+    assertType<string>(id);
+}
+
+// load user (via store.find)
+userRef.load().then(user => {
+    assertType<User>(user);
+});
+
+// or trigger a reload
+userRef.reload().then(user => {
+    assertType<User>(user);
+});
+
+// provide data for reference
+userRef.push({ id: 1, username: '@user' }).then(function(user) {
+    assertType<User>(user);
+    userRef.value() === user;
+});
diff --git a/types/ember-data/test/relationships.ts b/types/ember-data/test/relationships.ts
new file mode 100644
index 0000000000..a878428bc4
--- /dev/null
+++ b/types/ember-data/test/relationships.ts
@@ -0,0 +1,30 @@
+import Ember from 'ember';
+import DS from 'ember-data';
+
+declare const store: DS.Store;
+
+const Person = DS.Model.extend({
+    children: DS.hasMany('folder', { inverse: 'parent' }),
+    parent: DS.belongsTo('folder', { inverse: 'children' })
+});
+
+const Polymorphic = DS.Model.extend({
+    paymentMethods: DS.hasMany('payment-method', { polymorphic: true })
+});
+
+class Comment extends DS.Model {
+    author = DS.attr('string');
+}
+
+class BlogPost extends DS.Model {
+    title = DS.attr('string');
+    tag = DS.attr('string');
+    comments = DS.hasMany<Comment>('comment', { async: true });
+    relatedPosts = DS.hasMany('post');
+}
+
+let blogPost = store.peekRecord<BlogPost>('blog-post', 1);
+blogPost!.get('comments').then((comments) => {
+    // now we can work with the comments
+    let author: string = comments.get('firstObject')!.get('author');
+});
diff --git a/types/ember-data/test/serializer.ts b/types/ember-data/test/serializer.ts
new file mode 100644
index 0000000000..986020144f
--- /dev/null
+++ b/types/ember-data/test/serializer.ts
@@ -0,0 +1,38 @@
+import Ember from 'ember';
+import DS from 'ember-data';
+
+const JsonApi = DS.JSONAPISerializer.extend({});
+
+const Customized = DS.JSONAPISerializer.extend({
+    serialize(snapshot: DS.Snapshot, options: {}) {
+        let json: any = this._super(...Array.from(arguments));
+
+        json.data.attributes.cost = {
+            amount: json.data.attributes.amount,
+            currency: json.data.attributes.currency
+        };
+
+        return json;
+    },
+    normalizeResponse(store: DS.Store, primaryModelClass: DS.Model, payload: any, id: string|number, requestType: string) {
+        payload.data.attributes.amount = payload.data.attributes.cost.amount;
+        payload.data.attributes.currency = payload.data.attributes.cost.currency;
+
+        delete payload.data.attributes.cost;
+
+        return this._super(...Array.from(arguments));
+    }
+});
+
+const EmbeddedRecordMixin = DS.JSONSerializer.extend(DS.EmbeddedRecordsMixin, {
+    attrs: {
+        author: {
+            serialize: false,
+            deserialize: 'records'
+        },
+        comments: {
+            deserialize: 'records',
+            serialize: 'ids'
+        }
+    }
+});
diff --git a/types/ember-data/test/store.ts b/types/ember-data/test/store.ts
new file mode 100644
index 0000000000..f7560a231f
--- /dev/null
+++ b/types/ember-data/test/store.ts
@@ -0,0 +1,119 @@
+import Ember from 'ember';
+import DS from 'ember-data';
+import { assertType } from "./lib/assert";
+
+declare const store: DS.Store;
+
+class Post extends DS.Model {
+  title = DS.attr('string');
+}
+
+let post = store.createRecord<Post>('post', {
+    title: 'Rails is Omakase',
+    body: 'Lorem ipsum'
+});
+
+post.save(); // => POST to '/posts'
+post.save().then((saved) => {
+    assertType<Post>(saved);
+});
+
+store.findRecord<Post>('post', 1).then(function(post) {
+    post.get('title'); // => "Rails is Omakase"
+    post.set('title', 'A new post');
+    post.save(); // => PATCH to '/posts/1'
+});
+
+class User extends DS.Model {
+    username = DS.attr('string');
+}
+
+store.queryRecord<User>('user', {}).then(function(user) {
+    let username = user.get('username');
+    console.log(`Currently logged in as ${username}`);
+});
+
+store.findAll('blog-post'); // => GET /blog-posts
+store.findAll('author', { reload: true }).then(function(authors) {
+    authors.getEach('id'); // ['first', 'second']
+});
+store.findAll('post', {
+    adapterOptions: { subscribe: false }
+});
+store.findAll('post', { include: 'comments,comments.author' });
+
+store.peekAll('blog-post'); // => no network request
+
+if (store.hasRecordForId('post', 1)) {
+    let maybePost = store.peekRecord('post', 1);
+    if (maybePost) {
+        maybePost.get('id'); // 1
+    }
+}
+
+class Message extends DS.Model {
+  hasBeenSeen = DS.attr('boolean');
+}
+
+const messages = store.peekAll<Message>('message');
+messages.forEach(function(message) {
+    message.set('hasBeenSeen', true);
+});
+messages.save();
+
+const people = store.peekAll('person');
+people.get('isUpdating'); // false
+people.update().then(function() {
+    people.get('isUpdating'); // false
+});
+people.get('isUpdating'); // true
+
+const MyRoute = Ember.Route.extend({
+    model(params: any): any {
+        return this.store.findRecord('post', params.post_id, {include: 'comments,comments.author'});
+    }
+});
+
+// GET to /users?filter[email]=tomster@example.com
+const tom = store.query('user', {
+    filter: {
+        email: 'tomster@example.com'
+    }
+}).then(function(users) {
+    return users.get("firstObject");
+});
+
+// GET /users?isAdmin=true
+const admins = store.query('user', { isAdmin: true });
+admins.then(function() {
+    console.log(admins.get("length")); // 42
+});
+admins.update().then(function() {
+    admins.get('isUpdating'); // false
+    console.log(admins.get("length")); // 123
+});
+
+store.push({
+    data: [{
+        id: 1,
+        type: 'album',
+        attributes: {
+            title: 'Fewer Moving Parts',
+            artist: 'David Bazan',
+            songCount: 10
+        },
+        relationships: {}
+    }, {
+        id: 2,
+        type: 'album',
+        attributes: {
+            title: 'Calgary b/w I Can\'t Make You Love Me/Nick Of Time',
+            artist: 'Bon Iver',
+            songCount: 2
+        },
+        relationships: {}
+    }]
+});
+
+assertType<DS.Adapter>(store.adapterFor('person'));
+assertType<DS.Serializer>(store.serializerFor('person'));
diff --git a/types/ember-data/test/transform.ts b/types/ember-data/test/transform.ts
new file mode 100644
index 0000000000..b76d40a73f
--- /dev/null
+++ b/types/ember-data/test/transform.ts
@@ -0,0 +1,16 @@
+import Ember from 'ember';
+import DS from 'ember-data';
+
+class Point extends Ember.Object {
+    x: number;
+    y: number;
+}
+
+const PointTransform = DS.Transform.extend({
+    serialize(value: Point): number[] {
+        return [value.get('x'), value.get('y')];
+    },
+    deserialize(value: [ number, number ]): Point {
+        return Point.create({ x: value[0], y: value[1] });
+    }
+});
diff --git a/types/ember-data/tsconfig.json b/types/ember-data/tsconfig.json
new file mode 100644
index 0000000000..155515ac6b
--- /dev/null
+++ b/types/ember-data/tsconfig.json
@@ -0,0 +1,32 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": false,
+        "baseUrl": "../",
+        "typeRoots": ["../"],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "test/lib/assert.ts",
+        "test/model.ts",
+        "test/adapter.ts",
+        "test/serializer.ts",
+        "test/transform.ts",
+        "test/relationships.ts",
+        "test/store.ts",
+        "test/has-many.ts",
+        "test/belongs-to.ts",
+        "test/record-reference.ts",
+        "test/injections.ts"
+    ]
+}
diff --git a/types/ember-data/tslint.json b/types/ember-data/tslint.json
new file mode 100644
index 0000000000..dd3a7f529c
--- /dev/null
+++ b/types/ember-data/tslint.json
@@ -0,0 +1,16 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        // Heavy use of Function type in this older package.
+        "ban-types": false,
+        "jsdoc-format": false,
+        "no-misused-new": false,
+        // not sure what this means
+        "no-single-declare-module": false,
+        "object-literal-key-quotes": false,
+        "only-arrow-functions": false,
+        "no-empty-interface": false,
+        "prefer-const": false,
+        "no-unnecessary-generics": false
+    }
+}
diff --git a/types/ember/index.d.ts b/types/ember/index.d.ts
index bb6cce8b36..adef4e70c2 100755
--- a/types/ember/index.d.ts
+++ b/types/ember/index.d.ts
@@ -558,6 +558,8 @@ declare module 'ember' {
         **/
         interface ArrayProxy<T> extends MutableArray<T> {}
         class ArrayProxy<T> extends Object.extend(MutableArray as {}) {
+            content: NativeArray<T>;
+
             /**
              * Should actually retrieve the object at the specified index from the
              * content. You can override this method in subclasses to transform the
@@ -1837,7 +1839,7 @@ declare module 'ember' {
              * A hook you can implement to convert the URL into the model for
              * this route.
              */
-            model<T>(params: {}, transition: Transition): T | Rsvp.Promise<T>;
+            model(params: {}, transition: Transition): any;
 
             /**
              * Returns the model of a parent (or any ancestor) route
diff --git a/types/ember/test/array-proxy.ts b/types/ember/test/array-proxy.ts
old mode 100755
new mode 100644
index 763034bbd0..dceea7b847
--- a/types/ember/test/array-proxy.ts
+++ b/types/ember/test/array-proxy.ts
@@ -21,7 +21,6 @@ class MyNewProxy<T> extends Ember.ArrayProxy<T> {
     isNew = true;
 }
 
-let x = MyNewProxy.create({ content: Ember.A([1, 2, 3]) });
-// TODO: type inference can't infer 'number', just '{}'
-// x.get('firstObject'); // $ExpectType number | undefined
-x.isNew; // $ExpectType boolean
+let x = MyNewProxy.create({ content: Ember.A([1, 2, 3]) }) as MyNewProxy<number>;
+assertType<number | undefined>(x.get('firstObject'));
+assertType<boolean>(x.isNew);
diff --git a/types/enzyme/enzyme-tests.tsx b/types/enzyme/enzyme-tests.tsx
index 63e716c50b..c48c050357 100644
--- a/types/enzyme/enzyme-tests.tsx
+++ b/types/enzyme/enzyme-tests.tsx
@@ -1,5 +1,14 @@
 import * as React from "react";
-import { shallow, mount, render, ShallowWrapper, ReactWrapper } from "enzyme";
+import {
+    shallow,
+    mount,
+    render,
+    ShallowWrapper,
+    ReactWrapper,
+    configure,
+    EnzymeAdapter,
+    ShallowRendererProps,
+} from "enzyme";
 import { Component, ReactElement, HTMLAttributes, ComponentClass, StatelessComponent } from "react";
 
 // Help classes/interfaces
@@ -24,6 +33,18 @@ class MyComponent extends Component<MyComponentProps, MyComponentState> {
 
 const MyStatelessComponent = (props: StatelessProps) => <span />;
 
+// Enzyme.configure
+function configureTest() {
+    const configureAdapter: { adapter: EnzymeAdapter } = { adapter: {} };
+    configure(configureAdapter);
+
+    const configureAdapterAndDisableLifecycle: typeof configureAdapter & Pick<ShallowRendererProps, "disableLifecycleMethods"> = {
+        adapter: {},
+        disableLifecycleMethods: true,
+    };
+    configure(configureAdapterAndDisableLifecycle);
+}
+
 // ShallowWrapper
 function ShallowWrapperTest() {
     let shallowWrapper: ShallowWrapper<MyComponentProps, MyComponentState> =
@@ -50,7 +71,8 @@ function ShallowWrapperTest() {
             context: {
                 test: "a",
             },
-            lifecycleExperimental: true
+            lifecycleExperimental: true,
+            disableLifecycleMethods: true
         });
     }
 
diff --git a/types/enzyme/index.d.ts b/types/enzyme/index.d.ts
index bfd714fd22..3a8ea149f9 100644
--- a/types/enzyme/index.d.ts
+++ b/types/enzyme/index.d.ts
@@ -551,6 +551,12 @@ export class ReactWrapper<P = {}, S = {}> {
 }
 
 export interface ShallowRendererProps {
+    // See https://github.com/airbnb/enzyme/blob/enzyme@3.1.1/docs/api/shallow.md#arguments
+    /**
+     * If set to true, componentDidMount is not called on the component, and componentDidUpdate is not called after
+     * setProps and setContext. Default to false.
+     */
+    disableLifecycleMethods?: boolean;
     /**
      * Enable experimental support for full react lifecycle methods
      */
@@ -602,4 +608,14 @@ export class EnzymeAdapter {
  * Configure enzyme to use the correct adapter for the react verstion
  * This is enabling the Enzyme configuration with adapters in TS
  */
-export function configure(options: { adapter: EnzymeAdapter }): void;
+export function configure(options: {
+    adapter: EnzymeAdapter,
+    // See https://github.com/airbnb/enzyme/blob/enzyme@3.1.1/docs/guides/migration-from-2-to-3.md#lifecycle-methods
+    // Actually, `{adapter:} & Pick<ShallowRendererProps,"disableLifecycleMethods">` is more precise. However,
+    // in that case jsdoc won't be shown
+    /**
+     * If set to true, componentDidMount is not called on the component, and componentDidUpdate is not called after
+     * setProps and setContext. Default to false.
+     */
+    disableLifecycleMethods?: boolean;
+}): void;
diff --git a/types/expo/expo-tests.tsx b/types/expo/expo-tests.tsx
new file mode 100644
index 0000000000..333b9d3e3c
--- /dev/null
+++ b/types/expo/expo-tests.tsx
@@ -0,0 +1,203 @@
+import * as React from 'react';
+
+import {
+    Accelerometer,
+    Amplitude,
+    Asset,
+    AuthSession,
+    Audio,
+    AppLoading,
+    BarCodeScanner,
+    BlurViewProps,
+    BlurView,
+    Brightness,
+    Camera,
+    DocumentPicker,
+    Facebook,
+    FacebookAds,
+    FileSystem
+} from 'expo';
+
+Accelerometer.addListener((obj) => {
+    obj.x;
+    obj.y;
+    obj.z;
+});
+Accelerometer.removeAllListeners();
+Accelerometer.setUpdateInterval(1000);
+
+Amplitude.initialize('key');
+Amplitude.setUserId('userId');
+Amplitude.setUserProperties({key: 1});
+Amplitude.clearUserProperties();
+Amplitude.logEvent('name');
+Amplitude.logEventWithProperties('event', {key: 'value'});
+Amplitude.setGroup('type', {key: 'value'});
+
+const asset = Asset.fromModule(1);
+asset.downloadAsync();
+Asset.loadAsync(1);
+Asset.loadAsync([1, 2, 3]);
+const asset1 = new Asset({
+    uri: 'uri',
+    type: 'type',
+    name: 'name',
+    hash: 'hash',
+    width: 122,
+    height: 122
+});
+
+const url = AuthSession.getRedirectUrl();
+AuthSession.dismiss();
+AuthSession.startAsync({
+    authUrl: 'url1',
+    returnUrl: 'url2'
+}).then(result => {
+    switch (result.type) {
+        case 'success':
+            result.event;
+            result.params;
+            break;
+        case 'error':
+            result.errorCode;
+            result.params;
+            result.event;
+            break;
+        case 'dismissed':
+        case 'cancel':
+            result.type;
+            break;
+    }
+});
+
+Audio.setAudioModeAsync({
+    shouldDuckAndroid: false,
+    playsInSilentModeIOS: true,
+    interruptionModeIOS: 2,
+    interruptionModeAndroid: 1,
+    allowsRecordingIOS: true
+});
+Audio.setIsEnabledAsync(true);
+async () => {
+    const result = await Audio.Sound.create('uri', {
+        volume: 0.5,
+        rate: 0.6
+    }, null, true);
+
+    const sound = result.sound;
+    const status = result.status;
+
+    if (!status.isLoaded) {
+        status.error;
+    } else {
+        status.didJustFinish;
+        // etc.
+    }
+
+    const _status = await sound.getStatusAsync();
+    await sound.loadAsync('uri');
+};
+
+() => (
+    <AppLoading
+        startAsync={() => Promise.resolve()}
+        onFinish={() => {}}
+        onError={(error) => console.log(error)} />
+);
+() => (
+    <AppLoading
+        startAsync={null}
+        onFinish={null}
+        onError={null} />
+);
+
+const barcodeReadCallback = () => {};
+() => (
+    <BarCodeScanner
+        type="front"
+        torchMode="off"
+        barCodeTypes={['s']}
+        onBarCodeRead={barcodeReadCallback} />
+);
+
+() => (
+    <BlurView
+        tint="dark"
+        intensity={2} />
+);
+
+async () => {
+    await Brightness.setBrightnessAsync(.6);
+    await Brightness.setSystemBrightnessAsync(.7);
+    const br1 = await Brightness.getBrightnessAsync();
+    const br2 = await Brightness.getSystemBrightnessAsync();
+};
+
+Camera.Constants.AutoFocus;
+Camera.Constants.Type;
+Camera.Constants.FlashMode;
+Camera.Constants.WhiteBalance;
+Camera.Constants.VideoQuality;
+Camera.Constants.BarCodeType;
+() => {
+    return(<Camera ref={(component: any) => {
+        if (component) {
+            component.recordAsync();
+        }
+    }} />);
+};
+
+async () => {
+    const result = await DocumentPicker.getDocumentAsync();
+
+    if (result.type === 'success') {
+        result.name;
+        result.uri;
+        result.size;
+    }
+};
+
+async () => {
+    const result = await Facebook.logInWithReadPermissionsAsync('appId');
+
+    if (result.type === 'success') {
+        result.expires;
+        result.token;
+    }
+};
+
+() => (
+    <FacebookAds.BannerView
+        type="large"
+        placementId="str"
+        onPress={() => {}}
+        onError={() => {}} />
+);
+
+async () => {
+    const info = await FileSystem.getInfoAsync('file');
+
+    info.exists;
+    info.isDirectory;
+
+    if (info.exists) {
+        info.md5;
+        info.uri;
+        info.size;
+        info.modificationTime;
+    }
+
+    const string: string = await FileSystem.readAsStringAsync('file');
+    await FileSystem.writeAsStringAsync('file', 'content');
+    await FileSystem.deleteAsync('file');
+    await FileSystem.moveAsync({ from: 'from', to: 'to'});
+    await FileSystem.copyAsync({ from: 'from', to: 'to' });
+    await FileSystem.makeDirectoryAsync('dir');
+    const dirs: string[] = await FileSystem.readDirectoryAsync('dir');
+    const result = await FileSystem.downloadAsync('from', 'to');
+
+    result.headers;
+    result.status;
+    result.uri;
+    result.md5;
+};
diff --git a/types/expo/index.d.ts b/types/expo/index.d.ts
new file mode 100644
index 0000000000..04d500ab6b
--- /dev/null
+++ b/types/expo/index.d.ts
@@ -0,0 +1,1481 @@
+// Type definitions for expo 23.0
+// Project: https://github.com/expo/expo-sdk
+// Definitions by: Konstantin Kai <https://github.com/KonstantinKai>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+import { EventSubscription } from 'fbemitter';
+import { Component, Ref } from 'react';
+import {
+    ViewStyle,
+    ViewProperties,
+    ColorPropType,
+    ImageURISource,
+    NativeEventEmitter,
+    ImageRequireSource
+} from 'react-native';
+
+export type URISource = ImageURISource;
+export type RequireSource = ImageRequireSource;
+export type ResizeModeContain = 'contain';
+export type ResizeModeCover = 'cover';
+export type ResizeModeStretch = 'stretch';
+export type Orientation = 'portrait' | 'landscape';
+export type Axis = number;
+export interface HashMap { [key: string]: any; }
+export type FloatFromZeroToOne = 0 | 0.1 | 0.2 | 0.3 | 0.4 | 0.5 | 0.6 | 0.7 | 0.8 | 0.9 | 1;
+export type BarCodeReadCallback = (params: { type: string; data: string; }) => void;
+export type Md5 = string;
+
+/**
+ * Accelerometer
+ */
+export namespace Accelerometer {
+    interface AccelerometerObject {
+        x: Axis;
+        y: Axis;
+        z: Axis;
+    }
+
+    function addListener(listener: (obj: AccelerometerObject) => any): EventSubscription;
+    function removeAllListeners(): void;
+    function setUpdateInterval(intervalMs: number): void;
+}
+
+/**
+ * Amplitude
+ */
+export namespace Amplitude {
+    function initialize(apiKey: string): void;
+    function setUserId(userId: string): void;
+    function setUserProperties(userProperties: HashMap): void;
+    function clearUserProperties(): void;
+    function logEvent(eventName: string): void;
+    function logEventWithProperties(eventName: string, properties: HashMap): void;
+    function setGroup(groupType: string, groupNames: HashMap): void;
+}
+
+/**
+ * Asset
+ */
+export class Asset {
+    constructor({ name, type, hash, uri, width, height }: {
+        name: string;
+        type: string;
+        hash: string;
+        uri: string;
+        width?: number;
+        height?: number;
+    });
+    name: string;
+    type: string;
+    hash: string;
+    uri: string;
+    localUri: string;
+    width?: number;
+    height?: number;
+
+    downloading: boolean;
+    downloaded: boolean;
+    downloadCallbacks: Array<{ resolve: () => any, reject: (e?: any) => any }>;
+
+    downloadAsync(): Promise<void>;
+
+    static fromModule(module: RequireSource): Asset;
+    static loadAsync(module: RequireSource[] | RequireSource): Promise<void>;
+}
+
+/**
+ * AuthSession
+ */
+export namespace AuthSession {
+    function startAsync(options: { authUrl: string; returnUrl: string; }): Promise<{
+        type: 'cancel';
+    } | {
+        type: 'dismissed';
+    } | {
+        type: 'success';
+        params: HashMap;
+        event: HashMap;
+    } | {
+        type: 'error';
+        params: HashMap;
+        errorCode: string;
+        event: HashMap;
+    }>;
+    function dismiss(): void;
+    function getRedirectUrl(): string;
+}
+
+/**
+ * AV
+ */
+export type PlaybackStatus = {
+    isLoaded: false;
+    androidImplementation?: string;
+    error?: string;
+} | {
+    isLoaded: true;
+    androidImplementation?: string;
+    uri: string;
+    progressUpdateIntervalMillis: number;
+    durationMillis?: number;
+    positionMillis: number;
+    playableDurationMillis?: number;
+    shouldPlay: boolean;
+    isPlaying: boolean;
+    isBuffering: boolean;
+    rate: number;
+    shouldCorrectPitch: boolean;
+    volume: number;
+    isMuted: boolean;
+    isLooping: boolean;
+    didJustFinish: boolean;
+};
+
+export interface PlaybackStatusToSet {
+    androidImplementation?: string;
+    progressUpdateIntervalMillis?: number;
+    positionMillis?: number;
+    shouldPlay?: boolean;
+    rate?: FloatFromZeroToOne;
+    shouldCorrectPitch?: boolean;
+    volume?: FloatFromZeroToOne;
+    isMuted?: boolean;
+    isLooping?: boolean;
+}
+
+export type Source = string | RequireSource | Asset;
+
+export class PlaybackObject {
+    loadAsync(source: Source, initialStatus?: PlaybackStatusToSet, downloadFirst?: boolean): Promise<PlaybackStatus>;
+    unloadAsync(): Promise<PlaybackStatus>;
+    getStatusAsync(): Promise<PlaybackStatus>;
+    setOnPlaybackStatusUpdate(onPlaybackStatusUpdate: (status: PlaybackStatus) => void): void;
+    setStatusAsync(status: PlaybackStatusToSet): Promise<PlaybackStatus>;
+    playAsync(): Promise<PlaybackStatus>;
+    playFromPositionAsync(positionMillis: number): Promise<PlaybackStatus>;
+    pauseAsync(): Promise<PlaybackStatus>;
+    stopAsync(): Promise<PlaybackStatus>;
+    setPositionAsync(positionMillis: number): Promise<PlaybackStatus>;
+    setRateAsync(rate: number, shouldCorrectPitch: boolean): Promise<PlaybackStatus>;
+    setVolumeAsync(volume: number): Promise<PlaybackStatus>;
+    setIsMutedAsync(isMuted: boolean): Promise<PlaybackStatus>;
+    setIsLoopingAsync(isLooping: boolean): Promise<PlaybackStatus>;
+    setProgressUpdateIntervalAsync(progressUpdateIntervalMillis: number): Promise<PlaybackStatus>;
+}
+
+export namespace Audio {
+    enum InterruptionModeIOS {
+        INTERRUPTION_MODE_IOS_MIX_WITH_OTHERS = 0,
+        INTERRUPTION_MODE_IOS_DO_NOT_MIX = 1,
+        INTERRUPTION_MODE_IOS_DUCK_OTHERS = 2
+    }
+
+    enum InterruptionModeAndroid {
+        INTERRUPTION_MODE_ANDROID_DO_NOT_MIX = 1,
+        INTERRUPTION_MODE_ANDROID_DUCK_OTHERS = 2
+    }
+
+    type RecordingStatus = {
+        canRecord: false,
+        isDoneRecording: false
+    } | {
+        canRecord: true,
+        isRecording: boolean,
+        durationMillis: number
+    } | {
+        canRecord: false,
+        isDoneRecording: true,
+        durationMillis: number
+    };
+
+    interface AudioMode {
+        playsInSilentModeIOS: boolean;
+        allowsRecordingIOS: boolean;
+        interruptionModeIOS: InterruptionModeIOS;
+        shouldDuckAndroid: boolean;
+        interruptionModeAndroid: InterruptionModeAndroid;
+    }
+
+    function setIsEnabledAsync(value: boolean): Promise<void>;
+    function setAudioModeAsync(mode: AudioMode): Promise<void>;
+
+    class Sound extends PlaybackObject {
+        constructor();
+
+        static create(
+            source: Source,
+            initialStatus?: PlaybackStatusToSet,
+            onPlaybackStatusUpdate?: ((status: PlaybackStatus) => void) | null,
+            downloadFirst?: boolean
+        ): Promise<{ sound: Sound, status: PlaybackStatus }>;
+    }
+
+    interface RecordingOptions {
+        android: {
+            extension: string;
+            outputFormat: number;
+            audioEncoder: number;
+            sampleRate?: number;
+            numberOfChannels?: number;
+            bitRate?: number;
+            maxFileSize?: number;
+        };
+        ios: {
+            extension: string;
+            outputFormat?: string | number;
+            audioQuality: number;
+            sampleRate: number;
+            numberOfChannels: number;
+            bitRate: number;
+            bitRateStrategy?: number;
+            bitDepthHint?: number;
+            linearPCMBitDepth?: number;
+            linearPCMIsBigEndian?: boolean;
+            linearPCMIsFloat?: boolean;
+        };
+    }
+
+    class Recording {
+        constructor();
+
+        getStatusAsync(): Promise<RecordingStatus>;
+        setOnRecordingStatusUpdate(onRecordingStatusUpdate: (status: RecordingStatus) => void): void;
+        setProgressUpdateInterval(miliss: number): void;
+        prepareToRecordAsync(options: Recording): Promise<RecordingStatus>;
+        isPreparedToRecord(): boolean;
+        startAsync(): Promise<RecordingStatus>;
+        pauseAsync(): Promise<RecordingStatus>;
+        stopAndUnloadAsync(): Promise<RecordingStatus>;
+        getURI(): string | undefined;
+        createNewLoadedSound(initialStatus: PlaybackStatusToSet, onPlaybackStatusUpdate: (status: PlaybackStatus) => void): Promise<{ sound: Sound, status: PlaybackStatus }>;
+    }
+}
+
+/**
+ * Expo Video
+ */
+export interface NaturalSize {
+    width: number;
+    height: number;
+    orientation: Orientation;
+}
+
+export interface ReadyForDisplayEvent {
+    naturalSize: NaturalSize;
+    status: PlaybackStatus;
+}
+
+export enum FullscreenUpdateVariants {
+    IOS_FULLSCREEN_UPDATE_PLAYER_WILL_PRESENT = 0,
+    IOS_FULLSCREEN_UPDATE_PLAYER_DID_PRESENT = 1,
+    IOS_FULLSCREEN_UPDATE_PLAYER_WILL_DISMISS = 2,
+    IOS_FULLSCREEN_UPDATE_PLAYER_DID_DISMISS = 3
+}
+
+export interface FullscreenUpdateEvent {
+    fullscreenUpdate: FullscreenUpdateVariants;
+    status: PlaybackStatus;
+}
+
+export interface VideoProps {
+    source?: Source | null;
+    posterSource?: URISource | RequireSource;
+
+    resizeMode?: ResizeModeContain | ResizeModeCover | ResizeModeStretch;
+    useNativeControls?: boolean;
+    usePoster?: boolean;
+
+    onPlaybackStatusUpdate?: (status: PlaybackStatus) => void;
+    onReadyForDisplay?: (event: ReadyForDisplayEvent) => void;
+    onIOSFullscreenUpdate?: (event: FullscreenUpdateEvent) => void;
+
+    onLoadStart?: () => void;
+    onLoad?: (status: PlaybackStatus) => void;
+    onError?: (error: string) => void;
+
+    status?: PlaybackStatusToSet;
+    progressUpdateIntervalMillis?: number;
+    positionMillis?: number;
+    shouldPlay?: boolean;
+    rate?: number;
+    shouldCorrectPitch?: boolean;
+    volume?: number;
+    isMuted?: boolean;
+    isLooping?: boolean;
+
+    scaleX?: number;
+    scaleY?: number;
+    translateX?: number;
+    translateY?: number;
+    rotation?: number;
+    ref?: Ref<PlaybackObject>;
+}
+
+export interface VideoState {
+    showPoster: boolean;
+}
+
+export class Video extends Component<VideoProps, VideoState> {
+    static RESIZE_MODE_CONTAIN: ResizeModeContain;
+    static RESIZE_MODE_COVER: ResizeModeCover;
+    static RESIZE_MODE_STRETCH: ResizeModeStretch;
+    static IOS_FULLSCREEN_UPDATE_PLAYER_WILL_PRESENT: FullscreenUpdateVariants.IOS_FULLSCREEN_UPDATE_PLAYER_WILL_PRESENT;
+    static IOS_FULLSCREEN_UPDATE_PLAYER_DID_PRESENT: FullscreenUpdateVariants.IOS_FULLSCREEN_UPDATE_PLAYER_DID_PRESENT;
+    static IOS_FULLSCREEN_UPDATE_PLAYER_WILL_DISMISS: FullscreenUpdateVariants.IOS_FULLSCREEN_UPDATE_PLAYER_WILL_DISMISS;
+    static IOS_FULLSCREEN_UPDATE_PLAYER_DID_DISMISS: FullscreenUpdateVariants.IOS_FULLSCREEN_UPDATE_PLAYER_DID_DISMISS;
+}
+
+/**
+ * AppLoading
+ */
+export type AppLoadingProperties = {
+    startAsync: () => Promise<void>;
+    onFinish: () => void;
+    onError?: (error: Error) => void;
+} | {
+    startAsync: null;
+    onFinish: null;
+    onError?: null;
+};
+export class AppLoading extends Component<AppLoadingProperties> { }
+
+/**
+ * BarCodeScanner
+ */
+export interface BarCodeScannerProps extends ViewProperties {
+    type?: 'front' | 'back';
+    torchMode?: 'on' | 'off';
+    barCodeTypes?: string[];
+    onBarCodeRead?: BarCodeReadCallback;
+}
+
+export class BarCodeScanner extends Component<BarCodeScannerProps> { }
+
+/**
+ * BlurView
+ */
+export interface BlurViewProps extends ViewProperties {
+    tint: 'light' | 'default' | 'dark';
+    intensity: number;
+}
+export class BlurView extends Component<BlurViewProps> { }
+
+/**
+ * Brightness
+ */
+export namespace Brightness {
+    function setBrightnessAsync(brightnessValue: FloatFromZeroToOne): Promise<void>;
+    function getBrightnessAsync(): Promise<FloatFromZeroToOne>;
+    function getSystemBrightnessAsync(): Promise<FloatFromZeroToOne>;
+    function setSystemBrightnessAsync(brightnessValue: FloatFromZeroToOne): Promise<void>;
+}
+
+/**
+ * Camera
+ */
+export interface TakePictureOptions {
+    quality?: number;
+    base64?: boolean;
+    exif?: boolean;
+}
+export interface PictureResponse {
+    uri: string;
+    width: number;
+    height: number;
+    exif: string;
+    base64: string;
+}
+export interface RecordOptions {
+    quality?: string;
+    maxDuration?: number;
+    maxFileSize?: number;
+    mute?: boolean;
+}
+export class CameraObject {
+    takePictureAsync(options: TakePictureOptions): Promise<PictureResponse>;
+    recordAsync(options: RecordOptions): Promise<{ uri: string; }>;
+    stopRecording(): void;
+    getSupportedRatiosAsync(): Promise<string[]>; // Android only
+}
+export interface CameraProperties extends ViewProperties {
+    flashMode?: string | number;
+    type?: string | number;
+    ratio?: string;
+    autoFocus?: string | number | boolean;
+    focusDepth?: FloatFromZeroToOne;
+    zoom?: FloatFromZeroToOne;
+    whiteBalance?: string | number;
+    barCodeTypes?: string[];
+    onCameraReady?: () => void;
+    onMountError?: () => void;
+    onBarCodeRead?: BarCodeReadCallback;
+    ref?: Ref<CameraObject>;
+}
+export interface CameraConstants {
+    readonly Type: string;
+    readonly FlashMode: string;
+    readonly AutoFocus: string;
+    readonly WhiteBalance: string;
+    readonly VideoQuality: string;
+    readonly BarCodeType: string;
+}
+export class Camera extends Component<CameraProperties> {
+    static readonly Constants: CameraConstants;
+}
+
+/**
+ * Constants
+ */
+export namespace Constants {
+    const appOwnership: 'expo' | 'standalone' | 'guest';
+    const expoVersion: string;
+    const deviceId: string;
+    const deviceName: string;
+    const deviceYearClass: number;
+    const isDevice: boolean;
+
+    interface Platform {
+        ios: {
+            platform: string;
+            model: string;
+            userInterfaceIdiom: string;
+        };
+    }
+    const platform: Platform;
+    const sessionId: string;
+    const statusBarHeight: number;
+    const systemFonts: string[];
+
+    interface Manifest {
+        name: string;
+        description?: string;
+        slug?: string;
+        sdkVersion?: string;
+        version?: string;
+        orientation?: Orientation;
+        primaryColor?: string;
+        icon?: string;
+        notification?: {
+            icon?: string,
+            color?: string,
+            androidMode?: 'default' | 'collapse',
+            androidCollapsedTitle?: string
+        };
+        loading?: {
+            icon?: string,
+            exponentIconColor?: 'white' | 'blue',
+            exponentIconGrayscale?: 1 | 0,
+            backgroundImage?: string,
+            backgroundColor?: string,
+            hideExponentText?: boolean
+        };
+        appKey?: string;
+        androidStatusBarColor?: string;
+        androidStatusBar?: {
+            barStyle?: 'lignt-content' | 'dark-content',
+            backgroundColor?: string
+        };
+        androidHideExponentNotificationInShellApp?: boolean;
+        scheme?: string;
+        extra?: {
+            [propName: string]: any
+        };
+        rnCliPath?: any;
+        entryPoint?: string;
+        packagerOpts?: {
+            hostType?: string,
+            dev?: boolean,
+            strict?: boolean,
+            minify?: boolean,
+            urlType?: string,
+            urlRandomness?: string,
+            lanType?: string,
+            [propName: string]: any
+        };
+        ignoreNodeModulesValidation?: any;
+        nodeModulesPath?: string;
+        ios?: {
+            bundleIdentifier?: string,
+            buildNumber?: string,
+            config?: {
+                usesNonExemptEncryption?: boolean,
+                googleSignIn?: {
+                    reservedClientId: string
+                }
+            },
+            supportsTablet?: boolean,
+            infoPlist?: any
+        };
+        android?: {
+            package?: string,
+            versionCode?: string,
+            config?: {
+                fabric?: {
+                    apiKey: string,
+                    buildSecret: string
+                },
+                googleMaps?: {
+                    apiKey: string
+                },
+                googleSignIn?: {
+                    apiKey: string,
+                    certificateHash: string
+                }
+            }
+        };
+        facebookScheme: any;
+        xde: boolean;
+        developper?: {
+            tool?: string,
+            [propName: string]: any
+        };
+        bundleUrl?: string;
+        debuggerHost?: string;
+        mainModuleName?: string;
+        logUrl?: string;
+        [propName: string]: any;
+    }
+    const manifest: Manifest;
+    const linkingUri: string;
+}
+
+/**
+ * Contacts
+ */
+export namespace Contacts {
+    type PhoneNumbers = 'phoneNumbers';
+    type Emails = 'emails';
+    type Addresses = 'addresses';
+    type Image = 'image';
+    type Thumbnail = 'thumbnail';
+    type Note = 'note';
+    type Birthday = 'birthday';
+    type NonGregorianBirthday = 'nonGregorianBirthday';
+    type NamePrefix = 'namePrefix';
+    type NameSuffix = 'nameSuffix';
+    type PhoneticFirstName = 'phoneticFirstName';
+    type PhoneticMiddleName = 'phoneticMiddleName';
+    type PhoneticLastName = 'phoneticLastName';
+    type SocialProfiles = 'socialProfiles';
+    type InstantMessageAddresses = 'instantMessageAddresses';
+    type UrlAddresses = 'urlAddresses';
+    type Dates = 'dates';
+    type Relationships = 'relationships';
+
+    const PHONE_NUMBERS: PhoneNumbers;
+    const EMAILS: Emails;
+    const ADDRESSES: Addresses;
+    const IMAGE: Image;
+    const THUMBNAIL: Thumbnail;
+    const NOTE: Note;
+    const BIRTHDAY: Birthday;
+    const NON_GREGORIAN_BIRTHDAY: NonGregorianBirthday;
+    const NAME_PREFIX: NamePrefix;
+    const NAME_SUFFIX: NameSuffix;
+    const PHONETIC_FIRST_NAME: PhoneticFirstName;
+    const PHONETIC_MIDDLE_NAME: PhoneticMiddleName;
+    const PHONETIC_LAST_NAME: PhoneticLastName;
+    const SOCIAL_PROFILES: SocialProfiles;
+    const IM_ADDRESSES: InstantMessageAddresses;
+    const URLS: UrlAddresses;
+    const DATES: Dates;
+    const RELATIONSHIPS: Relationships;
+
+    type FieldType = PhoneNumbers | Emails | Addresses | Image | Thumbnail |
+        Note | Birthday | NonGregorianBirthday | NamePrefix | NameSuffix |
+        PhoneticFirstName | PhoneticMiddleName | PhoneticLastName | SocialProfiles |
+        InstantMessageAddresses | UrlAddresses | Dates | Relationships;
+
+    interface Options {
+        pageSize?: number;
+        pageOffset?: number;
+        fields?: FieldType[];
+    }
+
+    interface Contact {
+        id: string;
+        contactType: string;
+        name: string;
+        firstName?: string;
+        middleName?: string;
+        lastName?: string;
+        previousLastName?: string;
+        namePrefix?: string;
+        nameSuffix?: string;
+        nickname?: string;
+        phoneticFirstName?: string;
+        phoneticMiddleName?: string;
+        phoneticLastName?: string;
+        emails?: Array<{
+            email?: string;
+            primary?: boolean;
+            label: string;
+            id: string;
+        }>;
+        phoneNumbers?: Array<{
+            number?: string;
+            primary?: boolean;
+            digits?: string;
+            countryCode?: string;
+            label: string;
+            id: string;
+        }>;
+        addresses?: Array<{
+            street?: string;
+            city?: string;
+            country?: string;
+            region?: string;
+            neighborhood?: string;
+            postalCode?: string;
+            poBox?: string;
+            isoCountryCode?: string;
+            label: string;
+            id: string;
+        }>;
+        socialProfiles?: Array<{
+            service?: string;
+            localizedProfile?: string;
+            url?: string;
+            username?: string;
+            userId?: string;
+            label: string;
+            id: string;
+        }>;
+        instantMessageAddresses?: Array<{
+            service?: string;
+            username?: string;
+            localizedService?: string;
+            label: string;
+            id: string;
+        }>;
+        urls?: {
+            label: string;
+            url?: string;
+            id: string;
+        };
+        company?: string;
+        jobTitle?: string;
+        department?: string;
+        imageAvailable?: boolean;
+        image?: {
+            uri?: string;
+        };
+        thumbnail?: {
+            uri?: string;
+        };
+        note?: string;
+        dates?: Array<{
+            day?: number;
+            month?: number;
+            year?: number;
+            id: string;
+            label: string;
+        }>;
+        relationships?: Array<{
+            label: string;
+            name?: string;
+            id: string;
+        }>;
+    }
+
+    interface Response {
+        data: Contact[];
+        total: number;
+        hasNextPage: boolean;
+        hasPreviousPage: boolean;
+    }
+
+    function getContactsAsync(options: Options): Promise<Response>;
+    function getContactByIdAsync(options: { id?: string; fields?: FieldType[] }): Promise<Contact>;
+}
+
+/**
+ * DocumentPicker
+ */
+export namespace DocumentPicker {
+    interface Options {
+        type?: string;
+    }
+    type Response = {
+        type: 'success';
+        uri: string;
+        name: string;
+        size: number;
+    } | {
+        type: 'cancel';
+    };
+
+    function getDocumentAsync(options?: Options): Promise<Response>;
+}
+
+/**
+ * ErrorRecovery
+ */
+export namespace ErrorRecovery {
+    function setRecoveryProps(props: HashMap): void;
+}
+
+/**
+ * Facebook
+ */
+export namespace Facebook {
+    interface Options {
+        permissions?: string[];
+        behavior?: 'web' | 'native' | 'browser' | 'system';
+    }
+    type Response = {
+        type: 'success';
+        token: string;
+        expires: number;
+    } | {
+        type: 'cancel';
+    };
+    function logInWithReadPermissionsAsync(appId: string, options?: Options): Promise<Response>;
+}
+
+/**
+ * Facebook Ads
+ */
+export namespace FacebookAds {
+    /**
+     * Interstitial Ads
+     */
+    namespace InterstitialAdManager {
+        function showAd(placementId: string): Promise<boolean>;
+    }
+
+    /**
+     * Native Ads
+     */
+    type MediaCachePolicy = 'none' | 'icon' | 'image' | 'all';
+    class NativeAdsManager {
+        constructor(placementId: string, numberOfAdsToRequest?: number);
+        disableAutoRefresh(): void;
+        setMediaCachePolicy(cachePolicy: MediaCachePolicy): void;
+    }
+
+    function withNativeAd(component: Component<{
+        icon?: string;
+        coverImage?: string;
+        title?: string;
+        subtitle?: string;
+        description?: string;
+        callToActionText?: string;
+        socialContext?: string;
+    }>): Component<{ adsManager: NativeAdsManager }, { ad: any, canRequestAds: boolean }>;
+
+    /**
+     * Banner View
+     */
+    type AdType = 'large' | 'rectangle' | 'standard';
+
+    interface BannerViewProps {
+        type: AdType;
+        placementId: string;
+        onPress: () => void;
+        onError: () => void;
+    }
+
+    class BannerView extends Component<BannerViewProps> { }
+
+    /**
+     * Ad Settings
+     */
+    namespace AdSettings {
+        const currentDeviceHash: string;
+        function addTestDevice(device: string): void;
+        function clearTestDevices(): void;
+        type SDKLogLevel = 'none' | 'debug' | 'verbose' | 'warning' | 'error' | 'notification';
+        function setLogLevel(logLevel: SDKLogLevel): void;
+        function setIsChildDirected(isDirected: boolean): void;
+        function setMediationService(mediationService: string): void;
+        function setUrlPrefix(urlPrefix: string): void;
+    }
+}
+
+/**
+ * FileSystem
+ */
+export namespace FileSystem {
+    type FileInfo = {
+        exists: true;
+        isDirectory: boolean;
+        uri: string;
+        size: number;
+        modificationTime: number;
+        md5?: Md5;
+    } | {
+        exists: false;
+        isDirectory: false;
+    };
+
+    interface DownloadResult {
+        uri: string;
+        status: number;
+        headers: { [name: string]: string };
+        md5?: Md5;
+    }
+
+    const documentDirectory: string;
+    const cacheDirectory: string;
+
+    function getInfoAsync(fileUri: string, options?: { md5?: string, size?: boolean; }): Promise<FileInfo>;
+    function readAsStringAsync(fileUri: string): Promise<string>;
+    function writeAsStringAsync(fileUri: string, contents: string): Promise<void>;
+    function deleteAsync(fileUri: string, options?: { idempotent: boolean; }): Promise<void>;
+    function moveAsync(options: { from: string, to: string; }): Promise<void>;
+    function copyAsync(options: { from: string, to: string; }): Promise<void>;
+    function makeDirectoryAsync(dirUri: string, options?: { intermediates: boolean }): Promise<void>;
+    function readDirectoryAsync(dirUri: string): Promise<string[]>;
+    function downloadAsync(uri: string, fileUri: string, options?: { md5?: boolean; }): Promise<DownloadResult>;
+    function createDownloadResumable(
+        uri: string,
+        fileUri: string,
+        options?: DownloadOptions,
+        callback?: (totalBytesWritten: number, totalBytesExpectedToWrite: number) => void,
+        resumeData?: string | null
+    ): DownloadResumable;
+
+    interface PauseResult {
+        url: string;
+        fileUri: string;
+        options: { md5: boolean; };
+        resumeData: string;
+    }
+
+    interface DownloadOptions {
+        md5?: boolean;
+        headers?: { [name: string]: string };
+    }
+
+    interface DownloadProgressData {
+        totalBytesWritten: number;
+        totalBytesExpectedToWrite: number;
+    }
+
+    type DownloadProgressCallback = (data: DownloadProgressData) => void;
+
+    class DownloadResumable {
+        constructor(
+            url: string,
+            fileUri: string,
+            options: DownloadOptions,
+            callback?: DownloadProgressCallback,
+            resumeData?: string
+        );
+
+        downloadAsync(): Promise<DownloadResult>;
+        pauseAsync(): Promise<PauseResult>;
+        resumeAsync(): Promise<DownloadResult>;
+        savable(): PauseResult;
+    }
+}
+
+/**
+ * Fingerprint
+ */
+export namespace Fingerprint {
+    type FingerprintAuthenticationResult = { success: true } | { success: false, error: string };
+
+    function hasHardwareAsync(): Promise<boolean>;
+    function isEnrolledAsync(): Promise<boolean>;
+    function authenticateAsync(promptMessageIOS?: string): Promise<FingerprintAuthenticationResult>;
+    function cancelAuthenticate(): void;
+}
+
+/**
+ * Font
+ */
+export namespace Font {
+    interface FontMap {
+        [name: string]: RequireSource;
+    }
+
+    function loadAsync(name: string, url: string): Promise<void>;
+    function loadAsync(map: FontMap): Promise<void>;
+}
+
+/**
+ * GLView
+ */
+export interface GLViewProps extends ViewProperties {
+    onContextCreate(): void;
+    msaaSamples: number;
+}
+export class GLView extends Component<GLViewProps, { msaaSamples: number }> { }
+
+/**
+ * Google
+ */
+export namespace Google {
+    interface LogInConfig {
+        androidClientId?: string;
+        androidStandaloneAppClientId?: string;
+        iosClientId?: string;
+        iosStandaloneAppClientId?: string;
+        webClientId?: string;
+        behavior?: 'system' | 'web';
+        scopes?: string[];
+    }
+
+    type LogInResult = {
+        type: 'cancel';
+    } | {
+        type: 'success';
+        accessToken: string;
+        idToken?: string;
+        refreshToken?: string;
+        serverAuthCode?: string;
+        user: {
+            id: string;
+            name: string;
+            givenName: string;
+            familyName: string;
+            photoUrl?: string;
+            email?: string;
+        }
+    };
+
+    function logInAsync(config: LogInConfig): Promise<LogInResult>;
+}
+
+/**
+ * Gyroscope
+ */
+export namespace Gyroscope {
+    interface GyroscopeObject {
+        x: Axis;
+        y: Axis;
+        z: Axis;
+    }
+
+    function addListener(listener: (obj: GyroscopeObject) => any): EventSubscription;
+    function removeAllListeners(): void;
+    function setUpdateInterval(intervalMs: number): void;
+}
+
+/**
+ * Image Picker
+ */
+export namespace ImagePicker {
+    interface ImageInfo {
+        uri: string;
+        width: number;
+        height: number;
+    }
+
+    type ImageResult = { cancelled: true } | ({ cancelled: false } & ImageInfo);
+
+    interface ImageLibraryOptions {
+        allowsEditing?: boolean;
+        aspect?: [number, number];
+        quality?: number;
+    }
+
+    function launchImageLibraryAsync(options?: ImageLibraryOptions): Promise<ImageResult>;
+
+    interface CameraOptions {
+        allowsEditing?: boolean;
+        aspect?: [number, number];
+        quality?: number;
+    }
+    function launchCameraAsync(options?: CameraOptions): Promise<ImageResult>;
+}
+
+/**
+ * IntentLauncherAndroid
+ */
+export namespace IntentLauncherAndroid {
+    const ACTION_ACCESSIBILITY_SETTINGS: string;
+    const ACTION_APP_NOTIFICATION_REDACTION: string;
+    const ACTION_CONDITION_PROVIDER_SETTINGS: string;
+    const ACTION_NOTIFICATION_LISTENER_SETTINGS: string;
+    const ACTION_PRINT_SETTINGS: string;
+    const ACTION_ADD_ACCOUNT_SETTINGS: string;
+    const ACTION_AIRPLANE_MODE_SETTINGS: string;
+    const ACTION_APN_SETTINGS: string;
+    const ACTION_APPLICATION_DETAILS_SETTINGS: string;
+    const ACTION_APPLICATION_DEVELOPMENT_SETTINGS: string;
+    const ACTION_APPLICATION_SETTINGS: string;
+    const ACTION_APP_NOTIFICATION_SETTINGS: string;
+    const ACTION_APP_OPS_SETTINGS: string;
+    const ACTION_BATTERY_SAVER_SETTINGS: string;
+    const ACTION_BLUETOOTH_SETTINGS: string;
+    const ACTION_CAPTIONING_SETTINGS: string;
+    const ACTION_CAST_SETTINGS: string;
+    const ACTION_DATA_ROAMING_SETTINGS: string;
+    const ACTION_DATE_SETTINGS: string;
+    const ACTION_DEVICE_INFO_SETTINGS: string;
+    const ACTION_DEVICE_NAME: string;
+    const ACTION_DISPLAY_SETTINGS: string;
+    const ACTION_DREAM_SETTINGS: string;
+    const ACTION_HARD_KEYBOARD_SETTINGS: string;
+    const ACTION_HOME_SETTINGS: string;
+    const ACTION_IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS: string;
+    const ACTION_IGNORE_BATTERY_OPTIMIZATION_SETTINGS: string;
+    const ACTION_INPUT_METHOD_SETTINGS: string;
+    const ACTION_INPUT_METHOD_SUBTYPE_SETTINGS: string;
+    const ACTION_INTERNAL_STORAGE_SETTINGS: string;
+    const ACTION_LOCALE_SETTINGS: string;
+    const ACTION_LOCATION_SOURCE_SETTINGS: string;
+    const ACTION_MANAGE_ALL_APPLICATIONS_SETTINGS: string;
+    const ACTION_MANAGE_APPLICATIONS_SETTINGS: string;
+    const ACTION_MANAGE_DEFAULT_APPS_SETTINGS: string;
+    const ACTION_MEMORY_CARD_SETTINGS: string;
+    const ACTION_MONITORING_CERT_INFO: string;
+    const ACTION_NETWORK_OPERATOR_SETTINGS: string;
+    const ACTION_NFCSHARING_SETTINGS: string;
+    const ACTION_NFC_PAYMENT_SETTINGS: string;
+    const ACTION_NFC_SETTINGS: string;
+    const ACTION_NIGHT_DISPLAY_SETTINGS: string;
+    const ACTION_NOTIFICATION_POLICY_ACCESS_SETTINGS: string;
+    const ACTION_NOTIFICATION_SETTINGS: string;
+    const ACTION_PAIRING_SETTINGS: string;
+    const ACTION_PRIVACY_SETTINGS: string;
+    const ACTION_QUICK_LAUNCH_SETTINGS: string;
+    const ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS: string;
+    const ACTION_SECURITY_SETTINGS: string;
+    const ACTION_SETTINGS: string;
+    const ACTION_SHOW_ADMIN_SUPPORT_DETAILS: string;
+    const ACTION_SHOW_INPUT_METHOD_PICKER: string;
+    const ACTION_SHOW_REGULATORY_INFO: string;
+    const ACTION_SHOW_REMOTE_BUGREPORT_DIALOG: string;
+    const ACTION_SOUND_SETTINGS: string;
+    const ACTION_STORAGE_MANAGER_SETTINGS: string;
+    const ACTION_SYNC_SETTINGS: string;
+    const ACTION_SYSTEM_UPDATE_SETTINGS: string;
+    const ACTION_TETHER_PROVISIONING_UI: string;
+    const ACTION_TRUSTED_CREDENTIALS_USER: string;
+    const ACTION_USAGE_ACCESS_SETTINGS: string;
+    const ACTION_USER_DICTIONARY_INSERT: string;
+    const ACTION_USER_DICTIONARY_SETTINGS: string;
+    const ACTION_USER_SETTINGS: string;
+    const ACTION_VOICE_CONTROL_AIRPLANE_MODE: string;
+    const ACTION_VOICE_CONTROL_BATTERY_SAVER_MODE: string;
+    const ACTION_VOICE_CONTROL_DO_NOT_DISTURB_MODE: string;
+    const ACTION_VOICE_INPUT_SETTINGS: string;
+    const ACTION_VPN_SETTINGS: string;
+    const ACTION_VR_LISTENER_SETTINGS: string;
+    const ACTION_WEBVIEW_SETTINGS: string;
+    const ACTION_WIFI_IP_SETTINGS: string;
+    const ACTION_WIFI_SETTINGS: string;
+    const ACTION_WIRELESS_SETTINGS: string;
+    const ACTION_ZEN_MODE_AUTOMATION_SETTINGS: string;
+    const ACTION_ZEN_MODE_EVENT_RULE_SETTINGS: string;
+    const ACTION_ZEN_MODE_EXTERNAL_RULE_SETTINGS: string;
+    const ACTION_ZEN_MODE_PRIORITY_SETTINGS: string;
+    const ACTION_ZEN_MODE_SCHEDULE_RULE_SETTINGS: string;
+    const ACTION_ZEN_MODE_SETTINGS: string;
+
+    function startActivityAsync(activity: string, data?: HashMap): Promise<boolean>;
+}
+
+/**
+ * KeepAwake
+ */
+export class KeepAwake extends Component {
+    static activate(): void;
+    static deactivate(): void;
+}
+
+/**
+ * LinearGradient
+ */
+export interface LinearGradientProps {
+    colors: string[];
+    start: [number, number];
+    end: [number, number];
+    locations: number[];
+}
+
+export class LinearGradient extends Component<LinearGradientProps> { }
+
+/**
+ * Location
+ */
+export namespace Location {
+    interface LocationOptions {
+        enableHighAccuracy?: boolean;
+        timeInterval?: number;
+        distanceInterval?: number;
+    }
+
+    interface LocationProps {
+        latitude: number;
+        longitude: number;
+    }
+
+    interface Coords extends LocationProps {
+        altitude: number;
+        accuracy: number;
+    }
+
+    interface LocationData {
+        coords: {
+            heading: number;
+            speed: number
+        } & Coords;
+        timestamp: number;
+    }
+
+    interface ProviderStatus {
+        locationServicesEnabled: boolean;
+        gpsAvailable?: boolean;
+        networkAvailable?: boolean;
+        passiveAvailable?: boolean;
+    }
+
+    interface HeadingStatus {
+        magHeading: number;
+        trueHeading: number;
+        accuracy: number;
+    }
+
+    interface GeocodeData {
+        city: string;
+        street: string;
+        region: string;
+        postalCode: string;
+        country: string;
+        name: string;
+    }
+
+    type LocationCallback = (data: LocationData) => void;
+
+    function getCurrentPositionAsync(options: LocationOptions): Promise<LocationData>;
+    function watchPositionAsync(options: LocationOptions, callback: LocationCallback): EventSubscription;
+    function getProviderStatusAsync(): Promise<ProviderStatus>;
+    function getHeadingAsync(): Promise<HeadingStatus>;
+    function watchHeadingAsync(callback: (status: HeadingStatus) => void): EventSubscription;
+    function geocodeAsync(address: string): Promise<Coords>;
+    function reverseGeocodeAsync(location: LocationProps): Promise<GeocodeData>;
+    function setApiKey(key: string): void;
+}
+
+/**
+ * Magnetometer
+ */
+export namespace Magnetometer {
+    interface MagnetometerObject {
+        x: Axis;
+        y: Axis;
+        z: Axis;
+    }
+
+    function addListener(listener: (obj: MagnetometerObject) => any): EventSubscription;
+    function removeAllListeners(): void;
+    function setUpdateInterval(intervalMs: number): void;
+}
+
+/**
+ * Notifications
+ */
+export namespace Notifications {
+    interface Notification {
+        origin: 'selected' | 'received';
+        data: any;
+        remote: boolean;
+        isMultiple: boolean;
+    }
+
+    interface LocalNotification {
+        title: string;
+        body?: string;
+        data?: any;
+        ios?: {
+            sound?: boolean
+        };
+        android?: {
+            sound?: boolean;
+            icon?: string;
+            color?: string;
+            priority?: 'min' | 'low' | 'high' | 'max';
+            sticky?: boolean;
+            vibrate?: boolean | number[];
+            link?: string;
+        };
+    }
+
+    type LocalNotificationId = string | number;
+
+    function addListener(listener: (notification: Notification) => any): EventSubscription;
+    function getExponentPushTokenAsync(): Promise<string>;
+    function presentLocalNotificationAsync(localNotification: LocalNotification): Promise<LocalNotificationId>;
+    function scheduleLocalNotificationAsync(
+        localNotification: LocalNotification,
+        schedulingOptions: { time: Date | number, repeat?: 'minute' | 'hour' | 'day' | 'week' | 'month' | 'year' }
+    ): Promise<LocalNotificationId>;
+    function dismissNotificationAsync(localNotificationId: LocalNotificationId): Promise<void>;
+    function dismissAllNotificationsAsync(): Promise<void>;
+    function cancelScheduledNotificationAsync(localNotificationId: LocalNotificationId): Promise<void>;
+    function cancelAllScheduledNotificationsAsync(): Promise<void>;
+    function getBadgeNumberAsync(): Promise<number>;
+    function setBadgeNumberAsync(number: number): Promise<void>;
+}
+
+/**
+ * Pedometer
+ */
+export namespace Pedometer {
+    function isAvailableAsync(): Promise<boolean>;
+    function getStepCountAsync(start: Date, end: Date): Promise<{ steps: number; }>;
+    function watchStepCount(callback: (params: { steps: number; }) => void): EventSubscription;
+}
+
+/**
+ * Permissions
+ */
+export namespace Permissions {
+    type PermissionType = 'remoteNotifications' | 'location' |
+        'camera' | 'contacts' | 'audioRecording';
+    type PermissionStatus = 'undetermined' | 'granted' | 'denied';
+    type PermissionExpires = 'never';
+    interface PermissionDetailsLocationIOS {
+        scope: 'whenInUse' | 'always';
+    }
+    interface PermissionDetailsLocationAndroid {
+        scope: 'fine' | 'coarse' | 'none';
+    }
+    interface PermissionResponse {
+        status: PermissionStatus;
+        expires: PermissionExpires;
+        ios?: PermissionDetailsLocationIOS;
+        android?: PermissionDetailsLocationAndroid;
+    }
+
+    function getAsync(type: PermissionType): Promise<PermissionResponse>;
+    function askAsync(type: PermissionType): Promise<PermissionResponse>;
+
+    const CAMERA: string;
+    const CAMERA_ROLL: string;
+    const AUDIO_RECORDING: string;
+    const LOCATION: string;
+    const REMOTE_NOTIFICATIONS: string;
+    const NOTIFICATIONS: string;
+    const CONTACTS: string;
+}
+
+/**
+ * Register Root Component
+ */
+export function registerRootComponent(component: Component): Component;
+
+/**
+ * ScreenOrientation
+ */
+export namespace ScreenOrientation {
+    interface Orientation {
+        ALL: 'ALL';
+        ALL_BUT_UPSIDE_DOWN: 'ALL_BUT_UPSIDE_DOWN';
+        PORTRAIT: 'PORTRAIT';
+        PORTRAIT_UP: 'PORTRAIT_UP';
+        PORTRAIT_DOWN: 'PORTRAIT_DOWN';
+        LANDSCAPE: 'LANDSCAPE';
+        LANDSCAPE_LEFT: 'LANDSCAPE_LEFT';
+        LANDSCAPE_RIGHT: 'LANDSCAPE_RIGHT';
+    }
+    const Orientation: Orientation;
+    function allow(orientation: string): void;
+}
+
+/**
+ * SecureStore
+ */
+export namespace SecureStore {
+    interface SecureStoreOptions {
+        keychainService?: string;
+        keychainAccessible?: number;
+    }
+    function setItemAsync(key: string, value: string, options?: SecureStoreOptions): Promise<void>;
+    function getItemAsync(key: string, options?: SecureStoreOptions): Promise<string | null>;
+    function deleteItemAsync(key: string, options?: SecureStoreOptions): Promise<void>;
+}
+
+/**
+ * Segment
+ */
+export namespace Segment {
+    function initialize(keys: {
+        androidWriteKey: string;
+        iosWriteKey: string;
+    }): void;
+    function identify(userId: string): void;
+    function identifyWithTraits(userId: string, traits: object): void;
+    function track(event: string): void;
+    function reset(): void;
+    function trackWithProperties(event: string, properties: object): void;
+    function screen(screenName: string): void;
+    function screenWithProperties(screenName: string, properties: object): void;
+    function flush(): void;
+}
+
+/**
+ * Speech
+ */
+export namespace Speech {
+    interface SpeechOptions {
+        language?: string;
+        pitch?: number;
+        rate?: number;
+        onStart?: () => void;
+        onStopped?: () => void;
+        onDone?: () => void;
+        onError?: (error: string) => void;
+    }
+
+    function speak(text: string, options?: SpeechOptions): void;
+    function stop(): void;
+    function isSpeakingAsync(): Promise<boolean>;
+}
+
+/**
+ * SQLite
+ */
+export namespace SQLite {
+    type Error = any;
+
+    interface Database {
+        transaction(
+            callback: (transaction: Transaction) => any,
+            error?: (error: Error) => any,     // TODO def of error
+            success?: () => any
+        ): void;
+    }
+
+    interface Transaction {
+        executeSql(
+            sqlStatement: string,
+            arguments?: string[] | number[],
+            success?: (transaction: Transaction, resultSet: ResultSet) => any,
+            error?: (transaction: Transaction, error: Error) => any
+        ): void;
+    }
+
+    interface ResultSet {
+        insertId: number;
+        rowAffected: number;
+        rows: {
+            length: number;
+            item: (index: number) => any;
+            _array: HashMap[];
+        };
+    }
+
+    function openDatabase(
+        name: string | {
+            name: string,
+            version?: string,
+            description?: string,
+            size?: number,
+            callback?: () => any
+        },
+        version?: string,
+        description?: string,
+        size?: number,
+        callback?: () => any
+    ): any;
+}
+
+/**
+ * Svg
+ */
+export interface SvgCommonProps {
+    fill?: string;
+    fillOpacity?: number;
+    stroke?: string;
+    strokeWidth?: number;
+    strokeOpacity?: number;
+    strokeLinecap?: string;
+    strokeLineJoin?: string;
+    strokeDasharray?: any[];
+    strokeDashoffset?: any;
+    x?: Axis;
+    y?: Axis;
+    rotate?: number;
+    scale?: number;
+    origin?: number | string;
+    originX?: number;
+    originY?: number;
+}
+
+export class Svg extends Component<{ width: number, heigth: number }> { }
+export class Rect extends Component<SvgCommonProps> { }
+
+export interface CircleProps extends SvgCommonProps {
+    cx: Axis;
+    cy: Axis;
+}
+export class Circle extends Component<CircleProps> { }
+
+export interface EllipseProps extends CircleProps {
+    rx: Axis;
+    ry: Axis;
+}
+export class Ellipse extends Component<SvgCommonProps> { }
+
+export interface LineProps extends SvgCommonProps {
+    x1: Axis;
+    y1: Axis;
+    x2: Axis;
+    y2: Axis;
+}
+export class Line extends Component<LineProps> { }
+
+export interface PolyProps extends SvgCommonProps {
+    points: string;
+}
+export class Polygon extends Component<PolyProps> { }
+export class Polyline extends Component<PolyProps> { }
+
+export interface PathLine extends SvgCommonProps {
+    d: string;
+}
+export class Path extends Component<PolyProps> { }
+
+export interface TextProps extends SvgCommonProps {
+    textAnchor: string;
+}
+export class Text extends Component<TextProps> { }
+export class G extends Component<SvgCommonProps> { }
+export class Use extends Component<{ href: string, x: number, y: number }> { }
+export class Symbol extends Component<{ viewbox: string, widt: number, height: number }> { }
+export class Defs extends Component { }
+export class RadialGradient extends Component<SvgCommonProps> { }
+
+/**
+ * Take Snapshot
+ */
+export function takeSnapshotAsync(
+    view?: (number | React.ReactElement<any>),
+    options?: {
+        width?: number,
+        height?: number,
+        format?: 'png' | 'jpg' | 'jpeg' | 'webm',
+        quality?: number,
+        result?: 'file' | 'base64' | 'data-uri',
+    }
+): Promise<string>;
+
+/**
+ * Util
+ */
+export namespace Util {
+    function getCurrentDeviceCountryAsync(): Promise<number>;
+    function getCurrentLocaleAsync(): Promise<string>;
+    function getCurrentTimeZoneAsync(): Promise<string>;
+    function reload(): void;
+    function addNewVersionListenerExperimental(listener: (event: {
+        manifest: object;
+    }) => void): { remove(): void; }; // Android only
+}
+
+/**
+ * Web Browser
+ */
+export namespace WebBrowser {
+    function openBrowserAsync(url: string): Promise<{ type: 'cancelled' | 'dismissed' }>;
+    function openAuthSessionAsync(url: string, redirectUrl?: string): Promise<{ type: 'cancelled' | 'dismissed' }>;
+    function dismissBrowser(): Promise<{ type: 'dismissed' }>;
+}
diff --git a/types/expo/tsconfig.json b/types/expo/tsconfig.json
new file mode 100644
index 0000000000..5d0f560837
--- /dev/null
+++ b/types/expo/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "jsx": "react",
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "expo-tests.tsx"
+    ]
+}
diff --git a/types/expo/tslint.json b/types/expo/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/expo/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/express-serve-static-core/index.d.ts b/types/express-serve-static-core/index.d.ts
index 9119c8497f..2f8d862b14 100644
--- a/types/express-serve-static-core/index.d.ts
+++ b/types/express-serve-static-core/index.d.ts
@@ -820,7 +820,7 @@ export interface Application extends IRouter, Express.Application {
      * Express instance itself is a request handler, which could be invoked without
      * third argument.
      */
-    (req: Request, res: Response): any;
+    (req: Request | http.IncomingMessage, res: Response | http.ServerResponse): any;
 
     /**
      * Initialize the server.
diff --git a/types/gapi.auth2/index.d.ts b/types/gapi.auth2/index.d.ts
index c5cfff0d9e..0acae5e2a7 100644
--- a/types/gapi.auth2/index.d.ts
+++ b/types/gapi.auth2/index.d.ts
@@ -27,7 +27,7 @@ declare namespace gapi.auth2 {
      * Signs in the user using the specified options.
      * If no option specified here, fallback to the options specified to gapi.auth2.init().
      */
-    signIn(options?: SigninOptions | SigninOptionsBuilder): any;
+    signIn(options?: SigninOptions | SigninOptionsBuilder): Promise<GoogleUser>;
 
     /**
      * Signs out all accounts from the application.
diff --git a/types/geojson/geojson-tests.ts b/types/geojson/geojson-tests.ts
index 4adb7f88f2..ce8c62418e 100644
--- a/types/geojson/geojson-tests.ts
+++ b/types/geojson/geojson-tests.ts
@@ -1,4 +1,10 @@
-let featureCollection: GeoJSON.FeatureCollection<any> =  {
+import {
+    BBox,
+    Feature, FeatureCollection, GeometryCollection, LineString,
+    MultiLineString, MultiPoint, MultiPolygon, Point, Polygon, GeometryObject
+} from "geojson";
+
+let featureCollection: FeatureCollection<Point | LineString | Polygon | MultiPoint | MultiLineString | MultiPolygon | GeometryCollection> = {
     type: "FeatureCollection",
     features: [
         {
@@ -34,7 +40,7 @@ let featureCollection: GeoJSON.FeatureCollection<any> =  {
             geometry: {
                 type: "Polygon",
                 coordinates: [
-                    [ [100.0, 0.0], [101.0, 0.0], [101.0, 1.0], [100.0, 1.0], [100.0, 0.0] ]
+                    [[100.0, 0.0], [101.0, 0.0], [101.0, 1.0], [100.0, 1.0], [100.0, 0.0]]
                 ]
             },
             properties: {
@@ -44,17 +50,10 @@ let featureCollection: GeoJSON.FeatureCollection<any> =  {
                 }
             }
         }
-    ],
-    crs: {
-        type: "link",
-        properties: {
-            href: "http://example.com/crs/42",
-            type: "proj4"
-        }
-    }
+    ]
 };
 
-let featureWithPolygon: GeoJSON.Feature<GeoJSON.Polygon> = {
+const featureWithPolygon: Feature<Polygon> = {
     type: "Feature",
     bbox: [-180.0, -90.0, 180.0, 90.0],
     geometry: {
@@ -66,57 +65,57 @@ let featureWithPolygon: GeoJSON.Feature<GeoJSON.Polygon> = {
     properties: null
 };
 
-let point: GeoJSON.Point = {
+const point: Point = {
     type: "Point",
     coordinates: [100.0, 0.0]
 };
 
 // This type is commonly used in the turf package
-let pointCoordinates: number[] = point.coordinates;
+const pointCoordinates: number[] = point.coordinates;
 
-let lineString: GeoJSON.LineString = {
+const lineString: LineString = {
     type: "LineString",
-    coordinates: [ [100.0, 0.0], [101.0, 1.0] ]
+    coordinates: [[100.0, 0.0], [101.0, 1.0]]
 };
 
-let polygon: GeoJSON.Polygon = {
+const polygon: Polygon = {
     type: "Polygon",
     coordinates: [
-        [ [100.0, 0.0], [101.0, 0.0], [101.0, 1.0], [100.0, 1.0], [100.0, 0.0] ]
+        [[100.0, 0.0], [101.0, 0.0], [101.0, 1.0], [100.0, 1.0], [100.0, 0.0]]
     ]
 };
 
-let polygonWithHole: GeoJSON.Polygon = {
+const polygonWithHole: Polygon = {
     type: "Polygon",
     coordinates: [
-        [ [100.0, 0.0], [101.0, 0.0], [101.0, 1.0], [100.0, 1.0], [100.0, 0.0] ],
-        [ [100.2, 0.2], [100.8, 0.2], [100.8, 0.8], [100.2, 0.8], [100.2, 0.2] ]
+        [[100.0, 0.0], [101.0, 0.0], [101.0, 1.0], [100.0, 1.0], [100.0, 0.0]],
+        [[100.2, 0.2], [100.8, 0.2], [100.8, 0.8], [100.2, 0.8], [100.2, 0.2]]
     ]
 };
 
-let multiPoint: GeoJSON.MultiPoint = {
+const multiPoint: MultiPoint = {
     type: "MultiPoint",
-    coordinates: [ [100.0, 0.0], [101.0, 1.0] ]
+    coordinates: [[100.0, 0.0], [101.0, 1.0]]
 };
 
-let multiLineString: GeoJSON.MultiLineString = {
+const multiLineString: MultiLineString = {
     type: "MultiLineString",
     coordinates: [
-        [ [100.0, 0.0], [101.0, 1.0] ],
-        [ [102.0, 2.0], [103.0, 3.0] ]
+        [[100.0, 0.0], [101.0, 1.0]],
+        [[102.0, 2.0], [103.0, 3.0]]
     ]
 };
 
-let multiPolygon: GeoJSON.MultiPolygon = {
+const multiPolygon: MultiPolygon = {
     type: "MultiPolygon",
     coordinates: [
         [[[102.0, 2.0], [103.0, 2.0], [103.0, 3.0], [102.0, 3.0], [102.0, 2.0]]],
         [[[100.0, 0.0], [101.0, 0.0], [101.0, 1.0], [100.0, 1.0], [100.0, 0.0]],
-            [[100.2, 0.2], [100.8, 0.2], [100.8, 0.8], [100.2, 0.8], [100.2, 0.2]]]
+        [[100.2, 0.2], [100.8, 0.2], [100.8, 0.8], [100.2, 0.8], [100.2, 0.2]]]
     ]
 };
 
-let geometryCollection: GeoJSON.GeometryCollection = {
+const geometryCollection: GeometryCollection = {
     type: "GeometryCollection",
     geometries: [
         {
@@ -125,16 +124,17 @@ let geometryCollection: GeoJSON.GeometryCollection = {
         },
         {
             type: "LineString",
-            coordinates: [ [101.0, 0.0], [102.0, 1.0] ]
+            coordinates: [[101.0, 0.0], [102.0, 1.0]]
         }
     ]
 };
 
-let feature: GeoJSON.Feature<GeoJSON.GeometryObject> = {
+let feature: Feature<GeometryObject> = {
     type: "Feature",
     geometry: lineString,
     properties: null
 };
+
 feature = {
     type: "Feature",
     geometry: polygon,
@@ -172,44 +172,37 @@ featureCollection = {
         {
             type: "Feature",
             geometry: lineString,
-            properties: {test: "OK"}
+            properties: { test: "OK" }
         }, {
             type: "Feature",
             geometry: polygon,
-            properties: {test: "OK"}
+            properties: { test: "OK" }
         }, {
             type: "Feature",
             geometry: polygonWithHole,
-            properties: {test: "OK"}
+            properties: { test: "OK" }
         }, {
             type: "Feature",
             geometry: multiPoint,
-            properties: {test: "OK"}
+            properties: { test: "OK" }
         }, {
             type: "Feature",
             geometry: multiLineString,
-            properties: {test: "OK"}
+            properties: { test: "OK" }
         }, {
             type: "Feature",
             geometry: multiPolygon,
-            properties: {test: "OK"}
+            properties: { test: "OK" }
         }, {
             type: "Feature",
             geometry: geometryCollection,
-            properties: {test: "OK"}
+            properties: { test: "OK" }
         }
-    ],
-    crs: {
-        type: "link",
-        properties: {
-            href: "http://example.com/crs/42",
-            type: "proj4"
-        }
-    }
+    ]
 };
 
 // Allow access to custom properties
-const pt: GeoJSON.Feature<GeoJSON.Point> = {
+const pt: Feature<Point> = {
     type: "Feature",
     properties: {
         foo: "bar",
@@ -221,9 +214,14 @@ const pt: GeoJSON.Feature<GeoJSON.Point> = {
         coordinates: [0, 0]
     }
 };
-pt.properties.foo;
-pt.properties.hello;
-pt.properties[1];
+
+if (pt.properties) {
+    if (pt.properties.foo == null || pt.properties.hello == null || pt.properties[1] == null) {
+        throw TypeError("Properties should not be null or undefined.");
+    }
+} else {
+    throw TypeError("Feature should have a 'properties' property.");
+}
 
 // Optional generic for properties
 
@@ -232,19 +230,21 @@ interface TestProperty {
     hello: string;
 }
 
-const typedPropertiesFeature: GeoJSON.Feature<GeoJSON.Point, TestProperty> = {
+const testProps: TestProperty = {
+    foo: "bar",
+    hello: "world"
+};
+
+const typedPropertiesFeature: Feature<Point> = {
     type: "Feature",
-    properties: {
-        foo: "bar",
-        hello: "world",
-    },
+    properties: testProps,
     geometry: {
         type: "Point",
         coordinates: [0, 0]
     }
 };
 
-const typedPropertiesFeatureCollection: GeoJSON.FeatureCollection<GeoJSON.Point, TestProperty> = {
+const typedPropertiesFeatureCollection: FeatureCollection<Point> = {
     type: "FeatureCollection",
     features: [typedPropertiesFeature]
 };
diff --git a/types/geojson/index.d.ts b/types/geojson/index.d.ts
index b916179fac..e6783255eb 100644
--- a/types/geojson/index.d.ts
+++ b/types/geojson/index.d.ts
@@ -1,123 +1,165 @@
-// Type definitions for GeoJSON Format Specification Revision 1.0
-// Project: http://geojson.org/
+// Type definitions for geojson 7946.0
+// Project: https://geojson.org/
 // Definitions by: Jacob Bruun <https://github.com/cobster>
 //                 Arne Schubert <https://github.com/atd-schubert>
+//                 Jeff Jacobson <https://github.com/JeffJacobson>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
+// Note: as of the RFC 7946 version of GeoJSON, Coordinate Reference Systems
+// are no longer supported. (See https://tools.ietf.org/html/rfc7946#appendix-B)}
+
 export as namespace GeoJSON;
 
-/***
- * http://geojson.org/geojson-spec.html#geojson-objects
+/**
+ * The valid values for the "type" property of GeoJSON geometry objects.
+ * https://tools.ietf.org/html/rfc7946#section-1.4
+ */
+export type GeoJsonGeometryTypes = "Point" | "LineString" | "MultiPoint" | "Polygon" | "MultiLineString" |
+    "MultiPolygon" | "GeometryCollection";
+
+/**
+ * The value values for the "type" property of GeoJSON Objects.
+ * https://tools.ietf.org/html/rfc7946#section-1.4
+ */
+export type GeoJsonTypes = "FeatureCollection" | "Feature" | GeoJsonGeometryTypes;
+
+/**
+ * Bounding box
+ * https://tools.ietf.org/html/rfc7946#section-5
+ */
+export type BBox = [number, number, number, number] | [number, number, number, number, number, number];
+
+/**
+ * A Position is an array of coordinates.
+ * https://tools.ietf.org/html/rfc7946#section-3.1.1
+ * Array should contain between two and three elements.
+ * The previous GeoJSON specification allowed more elements (e.g., which could be used to represent M values),
+ * but the current specification only allows X, Y, and (optionally) Z to be defined.
+ */
+export type Position = number[]; // [number, number] | [number, number, number];
+
+/**
+ * The base GeoJSON object.
+ * https://tools.ietf.org/html/rfc7946#section-3
+ * The GeoJSON specification also allows foreign members
+ * (https://tools.ietf.org/html/rfc7946#section-6.1)
+ * Developers should use "&" type in TypeScript or extend the interface
+ * to add these foreign members.
  */
 export interface GeoJsonObject {
-    type: string;
-    bbox?: number[];
-    crs?: CoordinateReferenceSystem;
+    // Don't include foreign members directly into this type def.
+    // in order to preserve type safety.
+    // [key: string]: any;
+    /**
+     * Specifies the type of GeoJSON object.
+     */
+    type: GeoJsonTypes;
+    /**
+     * Bounding box of the coordinate range of the object's Geometries, Features, or Feature Collections.
+     * https://tools.ietf.org/html/rfc7946#section-5
+     */
+    bbox?: BBox;
 }
 
-/***
- * http://geojson.org/geojson-spec.html#positions
- */
-export type Position = number[];
-
-/***
- * http://geojson.org/geojson-spec.html#geometry-objects
- */
-export interface DirectGeometryObject extends GeoJsonObject {
-    coordinates: Position[][][] | Position[][] | Position[] | Position;
-}
 /**
- * GeometryObject supports geometry collection as well
+ * A geometry object.
+ * https://tools.ietf.org/html/rfc7946#section-3
  */
-export type GeometryObject = DirectGeometryObject | GeometryCollection;
+export interface GeometryObject extends GeoJsonObject {
+    type: GeoJsonGeometryTypes;
+}
 
-/***
- * http://geojson.org/geojson-spec.html#point
+/**
+ * Point geometry object.
+ * https://tools.ietf.org/html/rfc7946#section-3.1.2
  */
-export interface Point extends DirectGeometryObject {
+export interface Point extends GeometryObject {
     type: "Point";
     coordinates: Position;
 }
 
-/***
- * http://geojson.org/geojson-spec.html#multipoint
+/**
+ * MultiPoint geometry object.
+ *  https://tools.ietf.org/html/rfc7946#section-3.1.3
  */
-export interface MultiPoint extends DirectGeometryObject {
+export interface MultiPoint extends GeometryObject {
     type: "MultiPoint";
     coordinates: Position[];
 }
 
-/***
- * http://geojson.org/geojson-spec.html#linestring
+/**
+ * LineString geometry object.
+ * https://tools.ietf.org/html/rfc7946#section-3.1.4
  */
-export interface LineString extends DirectGeometryObject {
+export interface LineString extends GeometryObject {
     type: "LineString";
     coordinates: Position[];
 }
 
-/***
- * http://geojson.org/geojson-spec.html#multilinestring
+/**
+ * MultiLineString geometry object.
+ * https://tools.ietf.org/html/rfc7946#section-3.1.5
  */
-export interface MultiLineString extends DirectGeometryObject {
+export interface MultiLineString extends GeometryObject {
     type: "MultiLineString";
     coordinates: Position[][];
 }
 
-/***
- * http://geojson.org/geojson-spec.html#polygon
+/**
+ * Polygon geometry object.
+ * https://tools.ietf.org/html/rfc7946#section-3.1.6
  */
-export interface Polygon extends DirectGeometryObject {
+export interface Polygon extends GeometryObject {
     type: "Polygon";
     coordinates: Position[][];
 }
 
-/***
- * http://geojson.org/geojson-spec.html#multipolygon
+/**
+ * MultiPolygon geometry object.
+ * https://tools.ietf.org/html/rfc7946#section-3.1.7
  */
-export interface MultiPolygon extends DirectGeometryObject {
+export interface MultiPolygon extends GeometryObject {
     type: "MultiPolygon";
     coordinates: Position[][][];
 }
 
-/***
- * http://geojson.org/geojson-spec.html#geometry-collection
+/**
+ * Geometry Collection
+ * https://tools.ietf.org/html/rfc7946#section-3.1.8
  */
-export interface GeometryCollection extends GeoJsonObject {
+export interface GeometryCollection extends GeometryObject {
     type: "GeometryCollection";
-    geometries: GeometryObject[];
+    geometries: Array<Point | LineString | Polygon | MultiPoint | MultiLineString | MultiPolygon>;
 }
 
-/***
+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 = any> extends GeoJsonObject {
+export interface Feature<G extends GeometryObject, P = GeoJsonProperties> extends GeoJsonObject {
     type: "Feature";
-    geometry: G;
-    properties: P;
+    /**
+     * The feature's geometry
+     */
+    geometry: G | null;
+    /**
+     * A value that uniquely identifies this feature in a
+     * https://tools.ietf.org/html/rfc7946#section-3.2.
+     */
     id?: string | number;
+    /**
+     * Properties associated with this feature.
+     */
+    properties: P | null;
 }
 
-/***
- * http://geojson.org/geojson-spec.html#feature-collection-objects
+/**
+ * A collection of feature objects.
+ *  https://tools.ietf.org/html/rfc7946#section-3.3
  */
-export interface FeatureCollection<G extends GeometryObject, P = any> extends GeoJsonObject {
-    type: "FeatureCollection";
+export interface FeatureCollection<G extends GeometryObject, P = GeoJsonProperties> extends GeoJsonObject {
     features: Array<Feature<G, P>>;
 }
-
-/***
- * http://geojson.org/geojson-spec.html#coordinate-reference-system-objects
- */
-export interface CoordinateReferenceSystem {
-    type: string;
-    properties: any;
-}
-
-export interface NamedCoordinateReferenceSystem extends CoordinateReferenceSystem {
-    properties: { name: string };
-}
-
-export interface LinkedCoordinateReferenceSystem extends CoordinateReferenceSystem {
-    properties: { href: string; type: string };
-}
diff --git a/types/gzip-size/gzip-size-tests.ts b/types/gzip-size/gzip-size-tests.ts
index f07d99bd50..70ea15b5e6 100644
--- a/types/gzip-size/gzip-size-tests.ts
+++ b/types/gzip-size/gzip-size-tests.ts
@@ -1,7 +1,16 @@
+import fs = require('fs');
 import gzipSize = require('gzip-size');
 
 const string = 'Lorem ipsum dolor sit amet.';
 
 console.log(string.length);
 
+gzipSize(string).then(size => console.log(size));
+
 console.log(gzipSize.sync(string));
+
+const stream = fs.createReadStream("index.d.ts");
+const gstream = stream.pipe(gzipSize.stream()).on("gzip-size", size => console.log(size));
+console.log(gstream.gzipSize); // Could be a number or undefined. Recommended to use "gzip-size" event instead
+
+gzipSize.file("index.d.ts").then(size => console.log(size));
diff --git a/types/gzip-size/index.d.ts b/types/gzip-size/index.d.ts
index cab8ec225b..66251e0da8 100644
--- a/types/gzip-size/index.d.ts
+++ b/types/gzip-size/index.d.ts
@@ -1,7 +1,8 @@
-// Type definitions for gzip-size 4.0
+// Type definitions for gzip-size 4.1
 // Project: https://github.com/sindresorhus/gzip-size
 // Definitions by: York Yao <https://github.com/plantain-00>
 //                 Jimi van der Woning <https://github.com/jimivdw>
+//                 Andre Wiggins <https://github.com/andrewiggins>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />
@@ -9,11 +10,45 @@
 import * as stream from 'stream';
 import * as zlib from 'zlib';
 
+interface GzipSizeStream extends stream.PassThrough {
+    on(event: string, listener: (...args: any[]) => void): this;
+    on(event: "gzip-size", listener: (size: number) => void): this;
+
+    /**
+     * Contains the gzip size of the stream after it is finished.
+     * Since this happens asynchronously, it is recommended you use
+     * the `.on("gzip-size", size => console.log(size))` method instead
+     */
+    gzipSize?: number;
+}
+
+/**
+ * Returns a Promise for the size.
+ * @param input A string or Buffer to determine the gzip size of
+ * @param options Any zlib option
+ */
 declare function gzipSize(input: string | Buffer, options?: zlib.ZlibOptions): Promise<number>;
 
 declare namespace gzipSize {
+    /**
+     * Returns the size synchronously
+     * @param input A string or Buffer to determine the gzip size of
+     * @param options Any zlib option
+     */
     function sync(input: string | Buffer, options?: zlib.ZlibOptions): number;
-    function stream(options?: zlib.ZlibOptions): stream.PassThrough;
+
+    /**
+     * Returns a stream.PassThrough. The stream emits a gzip-size event and has a gzipSize property.
+     * @param options Any zlib option
+     */
+    function stream(options?: zlib.ZlibOptions): GzipSizeStream;
+
+    /**
+     * Returns a Promise for the size of the file.
+     * @param path The path to the file
+     * @param options Any zlib option
+     */
+    function file(path: string, options?: zlib.ZlibOptions): Promise<number>;
 }
 
 export = gzipSize;
diff --git a/types/highlight.js/index.d.ts b/types/highlight.js/index.d.ts
index d691811b47..f96be1c06f 100644
--- a/types/highlight.js/index.d.ts
+++ b/types/highlight.js/index.d.ts
@@ -1,10 +1,14 @@
 // Type definitions for highlight.js v9.12
 // Project: https://github.com/isagalaev/highlight.js
-// Definitions by: Niklas Mollenhauer <https://github.com/nikeee>, Jeremy Hull <https://github.com/sourrust>
+// Definitions by: Niklas Mollenhauer <https://github.com/nikeee>
+//                 Jeremy Hull <https://github.com/sourrust>
+//                 Josh Goldberg <https://github.com/joshuakgoldberg>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare namespace hljs
 {
+	interface Node { }
+
 	export function highlight(
 		name: string,
 		value: string,
diff --git a/types/highlight.js/tsconfig.json b/types/highlight.js/tsconfig.json
index 5f5d2ae011..e3627e99ca 100644
--- a/types/highlight.js/tsconfig.json
+++ b/types/highlight.js/tsconfig.json
@@ -2,8 +2,7 @@
     "compilerOptions": {
         "module": "commonjs",
         "lib": [
-            "es6",
-            "dom"
+            "es6"
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
diff --git a/types/http-aws-es/index.d.ts b/types/http-aws-es/index.d.ts
index c14547a58f..91e12604f8 100644
--- a/types/http-aws-es/index.d.ts
+++ b/types/http-aws-es/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/TheDeveloper/http-aws-es#readme
 // Definitions by: Marco Gonzalez <https://github.com/marcogrcr>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 /// <reference types="node" />
 
diff --git a/types/http-proxy-agent/http-proxy-agent-tests.ts b/types/http-proxy-agent/http-proxy-agent-tests.ts
new file mode 100644
index 0000000000..f730cd1bde
--- /dev/null
+++ b/types/http-proxy-agent/http-proxy-agent-tests.ts
@@ -0,0 +1,12 @@
+import Agent = require('http-proxy-agent');
+
+// $ExpectType HttpProxyAgent
+new Agent('url');
+new Agent({});
+new Agent({ host: 'url' });
+
+// $ExpectError
+new Agent();
+
+// $ExpectError
+new Agent({ a: 1 });
diff --git a/types/http-proxy-agent/index.d.ts b/types/http-proxy-agent/index.d.ts
new file mode 100644
index 0000000000..015508b5d1
--- /dev/null
+++ b/types/http-proxy-agent/index.d.ts
@@ -0,0 +1,15 @@
+// Type definitions for http-proxy-agent 2.0
+// Project: https://github.com/TooTallNate/node-http-proxy-agent
+// Definitions by: mrmlnc <https://github.com/mrmlnc>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node"/>
+
+import { Agent } from 'http';
+import { Url } from 'url';
+
+declare class HttpProxyAgent extends Agent {
+    constructor(options: string | Url);
+}
+
+export = HttpProxyAgent;
diff --git a/types/http-proxy-agent/tsconfig.json b/types/http-proxy-agent/tsconfig.json
new file mode 100644
index 0000000000..626d4eaa4c
--- /dev/null
+++ b/types/http-proxy-agent/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",
+        "http-proxy-agent-tests.ts"
+    ]
+}
diff --git a/types/http-proxy-agent/tslint.json b/types/http-proxy-agent/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/http-proxy-agent/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/i18n-js/i18n-js-tests.ts b/types/i18n-js/i18n-js-tests.ts
new file mode 100644
index 0000000000..4f19dc4c02
--- /dev/null
+++ b/types/i18n-js/i18n-js-tests.ts
@@ -0,0 +1,81 @@
+/**
+ * Test suite created by Yuya Tanaka <https://github.com/ypresto>
+ * Created by using code examples from https://github.com/fnando/i18n-js
+ */
+
+import I18n = require("i18n-js");
+
+I18n.defaultLocale = "pt-BR";
+I18n.locale = "pt-BR";
+I18n.currentLocale() === "pt-BR";
+
+I18n.t("some.scoped.translation");
+I18n.t("some.scoped.translation", { locale: "fr" });
+I18n.t("hello", { name: "John Doe" });
+I18n.t("some.missing.scope", { defaultValue: "A default message" });
+I18n.t("noun", { defaultValue: "I'm a {{noun}}", noun: "Mac" });
+I18n.t("some.missing.scope", { defaults: [{ scope: "some.existing.scope" }] });
+I18n.t("some.missing.scope", { defaults: [{ message: "Some message" }] });
+
+I18n.fallbacks = true;
+I18n.locales.no = ["nb", "en"];
+I18n.locales.no = "nb";
+I18n.locales.no = locale => ["nb"];
+
+I18n.missingBehaviour = "guess";
+I18n.missingTranslationPrefix = "EE: ";
+I18n.missingTranslation = (scope, options) => "foobar";
+I18n.missingTranslation = (scope, options) => null;
+I18n.missingTranslation = (scope, options) => undefined;
+
+I18n.t("inbox.counting", { count: 10 });
+I18n.pluralization["ru"] = count => {
+    const key = count % 10 === 1 && count % 100 !== 11 ? "one"
+        : [2, 3, 4].indexOf(count % 10) >= 0 && [12, 13, 14].indexOf(count % 100) < 0 ? "few"
+            : count % 10 === 0 || [5, 6, 7, 8, 9].indexOf(count % 10) >= 0 || [11, 12, 13, 14].indexOf(count % 100) >= 0 ? "many"
+                : "other";
+    return [key];
+};
+
+const options = { scope: "activerecord.attributes.user" };
+I18n.t("name", options);
+I18n.t(["greetings", "hello"]);
+
+I18n.l("currency", 1990.99);
+I18n.l("number", 1990.99);
+I18n.l("percentage", 123.45);
+
+I18n.toNumber(1000);
+I18n.toCurrency(1000);
+I18n.toPercentage(100);
+
+I18n.toNumber(1000, { precision: 0 });
+I18n.toNumber(1000, { delimiter: ".", separator: "," });
+I18n.toNumber(1000, { delimiter: ".", precision: 0 });
+
+I18n.toCurrency(1000, { precision: 0 });
+
+I18n.toHumanSize(1234);
+
+I18n.l("date.formats.short", "2009-09-18");
+I18n.l("time.formats.short", "2009-09-18 23:12:43");
+I18n.l("time.formats.short", "2009-11-09T18:10:34");
+I18n.l("time.formats.short", "2009-11-09T18:10:34Z");
+I18n.l("date.formats.short", 1251862029000);
+I18n.l("date.formats.short", "09/18/2009");
+I18n.l("date.formats.short", (new Date()));
+
+I18n.l("date.formats.ordinal_day", "2009-09-18", { day: "18th" });
+
+I18n.strftime(new Date(), "%d/%m/%Y");
+
+const point_in_number = 1000;
+I18n.t("point", { count: point_in_number, formatted_number: I18n.toNumber(point_in_number) });
+
+I18n.translations = {};
+I18n.translations["en"] = {
+  message: "Some special message for you"
+};
+I18n.translations["pt-BR"] = {
+  message: "Uma mensagem especial para você"
+};
diff --git a/types/i18n-js/index.d.ts b/types/i18n-js/index.d.ts
new file mode 100644
index 0000000000..4800125087
--- /dev/null
+++ b/types/i18n-js/index.d.ts
@@ -0,0 +1,79 @@
+// Type definitions for i18n-js 3.0
+// Project: https://github.com/fnando/i18n-js
+// Definitions by: Yuya Tanaka <https://github.com/ypresto>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+// tslint:disable-next-line:export-just-namespace
+export = I18n;
+export as namespace I18n;
+
+declare namespace I18n {
+    type Scope = string | string[];
+
+    let defaultLocale: string;
+    let locale: string;
+    let defaultSeparator: string;
+    let placeholder: RegExp;
+    let fallbacks: boolean;
+    let missingBehaviour: "message" | "guess";
+    let missingTranslationPrefix: string;
+
+    // tslint:disable-next-line prefer-declare-function
+    let missingTranslation: (scope: string, options?: TranslateOptions) => string | null | undefined;
+    // tslint:disable-next-line prefer-declare-function
+    let missingPlaceholder: (placeholder: string, message: string, options?: InterpolateOptions) => string | null | undefined;
+    // tslint:disable-next-line prefer-declare-function
+    let nullPlaceholder: (placeholder: string, message: string, options?: InterpolateOptions) => string | null | undefined;
+
+    let translations: { [locale: string]: object };
+    let locales: { [key: string]: string | string[] | ((locale: string) => string | string[]) };
+    let pluralization: { [locale: string]: (count: number) => string[] };
+
+    function reset(): void;
+
+    function currentLocale(): string;
+
+    interface InterpolateOptions {
+        [key: string]: any; // interpolation
+    }
+
+    interface TranslateOptions extends InterpolateOptions {
+        scope?: Scope;
+        message?: string;
+        defaults?: Array<{ message: string } | { scope: Scope }>;
+        defaultValue?: string;
+    }
+    function translate(scope: Scope, options?: TranslateOptions): string;
+    function t(scope: Scope, options?: TranslateOptions): string;
+
+    function localize(scope: "currency" | "number" | "percentage", value: number, options?: InterpolateOptions): string;
+    function localize(scope: Scope, value: string | number | Date, options?: InterpolateOptions): string;
+    function l(scope: "currency" | "number" | "percentage", value: number, options?: InterpolateOptions): string;
+    function l(scope: Scope, value: string | number | Date, options?: InterpolateOptions): string;
+
+    interface ToNumberOptions {
+        precision?: number;
+        separator?: string;
+        delimiter?: string;
+        strip_insignificant_zeros?: boolean;
+    }
+    function toNumber(num: number, options?: ToNumberOptions): string;
+
+    type ToPercentageOptions = ToNumberOptions;
+    function toPercentage(num: number, options?: ToPercentageOptions): string;
+
+    interface ToCurrencyOptions extends ToNumberOptions {
+        format?: string;
+        unit?: string;
+        sign_first?: boolean;
+    }
+    function toCurrency(num: number, options?: ToCurrencyOptions): string;
+
+    interface ToHumanSizeOptions extends ToNumberOptions {
+        format?: string;
+    }
+    function toHumanSize(num: number, options?: ToHumanSizeOptions): string;
+
+    function strftime(date: Date, format: string): string;
+}
diff --git a/types/i18n-js/tsconfig.json b/types/i18n-js/tsconfig.json
new file mode 100644
index 0000000000..4a9e4d110b
--- /dev/null
+++ b/types/i18n-js/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",
+        "i18n-js-tests.ts"
+    ]
+}
diff --git a/types/i18n-js/tslint.json b/types/i18n-js/tslint.json
new file mode 100644
index 0000000000..299e93b32f
--- /dev/null
+++ b/types/i18n-js/tslint.json
@@ -0,0 +1,7 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "indent": [true, "spaces", 4],
+        "quotemark": [true, "double", "avoid-escape"]
+    }
+}
diff --git a/types/iltorb/iltorb-tests.ts b/types/iltorb/iltorb-tests.ts
new file mode 100644
index 0000000000..5c30fcd3b5
--- /dev/null
+++ b/types/iltorb/iltorb-tests.ts
@@ -0,0 +1,36 @@
+import { createReadStream, createWriteStream } from 'fs';
+import * as br from 'iltorb';
+
+const opts: br.BrotliEncodeParams = {
+    disable_literal_context_modeling: false,
+    lgblock: 0,
+    lgwin: 22,
+    mode: 0,
+    quality: 11,
+    size_hint: 0
+};
+
+const onCompress = (err1: Error | null | undefined, compressed: Buffer) => {
+    br.decompress(compressed, (err2: Error | null | undefined, decompressed: Buffer) => {
+        console.log(decompressed.toString());
+    });
+};
+
+br.compress(Buffer.from('foo', 'utf8'), onCompress);
+
+br.compress(Buffer.from('foo', 'utf8'), opts, onCompress);
+
+createReadStream(__filename)
+    .pipe(br.compressStream())
+    .pipe(createWriteStream('foo.ts'));
+
+createReadStream(__dirname)
+    .pipe(br.compressStream(opts))
+    .pipe(createWriteStream('bar.ts'));
+
+createReadStream('bar.ts')
+    .pipe(br.decompressStream())
+    .pipe(createWriteStream('qux.ts'));
+
+br.decompressSync(br.compressSync(Buffer.from('foo', 'utf8')));
+br.decompressSync(br.compressSync(Buffer.from('foo', 'utf8'), opts));
diff --git a/types/iltorb/index.d.ts b/types/iltorb/index.d.ts
new file mode 100644
index 0000000000..bd6cd88fb7
--- /dev/null
+++ b/types/iltorb/index.d.ts
@@ -0,0 +1,30 @@
+// Type definitions for iltorb 2.0
+// Project: https://github.com/MayhemYDG/iltorb
+// Definitions by: Arturas Molcanovas <https://github.com/Alorel>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node"/>
+
+import { Transform } from 'stream';
+
+export interface BrotliEncodeParams {
+    disable_literal_context_modeling?: boolean;
+    lgblock?: number;
+    lgwin?: number;
+    mode?: number;
+    quality?: number;
+    size_hint?: number;
+}
+
+export type IltorbCallback = (err: Error | null | undefined, output: Buffer) => void;
+
+export function compress(buffer: Buffer, options: BrotliEncodeParams, callback: IltorbCallback): void;
+export function compress(buffer: Buffer, callback: IltorbCallback): void;
+
+export function decompress(buffer: Buffer, callback: IltorbCallback): void;
+
+export function compressSync(buffer: Buffer, options?: BrotliEncodeParams): Buffer;
+export function decompressSync(buffer: Buffer): Buffer;
+
+export function compressStream(options?: BrotliEncodeParams): Transform;
+export function decompressStream(): Transform;
diff --git a/types/iltorb/tsconfig.json b/types/iltorb/tsconfig.json
new file mode 100644
index 0000000000..c12ff988ba
--- /dev/null
+++ b/types/iltorb/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es5"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "iltorb-tests.ts"
+    ]
+}
diff --git a/types/iltorb/tslint.json b/types/iltorb/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/iltorb/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/jest/index.d.ts b/types/jest/index.d.ts
index 1b8d137094..5c2152694f 100644
--- a/types/jest/index.d.ts
+++ b/types/jest/index.d.ts
@@ -145,10 +145,16 @@ declare namespace jest {
      */
     function runOnlyPendingTimers(): typeof jest;
     /**
-     * Executes only the macro task queue (i.e. all tasks queued by setTimeout()
-     * or setInterval() and setImmediate()).
+     * (renamed to `advanceTimersByTime` in Jest 21.3.0+) Executes only the macro
+     * task queue (i.e. all tasks queued by setTimeout() or setInterval() and setImmediate()).
      */
     function runTimersToTime(msToRun: number): typeof jest;
+    /**
+     * Advances all timers by msToRun milliseconds. All pending "macro-tasks" that have been
+     * queued via setTimeout() or setInterval(), and would be executed within this timeframe
+     * will be executed.
+     */
+    function advanceTimersByTime(msToRun: number): typeof jest;
     /**
      * Explicitly supplies the mock object that the module system should return
      * for the specified module.
@@ -555,7 +561,7 @@ declare namespace jasmine {
     function anything(): Any;
     function arrayContaining(sample: any[]): ArrayContaining;
     function objectContaining(sample: any): ObjectContaining;
-    function createSpy(name: string, originalFn?: (...args: any[]) => any): Spy;
+    function createSpy(name?: string, originalFn?: (...args: any[]) => any): Spy;
     function createSpyObj(baseName: string, methodNames: any[]): any;
     function createSpyObj<T>(baseName: string, methodNames: any[]): T;
     function pp(value: any): string;
@@ -867,6 +873,7 @@ declare namespace jest {
         runAllTicks(): void;
         runAllTimers(): void;
         runTimersToTime(msToRun: number): void;
+        advanceTimersByTime(msToRun: number): void;
         runOnlyPendingTimers(): void;
         runWithRealTimers(callback: any): void;
         useFakeTimers(): void;
diff --git a/types/js-yaml/index.d.ts b/types/js-yaml/index.d.ts
index 543391b23b..2fa264cbd9 100644
--- a/types/js-yaml/index.d.ts
+++ b/types/js-yaml/index.d.ts
@@ -1,96 +1,103 @@
-// Type definitions for js-yaml 3.10.0
+// Type definitions for js-yaml 3.10
 // Project: https://github.com/nodeca/js-yaml
 // Definitions by: Bart van der Schoor <https://github.com/Bartvds>, Sebastian Clausen <https://github.com/sclausen>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
-declare namespace jsyaml {
-	export function safeLoad(str: string, opts?: LoadOptions): any;
-	export function load(str: string, opts?: LoadOptions): any;
+export function safeLoad(str: string, opts?: LoadOptions): any;
+export function load(str: string, opts?: LoadOptions): any;
 
-        export interface Type extends TypeConstructorOptions { }
-	export class Type {
-			constructor(tag: string, opts?: TypeConstructorOptions);
-			tag: string;
-	}
-	export class Schema {
-		constructor(definition: SchemaDefinition);
-		public static create(types: Type[] | Type): Schema;
-		public static create(schemas: Schema[] | Schema, types: Type[] | Type): Schema;
-	}
-
-	export function safeLoadAll(str: string, iterator?: (doc: any) => void, opts?: LoadOptions): any;
-	export function loadAll(str: string, iterator?: (doc: any) => void, opts?: LoadOptions): any;
-
-	export function safeDump(obj: any, opts?: DumpOptions): string;
-	export function dump(obj: any, opts?: DumpOptions): string;
-
-	export interface LoadOptions {
-		// string to be used as a file path in error/warning messages.
-		filename?: string;
-		// makes the loader to throw errors instead of warnings.
-		strict?: boolean;
-		// specifies a schema to use.
-		schema?: any;
-	}
-
-	export interface DumpOptions {
-		// indentation width to use (in spaces).
-		indent?: number;
-		// do not throw on invalid types (like function in the safe schema) and skip pairs and single values with such types.
-		skipInvalid?: boolean;
-		// specifies level of nesting, when to switch from block to flow style for collections. -1 means block style everwhere
-		flowLevel?: number;
-		// Each tag may have own set of styles.	- "tag" => "style" map.
-		styles?: Object;
-		// specifies a schema to use.
-		schema?: any;
-		// if true, sort keys when dumping YAML. If a function, use the function to sort the keys. (default: false)
-		sortKeys?: boolean | ((a: any, b: any) => number);
-		// set max line width. (default: 80)
-		lineWidth?: number;
-		// if true, don't convert duplicate objects into references (default: false)
-		noRefs?: boolean;
-		// if true don't try to be compatible with older yaml versions. Currently: don't quote "yes", "no" and so on, as required for YAML 1.1 (default: false)
-		noCompatMode?: boolean;
-		// if true flow sequences will be condensed, omitting the space between `key: value` or `a, b`. Eg. `'[a,b]'` or `{a:{b:c}}`. Can be useful when using yaml for pretty URL query params as spaces are %-encoded. (default: false)
-		condenseFlow?: boolean;
-	}
-
-	export interface TypeConstructorOptions {
-		kind?: string;
-		resolve?: Function;
-		construct?: Function;
-		instanceOf?: Object;
-		predicate?: string;
-		represent?: Function;
-		defaultStyle?: string;
-		styleAliases?: Object;
-	}
-
-	export interface SchemaDefinition {
-		implicit?: any[];
-		explicit?: any[];
-		include?: any[];
-	}
-
-	// only strings, arrays and plain objects: http://www.yaml.org/spec/1.2/spec.html#id2802346
-	export var FAILSAFE_SCHEMA: any;
-	// only strings, arrays and plain objects: http://www.yaml.org/spec/1.2/spec.html#id2802346
-	export var JSON_SCHEMA: any;
-	// same as JSON_SCHEMA: http://www.yaml.org/spec/1.2/spec.html#id2804923
-	export var CORE_SCHEMA: any;
-	// all supported YAML types, without unsafe ones (!!js/undefined, !!js/regexp and !!js/function): http://yaml.org/type/
-	export var DEFAULT_SAFE_SCHEMA: any;
-	// all supported YAML types.
-	export var DEFAULT_FULL_SCHEMA: any;
-	export var MINIMAL_SCHEMA: any;
-	export var SAFE_SCHEMA: any;
-
-	export class YAMLException extends Error {
-		constructor(reason?: any, mark?: any);
-		toString(compact?: boolean): string;
-	}
+export class Type {
+	constructor(tag: string, opts?: TypeConstructorOptions);
+	kind: 'sequence' | 'scalar' | 'mapping' | null;
+	resolve(data: any): boolean;
+	construct(data: any): any;
+	instanceOf: object | null;
+	predicate: string | null;
+	represent: ((data: object) => any) | { [x: string]: (data: object) => any; } | null;
+	defaultStyle: string | null;
+	styleAliases: { [x: string]: any; };
 }
 
-export = jsyaml;
-export as namespace jsyaml;
+/* tslint:disable-next-line:no-unnecessary-class */
+export class Schema implements SchemaDefinition {
+	constructor(definition: SchemaDefinition);
+	static create(types: Type[] | Type): Schema;
+	static create(schemas: Schema[] | Schema, types: Type[] | Type): Schema;
+}
+
+export function safeLoadAll(str: string, iterator?: (doc: any) => void, opts?: LoadOptions): any;
+export function loadAll(str: string, iterator?: (doc: any) => void, opts?: LoadOptions): any;
+
+export function safeDump(obj: any, opts?: DumpOptions): string;
+export function dump(obj: any, opts?: DumpOptions): string;
+
+export interface LoadOptions {
+	// string to be used as a file path in error/warning messages.
+	filename?: string;
+	// makes the loader to throw errors instead of warnings.
+	strict?: boolean;
+	// specifies a schema to use.
+	schema?: any;
+	// compatibility with JSON.parse behaviour.
+	json?: boolean;
+}
+
+export interface DumpOptions {
+	// indentation width to use (in spaces).
+	indent?: number;
+	// do not throw on invalid types (like function in the safe schema) and skip pairs and single values with such types.
+	skipInvalid?: boolean;
+	// specifies level of nesting, when to switch from block to flow style for collections. -1 means block style everwhere
+	flowLevel?: number;
+	// Each tag may have own set of styles.	- "tag" => "style" map.
+	styles?: { [x: string]: any; };
+	// specifies a schema to use.
+	schema?: any;
+	// if true, sort keys when dumping YAML. If a function, use the function to sort the keys. (default: false)
+	sortKeys?: boolean | ((a: any, b: any) => number);
+	// set max line width. (default: 80)
+	lineWidth?: number;
+	// if true, don't convert duplicate objects into references (default: false)
+	noRefs?: boolean;
+	// if true don't try to be compatible with older yaml versions. Currently: don't quote "yes", "no" and so on, as required for YAML 1.1 (default: false)
+	noCompatMode?: boolean;
+	// if true flow sequences will be condensed, omitting the space between `key: value` or `a, b`. Eg. `'[a,b]'` or `{a:{b:c}}`.
+	// Can be useful when using yaml for pretty URL query params as spaces are %-encoded. (default: false)
+	condenseFlow?: boolean;
+}
+
+export interface TypeConstructorOptions {
+	kind?: 'sequence' | 'scalar' | 'mapping';
+	resolve?: (data: any) => boolean;
+	construct?: (data: any) => any;
+	instanceOf?: object;
+	predicate?: string;
+	represent?: ((data: object) => any) | { [x: string]: (data: object) => any };
+	defaultStyle?: string;
+	styleAliases?: { [x: string]: any; };
+}
+
+export interface SchemaDefinition {
+	implicit?: any[];
+	explicit?: Type[];
+	include?: Schema[];
+}
+
+// only strings, arrays and plain objects: http://www.yaml.org/spec/1.2/spec.html#id2802346
+export let FAILSAFE_SCHEMA: Schema;
+// only strings, arrays and plain objects: http://www.yaml.org/spec/1.2/spec.html#id2802346
+export let JSON_SCHEMA: Schema;
+// same as JSON_SCHEMA: http://www.yaml.org/spec/1.2/spec.html#id2804923
+export let CORE_SCHEMA: Schema;
+// all supported YAML types, without unsafe ones (!!js/undefined, !!js/regexp and !!js/function): http://yaml.org/type/
+export let DEFAULT_SAFE_SCHEMA: Schema;
+// all supported YAML types.
+export let DEFAULT_FULL_SCHEMA: Schema;
+export let MINIMAL_SCHEMA: Schema;
+export let SAFE_SCHEMA: Schema;
+
+export class YAMLException extends Error {
+	constructor(reason?: any, mark?: any);
+	toString(compact?: boolean): string;
+}
diff --git a/types/js-yaml/js-yaml-tests.ts b/types/js-yaml/js-yaml-tests.ts
index af932cb934..3d5ecc17bf 100644
--- a/types/js-yaml/js-yaml-tests.ts
+++ b/types/js-yaml/js-yaml-tests.ts
@@ -1,45 +1,55 @@
-
-
 import yaml = require('js-yaml');
 import LoadOptions = yaml.LoadOptions;
 import DumpOptions = yaml.DumpOptions;
 import TypeConstructorOptions = yaml.TypeConstructorOptions;
 import SchemaDefinition = yaml.SchemaDefinition;
 
-var bool: boolean;
-var num: number;
-var str: string;
-var obj: Object;
-var value: any;
-var array: any[];
-var fn: Function;
-var schemaDefinition: SchemaDefinition = {
+const bool = true;
+const num = 0;
+const str = "";
+const obj: object = {};
+const map: { [x: string]: any; } = {};
+const array: any[] = [];
+const fn: (...args: any[]) => any = () => {};
+const type = new yaml.Type(str);
+
+const schemaDefinition: SchemaDefinition = {
 	implicit: array,
 	explicit: array,
 	include: array
 };
-var typeConstructorOptions: TypeConstructorOptions = {
-	kind: str,
+const typeConstructorOptions: TypeConstructorOptions = {
+	kind: "scalar",
 	resolve: fn,
 	construct: fn,
 	instanceOf: obj,
 	predicate: str,
 	represent: fn,
 	defaultStyle: str,
-	styleAliases: obj
+	styleAliases: map
 };
 
-var loadOpts: LoadOptions;
-var dumpOpts: DumpOptions;
+const schema: yaml.Schema = new yaml.Schema(schemaDefinition);
+
+let value: any;
+let loadOpts: LoadOptions;
+let dumpOpts: DumpOptions;
 
 // -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
 
+// $ExpectType Schema
 yaml.FAILSAFE_SCHEMA;
+// $ExpectType Schema
 yaml.JSON_SCHEMA;
+// $ExpectType Schema
 yaml.CORE_SCHEMA;
+// $ExpectType Schema
 yaml.DEFAULT_SAFE_SCHEMA;
+// $ExpectType Schema
 yaml.DEFAULT_FULL_SCHEMA;
+// $ExpectType Schema
 yaml.MINIMAL_SCHEMA;
+// $ExpectType Schema
 yaml.SAFE_SCHEMA;
 
 // -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
@@ -53,6 +63,9 @@ loadOpts = {
 loadOpts = {
 	schema: bool
 };
+loadOpts = {
+	json: bool
+};
 
 // -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
 
@@ -74,46 +87,87 @@ dumpOpts = {
 
 // -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
 
-value = yaml.safeLoad(str);
-value = yaml.safeLoad(str, loadOpts);
+// $ExpectType Type
+new yaml.Type(str, typeConstructorOptions);
 
-value = yaml.load(str);
-value = yaml.load(str, loadOpts);
+// $ExpectType "sequence" | "scalar" | "mapping" | null
+type.kind;
+// $ExpectType (data: any) => boolean
+type.resolve;
+// $ExpectType (data: any) => any
+type.construct;
+// $ExpectType object | null
+type.instanceOf;
+// $ExpectType string | null
+type.predicate;
+// $ExpectType ((data: object) => any) | { [x: string]: (data: object) => any; } | null
+type.represent;
+// $ExpectType string | null
+type.defaultStyle;
+// $ExpectType { [x: string]: any; }
+type.styleAliases;
 
 // -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
 
-value = yaml.safeLoadAll(str);
-value = yaml.safeLoadAll(str, (doc) => {
+// $ExpectType any
+yaml.safeLoad(str);
+// $ExpectType any
+yaml.safeLoad(str, loadOpts);
+
+// $ExpectType any
+yaml.load(str);
+// $ExpectType any
+yaml.load(str, loadOpts);
+
+// -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
+
+// $ExpectType any
+yaml.safeLoadAll(str);
+// $ExpectType any
+yaml.safeLoadAll(str, (doc) => {
 	value = doc;
 });
-value = yaml.safeLoadAll(str, (doc) => {
+// $ExpectType any
+yaml.safeLoadAll(str, (doc) => {
 	value = doc;
 }, loadOpts);
 value = yaml.safeLoadAll(str, undefined, loadOpts);
 
+// $ExpectType any
 value = yaml.loadAll(str);
-value = yaml.loadAll(str, (doc) => {
+// $ExpectType any
+yaml.loadAll(str, (doc) => {
 	value = doc;
 });
-value = yaml.loadAll(str, (doc) => {
+// $ExpectType any
+yaml.loadAll(str, (doc) => {
 	value = doc;
 }, loadOpts);
 value = yaml.loadAll(str, undefined, loadOpts);
 
 // -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
 
-value = yaml.safeDump(str);
-value = yaml.safeDump(str, dumpOpts);
+// $ExpectType string
+yaml.safeDump(str);
+// $ExpectType string
+yaml.safeDump(str, dumpOpts);
 
-value = yaml.dump(str);
-value = yaml.dump(str, dumpOpts);
+// $ExpectType string
+yaml.dump(str);
+// $ExpectType string
+yaml.dump(str, dumpOpts);
 
-value = new yaml.YAMLException();
-value = new yaml.Type(str, typeConstructorOptions);
-value = new yaml.Schema(schemaDefinition);
-value = yaml.Schema.create([new yaml.Type(str)]);
-value = yaml.Schema.create(new yaml.Type(str));
-value = yaml.Schema.create(new yaml.Schema(schemaDefinition), [new yaml.Type(str)]);
-value = yaml.Schema.create([new yaml.Schema(schemaDefinition)], [new yaml.Type(str)]);
-value = yaml.Schema.create(new yaml.Schema(schemaDefinition), new yaml.Type(str));
-value = yaml.Schema.create([new yaml.Schema(schemaDefinition)], new yaml.Type(str));
+new yaml.YAMLException();
+
+// $ExpectType Schema
+yaml.Schema.create([type]);
+// $ExpectType Schema
+yaml.Schema.create(type);
+// $ExpectType Schema
+yaml.Schema.create(schema, [type]);
+// $ExpectType Schema
+yaml.Schema.create([schema], [type]);
+// $ExpectType Schema
+yaml.Schema.create(schema, type);
+// $ExpectType Schema
+yaml.Schema.create([schema], type);
diff --git a/types/js-yaml/tsconfig.json b/types/js-yaml/tsconfig.json
index b1e787d1b3..c36931fa61 100644
--- a/types/js-yaml/tsconfig.json
+++ b/types/js-yaml/tsconfig.json
@@ -6,7 +6,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
@@ -20,4 +20,4 @@
         "index.d.ts",
         "js-yaml-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/js-yaml/tslint.json b/types/js-yaml/tslint.json
index a41bf5d19a..3db14f85ea 100644
--- a/types/js-yaml/tslint.json
+++ b/types/js-yaml/tslint.json
@@ -1,79 +1 @@
-{
-    "extends": "dtslint/dt.json",
-    "rules": {
-        "adjacent-overload-signatures": false,
-        "array-type": false,
-        "arrow-return-shorthand": false,
-        "ban-types": false,
-        "callable-types": false,
-        "comment-format": false,
-        "dt-header": false,
-        "eofline": false,
-        "export-just-namespace": false,
-        "import-spacing": false,
-        "interface-name": false,
-        "interface-over-type-literal": false,
-        "jsdoc-format": false,
-        "max-line-length": false,
-        "member-access": false,
-        "new-parens": false,
-        "no-any-union": false,
-        "no-boolean-literal-compare": false,
-        "no-conditional-assignment": false,
-        "no-consecutive-blank-lines": false,
-        "no-construct": false,
-        "no-declare-current-package": false,
-        "no-duplicate-imports": false,
-        "no-duplicate-variable": false,
-        "no-empty-interface": false,
-        "no-for-in-array": false,
-        "no-inferrable-types": false,
-        "no-internal-module": false,
-        "no-irregular-whitespace": false,
-        "no-mergeable-namespace": false,
-        "no-misused-new": false,
-        "no-namespace": false,
-        "no-object-literal-type-assertion": false,
-        "no-padding": false,
-        "no-redundant-jsdoc": false,
-        "no-redundant-jsdoc-2": false,
-        "no-redundant-undefined": false,
-        "no-reference-import": false,
-        "no-relative-import-in-test": false,
-        "no-self-import": false,
-        "no-single-declare-module": false,
-        "no-string-throw": false,
-        "no-unnecessary-callback-wrapper": false,
-        "no-unnecessary-class": false,
-        "no-unnecessary-generics": false,
-        "no-unnecessary-qualifier": false,
-        "no-unnecessary-type-assertion": false,
-        "no-useless-files": false,
-        "no-var-keyword": false,
-        "no-var-requires": false,
-        "no-void-expression": false,
-        "no-trailing-whitespace": false,
-        "object-literal-key-quotes": false,
-        "object-literal-shorthand": false,
-        "one-line": false,
-        "one-variable-per-declaration": false,
-        "only-arrow-functions": false,
-        "prefer-conditional-expression": false,
-        "prefer-const": false,
-        "prefer-declare-function": false,
-        "prefer-for-of": false,
-        "prefer-method-signature": false,
-        "prefer-template": false,
-        "radix": false,
-        "semicolon": false,
-        "space-before-function-paren": false,
-        "space-within-parens": false,
-        "strict-export-declare-modifiers": false,
-        "trim-file": false,
-        "triple-equals": false,
-        "typedef-whitespace": false,
-        "unified-signatures": false,
-        "void-return": false,
-        "whitespace": false
-    }
-}
+{ "extends": "dtslint/dt.json" }
diff --git a/types/js.spec/index.d.ts b/types/js.spec/index.d.ts
index 735de40976..764bfa845e 100644
--- a/types/js.spec/index.d.ts
+++ b/types/js.spec/index.d.ts
@@ -71,7 +71,7 @@ export interface Problem {
  * @param value the value to test
  * @returns true if valid
  */
-export function valid(spec: Spec, value: any): boolean;
+export function valid(spec: spec.SpecInput, value: any): boolean;
 
 /**
  * Returns the conformed value to this spec.
@@ -79,7 +79,7 @@ export function valid(spec: Spec, value: any): boolean;
  * @param value the value to test
  * @returns if the value does not conform to the spec, or the conformed value if it does.
  */
-export function conform(spec: Spec, value: any): any;
+export function conform(spec: spec.SpecInput, value: any): any;
 
 /**
  * Like explain(), but returns Problems array.
@@ -87,28 +87,28 @@ export function conform(spec: Spec, value: any): any;
  * @param value the value to test
  * @returns list of problems or null if none
  */
-export function explainData(spec: Spec, value: any): Problem[];
+export function explainData(spec: spec.SpecInput, value: any): Problem[];
 
 /**
  * Prints, to the console, reasons why the value did not conform to this spec.
  * @param spec the spec to test with
  * @param value the value to test
  */
-export function explain(spec: Spec, value: any): void;
+export function explain(spec: spec.SpecInput, value: any): void;
 
 /**
  * Returns a multiline string with reasons why the value did not conform to this spec.
  * @param spec the spec to test with
  * @param value the value to test
  */
-export function explainStr(spec: Spec, value: any): string;
+export function explainStr(spec: spec.SpecInput, value: any): string;
 
 /**
  * Tests if a value conforms to a spec, and if not, throws an Error.
  * @param spec the spec to test with
  * @param value the value to test
  */
-export function assert(spec: Spec, value: any): void;
+export function assert(spec: spec.SpecInput, value: any): void;
 
 export namespace symbol {
     /**
diff --git a/types/js.spec/js.spec-tests.ts b/types/js.spec/js.spec-tests.ts
index 8bb9611e87..e1d7703f76 100644
--- a/types/js.spec/js.spec-tests.ts
+++ b/types/js.spec/js.spec-tests.ts
@@ -7,20 +7,28 @@ const name: string = spec.name;
 const options: object = spec.options;
 
 const isValid: boolean = S.valid(S.spec.boolean, true);
+S.valid((value) => true, "a value");
 
 const result = S.conform(S.spec.map("dancing", {field: S.spec.string}), "not a map");
+S.conform((value) => true, "a value");
 
 const problems: S.Problem[] = S.explainData(S.spec.int, "not a number");
+S.explainData((value) => true, "a value");
 
 const {path, via, value, predicate}: {path: string[], via: string[], value: any, predicate: S.Predicate} = problems[0];
 
 const problemStr: string = S.explainStr(S.spec.even, 3);
+S.explainStr((value) => true, "a value");
 
 // $ExpectType void
 S.explain(S.spec.positive, true);
+// $ExpectType void
+S.explain((value) => true, "a value");
 
 // $ExpectType void
 S.assert(S.spec.string, "things");
+// $ExpectType void
+S.assert((value) => true, "a value");
 
 const symbols: symbol[] = [S.symbol.count, S.symbol.invalid, S.symbol.maxCount, S.symbol.minCount, S.symbol.optional];
 
diff --git a/types/keypress.js/index.d.ts b/types/keypress.js/index.d.ts
index 63da327acd..202990da93 100644
--- a/types/keypress.js/index.d.ts
+++ b/types/keypress.js/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Keypress 2.0
+// Type definitions for Keypress 2.1
 // Project: https://github.com/dmauro/Keypress/
 // Definitions by: Roger Chen <https://github.com/rcchen>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -39,9 +39,9 @@ export class Listener {
     simple_combo(keys: string, on_keydown_callback: (event?: KeyboardEvent, count?: number) => any): void;
     counting_combo(keys: string, on_count_callback: (event?: KeyboardEvent, count?: number) => any): void;
     sequence_combo(keys: string, callback: (event?: KeyboardEvent, count?: number) => any): void;
-    register_combo(combo: Combo): void;
+    register_combo(combo: Combo): Combo;
     unregister_combo(combo: Combo | string): void;
-    register_many(combos: Combo[]): void;
+    register_many(combos: Combo[]): Combo[];
     unregister_many(combos: Combo[] | string[]): void;
     get_registered_combos(): Combo[];
     destroy(): void;
diff --git a/types/koa-router/index.d.ts b/types/koa-router/index.d.ts
index b543a764b0..4ad96140eb 100644
--- a/types/koa-router/index.d.ts
+++ b/types/koa-router/index.d.ts
@@ -150,7 +150,7 @@ declare class Router {
      * "down" the middleware stack.
      */
     use(...middleware: Array<Router.IMiddleware>): Router;
-    use(path: string | RegExp, ...middleware: Array<Router.IMiddleware>): Router;
+    use(path: string | string[] | RegExp, ...middleware: Array<Router.IMiddleware>): Router;
 
     /**
      * HTTP get method
diff --git a/types/koa/index.d.ts b/types/koa/index.d.ts
index d46920bf07..d4f339aa32 100644
--- a/types/koa/index.d.ts
+++ b/types/koa/index.d.ts
@@ -136,6 +136,11 @@ declare interface ContextDelegatedRequest {
      */
     secure: boolean;
 
+    /**
+     * Request remote address. Supports X-Forwarded-For when app.proxy is true.
+     */
+    ip: string;
+
     /**
      * When `app.proxy` is `true`, parse
      * the "X-Forwarded-For" ip address list.
diff --git a/types/lodash/index.d.ts b/types/lodash/index.d.ts
index f038846d22..a0eaef941c 100644
--- a/types/lodash/index.d.ts
+++ b/types/lodash/index.d.ts
@@ -1234,7 +1234,7 @@ declare namespace _ {
          */
         findIndex<T>(
             array: List<T> | null | undefined,
-            predicate?: ListIterateeBoolean<T>,
+            predicate?: ListIterateeCustom<T, boolean>,
             fromIndex?: number
         ): number;
     }
@@ -1245,7 +1245,7 @@ declare namespace _ {
          */
         findIndex<T>(
             this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            predicate?: ListIterateeBoolean<T>,
+            predicate?: ListIterateeCustom<T, boolean>,
             fromIndex?: number
         ): number;
     }
@@ -1256,7 +1256,7 @@ declare namespace _ {
          */
         findIndex<T>(
             this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            predicate?: ListIterateeBoolean<T>,
+            predicate?: ListIterateeCustom<T, boolean>,
             fromIndex?: number
         ): LoDashExplicitWrapper<number>;
     }
@@ -1282,7 +1282,7 @@ declare namespace _ {
          */
         findLastIndex<T>(
             array: List<T> | null | undefined,
-            predicate?: ListIterateeBoolean<T>,
+            predicate?: ListIterateeCustom<T, boolean>,
             fromIndex?: number
         ): number;
     }
@@ -1293,7 +1293,7 @@ declare namespace _ {
          */
         findLastIndex<T>(
             this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            predicate?: ListIterateeBoolean<T>,
+            predicate?: ListIterateeCustom<T, boolean>,
             fromIndex?: number
         ): number;
     }
@@ -1304,7 +1304,7 @@ declare namespace _ {
          */
         findLastIndex<T>(
             this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            predicate?: ListIterateeBoolean<T>,
+            predicate?: ListIterateeCustom<T, boolean>,
             fromIndex?: number
         ): LoDashExplicitWrapper<number>;
     }
@@ -4315,6 +4315,14 @@ declare namespace _ {
          * @param thisArg The this binding of iteratee.
          * @return Returns the composed aggregate object.
          */
+        countBy<T>(
+            collection: string | null | undefined,
+            iteratee?: StringIterator<T>
+        ): Dictionary<number>;
+
+        /**
+         * @see _.countBy
+         */
         countBy<T>(
             collection: List<T> | null | undefined,
             iteratee?: ListIteratee<T>
@@ -4338,6 +4346,14 @@ declare namespace _ {
     }
 
     interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.countBy
+         */
+        countBy<T>(
+            this: LoDashImplicitWrapper<string | null | undefined>,
+            iteratee?: StringIterator<T>
+        ): LoDashImplicitWrapper<Dictionary<number>>;
+
         /**
          * @see _.countBy
          */
@@ -4364,6 +4380,14 @@ declare namespace _ {
     }
 
     interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.countBy
+         */
+        countBy<T>(
+            this: LoDashExplicitWrapper<string | null | undefined>,
+            iteratee?: StringIterator<T>
+        ): LoDashExplicitWrapper<Dictionary<number>>;
+
         /**
          * @see _.countBy
          */
@@ -4479,7 +4503,7 @@ declare namespace _ {
          */
         every<T>(
             collection: List<T> | null | undefined,
-            predicate?: ListIterateeBoolean<T>
+            predicate?: ListIterateeCustom<T, boolean>
         ): boolean;
 
         /**
@@ -4487,7 +4511,7 @@ declare namespace _ {
          */
         every<T>(
             collection: NumericDictionary<T> | null | undefined,
-            predicate?: NumericDictionaryIterateeBoolean<T>
+            predicate?: NumericDictionaryIterateeCustom<T, boolean>
         ): boolean;
 
         /**
@@ -4495,7 +4519,7 @@ declare namespace _ {
          */
         every<T extends object>(
             collection: T | null | undefined,
-            predicate?: ObjectIterateeBoolean<T>
+            predicate?: ObjectIterateeCustom<T, boolean>
         ): boolean;
     }
 
@@ -4505,7 +4529,7 @@ declare namespace _ {
          */
         every<T>(
             this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            predicate?: ListIterateeBoolean<T>
+            predicate?: ListIterateeCustom<T, boolean>
         ): boolean;
 
         /**
@@ -4513,7 +4537,7 @@ declare namespace _ {
          */
         every<T extends object>(
             this: LoDashImplicitWrapper<T | null | undefined>,
-            predicate?: ObjectIterateeBoolean<T>
+            predicate?: ObjectIterateeCustom<T, boolean>
         ): boolean;
 
         /**
@@ -4521,7 +4545,7 @@ declare namespace _ {
          */
         every<T>(
             this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
-            predicate?: NumericDictionaryIterateeBoolean<T>
+            predicate?: NumericDictionaryIterateeCustom<T, boolean>
         ): boolean;
     }
 
@@ -4531,7 +4555,7 @@ declare namespace _ {
          */
         every<T>(
             this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            predicate?: ListIterateeBoolean<T>
+            predicate?: ListIterateeCustom<T, boolean>
         ): LoDashExplicitWrapper<boolean>;
 
         /**
@@ -4539,7 +4563,7 @@ declare namespace _ {
          */
         every<T extends object>(
             this: LoDashExplicitWrapper<T | null | undefined>,
-            predicate?: ObjectIterateeBoolean<T>
+            predicate?: ObjectIterateeCustom<T, boolean>
         ): LoDashExplicitWrapper<boolean>;
 
         /**
@@ -4547,7 +4571,7 @@ declare namespace _ {
          */
         every<T>(
             this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
-            predicate?: NumericDictionaryIterateeBoolean<T>
+            predicate?: NumericDictionaryIterateeCustom<T, boolean>
         ): LoDashExplicitWrapper<boolean>;
     }
 
@@ -4589,7 +4613,7 @@ declare namespace _ {
          */
         filter<T>(
             collection: List<T> | null | undefined,
-            predicate?: ListIterateeBoolean<T>
+            predicate?: ListIterateeCustom<T, boolean>
         ): T[];
 
         /**
@@ -4605,7 +4629,7 @@ declare namespace _ {
          */
         filter<T extends object>(
             collection: T | null | undefined,
-            predicate?: ObjectIterateeBoolean<T>
+            predicate?: ObjectIterateeCustom<T, boolean>
         ): Array<T[keyof T]>;
     }
 
@@ -4631,7 +4655,7 @@ declare namespace _ {
          */
         filter<T>(
             this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            predicate?: ListIterateeBoolean<T>
+            predicate?: ListIterateeCustom<T, boolean>
         ): LoDashImplicitWrapper<T[]>;
 
         /**
@@ -4647,7 +4671,7 @@ declare namespace _ {
          */
         filter<T extends object>(
             this: LoDashImplicitWrapper<T | null | undefined>,
-            predicate?: ObjectIterateeBoolean<T>
+            predicate?: ObjectIterateeCustom<T, boolean>
         ): LoDashImplicitWrapper<Array<T[keyof T]>>;
     }
 
@@ -4673,7 +4697,7 @@ declare namespace _ {
          */
         filter<T>(
             this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            predicate?: ListIterateeBoolean<T>
+            predicate?: ListIterateeCustom<T, boolean>
         ): LoDashExplicitWrapper<T[]>;
 
         /**
@@ -4689,7 +4713,7 @@ declare namespace _ {
          */
         filter<T extends object>(
             this: LoDashExplicitWrapper<T | null | undefined>,
-            predicate?: ObjectIterateeBoolean<T>
+            predicate?: ObjectIterateeCustom<T, boolean>
         ): LoDashExplicitWrapper<Array<T[keyof T]>>;
     }
 
@@ -4724,7 +4748,7 @@ declare namespace _ {
          */
         find<T>(
             collection: List<T> | null | undefined,
-            predicate?: ListIterateeBoolean<T>,
+            predicate?: ListIterateeCustom<T, boolean>,
             fromIndex?: number
         ): T|undefined;
 
@@ -4742,7 +4766,7 @@ declare namespace _ {
          */
         find<T extends object>(
             collection: T | null | undefined,
-            predicate?: ObjectIterateeBoolean<T>,
+            predicate?: ObjectIterateeCustom<T, boolean>,
             fromIndex?: number
         ): T[keyof T]|undefined;
     }
@@ -4762,7 +4786,7 @@ declare namespace _ {
          */
         find<T>(
             this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            predicate?: ListIterateeBoolean<T>,
+            predicate?: ListIterateeCustom<T, boolean>,
             fromIndex?: number
         ): T|undefined;
 
@@ -4780,7 +4804,7 @@ declare namespace _ {
          */
         find<T extends object>(
             this: LoDashImplicitWrapper<T | null | undefined>,
-            predicate?: ObjectIterateeBoolean<T>,
+            predicate?: ObjectIterateeCustom<T, boolean>,
             fromIndex?: number
         ): T[keyof T]|undefined;
     }
@@ -4800,7 +4824,7 @@ declare namespace _ {
          */
         find<T>(
             this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            predicate?: ListIterateeBoolean<T>,
+            predicate?: ListIterateeCustom<T, boolean>,
             fromIndex?: number
         ): LoDashExplicitWrapper<T|undefined>;
 
@@ -4818,7 +4842,7 @@ declare namespace _ {
          */
         find<T extends object>(
             this: LoDashExplicitWrapper<T | null | undefined>,
-            predicate?: ObjectIterateeBoolean<T>,
+            predicate?: ObjectIterateeCustom<T, boolean>,
             fromIndex?: number
         ): LoDashExplicitWrapper<T[keyof T]|undefined>;
     }
@@ -4844,7 +4868,7 @@ declare namespace _ {
          */
         findLast<T>(
             collection: List<T> | null | undefined,
-            predicate?: ListIterateeBoolean<T>,
+            predicate?: ListIterateeCustom<T, boolean>,
             fromIndex?: number
         ): T|undefined;
 
@@ -4862,7 +4886,7 @@ declare namespace _ {
          */
         findLast<T extends object>(
             collection: T | null | undefined,
-            predicate?: ObjectIterateeBoolean<T>,
+            predicate?: ObjectIterateeCustom<T, boolean>,
             fromIndex?: number
         ): T[keyof T]|undefined;
     }
@@ -4882,7 +4906,7 @@ declare namespace _ {
          */
         findLast<T>(
             this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            predicate?: ListIterateeBoolean<T>,
+            predicate?: ListIterateeCustom<T, boolean>,
             fromIndex?: number
         ): T | undefined;
 
@@ -4900,7 +4924,7 @@ declare namespace _ {
          */
         findLast<T extends object>(
             this: LoDashImplicitWrapper<T | null | undefined>,
-            predicate?: ObjectIterateeBoolean<T>,
+            predicate?: ObjectIterateeCustom<T, boolean>,
             fromIndex?: number
         ): T[keyof T]|undefined;
     }
@@ -4920,7 +4944,7 @@ declare namespace _ {
          */
         findLast<T>(
             this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            predicate?: ListIterateeBoolean<T>,
+            predicate?: ListIterateeCustom<T, boolean>,
             fromIndex?: number
         ): LoDashExplicitWrapper<T | undefined>;
 
@@ -4938,7 +4962,7 @@ declare namespace _ {
          */
         findLast<T extends object>(
             this: LoDashExplicitWrapper<T | null | undefined>,
-            predicate?: ObjectIterateeBoolean<T>,
+            predicate?: ObjectIterateeCustom<T, boolean>,
             fromIndex?: number
         ): LoDashExplicitWrapper<T[keyof T]|undefined>;
     }
@@ -5849,9 +5873,17 @@ declare namespace _ {
          * @param thisArg The this binding of iteratee.
          * @return Returns the composed aggregate object.
          */
+        keyBy(
+            collection: string | null | undefined,
+            iteratee?: StringIterator<PropertyName>
+        ): Dictionary<string>;
+
+        /**
+         * @see _.keyBy
+         */
         keyBy<T>(
             collection: List<T> | null | undefined,
-            iteratee?: ListIteratee<T>
+            iteratee?: ListIterateeCustom<T, PropertyName>
         ): Dictionary<T>;
 
         /**
@@ -5859,7 +5891,7 @@ declare namespace _ {
          */
         keyBy<T extends object>(
             collection: T | null | undefined,
-            iteratee?: ObjectIteratee<T>
+            iteratee?: ObjectIterateeCustom<T, PropertyName>
         ): Dictionary<T[keyof T]>;
 
         /**
@@ -5867,17 +5899,25 @@ declare namespace _ {
          */
         keyBy<T>(
             collection: NumericDictionary<T> | null | undefined,
-            iteratee?: NumericDictionaryIteratee<T>
+            iteratee?: NumericDictionaryIterateeCustom<T, PropertyName>
         ): Dictionary<T>;
     }
 
     interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.keyBy
+         */
+        keyBy(
+            this: LoDashImplicitWrapper<string | null | undefined>,
+            iteratee?: StringIterator<PropertyName>
+        ): LoDashImplicitWrapper<Dictionary<string>>;
+
         /**
          * @see _.keyBy
          */
         keyBy<T>(
             this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            iteratee?: ListIteratee<T>
+            iteratee?: ListIterateeCustom<T, PropertyName>
         ): LoDashImplicitWrapper<Dictionary<T>>;
 
         /**
@@ -5885,7 +5925,7 @@ declare namespace _ {
          */
         keyBy<T extends object>(
             this: LoDashImplicitWrapper<T | null | undefined>,
-            iteratee?: ObjectIteratee<T>
+            iteratee?: ObjectIterateeCustom<T, PropertyName>
         ): LoDashImplicitWrapper<Dictionary<T[keyof T]>>;
 
         /**
@@ -5893,17 +5933,25 @@ declare namespace _ {
          */
         keyBy<T>(
             this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
-            iteratee?: NumericDictionaryIteratee<T>
+            iteratee?: NumericDictionaryIterateeCustom<T, PropertyName>
         ): LoDashImplicitWrapper<Dictionary<T>>;
     }
 
     interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.keyBy
+         */
+        keyBy(
+            this: LoDashExplicitWrapper<string | null | undefined>,
+            iteratee?: StringIterator<PropertyName>
+        ): LoDashExplicitWrapper<Dictionary<string>>;
+
         /**
          * @see _.keyBy
          */
         keyBy<T>(
             this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            iteratee?: ListIteratee<T>
+            iteratee?: ListIterateeCustom<T, PropertyName>
         ): LoDashExplicitWrapper<Dictionary<T>>;
 
         /**
@@ -5911,7 +5959,7 @@ declare namespace _ {
          */
         keyBy<T extends object>(
             this: LoDashExplicitWrapper<T | null | undefined>,
-            iteratee?: ObjectIteratee<T>
+            iteratee?: ObjectIterateeCustom<T, PropertyName>
         ): LoDashExplicitWrapper<Dictionary<T[keyof T]>>;
 
         /**
@@ -5919,7 +5967,7 @@ declare namespace _ {
          */
         keyBy<T>(
             this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
-            iteratee?: NumericDictionaryIteratee<T>
+            iteratee?: NumericDictionaryIterateeCustom<T, PropertyName>
         ): LoDashExplicitWrapper<Dictionary<T>>;
     }
 
@@ -6718,7 +6766,7 @@ declare namespace _ {
          */
         reject<T>(
             collection: List<T> | null | undefined,
-            predicate?: ListIterateeBoolean<T>
+            predicate?: ListIterateeCustom<T, boolean>
         ): T[];
 
         /**
@@ -6726,7 +6774,7 @@ declare namespace _ {
          */
         reject<T extends object>(
             collection: T | null | undefined,
-            predicate?: ObjectIterateeBoolean<T>
+            predicate?: ObjectIterateeCustom<T, boolean>
         ): Array<T[keyof T]>;
     }
 
@@ -6744,7 +6792,7 @@ declare namespace _ {
          */
         reject<T>(
             this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            predicate?: ListIterateeBoolean<T>
+            predicate?: ListIterateeCustom<T, boolean>
         ): LoDashImplicitWrapper<T[]>;
 
         /**
@@ -6752,7 +6800,7 @@ declare namespace _ {
          */
         reject<T extends object>(
             this: LoDashImplicitWrapper<T | null | undefined>,
-            predicate?: ObjectIterateeBoolean<T>
+            predicate?: ObjectIterateeCustom<T, boolean>
         ): LoDashImplicitWrapper<Array<T[keyof T]>>;
     }
 
@@ -6770,7 +6818,7 @@ declare namespace _ {
          */
         reject<T>(
             this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            predicate?: ListIterateeBoolean<T>
+            predicate?: ListIterateeCustom<T, boolean>
         ): LoDashExplicitWrapper<T[]>;
 
         /**
@@ -6778,7 +6826,7 @@ declare namespace _ {
          */
         reject<T extends object>(
             this: LoDashExplicitWrapper<T | null | undefined>,
-            predicate?: ObjectIterateeBoolean<T>
+            predicate?: ObjectIterateeCustom<T, boolean>
         ): LoDashExplicitWrapper<Array<T[keyof T]>>;
     }
 
@@ -6992,7 +7040,7 @@ declare namespace _ {
          */
         some<T>(
             collection: List<T> | null | undefined,
-            predicate?: ListIterateeBoolean<T>
+            predicate?: ListIterateeCustom<T, boolean>
         ): boolean;
 
         /**
@@ -7000,7 +7048,7 @@ declare namespace _ {
          */
         some<T extends object>(
             collection: T | null | undefined,
-            predicate?: ObjectIterateeBoolean<T>
+            predicate?: ObjectIterateeCustom<T, boolean>
         ): boolean;
 
         /**
@@ -7008,7 +7056,7 @@ declare namespace _ {
          */
         some<T>(
             collection: NumericDictionary<T> | null | undefined,
-            predicate?: NumericDictionaryIterateeBoolean<T>
+            predicate?: NumericDictionaryIterateeCustom<T, boolean>
         ): boolean;
     }
 
@@ -7018,7 +7066,7 @@ declare namespace _ {
          */
         some<T>(
             this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            predicate?: ListIterateeBoolean<T>
+            predicate?: ListIterateeCustom<T, boolean>
         ): boolean;
 
         /**
@@ -7026,7 +7074,7 @@ declare namespace _ {
          */
         some<T extends object>(
             this: LoDashImplicitWrapper<T | null | undefined>,
-            predicate?: ObjectIterateeBoolean<T>
+            predicate?: ObjectIterateeCustom<T, boolean>
         ): boolean;
 
         /**
@@ -7034,7 +7082,7 @@ declare namespace _ {
          */
         some<T>(
             this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
-            predicate?: NumericDictionaryIterateeBoolean<T>
+            predicate?: NumericDictionaryIterateeCustom<T, boolean>
         ): boolean;
     }
 
@@ -7044,7 +7092,7 @@ declare namespace _ {
          */
         some<T>(
             this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            predicate?: ListIterateeBoolean<T>
+            predicate?: ListIterateeCustom<T, boolean>
         ): LoDashExplicitWrapper<boolean>;
 
         /**
@@ -7052,7 +7100,7 @@ declare namespace _ {
          */
         some<T extends object>(
             this: LoDashExplicitWrapper<T | null | undefined>,
-            predicate?: ObjectIterateeBoolean<T>
+            predicate?: ObjectIterateeCustom<T, boolean>
         ): LoDashExplicitWrapper<boolean>;
 
         /**
@@ -7060,7 +7108,7 @@ declare namespace _ {
          */
         some<T>(
             this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
-            predicate?: NumericDictionaryIterateeBoolean<T>
+            predicate?: NumericDictionaryIterateeCustom<T, boolean>
         ): LoDashExplicitWrapper<boolean>;
     }
 
@@ -9315,14 +9363,16 @@ declare namespace _ {
         /**
          * @see _.conformsTo
          */
-        conformsTo(source: ConformsPredicateObject<TValue>): boolean;
+        conformsTo<T>(this: LoDashImplicitWrapper<T>, source: ConformsPredicateObject<T>): boolean;
+        // Note: we can't use TValue here,  because it generates a typescript error when strictFunctionTypes is enabled.
     }
 
     interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.conformsTo
          */
-        conformsTo(source: ConformsPredicateObject<TValue>): LoDashExplicitWrapper<boolean>;
+        conformsTo<T>(this: LoDashImplicitWrapper<T>, source: ConformsPredicateObject<T>): LoDashExplicitWrapper<boolean>;
+        // Note: we can't use TValue here,  because it generates a typescript error when strictFunctionTypes is enabled.
     }
 
     type CondPair<T, R> = [(val: T) => boolean, (val: T) => R]
@@ -10723,7 +10773,7 @@ declare namespace _ {
         /**
          * @see _.toArray
          */
-        toArray(): LoDashImplicitWrapper<Array<TValue[keyof TValue]>>;
+        toArray<T extends object>(this: LoDashImplicitWrapper<T>): LoDashImplicitWrapper<Array<T[keyof T]>>;
     }
 
     interface LoDashExplicitWrapper<TValue> {
@@ -10735,7 +10785,7 @@ declare namespace _ {
         /**
          * @see _.toArray
          */
-        toArray(): LoDashExplicitWrapper<Array<TValue[keyof TValue]>>;
+        toArray<T extends object>(this: LoDashImplicitWrapper<T>): LoDashExplicitWrapper<Array<T[keyof T]>>;
     }
 
     //_.toPlainObject
@@ -14348,6 +14398,9 @@ declare namespace _ {
              ...props: Array<Many<U>>
         ): Pick<T, U>;
 
+        /**
+         * @see _.pick
+         */
         pick<T>(
             object: T | null | undefined,
             ...props: PropertyPath[]
@@ -14355,6 +14408,14 @@ declare namespace _ {
     }
 
     interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.pick
+         */
+        pick<T extends object, U extends keyof T>(
+            this: LoDashImplicitWrapper<T | null | undefined>,
+            ...props: Array<Many<U>>
+        ): LoDashImplicitWrapper<Pick<T, U>>;
+
         /**
          * @see _.pick
          */
@@ -14365,6 +14426,14 @@ declare namespace _ {
     }
 
     interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.pick
+         */
+        pick<T extends object, U extends keyof T>(
+            this: LoDashExplicitWrapper<T | null | undefined>,
+            ...props: Array<Many<U>>
+        ): LoDashExplicitWrapper<Pick<T, U>>;
+
         /**
          * @see _.pick
          */
@@ -17015,13 +17084,13 @@ declare namespace _ {
     type ArrayIterator<T, TResult> = (value: T, index: number, collection: T[]) => TResult;
     type ListIterator<T, TResult> = (value: T, index: number, collection: List<T>) => TResult;
     type ListIteratee<T> = ListIterator<T, NotVoid> | string | [string, any] | PartialDeep<T>;
-    type ListIterateeBoolean<T> = ListIterator<T, boolean> | string | [string, any] | PartialDeep<T>;
+    type ListIterateeCustom<T, TResult> = ListIterator<T, TResult> | string | [string, any] | PartialDeep<T>;
     type ListIteratorTypeGuard<T, S extends T> = (value: T, index: number, collection: List<T>) => value is S;
 
     // 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 ObjectIterateeBoolean<TObject> = ObjectIterator<TObject, boolean> | string | [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>;
@@ -17030,7 +17099,7 @@ declare namespace _ {
 
     type NumericDictionaryIterator<T, TResult> = (value: T, key: number, collection: NumericDictionary<T>) => TResult;
     type NumericDictionaryIteratee<T> = NumericDictionaryIterator<T, NotVoid> | string | [string, any] | PartialDeep<T>;
-    type NumericDictionaryIterateeBoolean<T> = NumericDictionaryIterator<T, boolean> | 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;
 
diff --git a/types/lodash/lodash-tests.ts b/types/lodash/lodash-tests.ts
index e40569204d..dbefb1abaa 100644
--- a/types/lodash/lodash-tests.ts
+++ b/types/lodash/lodash-tests.ts
@@ -4,86 +4,19 @@ interface IFoodOrganic {
     name: string;
     organic: boolean;
 }
-
-interface IFoodType {
-    name: string;
-    type: string;
-}
-
-interface IFoodCombined {
-    name: string;
-    organic: boolean;
-    type: string;
-}
-
-interface IStoogesQuote {
-    name: string;
-    quotes: string[];
-}
-
 interface IStoogesAge {
     name: string;
     age: number;
 }
 
-interface IStoogesCombined {
-    name: string;
-    age: number;
-    quotes: string[];
-}
-
-interface IKey {
-    dir: string;
-    code: number;
-}
-
-interface IDictionary<T> {
-    [index: string]: T;
-}
-
 const foodsOrganic: IFoodOrganic[] = [
     { name: 'banana', organic: true },
     { name: 'beet', organic: false },
 ];
-const foodsType: IFoodType[] = [
-    { name: 'apple', type: 'fruit' },
-    { name: 'banana', type: 'fruit' },
-    { name: 'beet', type: 'vegetable' }
-];
-const foodsCombined: IFoodCombined[] = [
-    { 'name': 'apple', 'organic': false, 'type': 'fruit' },
-    { 'name': 'carrot', 'organic': true, 'type': 'vegetable' }
-];
-
-const stoogesQuotes: IStoogesQuote[] = [
-    { 'name': 'curly', 'quotes': ['Oh, a wise guy, eh?', 'Poifect!'] },
-    { 'name': 'moe', 'quotes': ['Spread out!', 'You knucklehead!'] }
-];
 const stoogesAges: IStoogesAge[] = [
     { 'name': 'moe', 'age': 40 },
     { 'name': 'larry', 'age': 50 }
 ];
-const stoogesAgesDict: IDictionary<IStoogesAge> = {
-    first: { 'name': 'moe', 'age': 40 },
-    second: { 'name': 'larry', 'age': 50 }
-};
-const stoogesCombined: IStoogesCombined[] = [
-    { 'name': 'curly', 'age': 30, 'quotes': ['Oh, a wise guy, eh?', 'Poifect!'] },
-    { 'name': 'moe', 'age': 40, 'quotes': ['Spread out!', 'You knucklehead!'] }
-];
-
-const keys: IKey[] = [
-    { 'dir': 'left', 'code': 97 },
-    { 'dir': 'right', 'code': 100 }
-];
-
-class Dog {
-    constructor(public name: string) { }
-
-    bark() {
-        // Woof
-    }
-}
 
 let result: any;
 
@@ -4591,9 +4524,9 @@ namespace TestFilter {
     let obj: any = {};
     let dictionary: _.Dictionary<TResult> | null | undefined = obj;
 
-    let stringIterator: (char: string, index: number, string: string) => any = (char: string, index: number, string: string) => 1;
-    let listIterator: (value: TResult, index: number, collection: _.List<TResult>) => any = (value: TResult, index: number, collection: _.List<TResult>) => 1;
-    let dictionaryIterator: (value: TResult, key: string, collection: _.Dictionary<TResult>) => any = (value: TResult, key: string, collection: _.Dictionary<TResult>) => 1;
+    let stringIterator = (char: string, index: number, string: string) => true;
+    let listIterator = (value: TResult, index: number, collection: _.List<TResult>) => true;
+    let dictionaryIterator = (value: TResult, key: string, collection: _.Dictionary<TResult>) => true;
 
     {
         let result: string[];
@@ -5207,7 +5140,7 @@ namespace TestFlatMapDepth {
 
     let listIterator: (value: number|number[], index: number, collection: _.List<number|number[]>) => _.ListOfRecursiveArraysOrValues<number> = (a, b, c) =>[ 1];
 
-    let dictionaryIterator: (value: number|number[], key: number, collection: _.Dictionary<number|number[]>) => _.ListOfRecursiveArraysOrValues<number> = (a, b, c) => [1];
+    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];
 
@@ -5776,8 +5709,8 @@ namespace TestGroupBy {
     {
         let result: _.Dictionary<string[]>;
 
-        result = _.groupBy<string>('');
-        result = _.groupBy<string>('', stringIterator);
+        result = _.groupBy('');
+        result = _.groupBy('', stringIterator);
     }
 
     {
@@ -5909,16 +5842,16 @@ namespace TestKeyBy {
     let dictionary: _.Dictionary<SampleObject> | null | undefined = obj;
     let numericDictionary: _.NumericDictionary<SampleObject> | null | undefined = obj;
 
-    let stringIterator: (value: string, index: number, collection: string) => any = (value: string, index: number, collection: string) => 1;
-    let listIterator: (value: SampleObject, index: number, collection: _.List<SampleObject>) => any = (value: SampleObject, index: number, collection: _.List<SampleObject>) => 1;
-    let dictionaryIterator: (value: SampleObject, key: string, collection: _.Dictionary<SampleObject>) => any = (value: SampleObject, key: string, collection: _.Dictionary<SampleObject>) => 1;
-    let numericDictionaryIterator: (value: SampleObject, key: number, collection: _.NumericDictionary<SampleObject>) => any = (value: SampleObject, key: number, collection: _.NumericDictionary<SampleObject>) => 1;
+    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 result: _.Dictionary<string>;
 
-        result = _.keyBy<string>('abcd');
-        result = _.keyBy<string>('abcd', stringIterator);
+        result = _.keyBy('abcd');
+        result = _.keyBy('abcd', stringIterator);
     }
 
     {
@@ -6464,9 +6397,9 @@ namespace TestReject {
     let obj: any = {};
     let dictionary: _.Dictionary<TResult> | null | undefined = obj;
 
-    let stringIterator: (char: string, index: number, string: string) => any = (char: string, index: number, string: string) => 1;
-    let listIterator: (value: TResult, index: number, collection: _.List<TResult>) => any = (value: TResult, index: number, collection: _.List<TResult>) => 1;
-    let dictionaryIterator: (value: TResult, key: string, collection: _.Dictionary<TResult>) => any = (value: TResult, key: string, collection: _.Dictionary<TResult>) => 1;
+    let stringIterator = (char: string, index: number, string: string) => true;
+    let listIterator = (value: TResult, index: number, collection: _.List<TResult>) => true;
+    let dictionaryIterator = (value: TResult, key: string, collection: _.Dictionary<TResult>) => true;
 
     {
         let result: string[];
@@ -8667,9 +8600,7 @@ namespace TestIsEqual {
 
 // _.isEqualWith
 namespace TestIsEqualWith {
-    let customizer = (value: any, other: any, indexOrKey: number|string|undefined, parent: any, otherParent: any, stack: any) => {
-        return value ? undefined : true;
-    };
+    let customizer = (value: any, other: any, indexOrKey: number|string|symbol|undefined, parent: any, otherParent: any, stack: any) => true;
 
     {
         let result: boolean;
@@ -8873,7 +8804,7 @@ namespace TestIsMatch {
 
 // _.isMatchWith
 namespace TestIsMatchWith {
-    let testIsMatchCustiomizerFn = (value: any, other: any, indexOrKey: number|string) => true;
+    let testIsMatchCustiomizerFn = (value: any, other: any, indexOrKey: number|string|symbol) => true;
 
     let result: boolean;
 
@@ -11890,7 +11821,7 @@ namespace TestPick {
     {
         let result: Pick<TResult, 'a' | 'b'>;
         result = _.pick(obj, 'a', 'b');
-        result = _.pick(obj, ['a', 'b']);
+        result = _.pick(obj, ['a' as 'a', 'b' as 'b']);
     }
 
     {
@@ -11901,6 +11832,13 @@ namespace TestPick {
         result = _(obj).pick<TResult>(['b', 1], 0, 'a');
     }
 
+    {
+        let result: _.LoDashImplicitWrapper<Pick<TResult, 'a' | 'b'>>;
+
+        result = _(obj).pick('a', 'b');
+        result = _(obj).pick(['a' as 'a', 'b' as 'b']);
+    }
+
     {
         let result: _.LoDashExplicitWrapper<Partial<TResult>>;
 
@@ -11908,6 +11846,13 @@ namespace TestPick {
         result = _(obj).chain().pick<TResult>(0, 'a');
         result = _(obj).chain().pick<TResult>(['b', 1], 0, 'a');
     }
+
+    {
+        let result: _.LoDashExplicitWrapper<Pick<TResult, 'a' | 'b'>>;
+
+        result = _(obj).chain().pick('a', 'b');
+        result = _(obj).chain().pick(['a' as 'a', 'b' as 'b']);
+    }
 }
 
 // _.pickBy
diff --git a/types/lodash/tsconfig.json b/types/lodash/tsconfig.json
index 2c4aa57c54..8bd56c0b87 100644
--- a/types/lodash/tsconfig.json
+++ b/types/lodash/tsconfig.json
@@ -7,7 +7,7 @@
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
-        "strictFunctionTypes": false,
+        "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"
diff --git a/types/lolex/index.d.ts b/types/lolex/index.d.ts
index c0dec4cd56..510cb911ec 100644
--- a/types/lolex/index.d.ts
+++ b/types/lolex/index.d.ts
@@ -1,6 +1,8 @@
-// Type definitions for lolex 1.5
+// Type definitions for lolex 2.1
 // Project: https://github.com/sinonjs/lolex
-// Definitions by: Wim Looman <https://github.com/Nemo157>, Josh Goldberg <https://github.com/joshuakgoldberg>
+// Definitions by: Wim Looman <https://github.com/Nemo157>
+//                 Josh Goldberg <https://github.com/joshuakgoldberg>
+//                 Rogier Schouten <https://github.com/rogierschouten>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /**
@@ -34,7 +36,7 @@ type BrowserClock = LolexClock<number>;
 type NodeClock = LolexClock<NodeTimer> & {
     /**
      * Mimicks process.hrtime().
-     * 
+     *
      * @param prevTime   Previous system time to calculate time elapsed.
      * @returns High resolution real time as [seconds, nanoseconds].
      */
@@ -49,7 +51,7 @@ type Clock = BrowserClock | NodeClock;
 /**
  * Names of clock methods that may be faked by install.
  */
-type FakeMethod = "setTimeout" | "clearTimeout" | "setImmediate" | "clearImmediate" | "setInterval" | "clearInterval" | "Date";
+type FakeMethod = "setTimeout" | "clearTimeout" | "setImmediate" | "clearImmediate" | "setInterval" | "clearInterval" | "Date" | "nextTick" | "hrtime";
 
 /**
  * Controls the flow of time.
@@ -67,7 +69,7 @@ export interface LolexClock<TTimerId extends TimerId> {
 
     /**
      * Schedules a callback to be fired once timeout milliseconds have ticked by.
-     * 
+     *
      * @param callback   Callback to be fired.
      * @param timeout   How many ticks to wait to run the callback.
      * @param args   Any extra arguments to pass to the callback.
@@ -77,14 +79,14 @@ export interface LolexClock<TTimerId extends TimerId> {
 
     /**
      * Clears a timer, as long as it was created using setTimeout.
-     * 
+     *
      * @param id   Timer ID or object.
      */
     clearTimeout(id: TTimerId): void;
 
     /**
      * Schedules a callback to be fired every time timeout milliseconds have ticked by.
-     * 
+     *
      * @param callback   Callback to be fired.
      * @param timeout   How many ticks to wait between callbacks.
      * @param args   Any extra arguments to pass to the callback.
@@ -94,14 +96,14 @@ export interface LolexClock<TTimerId extends TimerId> {
 
     /**
      * Clears a timer, as long as it was created using setInterval.
-     * 
+     *
      * @param id   Timer ID or object.
      */
     clearInterval(id: TTimerId): void;
 
     /**
      * Schedules the callback to be fired once 0 milliseconds have ticked by.
-     * 
+     *
      * @param callback   Callback to be fired.
      * @remarks You'll still have to call clock.tick() for the callback to fire.
      * @remarks If called during a tick the callback won't fire until 1 millisecond has ticked by.
@@ -110,11 +112,16 @@ export interface LolexClock<TTimerId extends TimerId> {
 
     /**
      * Clears a timer, as long as it was created using setImmediate.
-     * 
+     *
      * @param id   Timer ID or object.
      */
     clearImmediate(id: TTimerId): void;
 
+    /**
+     * Simulates process.nextTick();
+     */
+    nextTick(callback: () => void): void;
+
     /**
      * Advances the clock to the the moment of the first scheduled timer, firing it.
      */
@@ -122,14 +129,14 @@ export interface LolexClock<TTimerId extends TimerId> {
 
     /**
      * Advance the clock, firing callbacks if necessary.
-     * 
+     *
      * @param time   How many ticks to advance by.
      */
     tick(time: number | string): void;
 
     /**
      * Runs all pending timers until there are none remaining.
-     * 
+     *
      * @remarks  If new timers are added while it is executing they will be run as well.
      */
     runAll(): void;
@@ -142,7 +149,7 @@ export interface LolexClock<TTimerId extends TimerId> {
 
     /**
      * Simulates a user changing the system clock.
-     * 
+     *
      * @param now   New system time.
      * @remarks This affects the current time but it does not in itself cause timers to fire.
      */
@@ -157,7 +164,7 @@ export interface LolexClock<TTimerId extends TimerId> {
 
 /**
  * Creates a clock.
- * 
+ *
  * @param now   Current time for the clock.
  * @param loopLimit    Maximum number of timers that will be run when calling runAll()
  *                     before assuming that we have an infinite loop and throwing an error
@@ -167,23 +174,47 @@ export interface LolexClock<TTimerId extends TimerId> {
  */
 export declare function createClock<TClock extends Clock>(now?: number | Date, loopLimit?: number): TClock;
 
-/**
- * Creates a clock and installs it globally.
- * 
- * @param now   Current time for the clock, as with lolex.createClock().
- * @param toFake   Names of methods that should be faked.
- * @type TClock   Type of clock to create.
- * @usage lolex.install(["setTimeout", "clearTimeout"]);
- */
-export declare function install<TClock extends Clock>(now?: number | Date, toFake?: FakeMethod[]): TClock;
+
+export interface LolexInstallOpts {
+    /**
+     * Installs lolex onto the specified target context (default: global)
+     */
+    target?: any;
+
+    /**
+     * Installs lolex with the specified unix epoch (default: 0)
+     */
+    now?: number;
+
+    /**
+     * An array with explicit function names to hijack. When not set, lolex will automatically fake all methods except nextTick
+     * e.g., lolex.install({ toFake: ["setTimeout", "nextTick"]}) will fake only setTimeout and nextTick
+     */
+    toFake?: FakeMethod[];
+
+    /**
+     * The maximum number of timers that will be run when calling runAll() (default: 1000)
+     */
+    loopLimit?: number;
+
+    /**
+     * Tells lolex to increment mocked time automatically based on the real system time shift (e.g. the mocked time will be incremented by
+     * 20ms for every 20ms change in the real system time) (default: false)
+     */
+    shouldAdvanceTime?: boolean;
+
+    /**
+     * Relevant only when using with shouldAdvanceTime: true. increment mocked time by advanceTimeDelta ms every advanceTimeDelta ms change
+     * in the real system time (default: 20)
+     */
+    advanceTimeDelta?: number;
+}
 
 /**
- * Creates a clock and installs it onto the context object.
- * 
- * @param context   Context to install the clock onto.
+ * Creates a clock and installs it globally.
+ *
  * @param now   Current time for the clock, as with lolex.createClock().
  * @param toFake   Names of methods that should be faked.
  * @type TClock   Type of clock to create.
- * @usage lolex.install(context, ["setTimeout", "clearTimeout"]);
  */
-export declare function install<TClock extends Clock>(context?: any, now?: number | Date, toFake?: FakeMethod[]): TClock;
+export declare function install<TClock extends Clock>(opts: LolexInstallOpts): TClock;
diff --git a/types/lolex/lolex-tests.ts b/types/lolex/lolex-tests.ts
index 876e4280c5..95b6a2be78 100644
--- a/types/lolex/lolex-tests.ts
+++ b/types/lolex/lolex-tests.ts
@@ -16,25 +16,14 @@ lolex.createClock<lolex.NodeClock>(new Date());
 lolex.createClock<lolex.NodeClock>(7, 9001);
 lolex.createClock<lolex.NodeClock>(new Date(), 9001);
 
-lolex.install<lolex.BrowserClock>(7);
-lolex.install<lolex.BrowserClock>(new Date());
-lolex.install<lolex.BrowserClock>(7, ["setTimeout"]);
-lolex.install<lolex.BrowserClock>(new Date(), ["setTimeout"]);
-
-lolex.install<lolex.NodeClock>(7);
-lolex.install<lolex.NodeClock>(new Date());
-lolex.install<lolex.NodeClock>(7, ["setTimeout"]);
-lolex.install<lolex.NodeClock>(new Date(), ["setTimeout"]);
-
-lolex.install<lolex.BrowserClock>({}, 7);
-lolex.install<lolex.BrowserClock>({}, new Date());
-lolex.install<lolex.BrowserClock>({}, 7, ["setTimeout"]);
-lolex.install<lolex.BrowserClock>({}, new Date(), ["setTimeout"]);
-
-lolex.install<lolex.NodeClock>({}, 7);
-lolex.install<lolex.NodeClock>({}, new Date());
-lolex.install<lolex.NodeClock>({}, 7, ["setTimeout"]);
-lolex.install<lolex.NodeClock>({}, new Date(), ["setTimeout"]);
+lolex.install<lolex.BrowserClock>({
+	advanceTimeDelta: 20,
+	loopLimit: 10,
+	now: 0,
+	shouldAdvanceTime: true,
+	target: {},
+	toFake: ["setTimeout", "nextTick", "hrtime"]
+});
 
 const browserNow: number = browserClock.now;
 const browserDate: Date = new browserClock.Date();
@@ -80,5 +69,7 @@ nodeClock.setSystemTime();
 nodeClock.setSystemTime(7);
 nodeClock.setSystemTime(new Date());
 
+nodeClock.nextTick(() => undefined);
+
 browserClock.uninstall();
 nodeClock.uninstall();
diff --git a/types/lusca/index.d.ts b/types/lusca/index.d.ts
new file mode 100644
index 0000000000..8527ef3411
--- /dev/null
+++ b/types/lusca/index.d.ts
@@ -0,0 +1,78 @@
+// Type definitions for lusca 1.5
+// Project: https://github.com/krakenjs/lusca#readme
+// Definitions by: Corbin Crutchley <https://github.com/crutchcorn>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+import express = require('express');
+
+declare function lusca(options?: lusca.LuscaOptions): express.RequestHandler;
+
+declare namespace lusca {
+    /*~ Documentation declares that:
+     *~ Setting any value to false will disable it.
+     */
+    interface LuscaOptions {
+        csrf?: csrfOptions | boolean;
+        csp?: cspOptions | false;
+        xframe?: string | false;
+        p3p?: string | false;
+        hsts?: hstsOptions | false;
+        xssProtection?: xssProtectionOptions | boolean;
+        nosniff?: boolean;
+        referrerPolicy?: string | false;
+    }
+
+    interface cspOptions {
+        policy?: string | object | Array<object | string>;
+        reportOnly?: boolean;
+        reportUri?: string;
+        styleNonce?: boolean;
+        scriptNonce?: boolean;
+    }
+
+    interface hstsOptions {
+        maxAge?: number;
+        includeSubDomains?: boolean;
+        preload?: boolean;
+    }
+
+    type csrfOptions = csrfOptionsAngular | csrfOptionsNonAngular;
+
+    interface csrfOptionsAngular  {
+        key?: string;
+        secret?: string;
+        impl?: () => any;
+        cookie?: string | {
+            options?: object;
+        };
+        angular: true;
+    }
+
+    interface csrfOptionsNonAngular {
+        key?: string;
+        secret?: string;
+        impl?: () => any;
+        cookie?: string | {
+            name: string;
+            options?: object;
+        };
+        angular?: false;
+    }
+
+    interface xssProtectionOptions {
+        enabled?: boolean;
+        mode?: string;
+    }
+
+    function csrf(options?: csrfOptions): express.RequestHandler;
+    function csp(options?: cspOptions): express.RequestHandler;
+    function xframe(value: string): express.RequestHandler;
+    function p3p(value: string): express.RequestHandler;
+    function hsts(options?: hstsOptions): express.RequestHandler;
+    function xssProtection(options?: xssProtectionOptions | true): express.RequestHandler;
+    function nosniff(): express.RequestHandler;
+    function referrerPolicy(value: string): express.RequestHandler;
+}
+
+export = lusca;
diff --git a/types/lusca/lusca-tests.ts b/types/lusca/lusca-tests.ts
new file mode 100644
index 0000000000..8a74ec5e8a
--- /dev/null
+++ b/types/lusca/lusca-tests.ts
@@ -0,0 +1,24 @@
+import express = require('express');
+import lusca = require('lusca');
+
+const app = express();
+
+app.use(lusca({
+    csrf: true,
+    csp: { policy: "referrer no-referrer"},
+    xframe: 'SAMEORIGIN',
+    p3p: 'ABCDEF',
+    hsts: {maxAge: 31536000, includeSubDomains: true, preload: true},
+    xssProtection: true,
+    nosniff: true,
+    referrerPolicy: 'same-origin'
+}));
+
+app.use(lusca.csrf());
+app.use(lusca.csp({policy: [{ "img-src": "'self' http:" }, "block-all-mixed-content"], reportOnly: false}));
+app.use(lusca.xframe('SAMEORIGIN'));
+app.use(lusca.p3p('ABCDEF'));
+app.use(lusca.hsts({ maxAge: 31536000 }));
+app.use(lusca.xssProtection(true));
+app.use(lusca.nosniff());
+app.use(lusca.referrerPolicy('same-origin'));
diff --git a/types/lusca/tsconfig.json b/types/lusca/tsconfig.json
new file mode 100644
index 0000000000..ede7926c1c
--- /dev/null
+++ b/types/lusca/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",
+        "lusca-tests.ts"
+    ]
+}
diff --git a/types/lusca/tslint.json b/types/lusca/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/lusca/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/mapbox-gl/index.d.ts b/types/mapbox-gl/index.d.ts
index 6be9a465ef..ddaafced3d 100644
--- a/types/mapbox-gl/index.d.ts
+++ b/types/mapbox-gl/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Mapbox GL JS v0.40.1
+// Type definitions for Mapbox GL JS v0.41.0
 // Project: https://github.com/mapbox/mapbox-gl-js
 // Definitions by: Dominik Bruderer <https://github.com/dobrud>, Patrick Reames <https://github.com/patrickr>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -901,7 +901,7 @@ declare namespace mapboxgl {
 
 	export interface Layer {
 		id: string;
-		type?: "fill" | "line" | "symbol" | "circle" | "fill-extrusion" | "raster" | "background";
+		type?: "fill" | "line" | "symbol" | "circle" | "fill-extrusion" | "raster" | "background" | "heatmap";
 
 		metadata?: any;
 		ref?: string;
diff --git a/types/mixpanel/index.d.ts b/types/mixpanel/index.d.ts
index 4964a55c79..08bbe26720 100644
--- a/types/mixpanel/index.d.ts
+++ b/types/mixpanel/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Mixpanel 2.13
+// Type definitions for Mixpanel 2.14
 // Project: https://mixpanel.com/
 //          https://github.com/mixpanel/mixpanel-js
 // Definitions by: Knut Eirik Leira Hjelle <https://github.com/hjellek>
@@ -348,6 +348,21 @@ declare namespace Mixpanel {
         set_once(prop: string, value: any, callback?: () => void): void;
         set_once(keys: { [index: string]: any }, callback?: () => void): void;
 
+        /**
+         * Unset properties on a user record (permanently removes the properties and their values from a profile).
+         *
+         * ### Usage:
+         *
+         *     mixpanel.people.unset('gender');
+         *
+         *     // or unset multiple properties at once
+         *     mixpanel.people.unset(['gender', 'Company']);
+         *
+         * @param prop If a string, this is the name of the property. If an array, this is a list of property names.
+         * @param callback If provided, the callback will be called after the tracking event
+         */
+        unset(prop: string | string[], callback?: () => void): void;
+
         /**
          * Increment/decrement numeric people analytics properties.
          *
diff --git a/types/mixpanel/mixpanel-tests.ts b/types/mixpanel/mixpanel-tests.ts
index b1d735c22e..a48cd4065a 100644
--- a/types/mixpanel/mixpanel-tests.ts
+++ b/types/mixpanel/mixpanel-tests.ts
@@ -95,6 +95,11 @@ function mixpanel_people() {
         'Starting Plan': 'Premium'
     }, () => {});
 
+    mixpanel.people.unset('Company');
+    mixpanel.people.unset('Company', () => {});
+    mixpanel.people.unset(['Company', 'Plan']);
+    mixpanel.people.unset(['Company', 'Plan'], () => {});
+
     mixpanel.people.increment('page_views');
     mixpanel.people.increment('page_views', 1);
     mixpanel.people.increment('credits_left', -1);
diff --git a/types/mobx-apollo/index.d.ts b/types/mobx-apollo/index.d.ts
new file mode 100644
index 0000000000..4054601717
--- /dev/null
+++ b/types/mobx-apollo/index.d.ts
@@ -0,0 +1,29 @@
+// Type definitions for mobx-apollo 0.0
+// Project: https://github.com/sonaye/mobx-apollo#readme
+// Definitions by: Paul Selden <https://github.com/pselden>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import {
+    ApolloClient,
+    ObservableQuery,
+    WatchQueryOptions,
+    ApolloError
+} from 'apollo-client';
+
+export interface MobxApolloQueryOptions<T> extends WatchQueryOptions {
+    client: ApolloClient<any>;
+    onFetch?: (result: T) => void;
+    onError?: (error: ApolloError) => void;
+}
+
+export interface MobxApolloQuery<T> {
+    loading: boolean;
+    data: T;
+    error?: ApolloError;
+    ref: ObservableQuery<T>;
+}
+
+export default function graphql<T>(
+    options: MobxApolloQueryOptions<T>
+): MobxApolloQuery<T>;
diff --git a/types/mobx-apollo/mobx-apollo-tests.ts b/types/mobx-apollo/mobx-apollo-tests.ts
new file mode 100644
index 0000000000..964e6b0c6e
--- /dev/null
+++ b/types/mobx-apollo/mobx-apollo-tests.ts
@@ -0,0 +1,34 @@
+import { ApolloClient } from 'apollo-client';
+import query from 'mobx-apollo';
+
+const PostsQuery = `
+    {
+        posts {
+            id
+            title
+        }
+    }
+` as any;
+
+interface Post {
+    id: string;
+    title: string;
+}
+
+class PostStore {
+    private get postsQuery() {
+        return query<{ posts: Post[] }>({
+            client: new ApolloClient({
+                link: {} as any,
+                cache: {} as any
+            }),
+            query: PostsQuery
+        });
+    }
+
+    get posts() {
+        return this.postsQuery.data.posts;
+    }
+}
+
+new PostStore();
diff --git a/types/mobx-apollo/package.json b/types/mobx-apollo/package.json
new file mode 100644
index 0000000000..da0ffc3953
--- /dev/null
+++ b/types/mobx-apollo/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "apollo-client": "^2.0.0"
+    }
+}
diff --git a/types/mobx-apollo/tsconfig.json b/types/mobx-apollo/tsconfig.json
new file mode 100644
index 0000000000..c4c2acace4
--- /dev/null
+++ b/types/mobx-apollo/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": ["es6"],
+        "target": "es5",
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": ["../"],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": ["index.d.ts", "mobx-apollo-tests.ts"]
+}
diff --git a/types/mobx-apollo/tslint.json b/types/mobx-apollo/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/mobx-apollo/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/moment-timezone/index.d.ts b/types/moment-timezone/index.d.ts
index a839b093c4..ca62b3cb82 100644
--- a/types/moment-timezone/index.d.ts
+++ b/types/moment-timezone/index.d.ts
@@ -18,6 +18,7 @@ declare module "moment" {
 
         abbr(timestamp: number): string;
         offset(timestamp: number): number;
+        utcOffset(timestamp: number): number;
         parse(timestamp: number): number;
     }
 
diff --git a/types/moment-timezone/moment-timezone-tests.ts b/types/moment-timezone/moment-timezone-tests.ts
index 9e3e720d24..14df62915b 100644
--- a/types/moment-timezone/moment-timezone-tests.ts
+++ b/types/moment-timezone/moment-timezone-tests.ts
@@ -49,7 +49,7 @@ moment.tz(mo, "America/Los_Angeles");
 moment.tz(obj, "America/Los_Angeles");
 
 moment.tz.zone('America/Los_Angeles').abbr(1403465838805);
-moment.tz.zone('America/Los_Angeles').offset(1403465838805);
+moment.tz.zone('America/Los_Angeles').utcOffset(1403465838805);
 
 const zone = moment.tz.zone('America/New_York');
 zone.parse(Date.UTC(2012, 2, 19, 8, 30)); // 240
diff --git a/types/mongodb/index.d.ts b/types/mongodb/index.d.ts
index 19cf0136e2..32bc523d38 100644
--- a/types/mongodb/index.d.ts
+++ b/types/mongodb/index.d.ts
@@ -5,6 +5,7 @@
 //                 Gady Piazza <https://github.com/kikar>
 //                 Jason Dreyzehner <https://github.com/bitjson>
 //                 Gaurav Lahoti <https://github.com/dante-101>
+//                 Mariano Cortesi <https://github.com/dante-101>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -146,6 +147,9 @@ export interface DbCreateOptions {
     promiseLibrary?: Object;
     // https://docs.mongodb.com/manual/reference/read-concern/#read-concern
     readConcern?: { level?: Object };
+    // Sets a cap on how many operations the driver will buffer up before giving up on getting a
+    // working connection, default is -1 which is unlimited.
+    bufferMaxEntries?: number;
 }
 
 // http://mongodb.github.io/node-mongodb-native/2.2/api/Server.html
diff --git a/types/mongodb/mongodb-tests.ts b/types/mongodb/mongodb-tests.ts
index 2b8c49d186..52f2d6e4f8 100644
--- a/types/mongodb/mongodb-tests.ts
+++ b/types/mongodb/mongodb-tests.ts
@@ -3,7 +3,7 @@ import mongodb = require('mongodb');
 var MongoClient = mongodb.MongoClient;
 
 var format  = require('util').format;
-let options = {
+let options: mongodb.MongoClientOptions = {
     authSource           : ' ',
     w                    : 1,
     wtimeout             : 300,
diff --git a/types/mongoose/index.d.ts b/types/mongoose/index.d.ts
index b819e37ad9..f86dea4f8a 100644
--- a/types/mongoose/index.d.ts
+++ b/types/mongoose/index.d.ts
@@ -1622,7 +1622,7 @@ declare module "mongoose" {
      * getters/setters or other Mongoose magic applied.
      * @param bool defaults to true
      */
-    lean(bool?: boolean): Query<Object>;
+    lean(bool?: boolean): Query<object>;
 
     /** Specifies the maximum number of documents the query will return. Cannot be used with distinct() */
     limit(val: number): this;
diff --git a/types/mongoose/mongoose-tests.ts b/types/mongoose/mongoose-tests.ts
index d6f262ebf6..9fe20cd8ad 100644
--- a/types/mongoose/mongoose-tests.ts
+++ b/types/mongoose/mongoose-tests.ts
@@ -385,8 +385,14 @@ Animal['findByName']('fido', function(err: any, animals: any) {
 animalSchema.virtual('name.full').get(function () {
   return this.name.first + ' ' + this.name.last;
 });
-new mongoose.Schema({
-  child: { name: String }
+var childSchema = new mongoose.Schema({ name: String });
+var parentSchema = new mongoose.Schema({
+  children: [childSchema],
+  child: childSchema,
+  name: {
+    index: true,
+    required: true
+  }
 });
 new mongoose.Schema({
   eggs: {
@@ -1349,6 +1355,17 @@ MongoModel.findOne({ type: 'iphone' }, 'name').exec(function (err, adventure) {}
 MongoModel.findOne({ type: 'iphone' }, 'name', { lean: true }, cb);
 MongoModel.findOne({ type: 'iphone' }, 'name', { lean: true }).exec(cb);
 MongoModel.findOne({ type: 'iphone' }).select('name').lean().exec(cb);
+interface ModelUser {
+  _id: any;
+  name: string;
+  abctest: string;
+}
+MongoModel.findOne({ type: 'iphone' }).select('name').lean().exec()
+.then(function(doc: ModelUser) {
+  doc._id;
+  doc.name;
+  doc.abctest;
+});
 MongoModel.findOneAndRemove({}, {}, cb);
 MongoModel.findOneAndRemove({}, {});
 MongoModel.findOneAndRemove({}, cb);
diff --git a/types/moxios/index.d.ts b/types/moxios/index.d.ts
index b4ca5580fd..b0cc379fef 100644
--- a/types/moxios/index.d.ts
+++ b/types/moxios/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Asuka Ito <https://github.com/itoasuka>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-import { AxiosInstance } from "axios";
+import { AxiosInstance, AxiosRequestConfig } from "axios";
 
 interface Item {
     response?: any;
@@ -75,7 +75,14 @@ declare class Request {
      * @param reject The function to call when Promise is rejected
      * @param config The config object to be used for the request
      */
-    constructor(resolve: (arg: any) => void, reject: (arg: any) => void, config: any);
+    constructor(resolve: (arg: any) => void, reject: (arg: any) => void, config: AxiosRequestConfig);
+
+    config: AxiosRequestConfig;
+    headers: any;
+    url: string;
+    timeout: number;
+    withCredentials: boolean;
+    responseType: string;
 
     /**
      * Respond to this request with a timeout result
@@ -102,12 +109,13 @@ declare class Response {
      */
     constructor(req: Request, res: any);
 
-    config: any;
+    config: AxiosRequestConfig;
     data?: any;
     status?: number;
     statusText?: string;
     headers: any;
     request: Request;
+    code?: string;
 }
 
 declare let moxios: {
diff --git a/types/mysql/index.d.ts b/types/mysql/index.d.ts
index 7260dc2e85..7d3281218f 100644
--- a/types/mysql/index.d.ts
+++ b/types/mysql/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/mysqljs/mysql
 // Definitions by:  William Johnston <https://github.com/wjohnsto>
 // 	                Kacper Polak <https://github.com/kacepe>
+// 	                Krittanan Pingclasai <https://github.com/kpping>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.1
 
@@ -422,7 +423,7 @@ export interface ConnectionConfig extends ConnectionOptions {
     /**
      * object with ssl parameters or a string containing name of ssl profile
      */
-    ssl?: tls.SecureContextOptions & { rejectUnauthorized?: boolean };
+    ssl?: string | (tls.SecureContextOptions & { rejectUnauthorized?: boolean });
 }
 
 export interface PoolConfig extends ConnectionConfig {
diff --git a/types/mysql/mysql-tests.ts b/types/mysql/mysql-tests.ts
index a708aa6163..a3ddb27248 100644
--- a/types/mysql/mysql-tests.ts
+++ b/types/mysql/mysql-tests.ts
@@ -39,6 +39,11 @@ connection.query('SELECT 1', (err, rows) => {
     // connected! (unless `err` is set)
 });
 
+connection = mysql.createConnection({
+    host: 'localhost',
+    ssl: 'Amazon RDS'
+});
+
 connection = mysql.createConnection({
     host: 'localhost',
     ssl: {
diff --git a/types/nightwatch/index.d.ts b/types/nightwatch/index.d.ts
index 3a7e81d0fa..a32a07b3dd 100644
--- a/types/nightwatch/index.d.ts
+++ b/types/nightwatch/index.d.ts
@@ -4,8 +4,6 @@
 //                 Connor Schlesiger <https://github.com/schlesiger>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/* tslint:disable:max-line-length */
-
 export interface NightwatchCustomPageObjects {
     page: {};
 }
@@ -887,7 +885,7 @@ export interface NightwatchAPI {
      * @param callback: Optional callback function to be called when the command finishes.
      * @returns The value of the attribute
      */
-    getAttribute(selector: string, attribute: string, callback?: (result: NightwatchCallbackResult) => void): this;
+    getAttribute(selector: string, attribute: string, callback?: (this: NightwatchAPI, result: NightwatchCallbackResult) => void): this;
 
     /**
      * Retrieve a single cookie visible to the current page. The cookie is returned as a cookie JSON object, as defined here.
@@ -906,7 +904,7 @@ export interface NightwatchAPI {
      * @param callback: The callback function which will receive the response as an argument.
      * @returns The cookie object as a selenium cookie JSON object or null if the cookie wasn't found.
      */
-    getCookie(name: string, callback?: (result: NightwatchCallbackResult) => void): this;
+    getCookie(name: string, callback?: (this: NightwatchAPI, result: NightwatchCallbackResult) => void): this;
 
     /**
      * Retrieve all cookies visible to the current page. The cookies are returned as an array of cookie JSON object,
@@ -924,7 +922,7 @@ export interface NightwatchAPI {
      * @param callback: The callback function which will receive the response as an argument.
      * @returns A list of cookies
      */
-    getCookies(callback?: (result: NightwatchCallbackResult) => void): this;
+    getCookies(callback?: (this: NightwatchAPI, result: NightwatchCallbackResult) => void): this;
 
     /**
      * Retrieve the value of a css property for a given DOM element. Uses elementIdCssProperty protocol command.
@@ -944,7 +942,7 @@ export interface NightwatchAPI {
      * @param callback: Optional callback function to be called when the command finishes.
      * @returns The value of the css property
      */
-    getCssProperty(selector: string, cssProperty: string, callback?: (result: NightwatchCallbackResult) => void): this;
+    getCssProperty(selector: string, cssProperty: string, callback?: (this: NightwatchAPI, result: NightwatchCallbackResult) => void): this;
 
     /**
      * Determine an element's size in pixels. Uses elementIdSize protocol command.
@@ -964,7 +962,7 @@ export interface NightwatchAPI {
      * @param callback: Optional callback function to be called when the command finishes.
      * @returns The width and height of the element in pixels
      */
-    getElementSize(selector: string, callback?: (result: NightwatchCallbackResult) => void): this;
+    getElementSize(selector: string, callback?: (this: NightwatchAPI, result: NightwatchCallbackResult) => void): this;
 
     /**
      * Determine an element's location on the page. The point (0, 0) refers to the upper-left corner of the page.
@@ -985,7 +983,7 @@ export interface NightwatchAPI {
      * @param callback: Optional callback function to be called when the command finishes.
      * @returns The X and Y coordinates for the element on the page
      */
-    getLocation(selector: string, callback?: (result: NightwatchCallbackResult) => void): this;
+    getLocation(selector: string, callback?: (this: NightwatchAPI, result: NightwatchCallbackResult) => void): this;
 
     /**
      * Determine an element's location on the screen once it has been scrolled into view. Uses elementIdLocationInView protocol command.
@@ -1005,7 +1003,7 @@ export interface NightwatchAPI {
      * @param callback: Optional callback function to be called when the command finishes.
      * @returns The X and Y coordinates for the element on the page.
      */
-    getLocationInView(selector: string, callback?: (result: NightwatchCallbackResult) => void): this;
+    getLocationInView(selector: string, callback?: (this: NightwatchAPI, result: NightwatchCallbackResult) => void): this;
 
     /**
      * Gets a log from selenium
@@ -1059,7 +1057,7 @@ export interface NightwatchAPI {
      * @param callback: Optional callback function to be called when the command finishes.
      * @returns The element's tag name, as a lowercase string.
      */
-    getTagName(selector: string, callback?: (result: NightwatchCallbackResult) => void): this;
+    getTagName(selector: string, callback?: (this: NightwatchAPI, result: NightwatchCallbackResult) => void): this;
 
     /**
      * Returns the visible text for the element. Uses elementIdText protocol command.
@@ -1078,7 +1076,7 @@ export interface NightwatchAPI {
      * @param callback: Optional callback function to be called when the command finishes.
      * @returns The element's visible text.
      */
-    getText(selector: string, callback?: (result: NightwatchCallbackResult) => void): this;
+    getText(selector: string, callback?: (this: NightwatchAPI, result: NightwatchCallbackResult) => void): this;
 
     /**
      * Returns the title of the current page. Uses title protocol command.
@@ -1095,7 +1093,7 @@ export interface NightwatchAPI {
      * @param callback: Optional callback function to be called when the command finishes.
      * @returns The page title.
      */
-    getTitle(callback?: (result: NightwatchCallbackResult) => void): this;
+    getTitle(callback?: (this: NightwatchAPI, result?: string) => void): this;
 
     /**
      * Returns a form element current value. Uses elementIdValue protocol command.
@@ -1114,7 +1112,7 @@ export interface NightwatchAPI {
      * @param callback: Optional callback function to be called when the command finishes.
      * @returns The element's value.
      */
-    getValue(selector: string, callback?: (result: NightwatchCallbackResult) => void): this;
+    getValue(selector: string, callback?: (this: NightwatchAPI, result: NightwatchCallbackResult) => void): this;
 
     /**
      * This command is an alias to url and also a convenience method when called without any arguments in the sense that it performs a call to .url() with passing the value of launch_url
@@ -1180,7 +1178,7 @@ export interface NightwatchAPI {
      * @param selector: The CSS/Xpath selector used to locate the element.
      * @param callback: Optional callback function to be called when the command finishes.
      */
-    isVisible(selector: string, callback?: (result: NightwatchCallbackResult) => void): this;
+    isVisible(selector: string, callback?: (this: NightwatchAPI, result: NightwatchCallbackResult) => void): this;
 
     /**
      * Maximizes the current window.
@@ -1559,7 +1557,9 @@ export interface NightwatchAPI {
      * ```
      * @param selector: The selector (CSS / Xpath) used to locate the element.
      * @param time: The number of milliseconds to wait. The runner performs repeated checks every 500 ms.
-     * @param abortOnFailure: By the default if the element is not found the test will fail. Set this to false if you wish for the test to continue even if the assertion fails. To set this globally you can define a property `abortOnNightwatchAssertionsFailure` in your globals.
+     * @param abortOnFailure: By the default if the element is not found the test will fail.
+     * Set this to false if you wish for the test to continue even if the assertion fails.
+     * To set this globally you can define a property `abortOnNightwatchAssertionsFailure` in your globals.
      * @param callback: Optional callback function to be called when the command finishes.
      * @param message: Optional message to be shown in the output; the message supports two placeholders: %s for current selector and %d for the time (e.g. Element %s was not in the page for %d ms).
      */
@@ -1847,7 +1847,8 @@ export interface NightwatchAPI {
     /**
      * Send a sequence of key strokes to the active element. The sequence is defined in the same format as the sendKeys command.
      * An object map with available keys and their respective UTF-8 characters, as defined on W3C WebDriver draft spec, is loaded onto the main Nightwatch instance as client.Keys.
-     * Rather than the setValue, the modifiers are not released at the end of the call. The state of the modifier keys is kept between calls, so mouse interactions can be performed while modifier keys are depressed.
+     * Rather than the setValue, the modifiers are not released at the end of the call.
+     * The state of the modifier keys is kept between calls, so mouse interactions can be performed while modifier keys are depressed.
      * @param keysToSend: The keys sequence to be sent.
      * @param callback: Optional callback function to be called when the command finishes.
      */
@@ -1862,8 +1863,10 @@ export interface NightwatchAPI {
     mouseButtonClick(button: string, callback?: () => void): this;
 
     /**
-     * Click and hold the left mouse button (at the coordinates set by the last moveto command). Note that the next mouse-related command that should follow is mouseButtonUp . Any other mouse command (such as click or another call to buttondown) will yield undefined behaviour.
-     * Can be used for implementing drag-and-drop. The button can be (0, 1, 2) or ('left', 'middle', 'right'). It defaults to left mouse button, and if you don't pass in a button but do pass in a callback, it will handle it correctly.
+     * Click and hold the left mouse button (at the coordinates set by the last moveto command). Note that the next mouse-related command that should follow is mouseButtonUp .
+     * Any other mouse command (such as click or another call to buttondown) will yield undefined behaviour.
+     * Can be used for implementing drag-and-drop. The button can be (0, 1, 2) or ('left', 'middle', 'right').
+     * It defaults to left mouse button, and if you don't pass in a button but do pass in a callback, it will handle it correctly.
      * @param button: The mouse button
      * @param callback: Optional callback function to be called when the command finishes.
      */
@@ -1871,14 +1874,16 @@ export interface NightwatchAPI {
 
     /**
      * Releases the mouse button previously held (where the mouse is currently at). Must be called once for every mouseButtonDown command issued.
-     * Can be used for implementing drag-and-drop. The button can be (0, 1, 2) or ('left', 'middle', 'right'). It defaults to left mouse button, and if you don't pass in a button but do pass in a callback, it will handle it correctly.
+     * Can be used for implementing drag-and-drop. The button can be (0, 1, 2) or ('left', 'middle', 'right').
+     * It defaults to left mouse button, and if you don't pass in a button but do pass in a callback, it will handle it correctly.
      * @param button: The mouse button
      * @param callback: Optional callback function to be called when the command finishes.
      */
     mouseButtonUp(button: string, callback?: () => void): this;
 
     /**
-     * Move the mouse by an offset of the specificed element. If no element is specified, the move is relative to the current mouse cursor. If an element is provided but no offset, the mouse will be moved to the center of the element.
+     * Move the mouse by an offset of the specificed element. If no element is specified, the move is relative to the current mouse cursor.
+     * If an element is provided but no offset, the mouse will be moved to the center of the element.
      * If the element is not visible, it will be scrolled into view.
      * @param element: Opaque ID assigned to the element to move to. If not specified or is null, the offset is relative to current position of the mouse.
      * @param xofset: X offset to move to, relative to the top-left corner of the element. If not specified, the mouse will move to the middle of the element.
@@ -1997,14 +2002,16 @@ export interface NightwatchAPI {
 
     /**
      * Configure the amount of time that a particular type of operation can execute for before they are aborted and a |Timeout| error is returned to the client.
-     * @param typeOfOperation: The type of operation to set the timeout for. Valid values are: "script" for script timeouts, "implicit" for modifying the implicit wait timeout and "page load" for setting a page load timeout.
+     * @param typeOfOperation: The type of operation to set the timeout for.
+     * Valid values are: "script" for script timeouts, "implicit" for modifying the implicit wait timeout and "page load" for setting a page load timeout.
      * @param ms: The amount of time, in milliseconds, that time-limited commands are permitted to run.
      * @param callback: Optional callback function to be called when the command finishes.
      */
     timeouts(typeOfOperation: string, ms: number, callback?: () => void): this;
 
     /**
-     * Set the amount of time, in milliseconds, that asynchronous scripts executed by /session/:sessionId/execute_async are permitted to run before they are aborted and a |Timeout| error is returned to the client.
+     * Set the amount of time, in milliseconds, that asynchronous scripts executed by /session/:sessionId/execute_async are permitted
+     * to run before they are aborted and a |Timeout| error is returned to the client.
      * @param ms: The amount of time, in milliseconds, that time-limited commands are permitted to run.
      * @param callback: Optional callback function to be called when the command finishes.
      */
@@ -2087,7 +2094,8 @@ export interface NightwatchAPI {
     windowMaximize(handleOrName?: string, callback?: () => void): this;
 
     /**
-     * Change or get the position of the specified window. If the second argument is a function it will be used as a callback and the call will perform a get request to retrieve the existing window position.
+     * Change or get the position of the specified window. If the second argument is a function it will be used as a callback and the call
+     * will perform a get request to retrieve the existing window position.
      * @param windowHandle:
      * @param: offsetX:
      * @param: offsetY:
@@ -2199,5 +2207,3 @@ export interface Nightwatch {
     api: NightwatchAPI;
     client: NightwatchClient;
 }
-
-/* tslint:enable:max-line-length */
diff --git a/types/nightwatch/nightwatch-tests.ts b/types/nightwatch/nightwatch-tests.ts
index a40c8c466a..548dcee9bd 100644
--- a/types/nightwatch/nightwatch-tests.ts
+++ b/types/nightwatch/nightwatch-tests.ts
@@ -7,6 +7,9 @@ const test: NightwatchTests = {
       .waitForElementVisible('body', 1000)
       .setValue('input[type=text]', 'nightwatch')
       .waitForElementVisible('button[name=btnG]', 1000)
+      .getTitle(function(result) {
+        this.assert.equal(typeof result, 'string');
+      })
       .click('button[name=btnG]')
       .pause(1000)
       .assert.containsText('#main', 'Night Watch')
diff --git a/types/nightwatch/tslint.json b/types/nightwatch/tslint.json
index b1439230db..495d29983d 100644
--- a/types/nightwatch/tslint.json
+++ b/types/nightwatch/tslint.json
@@ -1,7 +1,5 @@
 {
     "extends": "dtslint/dt.json",
     "rules": {
-        // TODO
-        "no-any-union": false
     }
 }
diff --git a/types/passport-facebook-token/index.d.ts b/types/passport-facebook-token/index.d.ts
index 9013910ee1..9877b84527 100644
--- a/types/passport-facebook-token/index.d.ts
+++ b/types/passport-facebook-token/index.d.ts
@@ -7,15 +7,17 @@
 import * as passport from 'passport';
 import * as express from 'express';
 
-declare class Strategy implements passport.Strategy {
-    constructor(options: Strategy.StrategyOptionsWithRequest, verify: Strategy.VerifyFunctionWithRequest)
-    constructor(options: Strategy.StrategyOptions, verify: Strategy.VerifyFunction);
+declare namespace PassportFacebookToken {
+    interface StrategyStatic {
+        new(options: StrategyOptionsWithRequest, verify: VerifyFunctionWithRequest): StrategyInstance;
+        new(options: StrategyOptions, verify: VerifyFunction): StrategyInstance;
+    }
 
-    name: string;
-    authenticate: (req: express.Request, options?: any) => void;
-}
+    interface StrategyInstance {
+        name: string;
+        authenticate: (req: express.Request, options?: any) => void;
+    }
 
-declare namespace Strategy {
     interface ValueObject {
         value: string;
     }
@@ -55,4 +57,5 @@ declare namespace Strategy {
     type VerifyFunctionWithRequest = (req: express.Request, accessToken: string, refreshToken: string, profile: Profile, done: (error: any, user?: any, info?: any) => void) => void;
 }
 
-export = Strategy;
+declare const PassportFacebookToken: PassportFacebookToken.StrategyStatic;
+export = PassportFacebookToken;
diff --git a/types/passport-facebook-token/passport-facebook-token-tests.ts b/types/passport-facebook-token/passport-facebook-token-tests.ts
index cb2f078e88..c926748286 100644
--- a/types/passport-facebook-token/passport-facebook-token-tests.ts
+++ b/types/passport-facebook-token/passport-facebook-token-tests.ts
@@ -1,8 +1,6 @@
 import * as express from 'express';
 import * as passport from 'passport';
-import * as FacebookStrategy from 'passport-facebook-token';
-// tslint:disable-next-line:no-duplicate-imports
-import { StrategyOptions, StrategyOptionsWithRequest, VerifyFunction, VerifyFunctionWithRequest, Profile } from 'passport-facebook-token';
+import * as PassportFacebookToken from 'passport-facebook-token';
 
 const User = {
     findOrCreate(id: string, provider: string, callback: (err: any, user: any) => void): void {
@@ -10,18 +8,19 @@ const User = {
     }
 };
 
-const options: StrategyOptions = {
+const options: PassportFacebookToken.StrategyOptions = {
     clientID: 'TEST_CLIENT_ID',
     clientSecret: 'TEST_CLIENT_SECRET'
 };
 
-const optionsWithRequest: StrategyOptionsWithRequest = {
+const optionsWithRequest: PassportFacebookToken.StrategyOptionsWithRequest = {
     clientID: 'TEST_CLIENT_ID',
     clientSecret: 'TEST_CLIENT_SECRET',
     passReqToCallback: true
 };
 
-const verify: VerifyFunction = (accessToken: string, refreshToken: string, profile: Profile, done: (err: any, user?: any, info?: any) => void) => {
+const verify: PassportFacebookToken.VerifyFunction =
+    (accessToken: string, refreshToken: string, profile: PassportFacebookToken.Profile, done: (err: any, user?: any, info?: any) => void) => {
     User.findOrCreate(profile.id, profile.provider, (err, user) => {
         if (err) {
             done(err);
@@ -30,7 +29,8 @@ const verify: VerifyFunction = (accessToken: string, refreshToken: string, profi
     });
 };
 
-const verifyWithRequest: VerifyFunctionWithRequest = (req: express.Request, accessToken: string, refreshToken: string, profile: Profile, done: (err: any, user?: any, info?: any) => void) => {
+const verifyWithRequest: PassportFacebookToken.VerifyFunctionWithRequest =
+    (req: express.Request, accessToken: string, refreshToken: string, profile: PassportFacebookToken.Profile, done: (err: any, user?: any, info?: any) => void) => {
     User.findOrCreate(profile.id, profile.provider, (err, user) => {
         if (err) {
             done(err);
@@ -39,5 +39,5 @@ const verifyWithRequest: VerifyFunctionWithRequest = (req: express.Request, acce
     });
 };
 
-passport.use(new FacebookStrategy(options, verify));
-passport.use(new FacebookStrategy(optionsWithRequest, verifyWithRequest));
+passport.use(new PassportFacebookToken(options, verify));
+passport.use(new PassportFacebookToken(optionsWithRequest, verifyWithRequest));
diff --git a/types/pdfjs-dist/index.d.ts b/types/pdfjs-dist/index.d.ts
index a40c612d5a..f72d70f44e 100644
--- a/types/pdfjs-dist/index.d.ts
+++ b/types/pdfjs-dist/index.d.ts
@@ -407,6 +407,12 @@ declare namespace PDF {
      * in browsers which support the fullscreen API.
      */
     disableFullscreen: boolean;
+      
+    /**
+     * Disable the text layer of PDF when used PDF.js renders a canvas instead of div elements
+     *
+     */
+    disableTextLayer: boolean;
 
     /**
      * Enables CSS only zooming.
@@ -475,5 +481,11 @@ declare namespace PDF {
         : PDFPromise<PDFDocumentProxy>;
 
     PDFViewer(params: PDFViewerParams): void;
+    /**
+    * yet another viewer, this will render only one page at the time, reducing rendering time
+    * very important for mobile development
+    * @params {PDFViewerParams}
+    */
+    PDFSinglePageViewer(params: PDFViewerParams): void;
   }
 }
diff --git a/types/pg/index.d.ts b/types/pg/index.d.ts
index 68fba5fb40..62208830b3 100644
--- a/types/pg/index.d.ts
+++ b/types/pg/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for pg 7.1
+// Type definitions for pg 7.4
 // Project: https://github.com/brianc/node-postgres
 // Definitions by: Phips Peter <https://github.com/pspeter3>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -47,6 +47,7 @@ export interface QueryConfig {
     name?: string;
     text: string;
     values?: any[];
+    rowMode?: string;
 }
 
 export interface QueryResult {
diff --git a/types/pixelmatch/index.d.ts b/types/pixelmatch/index.d.ts
new file mode 100644
index 0000000000..0a2e4277ac
--- /dev/null
+++ b/types/pixelmatch/index.d.ts
@@ -0,0 +1,30 @@
+// Type definitions for pixelmatch 4.0
+// Project: https://github.com/mapbox/pixelmatch#readme
+// Definitions by: Oleg Repin <https://github.com/iamolegga>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+declare function Pixelmatch(
+  /** Image data of the first image to compare. Note: image dimensions must be equal. */
+  img1: Buffer | Uint8Array,
+  /** Image data of the second image to compare. Note: image dimensions must be equal. */
+  img2: Buffer | Uint8Array,
+  /** Image data to write the diff to, or null if don't need a diff image. */
+  output: Buffer | Uint8Array | null,
+  /** Width of the images. Note that all three images need to have the same dimensions. */
+  width: number,
+  /** Height of the images. Note that all three images need to have the same dimensions. */
+  height: number,
+  /** Options. */
+  options?: Options,
+): number;
+
+interface Options {
+  /** Matching threshold, ranges from 0 to 1. Smaller values make the comparison more sensitive. 0.1 by default. */
+  readonly threshold?: number;
+  /** If true, disables detecting and ignoring anti-aliased pixels. false by default. */
+  readonly includeAA?: boolean;
+}
+
+export = Pixelmatch;
diff --git a/types/pixelmatch/pixelmatch-tests.ts b/types/pixelmatch/pixelmatch-tests.ts
new file mode 100644
index 0000000000..dc49f7f326
--- /dev/null
+++ b/types/pixelmatch/pixelmatch-tests.ts
@@ -0,0 +1,27 @@
+/**
+ * This test code taken from pixelmatch example usage.
+ * https://github.com/mapbox/pixelmatch#example-usage
+ */
+
+import * as fs from 'fs';
+import pixelmatch = require('pixelmatch');
+import { PNG } from 'pngjs';
+
+const img1 = fs.createReadStream('img1.png')
+  .pipe(new PNG())
+  .on('parsed', doneReading);
+
+const img2 = fs.createReadStream('img2.png')
+  .pipe(new PNG())
+  .on('parsed', doneReading);
+
+let filesRead = 0;
+
+function doneReading() {
+    if (++filesRead < 2) return;
+    const diff = new PNG({width: img1.width, height: img1.height});
+
+    pixelmatch(img1.data, img2.data, diff.data, img1.width, img1.height, {threshold: 0.1});
+
+    diff.pack().pipe(fs.createWriteStream('diff.png'));
+}
diff --git a/types/pixelmatch/tsconfig.json b/types/pixelmatch/tsconfig.json
new file mode 100644
index 0000000000..02115e3fdc
--- /dev/null
+++ b/types/pixelmatch/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",
+        "pixelmatch-tests.ts"
+    ]
+}
diff --git a/types/pixelmatch/tslint.json b/types/pixelmatch/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/pixelmatch/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/plotly.js/index.d.ts b/types/plotly.js/index.d.ts
index a34dbf2ab8..81286fe0a4 100644
--- a/types/plotly.js/index.d.ts
+++ b/types/plotly.js/index.d.ts
@@ -94,23 +94,30 @@ export function downloadImage(root: Root, opts: DownloadImgopts): Promise<string
 // Layout
 export interface Layout {
 	title: string;
+	titlefont: Partial<Font>;
 	autosize: boolean;
 	showlegend: boolean;
-	xaxis: Partial<Axis>;
-	yaxis: Partial<Axis>;
-	yaxis2: Partial<Axis>;
-	yaxis3: Partial<Axis>;
-	yaxis4: Partial<Axis>;
-	yaxis5: Partial<Axis>;
-	yaxis6: Partial<Axis>;
-	yaxis7: Partial<Axis>;
-	yaxis8: Partial<Axis>;
-	yaxis9: Partial<Axis>;
+	paper_bgcolor: Color;
+    plot_bgcolor: Color;
+    separators: string;
+    hidesources: boolean;
+    xaxis: Partial<LayoutAxis>;
+	yaxis: Partial<LayoutAxis>;
+	yaxis2: Partial<LayoutAxis>;
+	yaxis3: Partial<LayoutAxis>;
+	yaxis4: Partial<LayoutAxis>;
+	yaxis5: Partial<LayoutAxis>;
+	yaxis6: Partial<LayoutAxis>;
+	yaxis7: Partial<LayoutAxis>;
+	yaxis8: Partial<LayoutAxis>;
+	yaxis9: Partial<LayoutAxis>;
 	margin: Partial<Margin>;
 	height: number;
 	width: number;
-	hovermode: "closest" | "x" | "y" | false;
-	'xaxis.range': [Datum, Datum];
+	hovermode: 'closest' | 'x' | 'y' | false;
+	hoverlabel: Partial<Label>;
+	calendar: Calendar;
+    'xaxis.range': [Datum, Datum];
 	'xaxis.range[0]': Datum;
 	'xaxis.range[1]': Datum;
 	'yaxis.range': [Datum, Datum];
@@ -120,47 +127,112 @@ export interface Layout {
 	'xaxis.type': AxisType;
 	'xaxis.autorange': boolean;
 	'yaxis.autorange': boolean;
-	dragmode: "lasso" | "pan" | "select" | "zoom";
+	ternary: {}; // TODO
+    geo: {}; // TODO
+    mapbox: {}; // TODO
+	radialaxis: {}; // TODO
+    angularaxis: {}; // TODO
+    direction: 'clockwise' | 'counterclockwise';
+    dragmode: 'zoom' | 'pan' | 'select' | 'lasso' | 'orbit' | 'turntable';
+    orientation: number;
+    annotations: {}; // TODO
 	shapes: Array<Partial<Shape>>;
-	legend: Partial<Legend>;
+    images: {}; // TODO
+    updatemenus: {}; // TODO
+    sliders: {}; // TODO
+    legend: Partial<Legend>;
 	font: Partial<Font>;
+	scene: Partial<Scene>;
 }
 
-export interface Legend {
-	traceorder: "grouped" | "normal" | "reversed";
+export interface Legend extends Label {
+	traceorder: 'grouped' | 'normal' | 'reversed';
 	x: number;
 	y: number;
-	font: Partial<Font>;
-	bgcolor: string;
-	bordercolor: string;
 	borderwidth: number;
-	orientation: "v" | "h";
+	orientation: 'v' | 'h';
 	tracegroupgap: number;
 	xanchor: 'auto' | 'left' | 'center' | 'right';
 	yanchor: 'auto' | 'top' | 'middle' | 'bottom';
 }
 
-export type AxisType = "date" | "log" | "linear";
+export type AxisType = '-' | 'linear' | 'log' | 'date' | 'category';
 
 export interface Axis {
-	title: string;
-	showgrid: boolean;
-	fixedrange: boolean;
-	rangemode: "tozero" | 'normal' | 'nonnegative';
-	domain: number[];
-	type: AxisType;
-	tickformat: string;
-	hoverformat: string;
-	exponentformat: "none" | "e" | "E" | "power" | "SI" | "B";
-	rangeslider: Partial<RangeSlider>;
-	rangeselector: Partial<RangeSelector>;
-	range: [Datum, Datum];
-	showticklabels: boolean;
-	autotick: boolean;
-	zeroline: boolean;
-	autorange: boolean | 'reversed';
-	side: "top" | "bottom" | "left" | "right";
-	overlaying: "free" | "/^x([2-9]|[1-9][0-9]+)?$/" | "/^y([2-9]|[1-9][0-9]+)?$/";
+    visible: boolean;
+    color: Color;
+    title: string;
+    titlefont: Partial<Font>;
+    type: AxisType;
+    autorange: true | false | 'reversed';
+    rangemode: 'normal' | 'tozero' | 'nonnegative';
+    range: any[];
+    tickmode: 'auto' | 'linear' | 'array';
+    nticks: number;
+    tick0: number | string;
+    dtick: number | string;
+    tickvals: any[];
+    ticktext: string[];
+    ticks: 'outside' | 'inside' | '';
+    mirror: true | 'ticks' | false | 'all' | 'allticks';
+    ticklen: number;
+    tickwidth: number;
+    tickcolor: Color;
+    showticklabels: boolean;
+    showspikes: boolean;
+    spikecolor: Color;
+    spikethickness: number;
+    categoryorder: 'trace' | 'category ascending' | 'category descending' | 'array';
+    categoryarray: any[];
+    tickfont: Partial<Font>;
+    tickangle: number;
+    tickprefix: string;
+    showtickprefix: 'all' | 'first' | 'last' | 'none';
+    ticksuffix: string;
+    showticksuffix: 'all' | 'first' | 'last' | 'none';
+    showexponent: 'all' | 'first' | 'last' | 'none';
+    exponentformat: 'none' | 'e' | 'E' | 'power' | 'SI' | 'B';
+    separatethousands: boolean;
+    tickformat: string;
+    hoverformat: string;
+    showline: boolean;
+    linecolor: Color;
+    linewidth: number;
+    showgrid: boolean;
+    gridcolor: Color;
+    gridwidth: number;
+    zeroline: boolean;
+    zerolinecolor: Color;
+    zerolinewidth: number;
+    calendar: Calendar;
+}
+
+export type Calendar = 'gregorian' | 'chinese' | 'coptic' | 'discworld' | 'ethiopian' | 'hebrew' | 'islamic' | 'julian' | 'mayan' |
+    'nanakshahi' | 'nepali' | 'persian' | 'jalali' | 'taiwan' | 'thai' | 'ummalqura';
+
+export interface LayoutAxis extends Axis {
+    fixedrange: boolean;
+    scaleanchor: '/^x([2-9]|[1-9][0-9]+)?$/' | '/^y([2-9]|[1-9][0-9]+)?$/';
+    scaleratio: number;
+    constrain: 'range' | 'domain';
+    constraintoward: 'left' | 'center' | 'right' | 'top' | 'middle' | 'bottom';
+    spikedash: string;
+    spikemode: string;
+    anchor: 'free' | '/^x([2-9]|[1-9][0-9]+)?$/' | '/^y([2-9]|[1-9][0-9]+)?$/';
+    side: 'top' | 'bottom' | 'left' | 'right';
+    overlaying: 'free' | '/^x([2-9]|[1-9][0-9]+)?$/' | '/^y([2-9]|[1-9][0-9]+)?$/';
+    layer: 'above traces' | 'below traces';
+    domain: number[];
+    position: number;
+    rangeslider: Partial<RangeSlider>;
+    rangeselector: Partial<RangeSelector>;
+}
+
+export interface SceneAxis extends Axis {
+    spikesides: boolean;
+    showbackground: boolean;
+    backgroundcolor: Color;
+    showaxeslabels: boolean;
 }
 
 export interface ShapeLine {
@@ -212,7 +284,7 @@ export type Color = string | Array<string | undefined | null> | Array<Array<stri
 
 // Bar Scatter
 export interface ScatterData {
-	type: 'bar' | 'scatter' | 'scattergl';
+	type: 'bar' | 'scatter' | 'scattergl' | 'scatter3d';
 	x: Datum[] | Datum[][];
 	y: Datum[] | Datum[][];
 	z: Datum[] | Datum[][] | Datum[][][];
@@ -234,13 +306,13 @@ export interface ScatterData {
 	'marker.maxdisplayed': number;
 	'marker.sizeref': number;
 	'marker.sizemin': number;
-	'marker.sizemode': "diameter" | "area";
+	'marker.sizemode': 'diameter' | 'area';
 	'marker.showscale': boolean;
-	'marker.line': {}; // TODO
+	'marker.line': Partial<ScatterMarkerLine>;
 	'marker.colorbar': {}; // TODO
-	mode: "lines" | "markers" | "text" | "lines+markers" | "text+markers" | "text+lines" | "text+lines+markers" | "none";
-	hoveron: "points" | "fills";
-	hoverinfo: "text";
+	mode: 'lines' | 'markers' | 'text' | 'lines+markers' | 'text+markers' | 'text+lines' | 'text+lines+markers' | 'none';
+	hoveron: 'points' | 'fills';
+	hoverinfo: 'text';
 	fill: 'none' | 'tozeroy' | 'tozerox' | 'tonexty' | 'tonextx' | 'toself' | 'tonext';
 	fillcolor: string;
 	legendgroup: string;
@@ -250,16 +322,34 @@ export interface ScatterData {
 
 export interface ScatterMarker {
 	symbol: string | string[]; // Drawing.symbolList
-	color: Color;
+	color: Color | number[];
+	colorscale: string | string[];
+	cauto: boolean;
+	cmax: boolean;
+	cmin: boolean;
+	autocolorscale: boolean;
+    reversescale: boolean;
 	opacity: number | number[];
 	size: number | number[];
 	maxdisplayed: number;
 	sizeref: number;
 	sizemin: number;
-	sizemode: "diameter" | "area";
+	sizemode: 'diameter' | 'area';
 	showscale: boolean;
-	line: {}; // TODO
+	line: Partial<ScatterMarkerLine>;
 	colorbar: {}; // TODO
+    gradient: {}; // TODO
+}
+
+export interface ScatterMarkerLine {
+    width: number | number[];
+    color: Color;
+    colorscale: string | string[];
+    cauto: boolean;
+    cmax: number;
+    cmin: number;
+    autocolorscale: boolean;
+    reversescale: boolean;
 }
 
 export interface ScatterLine {
@@ -380,16 +470,73 @@ export interface RangeSelectorButton {
 	label: string;
 }
 
-export interface RangeSelector {
+export interface RangeSelector extends Label {
 	buttons: Array<Partial<RangeSelectorButton>>;
 	visible: boolean;
 	x: number;
 	xanchor: 'auto' | 'left' | 'center' | 'right';
 	y: number;
 	yanchor: 'auto' | 'top' | 'middle' | 'bottom';
-	bgcolor: string;
 	activecolor: string;
-	bordercolor: string;
 	borderwidth: number;
+}
+
+export interface Camera {
+	up: Partial<Point>;
+	center: Partial<Point>;
+	eye: Partial<Point>;
+}
+
+export interface Label {
+	bgcolor: string;
+	bordercolor: string;
 	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>;
+	captureevents: boolean;
+}
+
+export interface Scene {
+	bgcolor: string;
+	camera: Partial<Camera>;
+	domain: Partial<Domain>;
+	aspectmode: 'auto' | 'cube' | 'data' | 'manual';
+	aspectratio: Partial<Point>;
+	xaxis: Partial<SceneAxis>;
+	yaxis: Partial<SceneAxis>;
+	zaxis: Partial<SceneAxis>;
+	dragmode: 'orbit' | 'turntable' | 'zoom' | 'pan' | false;
+	hovermode: 'closest' | false;
+	annotations: Partial<Annotations> | Array<Partial<Annotations>>;
+	captureevents: boolean;
+}
+
+export interface Domain {
+    x: number[];
+    y: number[];
+}
diff --git a/types/puppeteer/index.d.ts b/types/puppeteer/index.d.ts
index f92bedd135..8138419b6a 100644
--- a/types/puppeteer/index.d.ts
+++ b/types/puppeteer/index.d.ts
@@ -7,6 +7,8 @@
 
 /// <reference types="node" />
 
+import { EventEmitter } from "events";
+
 /** Keyboard provides an api for managing a virtual keyboard. */
 export interface Keyboard {
   /**
@@ -249,6 +251,12 @@ export interface EmulateOptions {
 
 export type EvaluateFn = string | ((...args: any[]) => any);
 
+export type LoadEvent =
+  | "load"
+  | "domcontentloaded"
+  | "networkidle0"
+  | "networkidle2";
+
 /** The navigation options. */
 export interface NavigationOptions {
   /**
@@ -260,7 +268,7 @@ export interface NavigationOptions {
    * When to consider navigation succeeded.
    * @default load Navigation is consider when the `load` event is fired.
    */
-  waitUntil?: "load" | "domcontentloaded" | "networkidle0" | "networkidle2";
+  waitUntil?: LoadEvent | LoadEvent[];
 }
 
 export type PDFFormat =
@@ -409,9 +417,9 @@ export interface ElementHandle extends JSHandle {
    */
   $$(selector: string): Promise<ElementHandle[]>;
   /**
-   * This method returns the bounding box of the element (relative to the main frame), or null if the element is not visible.
+   * This method returns the value resolve to the bounding box of the element (relative to the main frame), or null if the element is not visible.
    */
-  boundingBox(): BoundingBox | null;
+  boundingBox(): Promise<BoundingBox | null>;
   /**
    * This method scrolls element into view if needed, and then uses page.mouse to click in the center of the element.
    * If the element is detached from DOM, the method throws an error.
@@ -665,7 +673,8 @@ export interface FrameBase {
    */
   $eval(
     selector: string,
-    fn: (...args: any[]) => void
+    fn: (element: ElementHandle | null, ...args: any[]) => any,
+    ...args: any[]
   ): Promise<any>;
 
   /**
@@ -678,7 +687,7 @@ export interface FrameBase {
    */
   $$eval(
     selector: string,
-    fn: (...args: any[]) => void,
+    fn: (elements: ElementHandle[], ...args: any[]) => any,
     ...args: any[]
   ): Promise<any>;
 
@@ -723,7 +732,7 @@ export interface FrameBase {
   ): Promise<void>;
   waitForSelector(
     selector: string,
-    options?: { visible: boolean; timeout: number }
+    options?: { visible?: boolean; hidden?: boolean; timeout?: number }
   ): Promise<void>;
 }
 
@@ -781,11 +790,29 @@ export interface PageEventObj {
 }
 
 /** Page provides methods to interact with a single tab in Chromium. One Browser instance might have multiple Page instances. */
-export interface Page extends FrameBase {
+export interface Page extends EventEmitter, FrameBase {
+  /**
+   * Adds the listener function to the end of the listeners array for the event named `eventName`.
+   * No checks are made to see if the listener has already been added. Multiple calls passing the same combination of
+   * `eventName` and listener will result in the listener being added, and called, multiple times.
+   * @param event The name of the event.
+   * @param handler The callback function.
+   */
   on<K extends keyof PageEventObj>(
-    event: K,
+    eventName: K,
     handler: (e: PageEventObj[K], ...args: any[]) => void
-  ): void;
+  ): this;
+
+  /**
+   * Adds a one time listener function for the event named `eventName`.
+   * The next time `eventName` is triggered, this listener is removed and then invoked.
+   * @param event The name of the event.
+   * @param handler The callback function.
+   */
+  once<K extends keyof PageEventObj>(
+    eventName: K,
+    handler: (e: PageEventObj[K], ...args: any[]) => void
+  ): this;
 
   /**
    * Provide credentials for http authentication.
@@ -1028,11 +1055,29 @@ export interface Page extends FrameBase {
 }
 
 /** A Browser is created when Puppeteer connects to a Chromium instance, either through puppeteer.launch or puppeteer.connect. */
-export interface Browser {
+export interface Browser extends EventEmitter {
+  /**
+   * Adds the listener function to the end of the listeners array for the event named `eventName`.
+   * No checks are made to see if the listener has already been added. Multiple calls passing the same combination of
+   * `eventName` and listener will result in the listener being added, and called, multiple times.
+   * @param event The name of the event.
+   * @param handler The callback function.
+   */
   on<K extends keyof BrowserEventObj>(
-    event: K,
+    eventName: K,
     handler: (e: BrowserEventObj[K], ...args: any[]) => void
-  ): void;
+  ): this;
+
+  /**
+   * Adds a one time listener function for the event named `eventName`.
+   * The next time `eventName` is triggered, this listener is removed and then invoked.
+   * @param event The name of the event.
+   * @param handler The callback function.
+   */
+  once<K extends keyof BrowserEventObj>(
+    eventName: K,
+    handler: (e: BrowserEventObj[K], ...args: any[]) => void
+  ): this;
 
   /**
    * Closes browser with all the pages (if any were opened).
@@ -1110,6 +1155,10 @@ export interface LaunchOptions {
   args?: string[];
   /** Close chrome process on Ctrl-C. Defaults to true. */
   handleSIGINT?: boolean;
+  /** Close chrome process on SIGTERM. Defaults to true. */
+  handleSIGTERM?: boolean;
+  /** Close chrome process on SIGHUP. Defaults to true. */
+  handleSIGHUP?: boolean;
   /**
    * Maximum time in milliseconds to wait for the Chrome instance to start.
    * Defaults to 30000 (30 seconds). Pass 0 to disable timeout.
diff --git a/types/puppeteer/puppeteer-tests.ts b/types/puppeteer/puppeteer-tests.ts
index 709afc87d0..d8bb2b4229 100644
--- a/types/puppeteer/puppeteer-tests.ts
+++ b/types/puppeteer/puppeteer-tests.ts
@@ -118,7 +118,7 @@ puppeteer.launch().then(async browser => {
 
   let currentURL: string;
   page
-    .waitForSelector("img")
+    .waitForSelector("img", { visible: true })
     .then(() => console.log("First URL with image: " + currentURL));
   for (currentURL of [
     "https://example.com",
@@ -160,7 +160,10 @@ puppeteer.launch().then(async browser => {
     args: [
       '--no-sandbox',
       '--disable-setuid-sandbox',
-    ]
+    ],
+    handleSIGINT: true,
+    handleSIGHUP: true,
+    handleSIGTERM: true,
   });
   const page = await browser.newPage();
   await page.goto("https://example.com");
diff --git a/types/react-breadcrumbs/index.d.ts b/types/react-breadcrumbs/index.d.ts
index 01a91fed5d..c004e4aba4 100644
--- a/types/react-breadcrumbs/index.d.ts
+++ b/types/react-breadcrumbs/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/svenanders/react-breadcrumbs
 // Definitions by: Kostya Esmukov <https://github.com/KostyaEsmukov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.4
 
 import * as React from "react";
 import * as ReactRouter from "react-router";
diff --git a/types/react-loadable/index.d.ts b/types/react-loadable/index.d.ts
index 480ca7765f..6220b23ea6 100644
--- a/types/react-loadable/index.d.ts
+++ b/types/react-loadable/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for react-loadable 4.0
+// Type definitions for react-loadable 5.3
 // Project: https://github.com/thejameskyle/react-loadable#readme
 // Definitions by: Diogo Franco <https://github.com/Kovensky>, Oden S. <https://github.com/odensc>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -36,6 +36,31 @@ export interface CommonOptions {
      * After the specified time in milliseconds passes, the component's `timedOut` prop will be set to true.
      */
     timeout?: number | false | null;
+
+    /**
+     * Optional array of module paths that `Loadable.Capture`'s `report` function will be applied on during
+     * server-side rendering. This helps the server know which modules were imported/used during SSR.
+     * ```ts
+     * Loadable({
+     *   loader: () => import('./my-component'),
+     *   modules: ['./my-component'],
+     * });
+     * ```
+     */
+    modules?: string[];
+
+    /**
+     * An optional function which returns an array of Webpack module ids which you can get
+     * with require.resolveWeak. This is used by the client (inside `Loadable.preloadReady`) to
+     * guarantee each webpack module is preloaded before the first client render.
+     * ```ts
+     * Loadable({
+     *  loader: () => import('./Foo'),
+     *  webpack: () => [require.resolveWeak('./Foo')],
+     * });
+     * ```
+     */
+    webpack?: () => number[];
 }
 
 export interface OptionsWithoutRender<Props> extends CommonOptions {
@@ -112,9 +137,47 @@ export interface LoadableComponent {
     preload(): void;
 }
 
+export interface LoadableCaptureProps {
+    /**
+     * Function called for every moduleName that is rendered via React Loadable.
+     */
+    report: (moduleName: string) => void;
+}
+
 export interface Loadable {
     <Props, Exports extends object>(options: Options<Props, Exports>): React.ComponentType<Props> & LoadableComponent;
     Map<Props, Exports extends { [key: string]: any }>(options: OptionsWithMap<Props, Exports>): React.ComponentType<Props> & LoadableComponent;
+
+    /**
+     * This will call all of the LoadableComponent.preload methods recursively until they are all
+     * resolved. Allowing you to preload all of your dynamic modules in environments like the server.
+     * ```ts
+     * Loadable.preloadAll().then(() => {
+     *   app.listen(3000, () => {
+     *     console.log('Running on http://localhost:3000/');
+     *   });
+     * });
+     * ```
+     */
+    preloadAll(): Promise<void>;
+
+    /**
+     * Check for modules that are already loaded in the browser and call the matching
+     * `LoadableComponent.preload` methods.
+     * ```ts
+     * window.main = () => {
+     *   Loadable.preloadReady().then(() => {
+     *     ReactDOM.hydrate(
+     *       <App/>,
+     *       document.getElementById('app'),
+     *     );
+     *   });
+     * };
+     * ```
+     */
+    preloadReady(): Promise<void>;
+
+    Capture: React.ComponentType<LoadableCaptureProps>;
 }
 
 declare const LoadableExport: Loadable;
diff --git a/types/react-navigation/index.d.ts b/types/react-navigation/index.d.ts
index edf5cbc915..cd528e82e8 100644
--- a/types/react-navigation/index.d.ts
+++ b/types/react-navigation/index.d.ts
@@ -273,6 +273,7 @@ export type NavigationStackScreenOptions = NavigationScreenOptions & {
   headerRight?: React.ReactElement<any>;
   headerStyle?: StyleProp<ViewStyle>;
   gesturesEnabled?: boolean;
+  gestureResponseDistance?: { vertical?: number; horizontal?: number };
 };
 
 export interface NavigationStackRouterConfig {
@@ -348,7 +349,8 @@ export interface NavigationDrawerScreenOptions extends NavigationScreenOptions {
       any
     > | null));
   drawerLabel?:
-    React.ReactElement<any>
+    string
+    | React.ReactElement<any>
     | ((options: { tintColor: (string | null), focused: boolean }) => (React.ReactElement<
       any
     > | null));
diff --git a/types/react-redux-toastr/index.d.ts b/types/react-redux-toastr/index.d.ts
index 74346d2c29..a7ca79c5b1 100644
--- a/types/react-redux-toastr/index.d.ts
+++ b/types/react-redux-toastr/index.d.ts
@@ -10,7 +10,7 @@ import { Component } from 'react';
 import { Action, ActionCreator, Reducer } from 'redux';
 
 export type iconType = 'success' | 'info' | 'warning' | 'error';
-export type positionType = 'top-left' | 'top-center' | 'top-right' | 'bottom-left' | 'bottom-ceter' | 'bottom-right';
+export type positionType = 'top-left' | 'top-center' | 'top-right' | 'bottom-left' | 'bottom-center' | 'bottom-right';
 export type toastType = 'success' | 'info' | 'warning' | 'light' | 'error' | 'confirm' | 'message';
 export type transitionInType = 'bounceIn' | 'bounceInDown' | 'fadeIn';
 export type transitionOutType = 'bounceOut' | 'bounceOutUp' | 'fadeOut';
diff --git a/types/react-redux/index.d.ts b/types/react-redux/index.d.ts
index 8e2556ec6c..2a015389da 100644
--- a/types/react-redux/index.d.ts
+++ b/types/react-redux/index.d.ts
@@ -120,28 +120,28 @@ export interface Connect {
         mapStateToProps: MapStateToPropsParam<TStateProps, TOwnProps, State>,
         mapDispatchToProps: null | undefined,
         mergeProps: null | undefined,
-        options: Options<TStateProps, TOwnProps>
+        options: Options<State, TStateProps, TOwnProps>
     ): InferableComponentEnhancerWithProps<DispatchProp<any> & TStateProps, TOwnProps>;
 
-    <no_state = {}, TDispatchProps = {}, TOwnProps = {}>(
+    <TStateProps = {}, TDispatchProps = {}, TOwnProps = {}>(
         mapStateToProps: null | undefined,
         mapDispatchToProps: MapDispatchToPropsParam<TDispatchProps, TOwnProps>,
         mergeProps: null | undefined,
-        options: Options<no_state, TOwnProps>
+        options: Options<{}, TStateProps, TOwnProps>
     ): InferableComponentEnhancerWithProps<TDispatchProps, TOwnProps>;
 
     <TStateProps = {}, TDispatchProps = {}, TOwnProps = {}, State = {}>(
         mapStateToProps: MapStateToPropsParam<TStateProps, TOwnProps, State>,
         mapDispatchToProps: MapDispatchToPropsParam<TDispatchProps, TOwnProps>,
         mergeProps: null | undefined,
-        options: Options<TStateProps, TOwnProps>
+        options: Options<State, TStateProps, TOwnProps>
     ): InferableComponentEnhancerWithProps<TStateProps & TDispatchProps, TOwnProps>;
 
     <TStateProps = {}, TDispatchProps = {}, TOwnProps = {}, TMergedProps = {}, State = {}>(
         mapStateToProps: MapStateToPropsParam<TStateProps, TOwnProps, State>,
         mapDispatchToProps: MapDispatchToPropsParam<TDispatchProps, TOwnProps>,
         mergeProps: MergeProps<TStateProps, TDispatchProps, TOwnProps, TMergedProps>,
-        options: Options<TStateProps, TOwnProps, TMergedProps>
+        options: Options<State, TStateProps, TOwnProps, TMergedProps>
     ): InferableComponentEnhancerWithProps<TMergedProps, TOwnProps>;
 }
 
diff --git a/types/react-redux/react-redux-tests.tsx b/types/react-redux/react-redux-tests.tsx
index af77473473..393c4d09da 100644
--- a/types/react-redux/react-redux-tests.tsx
+++ b/types/react-redux/react-redux-tests.tsx
@@ -247,22 +247,26 @@ namespace MapStateAndDispatchAndMerge {
 }
 
 namespace MapStateAndOptions {
+    interface State { state: string; }
     interface OwnProps { foo: string }
     interface StateProps { bar: number }
     interface DispatchProps { dispatch: Dispatch<any> }
 
     class TestComponent extends Component<OwnProps & StateProps & DispatchProps> {}
 
-    const mapStateToProps = () => ({
+    const mapStateToProps = (state: State) => ({
         bar: 1
     })
 
-    const Test = connect(
+    const areStatePropsEqual = (next: StateProps, current: StateProps) => true;
+
+    const Test = connect<StateProps, DispatchProps, OwnProps, State>(
         mapStateToProps,
         null,
         null,
         {
-            pure: true
+            pure: true,
+            areStatePropsEqual,
         }
     )(TestComponent)
 
diff --git a/types/react-router-bootstrap/index.d.ts b/types/react-router-bootstrap/index.d.ts
index c09a82d770..19e1940836 100644
--- a/types/react-router-bootstrap/index.d.ts
+++ b/types/react-router-bootstrap/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/react-bootstrap/react-router-bootstrap
 // Definitions by: Vincent Lesierse <https://github.com/vlesierse>, Karol Janyst <https://github.com/LKay>, Olmo del Corral <https://github.com/olmobrutall>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.4
 
 export { default as LinkContainer } from "react-router-bootstrap/lib/LinkContainer"
 export { default as IndexLinkContainer } from "react-router-bootstrap/lib/IndexLinkContainer"
diff --git a/types/react-router-config/index.d.ts b/types/react-router-config/index.d.ts
index 54b48089fa..d33e385a53 100644
--- a/types/react-router-config/index.d.ts
+++ b/types/react-router-config/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/ReactTraining/react-router/tree/master/packages/react-router-config
 // Definitions by: François Nguyen <https://github.com/lith-light-g>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.4
 
 import * as React from "react";
 import { RouteComponentProps, match } from "react-router";
diff --git a/types/react-router-dom/index.d.ts b/types/react-router-dom/index.d.ts
index f19bfdee9a..88119a4858 100644
--- a/types/react-router-dom/index.d.ts
+++ b/types/react-router-dom/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
 //                 Huy Nguyen <https://github.com/huy-nguyen>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.4
 
 import { match } from "react-router";
 import * as React from 'react';
@@ -27,7 +27,7 @@ export {
 
 export interface BrowserRouterProps {
     basename?: string;
-    getUserConfirmation?(): void;
+    getUserConfirmation?: ((message: string, callback: (ok: boolean) => void) => void);
     forceRefresh?: boolean;
     keyLength?: number;
 }
@@ -35,7 +35,7 @@ export class BrowserRouter extends React.Component<BrowserRouterProps, any> {}
 
 export interface HashRouterProps {
     basename?: string;
-    getUserConfirmation?(): void;
+    getUserConfirmation?: ((message: string, callback: (ok: boolean) => void) => void);
     hashType?: 'slash' | 'noslash' | 'hashbang';
 }
 export class HashRouter extends React.Component<HashRouterProps, any> {}
diff --git a/types/react-router-native/index.d.ts b/types/react-router-native/index.d.ts
index f2ab1c72b1..88c0108212 100644
--- a/types/react-router-native/index.d.ts
+++ b/types/react-router-native/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/ReactTraining/react-router-native
 // Definitions by: Eduard Zintz <https://github.com/ezintz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.4
 
 export {
   match,
diff --git a/types/react-router/index.d.ts b/types/react-router/index.d.ts
index 548e7ef4a1..a46ddeaa5a 100644
--- a/types/react-router/index.d.ts
+++ b/types/react-router/index.d.ts
@@ -15,7 +15,7 @@
 //                 Daniel Roth <https://github.com/DaIgeb>
 //                 Egor Shulga <https://github.com/egorshulga>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.4
 
 import * as React from 'react';
 import * as H from 'history';
@@ -34,14 +34,14 @@ export interface RouterChildContext<P> {
 export interface MemoryRouterProps {
   initialEntries?: H.LocationDescriptor[];
   initialIndex?: number;
-  getUserConfirmation?: (() => void);
+  getUserConfirmation?: ((message: string, callback: (ok: boolean) => void) => void);
   keyLength?: number;
 }
 
 export class MemoryRouter extends React.Component<MemoryRouterProps, any> { }
 
 export interface PromptProps {
-  message: string | ((location: H.Location) => void);
+  message: string | ((location: H.Location) => string | boolean);
   when?: boolean;
 }
 export class Prompt extends React.Component<PromptProps, any> { }
@@ -99,7 +99,16 @@ export interface match<P> {
   url: string;
 }
 
+// Diff / Omit taken from https://github.com/Microsoft/TypeScript/issues/12215#issuecomment-311923766
+export type Diff<T extends string, U extends string> = ({ [P in T]: P } & { [P in U]: never } & { [x: string]: never })[T];
+export type Omit<T, K extends keyof T> = Pick<T, Diff<keyof T, K>>;
+
 export function matchPath<P>(pathname: string, props: RouteProps): match<P> | null;
-export function withRouter<P>(component: React.ComponentType<RouteComponentProps<any> & P>): React.ComponentClass<P>;
+export function withRouter<P extends RouteComponentProps<any>>(component: React.ComponentType<P>): React.ComponentClass<Omit<P, keyof RouteComponentProps<any>>>;
+
 // decorator signature
+// There is a known issue in TypeScript, which doesn't allow decorators to change the signature of the classes
+// they are decorating. Due to this, if you are using @withRouter decorator in your code,
+// you will see a bunch of errors from TypeScript. The current workaround is to use withRouter() as a function call
+// on a separate line instead of as a decorator.
 export function withRouter<P, TFunction extends React.ComponentClass<P>>(target: TFunction): TFunction;
diff --git a/types/react-router/test/MemoryRouter.tsx b/types/react-router/test/MemoryRouter.tsx
index 99aa385bd5..bd42d69407 100644
--- a/types/react-router/test/MemoryRouter.tsx
+++ b/types/react-router/test/MemoryRouter.tsx
@@ -12,8 +12,13 @@ const initialRouterEntries = [
   }
 ];
 
+const getConfirmation = (message: string, callback: (ok: boolean) => void): void => {
+  const allowTransition = window.confirm(message);
+  callback(allowTransition);
+};
+
 const MemoryRouterExample = () => (
-  <MemoryRouter initialEntries={initialRouterEntries} initialIndex={1}>
+  <MemoryRouter initialEntries={initialRouterEntries} initialIndex={1} getUserConfirmation={getConfirmation}>
     <div>
       <ul>
         <li><Link to="/">Home</Link></li>
diff --git a/types/react-router/test/WithRouter.tsx b/types/react-router/test/WithRouter.tsx
index 72035ed92f..5d203d8f01 100644
--- a/types/react-router/test/WithRouter.tsx
+++ b/types/react-router/test/WithRouter.tsx
@@ -1,13 +1,13 @@
 import * as React from 'react';
 import { withRouter, RouteComponentProps } from 'react-router-dom';
 
-interface TOwnProps {
+interface TOwnProps extends RouteComponentProps<{}> {
   username: string;
 }
 
-const Component = (props: TOwnProps & RouteComponentProps<{}>) => <h2>Welcome {props.username}</h2>;
+const Component = (props: TOwnProps) => <h2>Welcome {props.username}</h2>;
 
-const WithRouterComponent = withRouter<TOwnProps>(Component);
+const WithRouterComponent = withRouter(Component);
 
 const WithRouterTest = () => (<WithRouterComponent username="John" />);
 
diff --git a/types/react-router/test/WithRouterDecorator.tsx b/types/react-router/test/WithRouterDecorator.tsx
deleted file mode 100644
index aa907d1a7a..0000000000
--- a/types/react-router/test/WithRouterDecorator.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import * as React from 'react';
-import { withRouter, RouteComponentProps } from 'react-router-dom';
-
-interface TOwnProps {
-  username: string;
-}
-
-// $ExpectType Component
-@withRouter
-class Component extends React.Component<TOwnProps> {
-	render() {
-		return (
-			<h2>Welcome {this.props.username}</h2>
-		);
-	}
-}
-
-const WithRouterTest = () => (<Component username="John" />);
-
-// $ExpectType Element
-WithRouterTest();
-
-export default WithRouterTest;
diff --git a/types/react-router/test/examples-from-react-router-website/Auth.tsx b/types/react-router/test/examples-from-react-router-website/Auth.tsx
index c57251f9ef..6c8d70a791 100644
--- a/types/react-router/test/examples-from-react-router-website/Auth.tsx
+++ b/types/react-router/test/examples-from-react-router-website/Auth.tsx
@@ -65,10 +65,10 @@ const PrivateRoute: React.SFC<RouteProps> = ({ component, ...rest }) => (
   )}/>
 );
 
-const Public: React.SFC<RouteComponentProps<void>> = () => <h3>Public</h3>;
-const Protected: React.SFC<RouteComponentProps<void>> = () => <h3>Protected</h3>;
+const Public: React.SFC<RouteComponentProps<{}>> = () => <h3>Public</h3>;
+const Protected: React.SFC<RouteComponentProps<{}>> = () => <h3>Protected</h3>;
 
-class Login extends React.Component<RouteComponentProps<void>, {redirectToReferrer: boolean}> {
+class Login extends React.Component<RouteComponentProps<{}>, {redirectToReferrer: boolean}> {
   state = {
     redirectToReferrer: false
   };
diff --git a/types/react-router/test/examples-from-react-router-website/Basic.tsx b/types/react-router/test/examples-from-react-router-website/Basic.tsx
index c2b6c58405..5ed1350d83 100644
--- a/types/react-router/test/examples-from-react-router-website/Basic.tsx
+++ b/types/react-router/test/examples-from-react-router-website/Basic.tsx
@@ -36,7 +36,7 @@ const About = () => (
   </div>
 );
 
-const Topics: React.SFC<RouteComponentProps<void>> = ({ match }) => (
+const Topics: React.SFC<RouteComponentProps<{}>> = ({ match }) => (
   <div>
     <h2>Topics</h2>
     <ul>
diff --git a/types/react-router/test/examples-from-react-router-website/ModalGallery.tsx b/types/react-router/test/examples-from-react-router-website/ModalGallery.tsx
index 211e62aa49..c9632c311c 100644
--- a/types/react-router/test/examples-from-react-router-website/ModalGallery.tsx
+++ b/types/react-router/test/examples-from-react-router-website/ModalGallery.tsx
@@ -16,7 +16,7 @@ import {
 // are the same as before but now we see them inside a modal
 // on top of the old screen.
 
-class ModalSwitch extends React.Component<RouteComponentProps<void>> {
+class ModalSwitch extends React.Component<RouteComponentProps<{}>> {
   // We can pass a location to <Switch/> that will tell it to
   // ignore the router's current location and use the location
   // prop instead.
@@ -31,7 +31,7 @@ class ModalSwitch extends React.Component<RouteComponentProps<void>> {
   // is still `/` even though its `/images/2`.
   previousLocation = this.props.location;
 
-  componentWillUpdate(nextProps: RouteComponentProps<void>) {
+  componentWillUpdate(nextProps: RouteComponentProps<{}>) {
     const { location } = this.props;
     // set previousLocation if props.location is not modal
     if (
diff --git a/types/react-router/test/examples-from-react-router-website/NoMatch.tsx b/types/react-router/test/examples-from-react-router-website/NoMatch.tsx
index 83c359d33e..887efca027 100644
--- a/types/react-router/test/examples-from-react-router-website/NoMatch.tsx
+++ b/types/react-router/test/examples-from-react-router-website/NoMatch.tsx
@@ -39,7 +39,7 @@ const Home = () => (
 
 const WillMatch = () => <h3>Matched!</h3>;
 
-const NoMatch: React.SFC<RouteComponentProps<void>> = ({ location }) => (
+const NoMatch: React.SFC<RouteComponentProps<{}>> = ({ location }) => (
   <div>
     <h3>No match for <code>{location.pathname}</code></h3>
   </div>
diff --git a/types/react-router/test/examples-from-react-router-website/RouteConfig.tsx b/types/react-router/test/examples-from-react-router-website/RouteConfig.tsx
index b723821080..10f3f46bd1 100644
--- a/types/react-router/test/examples-from-react-router-website/RouteConfig.tsx
+++ b/types/react-router/test/examples-from-react-router-website/RouteConfig.tsx
@@ -17,7 +17,7 @@ const Main = () => <h2>Main</h2>;
 
 const Sandwiches = () => <h2>Sandwiches</h2>;
 
-interface PropsWithRoutes extends RouteComponentProps<void> {
+interface PropsWithRoutes extends RouteComponentProps<{}> {
   routes: MyRouteProps[];
 }
 
diff --git a/types/react-router/tsconfig.json b/types/react-router/tsconfig.json
index a9342966b5..95e3846a8c 100644
--- a/types/react-router/tsconfig.json
+++ b/types/react-router/tsconfig.json
@@ -39,7 +39,6 @@
         "test/MemoryRouter.tsx",
         "test/Switch.tsx",
         "test/InheritingRoute.tsx",
-        "test/WithRouter.tsx",
-        "test/WithRouterDecorator.tsx"
+        "test/WithRouter.tsx"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/react-sketchapp/index.d.ts b/types/react-sketchapp/index.d.ts
new file mode 100644
index 0000000000..f340e19232
--- /dev/null
+++ b/types/react-sketchapp/index.d.ts
@@ -0,0 +1,283 @@
+// Type definitions for react-sketchapp 0.12
+// Project: https://github.com/airbnb/react-sketchapp
+// Definitions by: Rico Kahler <https://github.com/ricokahler>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import * as React from 'react';
+
+declare global {
+    const context: SketchContext;
+}
+
+// sketch interfaces taken from
+// https://github.com/airbnb/react-sketchapp/blob/v0.12.1/src/types.js
+export interface SketchPage { name: () => any; }
+export interface SketchAssetCollection {
+    colors: () => any[];
+    gradients: () => any[];
+}
+export interface SketchSharedStyleContainer {
+    setObjects: (objects: any[]) => void;
+    addSharedStyleWithName_firstInstance: (name: string, ins: any) => void;
+}
+export interface SketchDocumentData {
+    layerStyles: () => void;
+    layerTextStyles: () => SketchSharedStyleContainer;
+    layerSymbols: () => void;
+    assets: () => SketchAssetCollection;
+}
+export interface SketchDocument {
+    documentData: () => SketchDocumentData;
+    pages: () => SketchPage[];
+    addBlankPage: () => SketchPage;
+    currentPage: SketchPage;
+}
+export interface SketchContext { document: SketchDocument; }
+
+/**
+ * Returns the top-level rendered Sketch object or an array of Sketch objects if you use
+ * components.
+ * @param element Top-level React component that defines your Sketch document.
+ * @param container The element to render into - will be replaced. Should either be a Sketch Group
+ * or Page Object.
+ * @return The top-most rendered native Sketch layer.
+ */
+export function render(element: JSX.Element, container?: any): any;
+
+/**
+ * Returns a Sketch JSON object for further consumption - doesn't add to the page.
+ * @return The top-most Sketch layer as JSON.
+ */
+export function renderToJSON(element: JSX.Element): any;
+
+// https://github.com/airbnb/react-sketchapp/blob/v0.12.1/src/types.js#L59
+export type Color = string | number;
+
+/**
+ * The [`StyleSheet` api uses numbers as IDs][0] to pull registered styles. The component props
+ * can actually take either a `Style` or a `StyleReference` (where the `StyleReference` is given
+ * by a `StyleSheet` obj created with `StyleSheet.create`)
+ * [0]: https://github.com/airbnb/react-sketchapp/blob/v0.12.1/src/stylesheet/index.js#L34
+ */
+export type StyleReference = number;
+
+/**
+ * Represents the base styles that can be applied to a component.
+ */
+export interface Style {
+    shadowColor?: Color;
+    shadowOffset?: { width?: number, height?: number };
+    shadowOpacity?: number;
+    shadowRadius?: number;
+    width?: number;
+    height?: number;
+    top?: number;
+    left?: number;
+    right?: number;
+    bottom?: number;
+    minWidth?: number;
+    maxWidth?: number;
+    minHeight?: number;
+    maxHeight?: number;
+    margin?: number;
+    marginVertical?: number;
+    marginHorizontal?: number;
+    marginTop?: number;
+    marginBottom?: number;
+    marginLeft?: number;
+    marginRight?: number;
+    padding?: number;
+    paddingVertical?: number;
+    paddingHorizontal?: number;
+    paddingTop?: number;
+    paddingBottom?: number;
+    paddingLeft?: number;
+    paddingRight?: number;
+    borderWidth?: number;
+    borderTopWidth?: number;
+    borderRightWidth?: number;
+    borderBottomWidth?: number;
+    borderLeftWidth?: number;
+    position?: 'absolute' | 'relative';
+    flexDirection?: 'row' | 'row-reverse' | 'column' | 'column-reverse';
+    flexWrap?: 'wrap' | 'nowrap';
+    justifyContent?: 'flex-start' | 'flex-end' | 'center' | 'space-between' | 'space-around';
+    alignItems?: 'flex-start' | 'flex-end' | 'center' | 'stretch';
+    alignSelf?: 'auto' | 'flex-start' | 'flex-end' | 'center' | 'stretch';
+    overflow?: 'visible' | 'hidden' | 'scroll';
+    flex?: number;
+    flexGrow?: number;
+    flexShrink?: number;
+    flexBasis?: number;
+    aspectRatio?: number;
+    zIndex?: number;
+    backfaceVisibility?: 'visible' | 'hidden';
+    backgroundColor?: Color;
+    borderColor?: Color;
+    borderTopColor?: Color;
+    borderRightColor?: Color;
+    borderBottomColor?: Color;
+    borderLeftColor?: Color;
+    borderRadius?: number;
+    borderTopLeftRadius?: number;
+    borderTopRightRadius?: number;
+    borderBottomLeftRadius?: number;
+    borderBottomRightRadius?: number;
+    borderStyle?: 'solid' | 'dotted' | 'dashed';
+    opacity?: number;
+}
+
+/**
+ * Represents all the Styles that can be applied to a `<Text/>` component. The this interface
+ * extends the `Style` interface
+ */
+export interface TextStyle extends Style {
+    color?: Color;
+    fontFamily?: string;
+    fontSize?: number;
+    fontStyle?: 'normal' | 'italic';
+    fontWeight?: string;
+    textDecorationLine?: 'none' | 'underline' | 'double' | 'line-through';
+    textShadowOffset?: { width: number, height: number };
+    textShadowRadius?: number;
+    textShadowColor?: Color;
+    letterSpacing?: number;
+    lineHeight?: number;
+    textAlign?: 'auto' | 'left' | 'right' | 'center' | 'justify';
+    writingDirection?: 'auto' | 'ltr' | 'rtl';
+}
+
+// wanted to type these as classes because they are implemented as classes and typing them this
+// way gives you typings like `Artboard.prototype`
+
+// Artboard
+export interface ArtboardProps {
+    /**
+     * The name to be displayed in the Sketch Layer List
+     */
+    name?: string;
+    children?: any;
+    style?: Style | StyleReference;
+}
+/**
+ * Wrapper for Sketch's Artboards.
+ */
+export class Artboard extends React.Component<ArtboardProps, any> { }
+
+// Image
+export type ImageSource = string | { src: string };
+export type ResizeMode = 'contain' | 'cover' | 'stretch' | 'center' | 'repeat' | 'none';
+export interface ImageProps {
+    children?: any;
+    source?: ImageSource;
+    style?: Style | StyleReference;
+    resizeMode: ResizeMode;
+}
+export class Image extends React.Component<ImageProps, any> { }
+
+// RedBox
+export interface RedBoxProps {
+    /** A JavaScript Error object */
+    error: Error;
+}
+/**
+ * A red box / 'red screen of death' error handler. Thanks to
+ * [commissure/redbox-react.](https://github.com/commissure/redbox-react)
+ */
+export class RedBox extends React.Component<RedBoxProps, any> { }
+
+// Text
+export interface TextProps {
+    name?: string;
+    children?: string;
+    style?: TextStyle | StyleReference;
+}
+/** Text primitives */
+export class Text extends React.Component<TextProps, any> { }
+
+// View
+export interface ViewProps {
+    name?: string;
+    children?: any;
+    style?: Style | StyleReference;
+}
+/** View primitives */
+export class View extends React.Component<ViewProps, any> { }
+
+export const StyleSheet: {
+    hairlineWidth: 1;
+    absoluteFill: StyleReference;
+    /**
+     * Create an optimized `StyleSheet` reference from a style object.
+     */
+    create: <T extends { [key: string]: Style | TextStyle }>(t: T) => {
+        [P in keyof T]: StyleReference
+    };
+    /**
+     * Flatten an array of style objects into one aggregated object, or look up the definition for a
+     * registered stylesheet.
+     */
+    flatten: (
+        input: Array<Style | TextStyle | StyleReference> | StyleReference | undefined | Style
+    ) => Style | TextStyle, // returns the expanded style or expanded style reference which conforms
+    // to the `Style | TextStyle` interface
+    /**
+     * resolve one style
+     */
+    resolve: (style: Style | TextStyle) => { style: Style | TextStyle }
+};
+
+/**
+ * An interface to Sketch's shared text styles. Create styles with or without rendering them to
+ * the document canvas.
+ */
+export const TextStyles: {
+    /**
+     * The primary interface to TextStyles. Call this before rendering.
+     */
+    create: (
+        options: { context: SketchContext, clearExistingStyle?: boolean },
+        styles: { [key: string]: TextStyle },
+    ) => any,
+    /**
+     * Find a stored native Sketch style object for a given JavaScript style object. You probably
+     * don't need to use this.
+     */
+    resolve: (style: TextStyle) => any,
+    /**
+     * Find a stored style by name.
+     */
+    get: (name: string) => TextStyle | undefined,
+    /**
+     * Find all of the registered styles. You probably don't need to use this.
+     */
+    styles: { [key: string]: TextStyle | undefined },
+    /**
+     * Reset the registered styles.
+     */
+    clear: () => void,
+};
+
+// Symbols
+/**
+ * Returns a Sketch symbol given a node and an optional name.
+ * @param node The node object that will be rendered as a symbol
+ * @param name Optional name for the symbol, string can include backslashes to organize these
+ * symbols with Sketch. For example squares/blue
+ */
+export function makeSymbol<P>(
+    node: React.ComponentClass<P> | ((props: P) => JSX.Element),
+    name?: string
+): React.ComponentClass<P & { overrides?: { [key: string]: any } }>;
+
+/**
+ * Injects the symbols into Sketch's symbol page. **Call this before rendering.**
+ */
+export function injectSymbols(context: SketchContext): void;
+
+export const Platform: {
+    OS: 'sketch',
+    Version: 1,
+    select: (obj: any) => any
+};
diff --git a/types/react-sketchapp/react-sketchapp-tests.tsx b/types/react-sketchapp/react-sketchapp-tests.tsx
new file mode 100644
index 0000000000..a3e339c625
--- /dev/null
+++ b/types/react-sketchapp/react-sketchapp-tests.tsx
@@ -0,0 +1,45 @@
+import {
+    Artboard, View, Text, StyleSheet, TextStyles, render, renderToJSON, Platform
+} from 'react-sketchapp';
+
+// the styles object should be a mapped typed mapping the keys of the object literal to numbers
+const styles = StyleSheet.create({
+    red: {
+        backgroundColor: '#FF00000'
+    },
+    flexRow: {
+        flexDirection: 'row'
+    }
+});
+
+// style references are numbers
+const styleReference = styles.red;
+
+const Document = () => <Artboard name="some artboard name" style={{ backgroundColor: '#FF0000' }} >
+    <View name="some view name" style={{ backgroundColor: '#FF0000' }} >
+        <Text name="some text name">text must be a string</Text>
+    </View>
+    <View style={styles.red}>
+    </View>
+</Artboard>;
+
+render(<Document />);
+renderToJSON(<Document />);
+
+// Artboard is typed with a class so the prototype should be typed too (not very useful though)
+Artboard.prototype.componentDidMount;
+
+// TODO: currently this interface returns any but it looks like this method produces a side-effect
+// and the return type isn't used anyway
+TextStyles.create(context as any, {
+    normal: {
+        fontSize: 16,
+    },
+    heading: {
+        fontSize: 16 * 1.618,
+        fontWeight: 'bold',
+    }
+});
+
+const shouldBeSketch = Platform.OS;
+const shouldBe1 = Platform.Version;
diff --git a/types/react-sketchapp/tsconfig.json b/types/react-sketchapp/tsconfig.json
new file mode 100644
index 0000000000..6dc8b9460a
--- /dev/null
+++ b/types/react-sketchapp/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "target": "es2017",
+        "module": "commonjs",
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "baseUrl": "../",
+        "jsx": "preserve",
+        "typeRoots": [
+            "../"
+        ],
+        "lib": [
+            "es2015"
+        ],
+        "types": [],
+        "noImplicitAny": true,
+        "strictNullChecks": true,
+        "noImplicitThis": true,
+        "strictFunctionTypes": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-sketchapp-tests.tsx"
+    ]
+}
\ No newline at end of file
diff --git a/types/react-sketchapp/tslint.json b/types/react-sketchapp/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-sketchapp/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/react-slick/index.d.ts b/types/react-slick/index.d.ts
index ab010943e5..4447e9d50f 100644
--- a/types/react-slick/index.d.ts
+++ b/types/react-slick/index.d.ts
@@ -1,6 +1,8 @@
-// Type definitions for react-slick 0.14
+// Type definitions for react-slick 0.15
 // Project: https://github.com/akiran/react-slick
-// Definitions by: Andrey Balokha <https://github.com/andrewBalekha>, Giedrius Grabauskas <https://github.com/GiedriusGrabauskas>
+// Definitions by: Andrey Balokha <https://github.com/andrewBalekha>
+//                 Giedrius Grabauskas <https://github.com/GiedriusGrabauskas>
+//                 Andrew Makarov <https://github.com/r3nya>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -12,6 +14,8 @@ export interface CustomArrowProps {
   className?: string;
   style?: React.CSSProperties;
   onClick?: React.MouseEventHandler<any>;
+  currentSlide?: number;
+  slideCount?: number;
 }
 
 export interface ResponsiveObject {
diff --git a/types/react-slick/react-slick-tests.tsx b/types/react-slick/react-slick-tests.tsx
index 4ed6dbb901..18a104049f 100644
--- a/types/react-slick/react-slick-tests.tsx
+++ b/types/react-slick/react-slick-tests.tsx
@@ -9,11 +9,13 @@ class LeftNavArrow extends React.Component<CustomArrowProps> {
 
 function RightNavArrow(props: CustomArrowProps): JSX.Element {
   const { className, style, onClick } = props;
-  return <div
-    className={className}
-    style={{ ...style, display: 'block', background: 'green' }}
-    onClick={onClick}
-  ></div>;
+  return (
+    <div
+      className={className}
+      style={{ ...style, display: 'block', background: 'green' }}
+      onClick={onClick}
+    />
+  );
 }
 
 const defaultSettings: Settings = {
diff --git a/types/react-swipeable/index.d.ts b/types/react-swipeable/index.d.ts
index b0036ae119..1608258c64 100644
--- a/types/react-swipeable/index.d.ts
+++ b/types/react-swipeable/index.d.ts
@@ -1,39 +1,42 @@
-// Type definitions for react-swipeable 4.0
+// Type definitions for react-swipeable 4.2
 // Project: https://www.npmjs.com/package/react-swipeable
 // Definitions by: Giedrius Grabauskas <https://github.com/GiedriusGrabauskas>
 //                 Konstantin Vasilev <https://github.com/mctep>
+//                 Hiroki Horiuchi <https://github.com/horiuchi>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
 import * as React from 'react';
 
-declare class ReactSwipeable extends React.Component<ReactSwipeable.SwipeableProps> {}
+declare class ReactSwipeable<T extends Element = HTMLElement> extends React.Component<ReactSwipeable.SwipeableProps<T>> {}
 
 declare namespace ReactSwipeable {
-    type OnSwipingCallback = (event: React.TouchEvent<HTMLElement>, deltaX: number, deltaY: number, absX: number, absY: number, velocity: number) => void;
-    type OnSwipedCallback = (event: React.TouchEvent<HTMLElement>, deltaX: number, deltaY: number, isFlick: boolean, velocity: number) => void;
-    type OnSwipedDirectionCallback = (event: React.TouchEvent<HTMLElement>, delta: number, isFlick: boolean) => void;
-    type OnSwipingDirectionCallback = (event: React.TouchEvent<HTMLElement>, delta: number) => void;
-    type OnTapCallback = (event: React.TouchEvent<HTMLElement>) => void;
+    type OnSwipingCallback<T extends Element = HTMLElement> = (event: React.TouchEvent<T>, deltaX: number, deltaY: number, absX: number, absY: number, velocity: number) => void;
+    type OnSwipedCallback<T extends Element = HTMLElement> = (event: React.TouchEvent<T>, deltaX: number, deltaY: number, isFlick: boolean, velocity: number) => void;
+    type OnSwipedDirectionCallback<T extends Element = HTMLElement> = (event: React.TouchEvent<T>, delta: number, isFlick: boolean) => void;
+    type OnSwipingDirectionCallback<T extends Element = HTMLElement> = (event: React.TouchEvent<T>, delta: number) => void;
+    type OnTapCallback<T extends Element = HTMLElement> = (event: React.TouchEvent<T>) => void;
 
-    interface SwipeableProps extends React.ClassAttributes<ReactSwipeable>, React.HTMLAttributes<HTMLElement> {
-        onSwiped?: OnSwipedCallback;
-        onSwiping?: OnSwipingCallback;
-        onSwipingUp?: OnSwipingDirectionCallback;
-        onSwipingRight?: OnSwipingDirectionCallback;
-        onSwipingDown?: OnSwipingDirectionCallback;
-        onSwipingLeft?: OnSwipingDirectionCallback;
-        onSwipedUp?: OnSwipedDirectionCallback;
-        onSwipedRight?: OnSwipedDirectionCallback;
-        onSwipedDown?: OnSwipedDirectionCallback;
-        onSwipedLeft?: OnSwipedDirectionCallback;
-        onTap?: OnTapCallback;
+    interface SwipeableProps<T extends Element = HTMLElement> extends React.ClassAttributes<ReactSwipeable<T>>, React.HTMLAttributes<T> {
+        onSwiped?: OnSwipedCallback<T>;
+        onSwiping?: OnSwipingCallback<T>;
+        onSwipingUp?: OnSwipingDirectionCallback<T>;
+        onSwipingRight?: OnSwipingDirectionCallback<T>;
+        onSwipingDown?: OnSwipingDirectionCallback<T>;
+        onSwipingLeft?: OnSwipingDirectionCallback<T>;
+        onSwipedUp?: OnSwipedDirectionCallback<T>;
+        onSwipedRight?: OnSwipedDirectionCallback<T>;
+        onSwipedDown?: OnSwipedDirectionCallback<T>;
+        onSwipedLeft?: OnSwipedDirectionCallback<T>;
+        onTap?: OnTapCallback<T>;
         flickThreshold?: number;
         delta?: number;
         preventDefaultTouchmoveEvent?: boolean;
         stopPropagation?: boolean;
         nodeName?: string;
         trackMouse?: boolean;
+        disabled?: boolean;
+        innerRef?: React.Ref<T>;
         children?: React.ReactNode;
     }
 }
diff --git a/types/react-swipeable/react-swipeable-tests.tsx b/types/react-swipeable/react-swipeable-tests.tsx
index 61093a203e..ed5df52e54 100644
--- a/types/react-swipeable/react-swipeable-tests.tsx
+++ b/types/react-swipeable/react-swipeable-tests.tsx
@@ -35,6 +35,8 @@ class SampleComponent extends React.PureComponent<Swipeable.SwipeableProps> {
         stopPropagation
         nodeName="swipe"
         trackMouse
+        disabled
+        innerRef="swipe-ref"
         onClick={this.handleClick}
       >
         <div>
@@ -44,3 +46,16 @@ class SampleComponent extends React.PureComponent<Swipeable.SwipeableProps> {
     );
   }
 }
+
+class DivSwipeable extends Swipeable<HTMLDivElement> {}
+const TestComponent: React.StatelessComponent = (_) => {
+    const handleSwiped = (event: React.TouchEvent<HTMLDivElement>) => {};
+    return (
+        <DivSwipeable
+            nodeName="div"
+            onSwiped={handleSwiped}
+        >
+            <div>this is sample code.</div>
+        </DivSwipeable>
+    );
+};
diff --git a/types/react-swipeable/tsconfig.json b/types/react-swipeable/tsconfig.json
index 0d676ade9b..a720949edf 100644
--- a/types/react-swipeable/tsconfig.json
+++ b/types/react-swipeable/tsconfig.json
@@ -6,8 +6,8 @@
             "dom"
         ],
         "noImplicitAny": true,
-        "noImplicitThis": false,
-        "strictNullChecks": false,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
@@ -22,4 +22,4 @@
         "index.d.ts",
         "react-swipeable-tests.tsx"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/recharts/index.d.ts b/types/recharts/index.d.ts
index 55feba3ad6..6fa7273108 100644
--- a/types/recharts/index.d.ts
+++ b/types/recharts/index.d.ts
@@ -3,844 +3,935 @@
 // Definitions by: Maarten Mulders <https://github.com/mthmulders>
 //                 Raphael Mueller <https://github.com/rapmue>
 //                 Roy Xue <https://github.com/royxue>
+//                 Zheyang Song <https://github.com/ZheyangSong>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
 import * as React from 'react';
+import { CurveFactory } from 'd3-shape';
 
 export type Percentage = string;
 export type RechartsFunction = () => void;
 export type TickFormatterFunction = (value: any) => any;
+export type TickGeneratorFunction = (noTicksProps: object) => any[];
 export type LabelFormatter = (label: string | number) => React.ReactNode;
 export type TooltipFormatter = (value: string | number | Array<string | number>, name: string,
                                 entry: TooltipPayload, index: number) => React.ReactNode;
 export type ItemSorter<T> = (a: T, b: T) => number;
 export type ContentRenderer<P> = (props: P) => React.ReactNode;
+export type DataKey = string | number | ((dataObject: any) => number | [number, number]);
 
-export type LegendType = 'line' | 'square' | 'rect' | 'circle' | 'cross' | 'diamond' | 'square' | 'star' | 'triangle' | 'wye' | 'none';
+export type IconType = 'line' | 'square' | 'rect' | 'circle' | 'cross' | 'diamond' | 'star' | 'triangle' | 'wye';
+export type LegendType = IconType | 'none';
 export type LayoutType = 'horizontal' | 'vertical';
 export type AnimationEasingType = 'ease' | 'ease-in' | 'ease-out' | 'ease-in-out' | 'linear';
-export type ScaleType = 'auto' | 'linear' | 'pow' | 'sqrt' | 'log' | 'identity' | 'time' | 'band' | 'point' | 'ordinal' | 'quantile' | 'quantize' | 'utcTime' | 'sequential' | 'threshold';
-export type PositionType = 'top' | 'left' | 'right' | 'bottom' | 'inside' | 'outside'| 'insideLeft' | 'insideRight' |
-	'insideTop' | 'insideBottom' | 'insideTopLeft' | 'insideBottomLeft' | 'insideTopRight' | 'insideBottomRight' | 'insideStart' | 'insideEnd' | 'end' | 'center';
+export type ScaleType =
+    'auto' | 'linear' | 'pow' | 'sqrt' | 'log' | 'identity' | 'time' | 'band' | 'point' |
+    'ordinal' | 'quantile' | 'quantize' | 'utcTime' | 'sequential' | 'threshold';
+export type PositionType =
+    'top' | 'left' | 'right' | 'bottom' | 'inside' | 'outside'| 'insideLeft' | 'insideRight' |
+    'insideTop' | 'insideBottom' | 'insideTopLeft' | 'insideBottomLeft' | 'insideTopRight' |
+    'insideBottomRight' | 'insideStart' | 'insideEnd' | 'end' | 'center';
+export type StackOffsetType = 'sign' | 'expand' | 'none' | 'wiggle' | 'silhouette';
+export type LineType =
+    'basis' | 'basisClosed' | 'basisOpen' | 'linear' | 'linearClosed' | 'natural' |
+    'monotoneX' | 'monotoneY' | 'monotone' | 'step' | 'stepBefore' | 'stepAfter' | CurveFactory;
+export type AxisInterval = number | 'preserveStart' | 'preserveEnd' | 'preserveStartEnd';
 
-export type PartialAndNumber<T> = {
-   [P in keyof T]?: number | T[P];
-};
+export type PickedCSSStyleDeclarationKeys =
+    'alignmentBaseline' | 'baselineShift' | 'clip' | 'clipPath' | 'clipRule' | 'color' |
+    'colorInterpolationFilters' | 'cursor' | 'direction' | 'display' | 'dominantBaseline' |
+    'enableBackground' | 'fill' | 'fillRule' | 'filter' | 'floodColor' |
+    'floodOpacity' | 'font' | 'fontFamily' | 'fontStretch' | 'fontStyle' | 'fontVariant' |
+    'glyphOrientationHorizontal' | 'glyphOrientationVertical' | 'letterSpacing' | 'lightingColor' |
+    'markerEnd' | 'markerMid' | 'markerStart' | 'mask' | 'overflow' | 'pointerEvents' |
+    'stopColor' | 'strokeDasharray' | 'strokeLinecap' | 'strokeLinejoin' | 'textAnchor' |
+    'textDecoration' | 'unicodeBidi' | 'visibility' | 'writingMode' | 'transform';
 
-export interface Margin {
-	top: number;
-	right: number;
-	bottom: number;
-	left: number;
+export interface Point {
+    x: number;
+    y: number;
+    value: number | any[];
 }
 
-export interface AreaProps extends Partial<CSSStyleDeclaration> {
-	type?: 'basis' | 'basisClosed' | 'basisOpen' | 'linear' | 'linearClosed' | 'natural' | 'monotoneX' | 'monotoneY' | 'monotone' | 'step' | 'stepBefore' | 'stepAfter' | RechartsFunction;
-	dataKey?: string | number;
-	xAxisId?: string | number;
-	yAxisId?: string | number;
-	legendType?: LegendType;
-	dot?: boolean | any | React.ReactElement<any> | RechartsFunction;
-	activeDot?: boolean | any | React.ReactElement<any> | RechartsFunction;
-	label?: boolean | any | React.ReactElement<any> | RechartsFunction;
-	stroke?: string;
-	layout?: LayoutType;
-	baseLine?: number | any[];
-	points?: any[];
-	stackId?: string | number;
-	connectNulls?: boolean;
-	unit?: string | number;
-	name?: string | number;
-	isAnimationActive?: boolean;
-	animationBegin?: number;
-	animationEasing?: AnimationEasingType;
-	onClick?: RechartsFunction;
-	onMouseDown?: RechartsFunction;
-	onMouseUp?: RechartsFunction;
-	onMouseMove?: RechartsFunction;
-	onMouseOver?: RechartsFunction;
-	onMouseOut?: RechartsFunction;
-	onMouseEnter?: RechartsFunction;
-	onMouseLeave?: RechartsFunction;
+export interface Margin {
+    top: number;
+    right: number;
+    bottom: number;
+    left: number;
+}
+
+export interface Animatable {
+    onAnimationStart?: RechartsFunction;
+    onAnimationEnd?: RechartsFunction;
+    animationId?: number;
+    isAnimationActive?: boolean;
+    isUpdateAnimationActive?: boolean;
+    animationBegin?: number;
+    animationDuration?: number;
+    animationEasing?: AnimationEasingType;
+}
+
+export interface CategoricalChartWrapper<L = LayoutType> {
+    syncId?: string | number;
+    compact?: boolean;
+    width?: number;
+    height?: number;
+    data?: object[];
+    layout?: L;
+    stackOffset?: StackOffsetType;
+    throttleDelay?: number;
+    margin?: Partial<Margin>;
+    barCategoryGap?: number | string;
+    barGap?: number | string;
+    barSize?: number | string;
+    maxBarSize?: number;
+    style?: object;
+    className?: string;
+    children?: React.ReactNode | React.ReactNode[];
+    onClick?: RechartsFunction;
+    onMouseLeave?: RechartsFunction;
+    onMouseEnter?: RechartsFunction;
+    onMouseMove?: RechartsFunction;
+    onMouseDown?: RechartsFunction;
+    onMouseUp?: RechartsFunction;
+    reverseStackOrder?: boolean;
+}
+
+export interface EventAttributes {
+    onClick?: RechartsFunction;
+    onMouseDown?: RechartsFunction;
+    onMouseUp?: RechartsFunction;
+    onMouseOver?: RechartsFunction;
+    onMouseMove?: RechartsFunction;
+    onMouseOut?: RechartsFunction;
+    onMouseEnter?: RechartsFunction;
+    onMouseLeave?: RechartsFunction;
+    onTouchEnd?: RechartsFunction;
+    onTouchMove?: RechartsFunction;
+    onTouchStart?: RechartsFunction;
+    onTouchCancel?: RechartsFunction;
+}
+
+export interface PresentationAttributes<X = number, Y = number> extends Pick<CSSStyleDeclaration, PickedCSSStyleDeclarationKeys> {
+    angle: number;
+    colorInterpolation: string;
+    colorProfile: string;
+    colorRendering: string;
+    fillOpacity: number | string;
+    fontSize: number | string;
+    fontSizeAdjust: number | string;
+    fontWeight: 'normal' | 'bold' | 'bolder' | 'lighter' |
+        100 | 200 | 300 | 400 | 500 | 600 | 700 | 800 | 900 | 'inherit';
+    imageRendering: 'auto' | 'optimizeSpeed' | 'optimizeQuality' | 'inherit';
+    kerning: number | string;
+    opacity: number | string;
+    shapeRendering: 'auto' | 'optimizeSpeed' | 'crispEdges' | 'geometricPrecision' | 'inherit';
+    stopOpacity: number | string;
+    stroke: number | string;
+    strokeDashoffset: number | string;
+    strokeMiterlimit: number | string;
+    strokeOpacity: number | string;
+    strokeWidth: number | string;
+    textRendering: 'auto' | 'optimizeSpeed' | 'optimizeLegibility' | 'geometricPrecision' | 'inherit';
+    wordSpacing: number | string;
+    style: object;
+    width: number;
+    height: number;
+    dx: number;
+    dy: number;
+    x: X;
+    y: Y;
+    r: number;
+}
+
+export interface AreaProps extends EventAttributes, Partial<PresentationAttributes>, Animatable {
+    dataKey: DataKey; // As the source code states, dataKey will replace valueKey in 1.1.0 and it'll be required (it's already required in current implementation).
+    className?: string;
+    type?: LineType;
+    unit?: string | number;
+    name?: string | number;
+    xAxisId?: string | number;
+    yAxisId?: string | number;
+    xAxis?: object;
+    yAxis?: object;
+    stackId?: string | number;
+    legendType?: LegendType;
+    connectNulls?: boolean;
+    activeDot?: boolean | object | React.ReactElement<any> | ContentRenderer<any>;
+    dot?: boolean | object | React.ReactElement<any> | ContentRenderer<DotProps>;
+    label?: boolean | object | React.ReactElement<any> | Label['content'];
+    hide?: boolean;
+    layout?: LayoutType;
+    baseLine?: number | any[];
+    isRange?: boolean;
+    points?: Point[];
 }
 
 export class Area extends React.Component<AreaProps> { }
 
-export interface AreaChartProps {
-	layout?: LayoutType;
-	syncId?: string;
-	width: number;
-	height: number;
-	data: any[];
-	margin?: Margin;
-	stackOffset?: 'expand' | 'none' | 'wiggle' | 'silhouette';
-	baseValue?: number | 'dataMin' | 'dataMax' | 'auto';
-	onClick?: RechartsFunction;
-	onMouseEnter?: RechartsFunction;
-	onMouseMove?: RechartsFunction;
-	onMouseLeave?: RechartsFunction;
-}
+// NOTE: the lib's implementation doesn't inherits the event props (it's kept in this definition due to the previous typing definition has it).
+export type AreaChartProps = CategoricalChartWrapper & EventAttributes;
 
 export class AreaChart extends React.Component<AreaChartProps> { }
 
-export interface BarProps extends Partial<CSSStyleDeclaration> {
-	layout?: LayoutType;
-	dataKey?: string | number;
-	xAxisId?: string | number;
-	yAxisId?: string | number;
-	legendType?: LegendType;
-	label?: boolean | any | React.ReactElement<any> | RechartsFunction;
-	data?: any[];
-	barSize?: number;
-	maxBarSize?: number;
-	minPointSize?: number;
-	shape?: React.ReactElement<any> | RechartsFunction;
-	stackId?: string | number;
-	unit?: string | number;
-	name?: string | number;
-	isAnimationActive?: boolean;
-	animationBegin?: number;
-	animationEasing?: AnimationEasingType;
-	onClick?: RechartsFunction;
-	onMouseDown?: RechartsFunction;
-	onMouseUp?: RechartsFunction;
-	onMouseMove?: RechartsFunction;
-	onMouseOver?: RechartsFunction;
-	onMouseOut?: RechartsFunction;
-	onMouseEnter?: RechartsFunction;
-	onMouseLeave?: RechartsFunction;
+export interface BarData {
+    x: number;
+    y: number;
+    width: number;
+    height: number;
+    radius: number | any[];
+    value: number | string | any[];
+}
+
+export interface BarProps extends EventAttributes, Partial<PresentationAttributes>, Animatable {
+    dataKey: DataKey; // As the source code states, dataKey will replace valueKey in 1.1.0 and it'll be required (it's already required in current implementation).
+    className?: string;
+    layout?: LayoutType;
+    xAxisId?: string | number;
+    yAxisId?: string | number;
+    yAxis?: object;
+    xAxis?: object;
+    stackId?: string | number;
+    barSize?: number;
+    unit?: string | number;
+    name?: string | number;
+    legendType?: LegendType;
+    minPointSize?: number;
+    maxBarSize?: number;
+    hide?: boolean;
+    shape?: React.ReactElement<any> | ContentRenderer<RectangleProps>;
+    data?: BarData[];
 }
 
 export class Bar extends React.Component<BarProps> { }
 
-export interface BarChartProps {
-	layout?: LayoutType;
-	syncId?: string;
-	width?: number;
-	height?: number;
-	data?: any[];
-	margin?: Margin;
-	barCategoryGap?: Percentage | number;
-	barGap?: Percentage | number;
-	barSize?: number;
-	maxBarSize?: number;
-	stackOffset?: 'expand' | 'none' | 'wiggle' | 'silhouette' | 'sign';
-	onClick?: RechartsFunction;
-	onMouseEnter?: RechartsFunction;
-	onMouseMove?: RechartsFunction;
-	onMouseLeave?: RechartsFunction;
-}
+// NOTE: the lib's implementation doesn't inherits the event props (it's kept in this definition due to the previous typing definition has it).
+export type BarChartProps = CategoricalChartWrapper & EventAttributes;
 
 export class BarChart extends React.Component<BarChartProps> { }
 
 export interface BrushProps {
-	dataKey: number | string;
-	x?: number;
-	y?: number;
-	width?: number;
-	height?: number;
-	data: any[];
-	travellerWidth?: number;
-	startIndex?: number;
-	endIndex?: number;
-	tickFormatter?: TickFormatterFunction;
-	onChange?: RechartsFunction;
+    className?: string;
+    fill?: string;
+    stroke?: string;
+    x: number;
+    y: number;
+    width: number;
+    height: number;
+    travellerWidth?: number;
+    padding?: Partial<Margin>;
+    dataKey?: DataKey;
+    data?: any[];
+    startIndex?: number;
+    endIndex?: number;
+    tickFormatter?: TickFormatterFunction;
+    children?: React.ReactNode;
+    onChange?: (newIndex: {
+        startIndex: number;
+        endIndex: number;
+    }) => void;
+    updateId?: string | number;
 }
 
 export class Brush extends React.Component<BrushProps> { }
 
-export interface CartesianAxisProps {
-	x?: number;
-	y?: number;
-	width?: number;
-	height?: number;
-	orientation?: 'top' | 'bottom' | 'left' | 'right';
-	viewBox?: ViewBox;
-	axisLine?: boolean | any;
-	tickLine?: boolean | any;
-	minTickGap?: number;
-	tickSize?: number;
-	interval?: "preserveStart" | "preserveEnd" | "preserveStartEnd" | number;
-	tick?: boolean | any | React.ReactElement<any> | RechartsFunction;
-	label?: string | number | React.ReactElement<any> | ContentRenderer<CartesianAxisProps>;
-	mirror?: boolean;
+export interface CartesianAxisProps extends EventAttributes, Partial<PresentationAttributes> {
+    className?: string;
+    x?: number;
+    y?: number;
+    width?: number;
+    height?: number;
+    orientation?: 'top' | 'bottom' | 'left' | 'right';
+    viewBox?: ViewBox;
+    tick?: boolean | ContentRenderer<any> | object | React.ReactElement<any>;
+    axisLine?: boolean | object;
+    tickLine?: boolean | object;
+    mirror?: boolean;
+    minTickGap?: number;
+    ticks?: any[];
+    tickSize?: number;
+    stroke?: string;
+    tickFormatter?: TickFormatterFunction;
+    ticksGenerator?: TickGeneratorFunction;
+    interval?: AxisInterval;
 }
 
 export class CartesianAxis extends React.Component<CartesianAxisProps> { }
 
-export interface CartesianGridProps extends Partial<CSSStyleDeclaration> {
-	x?: number;
-	y?: number;
-	horizontal?: boolean;
-	vertical?: boolean;
-	horizontalPoints?: any[];
-	verticalPoints?: any[];
+export interface CartesianGridProps extends Partial<PresentationAttributes> {
+    y?: number;
+    width?: number;
+    height?: number;
+    horizontal?: object | React.ReactElement<any> | ContentRenderer<LineProps & CartesianGridProps> | boolean;
+    vertical?: object | React.ReactElement<any> | ContentRenderer<LineProps & CartesianGridProps> | boolean;
+    horizontalPoints?: number[];
+    verticalPoints?: number[];
+    horizontalCoordinatesGenerator?: (arg: {
+        yAxis: CartesianGridProps['yAxis'];
+        width: CartesianGridProps['chartWidth'];
+        height: CartesianGridProps['chartHeight'];
+        offset: CartesianGridProps['offset'];
+    }) => number[];
+    verticalCoordinatesGenerator?: (arg: {
+        yAxis: CartesianGridProps['xAxis'];
+        width: CartesianGridProps['chartWidth'];
+        height: CartesianGridProps['chartHeight'];
+        offset: CartesianGridProps['offset'];
+    }) => number[];
+    xAxis?: object;
+    yAxis?: object;
+    offset?: object;
+    chartWidth?: number;
+    chartHeight?: number;
 }
 
 export class CartesianGrid extends React.Component<CartesianGridProps> { }
 
-export interface CellProps {
-	fill?: string;
-	stroke?: string;
-}
+// NOTE: the lib's implementation doesn't inherits the event props (it's kept in this definition due to the previous typing definition has it).
+export type CellProps = Partial<PresentationAttributes>;
 
 export class Cell extends React.Component<CellProps> { }
 
-export interface ComposedChartProps {
-	layout?: LayoutType;
-	syncId?: string;
-	width?: number;
-	height?: number;
-	data?: any[];
-	margin?: Margin;
-	barCategoryGap?: Percentage | number;
-	barGap?: number;
-	barSize?: number;
-	onClick?: RechartsFunction;
-	onMouseEnter?: RechartsFunction;
-	onMouseMove?: RechartsFunction;
-	onMouseLeave?: RechartsFunction;
-}
+// NOTE: the lib's implementation doesn't inherits the event props (it's kept in this definition due to the previous typing definition has it).
+export type ComposedChartProps = CategoricalChartWrapper & EventAttributes;
 
 export class ComposedChart extends React.Component<ComposedChartProps> { }
 
-export interface CrossProps {
-	x?: number;
-	y?: number;
-	top?: number;
-	left?: number;
-	width?: number;
-	height?: number;
+export interface CrossProps extends Partial<PresentationAttributes> {
+    className?: string;
+    x?: number;
+    y?: number;
+    width?: number;
+    height?: number;
+    top?: number;
+    left?: number;
 }
 
 export class Cross extends React.Component<CrossProps> { }
 
-export interface CurveProps extends Partial<CSSStyleDeclaration> {
-	type?: 'basis' | 'basisClosed' | 'basisOpen' | 'linear' | 'linearClosed' | 'natural' | 'monotoneX' | 'monotoneY' | 'monotone' | 'step' | 'stepBefore' | 'stepAfter' | RechartsFunction;
-	points: any[];
-	layout?: LayoutType;
-	baseLine?: number | any[];
-	connectNulls?: boolean;
-	onClick?: RechartsFunction;
-	onMouseDown?: RechartsFunction;
-	onMouseUp?: RechartsFunction;
-	onMouseMove?: RechartsFunction;
-	onMouseOver?: RechartsFunction;
-	onMouseOut?: RechartsFunction;
-	onMouseEnter?: RechartsFunction;
-	onMouseLeave?: RechartsFunction;
+// NOTE: the lib's implementation doesn't inherits the event props (it's kept in this definition due to the previous typing definition has it).
+export interface CurveProps extends EventAttributes, Partial<PresentationAttributes> {
+    className?: string;
+    type?: LineType;
+    layout?: LayoutType;
+    baseLine?: number | any[];
+    points?: object[];
+    connectNulls?: boolean;
+    path?: string;
+    pathRef?: React.Ref<any>;
 }
 
 export class Curve extends React.Component<CurveProps> { }
 
-export interface DotProps {
-	cx: number;
-	cy: number;
-	r: number;
-	onClick?: RechartsFunction;
-	onMouseDown?: RechartsFunction;
-	onMouseUp?: RechartsFunction;
-	onMouseOver?: RechartsFunction;
-	onMouseOut?: RechartsFunction;
-	onMouseEnter?: RechartsFunction;
-	onMouseMove?: RechartsFunction;
-	onMouseLeave?: RechartsFunction;
+// NOTE: the lib's implementation doesn't inherits the event props (it's kept in this definition due to the previous typing definition has it).
+export interface DotProps extends EventAttributes {
+    className?: string;
+    cx?: number;
+    cy?: number;
+    r?: number;
 }
 
 export class Dot extends React.Component<DotProps> { }
 
-export interface ErrorBarProps extends Partial<CSSStyleDeclaration> {
-	dataKey?: string | number;
-	strokeWidth?: string;
-	stroke?: string;
-	direction?: string;
+export interface ErrorBarProps {
+    dataKey: DataKey; // As the source code states, dataKey will replace valueKey in 1.1.0 and it'll be required (it's already required in current implementation).
+    data?: any[];
+    xAxis?: object;
+    yAxis?: object;
+    layout?: string;
+    dataPointFormatter?: (entry: any, dataKey: DataKey) => { x: number; y: number, value: any; errorVal: any; };
+    stroke?: string;
+    strokeWidth?: number;
+    width?: number;
+    offset?: number;
 }
 
 export class ErrorBar extends React.Component<ErrorBarProps> { }
 
+export interface LegendPayload {
+    value: any;
+    id: any;
+    type: LegendType;
+}
+
 export interface LegendProps {
-	width?: number;
-	height?: number;
-	layout?: LayoutType;
-	align?: 'left' | 'center' | 'right';
-	verticalAlign?: 'top' | 'middle' | 'bottom';
-	iconSize?: number;
-	iconType?: 'line' | 'square' | 'rect' | 'circle' | 'cross' | 'diamond' | 'star' | 'triangle' | 'wye';
-	payload?: any[];
-	chartWidth?: number;
-	chartHeight?: number;
-	margin?: Margin;
-	content?: React.ReactElement<any> | ContentRenderer<LegendProps>;
-	wrapperStyle?: any;
-	onClick?: RechartsFunction;
-	onMouseDown?: RechartsFunction;
-	onMouseUp?: RechartsFunction;
-	onMouseMove?: RechartsFunction;
-	onMouseOver?: RechartsFunction;
-	onMouseOut?: RechartsFunction;
-	onMouseEnter?: RechartsFunction;
-	onMouseLeave?: RechartsFunction;
+    content?: React.ReactElement<any> | ContentRenderer<LegendProps>;
+    wrapperStyle?: object;
+    chartWidth?: number;
+    chartHeight?: number;
+    width?: number;
+    height?: number;
+    iconSize?: number;
+    iconType?: IconType;
+    layout?: LayoutType;
+    align?: 'left' | 'center' | 'right';
+    verticalAlign?: 'top' | 'middle' | 'bottom';
+    margin?: Partial<Margin>;
+    payload?: LegendPayload[];
+    formatter?: RechartsFunction;
+    onClick?: RechartsFunction;
+    onMouseEnter?: RechartsFunction;
+    onMouseLeave?: RechartsFunction;
+    onBBoxUpdate?: (box: { width: number; height: number; }) => void;
 }
 
 export class Legend extends React.Component<LegendProps> { }
 
-export interface LineProps extends Partial<CSSStyleDeclaration> {
-	type?: 'basis' | 'basisClosed' | 'basisOpen' | 'linear' | 'linearClosed' | 'natural' | 'monotoneX' | 'monotoneY' | 'monotone' | 'step' | 'stepBefore' | 'stepAfter' | RechartsFunction;
-	dataKey: string | number;
-	xAxisId?: string | number;
-	yAxisId?: string | number;
-	legendType?: LegendType;
-	dot?: boolean | any | React.ReactElement<any> | RechartsFunction;
-	activeDot?: boolean | any | React.ReactElement<any> | RechartsFunction;
-	label?: boolean | any | React.ReactElement<any> | RechartsFunction;
-	points?: any[]; // made this points property partial, since in every example they don't use this property. But their definition says not optional.
-	layout?: LayoutType;
-	connectNulls?: boolean;
-	unit?: string | number;
-	name?: string | number;
-	isAnimationActive?: boolean;
-	animationBegin?: number;
-	animationEasing?: AnimationEasingType;
-	onClick?: RechartsFunction;
-	onMouseDown?: RechartsFunction;
-	onMouseUp?: RechartsFunction;
-	onMouseMove?: RechartsFunction;
-	onMouseOver?: RechartsFunction;
-	onMouseOut?: RechartsFunction;
-	onMouseEnter?: RechartsFunction;
-	onMouseLeave?: RechartsFunction;
+export interface LineProps extends EventAttributes, Partial<PresentationAttributes>, Animatable {
+    className?: string;
+    type?: LineType;
+    unit?: string | number;
+    name?: string | number;
+    xAxisId?: string | number;
+    yAxisId?: string | number;
+    yAxis?: object;
+    xAxis?: object;
+    legendType?: LegendType;
+    layout?: LayoutType;
+    connectNulls?: boolean;
+    hide?: boolean;
+    activeDot?: object | React.ReactElement<any> | ContentRenderer<any> | boolean;
+    dot?: object | React.ReactElement<any> | ContentRenderer<DotProps> | boolean;
+    top?: number;
+    left?: number;
+    width?: number;
+    height?: number;
+    dataKey: string | number; // As the source code states, dataKey will replace valueKey in 1.1.0 and it'll be required (it's already required in current implementation).
+    label?: boolean | object | React.ReactElement<any> | Label['content'];
+    points?: Point[];
 }
 
 export class Line extends React.Component<LineProps> { }
 
-export interface LineChartProps {
-	layout?: LayoutType;
-	syncId?: string;
-	width?: number;
-	height?: number;
-	data?: any[];
-	margin?: Margin;
-	onClick?: RechartsFunction;
-	onMouseEnter?: RechartsFunction;
-	onMouseMove?: RechartsFunction;
-	onMouseLeave?: RechartsFunction;
-}
+// NOTE: the lib's implementation doesn't inherits the event props (it's kept in this definition due to the previous typing definition has it).
+export type LineChartProps = CategoricalChartWrapper & EventAttributes;
 
 export class LineChart extends React.Component<LineChartProps> { }
 
-export interface PieProps extends Partial<CSSStyleDeclaration> {
-	cx?: Percentage | number;
-	cy?: Percentage | number;
-	innerRadius?: Percentage | number;
-	outerRadius?: Percentage | number;
-	startAngle?: number;
-	endAngle?: number;
-	minAngle?: number;
-	paddingAngle?: number;
-	nameKey?: string;
-	dataKey?: string;
-	valueKey?: string;
-	legendType?: LegendType;
-	label?: boolean | any | React.ReactElement<any> | RechartsFunction;
-	labelLine?: boolean | any | React.ReactElement<any> | RechartsFunction;
-	data: any[];
-	activeIndex?: number | number[];
-	activeShape?: any | React.ReactElement<any> | RechartsFunction;
-	isAnimationActive?: boolean;
-	animationBegin?: number;
-	animationEasing?: AnimationEasingType | RechartsFunction;
-	onClick?: RechartsFunction;
-	onMouseDown?: RechartsFunction;
-	onMouseUp?: RechartsFunction;
-	onMouseMove?: RechartsFunction;
-	onMouseOver?: RechartsFunction;
-	onMouseOut?: RechartsFunction;
-	onMouseEnter?: RechartsFunction;
-	onMouseLeave?: RechartsFunction;
+export interface PieProps extends EventAttributes, Partial<PresentationAttributes>, Animatable {
+    className?: string;
+    dataKey: DataKey; // As the source code states, dataKey will replace valueKey in 1.1.0 and it'll be required (it's already required in current implementation).
+    cx?: number | string;
+    cy?: number | string;
+    startAngle?: number;
+    endAngle?: number;
+    paddingAngle?: number;
+    innerRadius?: number | string;
+    outerRadius?: number | string;
+    cornerRadius?: number | string;
+    nameKey?: string | number | ((dataObject: any) => number);
+    valueKey?: string | number | ((dataObject: any) => number);
+    data?: object[];
+    minAngle?: number;
+    legendType?: LegendType;
+    maxRadius?: number;
+    sectors?: object[];
+    hide?: boolean;
+    labelLine?: object | ContentRenderer<LineProps & any> | React.ReactElement<any> | boolean;
+    label?: {
+        offsetRadius: number;
+    } | Label['content'] | React.ReactElement<any> | boolean;
+    activeShape?: object |ContentRenderer<any> | React.ReactElement<any>;
+    activeIndex?: number | number[];
 }
 
 export class Pie extends React.Component<PieProps> { }
 
-export interface PieChartProps {
-	width: number;
-	height: number;
-	margin?: Margin;
-	onClick?: RechartsFunction;
-	onMouseEnter?: RechartsFunction;
-	onMouseLeave?: RechartsFunction;
+// NOTE: the lib's implementation doesn't inherits the event props (it's kept in this definition due to the previous typing definition has it).
+export interface PieChartProps extends EventAttributes, CategoricalChartWrapper<'centric'> {
+    startAngle?: number;
+    endAngle?: number;
+    cx?: number | string;
+    cy?: number | string;
+    innerRadius?: number | string;
+    outerRadius?: number | string;
 }
 
 export class PieChart extends React.Component<PieChartProps> { }
 
-export interface PolarAngleAxisProps {
-	dataKey: string | number;
-	cx: number;
-	cy: number;
-	radius: Percentage | number;
-	axisLine?: boolean | any;
-	axisLineType?: string;
-	tickLine?: boolean | any;
-	tick?: boolean | any | React.ReactElement<any> | RechartsFunction;
-	ticks: any[];
-	orient?: string;
-	tickFormatter: TickFormatterFunction;
-	onClick?: RechartsFunction;
-	onMouseDown?: RechartsFunction;
-	onMouseUp?: RechartsFunction;
-	onMouseMove?: RechartsFunction;
-	onMouseOver?: RechartsFunction;
-	onMouseOut?: RechartsFunction;
-	onMouseEnter?: RechartsFunction;
-	onMouseLeave?: RechartsFunction;
+export interface PolarAngleAxisTick {
+    value: any;
+    coordinate: number;
+}
+
+export interface PolarAngleAxisProps extends EventAttributes, Partial<PresentationAttributes> {
+    type?: 'number' | 'category';
+    angleAxisId?: string | number;
+    dataKey?: DataKey; // As the source code states, dataKey will replace valueKey in 1.1.0 and it'll be required (it's already required in current implementation).
+    cx?: number;
+    cy?: number;
+    radius?: Percentage | number;
+    hide?: boolean;
+    scale?: ScaleType | RechartsFunction; // this seems not being used by the lib.
+    axisLine?: boolean | object;
+    axisLineType?: 'polygon' | 'circle';
+    tickLine?: boolean | object;
+    tick?: boolean | ContentRenderer<any> | object | React.ReactElement<any>;
+    ticks?: PolarAngleAxisTick[];
+    stroke?: string;
+    orientation?: 'inner' | 'outer';
+    tickFormatter: TickFormatterFunction;
 }
 
 export class PolarAngleAxis extends React.Component<PolarAngleAxisProps> { }
 
-export interface PolarGridProps extends Partial<CSSStyleDeclaration> {
-	cx: number;
-	cy: number;
-	innerRadius: number;
-	outerRadius: number;
-	polarAngles: any[];
-	polarRadius: any[];
-	gridType?: 'polygon' | 'circle';
+export interface PolarGridProps extends Partial<PresentationAttributes> {
+    cx?: number;
+    cy?: number;
+    innerRadius?: number;
+    outerRadius?: number;
+    polarAngles?: number[];
+    polarRadius?: number[];
+    gridType?: 'polygon' | 'circle';
 }
 
 export class PolarGrid extends React.Component<PolarGridProps> { }
 
-export interface PolarRadiusAxisProps {
-	angle?: number;
-	cx: number;
-	cy: number;
-	domain?: any[];
-	label?: string | number | React.ReactElement<any> | RechartsFunction;
-	orientation?: "left" | "right" | "middle";
-	axisLine?: boolean | any;
-	tick?: boolean | any | Element | RechartsFunction;
-	tickFormatter: TickFormatterFunction;
-	tickCount?: number;
-	scale?: ScaleType | RechartsFunction;
-	onClick?: RechartsFunction;
-	onMouseDown?: RechartsFunction;
-	onMouseUp?: RechartsFunction;
-	onMouseMove?: RechartsFunction;
-	onMouseOver?: RechartsFunction;
-	onMouseOut?: RechartsFunction;
-	onMouseEnter?: RechartsFunction;
-	onMouseLeave?: RechartsFunction;
+export interface PolarRadiusAxisTick {
+    value: any;
+    coordinate: number;
+}
+
+export type PolarRadiusAxisDomain = number | 'auto' | 'dataMin' | 'dataMax';
+
+export interface PolarRadiusAxisProps extends EventAttributes, Partial<PresentationAttributes> {
+    type?: 'number' | 'category';
+    cx?: number;
+    cy?: number;
+    hide?: boolean;
+    radiusAxisId?: string | number;
+    angle?: number;
+    tickCount?: number;
+    ticks?: PolarRadiusAxisTick[];
+    orientation?: "left" | "right" | "middle";
+    axisLine?: boolean | object;
+    tick?: boolean | object | React.ReactElement<any> | ContentRenderer<any>;
+    stroke?: string;
+    tickFormatter: TickFormatterFunction;
+    domain?: PolarRadiusAxisDomain[];
+    scale?: ScaleType | RechartsFunction;
+    allowDataOverflow?: boolean;
 }
 
 export class PolarRadiusAxis extends React.Component<PolarRadiusAxisProps> { }
 
-export interface PolygonProps {
-	points: any[];
-	onClick?: RechartsFunction;
-	onMouseDown?: RechartsFunction;
-	onMouseUp?: RechartsFunction;
-	onMouseMove?: RechartsFunction;
-	onMouseOver?: RechartsFunction;
-	onMouseOut?: RechartsFunction;
-	onMouseEnter?: RechartsFunction;
-	onMouseLeave?: RechartsFunction;
+export interface PolygonPoint {
+    x: number;
+    y: number;
+}
+
+export interface PolygonProps extends EventAttributes, Partial<PresentationAttributes> {
+    className?: string;
+    points?: PolygonPoint[];
 }
 
 export class Polygon extends React.Component<PolygonProps> { }
 
-export interface RadarProps extends Partial<CSSStyleDeclaration> {
-	dataKey: string | number;
-	points: any[];
-	shape: Element | RechartsFunction;
-	dot?: boolean | any | Element | RechartsFunction;
-	legendType?: LegendType;
-	label?: boolean | any | Element | RechartsFunction;
-	isAnimationActive?: boolean;
-	animationBegin?: number;
-	animationEasing?: AnimationEasingType;
+export interface RadarPoint {
+    x: number;
+    y: number;
+    cx: number;
+    cy: number;
+    angle: number;
+    radius: number;
+    value: number;
+    payload: object;
+}
+
+export interface RadarProps extends EventAttributes, Partial<PresentationAttributes>, Animatable {
+    className?: string;
+    dataKey: DataKey; // As the source code states, dataKey will replace valueKey in 1.1.0 and it'll be required (it's already required in current implementation).
+    points?: RadarPoint[];
+    shape?: React.ReactElement<any> | ContentRenderer<RadarProps>;
+    activeDot?: object | React.ReactElement<any> | ContentRenderer<any> | boolean;
+    dot?: object | React.ReactElement<any> | ContentRenderer<DotProps> | boolean;
+    label?: object | React.ReactElement<any> | Label['content'] | boolean;
+    legendType?: LegendType;
+    hide?: boolean;
 }
 
 export class Radar extends React.Component<RadarProps> { }
 
-export interface RadarChartProps {
-	width: number;
-	height: number;
-	cx?: Percentage | number;
-	cy?: Percentage | number;
-	startAngle?: number;
-	innerRadius?: Percentage | number;
-	outerRadius?: Percentage | number;
-	margin?: Margin;
-	clockWise?: boolean;
-	onMouseEnter?: RechartsFunction;
-	onMouseLeave?: RechartsFunction;
-	onClick?: RechartsFunction;
+// NOTE: the lib's implementation doesn't inherits the event props (it's kept in this definition due to the previous typing definition has it).
+export interface RadarChartProps extends EventAttributes, CategoricalChartWrapper<'centric'> {
+    startAngle?: number;
+    endAngle?: number;
+    cx?: number | string;
+    cy?: number | string;
+    innerRadius?: number | string;
+    outerRadius?: number | string;
 }
 
 export class RadarChart extends React.Component<RadarChartProps> { }
 
-export interface RadialBarProps extends Partial<CSSStyleDeclaration> {
-	cx?: number;
-	cy?: number;
-	startAngle?: number;
-	endAngle?: number;
-	maxAngle?: number;
-	minAngle?: number;
-	legendType?: LegendType;
-	label?: boolean | any | React.ReactElement<any> | RechartsFunction;
-	background?: boolean | any | React.ReactElement<any> | RechartsFunction;
-	data: any[];
-	isAnimationActive?: boolean;
-	animationBegin?: number;
-	animationEasing?: AnimationEasingType;
-	onClick?: RechartsFunction;
-	onMouseDown?: RechartsFunction;
-	onMouseUp?: RechartsFunction;
-	onMouseMove?: RechartsFunction;
-	onMouseOver?: RechartsFunction;
-	onMouseOut?: RechartsFunction;
-	onMouseEnter?: RechartsFunction;
-	onMouseLeave?: RechartsFunction;
+export interface RadialBarData {
+    cx: number;
+    cy: number;
+    innerRadius: number;
+    outerRadius: number;
+    value: any;
+}
+
+export interface RadialBarProps extends EventAttributes, Partial<PresentationAttributes>, Animatable {
+    className?: string;
+    dataKey: DataKey; // As the source code states, dataKey will replace valueKey in 1.1.0 and it'll be required (it's already required in current implementation).
+    angleAxisId?: string | number;
+    radiusAxisId?: string | number;
+    shape?: ContentRenderer<any> | React.ReactElement<any>;
+    activeShape?: object | ContentRenderer<any> | React.ReactElement<any>;
+    cornerRadius?: number | string;
+    minPointSize?: number;
+    maxBarSize?: number;
+    data?: RadialBarData[];
+    legendType?: LegendType;
+    label?: boolean | React.ReactElement<any> | Label['content'] | object;
+    background?: boolean | React.ReactElement<any> | ContentRenderer<any> | object;
+    hide?: boolean;
 }
 
 export class RadialBar extends React.Component<RadialBarProps> { }
 
-export interface RadialBarChartProps {
-	width?: number;
-	height?: number;
-	data?: any[];
-	margin?: Margin;
-	barCategoryGap?: Percentage | number;
-	barGap?: number;
-	cx?: Percentage | number;
-	cy?: Percentage | number;
-	innerRadius?: Percentage | number;
-	outerRadius?: Percentage | number;
-	barSize?: number;
-	onMouseEnter?: RechartsFunction;
-	onMouseLeave?: RechartsFunction;
-	onClick?: RechartsFunction;
+export interface RadialBarChartProps extends CategoricalChartWrapper<'radial'> {
+    startAngle?: number;
+    endAngle?: number;
+    cx?: string | number;
+    cy?: string | number;
+    innerRadius?: string | number;
+    outerRadius?: string | number;
 }
 
 export class RadialBarChart extends React.Component<RadialBarChartProps> { }
 
-export interface RectangleProps extends Partial<CSSStyleDeclaration> {
-	x?: number;
-	y?: number;
-	radius?: number;
-	onClick?: RechartsFunction;
-	onMouseDown?: RechartsFunction;
-	onMouseUp?: RechartsFunction;
-	onMouseMove?: RechartsFunction;
-	onMouseOver?: RechartsFunction;
-	onMouseOut?: RechartsFunction;
-	onMouseEnter?: RechartsFunction;
-	onMouseLeave?: RechartsFunction;
+export interface RectangleProps extends EventAttributes, Partial<PresentationAttributes>, Animatable {
+    className?: string;
+    x?: number;
+    y?: number;
+    width?: number;
+    height?: number;
+    radius?: number | any[];
 }
 
 export class Rectangle extends React.Component<RectangleProps> { }
 
-export interface ReferenceAreaProps extends PartialAndNumber<CSSStyleDeclaration> {
-	xAxisId?: string | number;
-	yAxisId?: string | number;
-	x1?: number | string;
-	x2?: number | string;
-	y1?: number | string;
-	y2?: number | string;
-	alwaysShow?: boolean;
-	viewBox?: ViewBox;
-	xAxis?: any;
-	yAxis?: any;
-	label?: string | number | React.ReactElement<any> | ContentRenderer<ReferenceAreaProps>;
-	isFront?: boolean;
+export interface ReferenceAreaProps extends Partial<PresentationAttributes> {
+    className?: number | string;
+    viewBox?: ViewBox;
+    xAxis?: object;
+    yAxis?: object;
+    isFront?: boolean;
+    alwaysShow?: boolean;
+    x1?: number | string;
+    x2?: number | string;
+    y1?: number | string;
+    y2?: number | string;
+    xAxisId?: string | number;
+    yAxisId?: string | number;
+    shape?: ContentRenderer<ReferenceAreaProps & RectangleProps> | React.ReactElement<any>;
 }
 
 export class ReferenceArea extends React.Component<ReferenceAreaProps> { }
 
-export interface ReferenceDotProps {
-	xAxisId?: string | number;
-	yAxisId?: string | number;
-	x: number | string;
-	y: number | string;
-	r: number;
-	alwaysShow?: boolean;
-	xAxis: any;
-	yAxis: any;
-	label?: string | number | React.ReactElement<any> | ContentRenderer<ReferenceDotProps>;
-	isFront?: boolean;
-	onClick?: RechartsFunction;
-	onMouseDown?: RechartsFunction;
-	onMouseUp?: RechartsFunction;
-	onMouseOver?: RechartsFunction;
-	onMouseOut?: RechartsFunction;
-	onMouseEnter?: RechartsFunction;
-	onMouseMove?: RechartsFunction;
-	onMouseLeave?: RechartsFunction;
+export interface ReferenceDotProps extends EventAttributes, Partial<PresentationAttributes<number | string, number | string>> {
+    className?: number | string;
+    r?: number;
+    xAxis?: { scale: (x: ReferenceDotProps['x']) => number };
+    yAxis?: { scale: (y: ReferenceDotProps['y']) => number };
+    isFront?: boolean;
+    alwaysShow?: boolean;
+    x?: number | string;
+    y?: number | string;
+    xAxisId?: string | number;
+    yAxisId?: string | number;
+    shape?: ContentRenderer<
+        EventAttributes
+        & Partial<PresentationAttributes<number | string, number | string>>
+        & { cx: number; cy: number; }
+    > | React.ReactElement<any>;
 }
 
 export class ReferenceDot extends React.Component<ReferenceDotProps> { }
 
-export interface ReferenceLineProps extends PartialAndNumber<CSSStyleDeclaration> {
-	xAxisId?: string | number;
-	yAxisId?: string | number;
-	x?: number | string;
-	y?: number | string;
-	alwaysShow?: boolean;
-	viewBox?: ViewBox;
-	xAxis?: any;
-	yAxis?: any;
-	label?: string | number | React.ReactElement<any> | ContentRenderer<ReferenceLineProps>;
-	isFront?: boolean;
+export interface ReferenceLineProps extends Partial<PresentationAttributes<number | string, number | string>> {
+    className?: number | string;
+    viewBox?: ViewBox;
+    xAxis?: object;
+    yAxis?: object;
+    isFront?: boolean;
+    alwaysShow?: boolean;
+    x?: number | string;
+    y?: number | string;
+    xAxisId?: string | number;
+    yAxisId?: string | number;
+    shape?: ContentRenderer<
+        EventAttributes
+        & Partial<PresentationAttributes<number | string, number | string>>
+        & { x1: number; y1: number; x2: number; y2: number; }
+    > | React.ReactElement<any>;
 }
 
 export class ReferenceLine extends React.Component<ReferenceLineProps> { }
 
 export interface ResponsiveContainerProps {
-	aspect?: number;
-	width?: Percentage | number;
-	height?: Percentage | number;
-	minWidth?: number;
-	minHeight?: number;
-    maxHeight?: Percentage | number;
-	debounce?: number;
+    aspect?: number;
+    width?: string | number;
+    height?: string | number;
+    minHeight?: string | number;
+    minWidth?: string | number;
+    maxHeight?: string | number;
+    children: React.ReactNode;
+    debounce?: number;
+    id?: string | number;
 }
 
 export class ResponsiveContainer extends React.Component<ResponsiveContainerProps> { }
 
-export interface ScatterProps extends Partial<CSSStyleDeclaration> {
-	legendType?: LegendType;
-	xAxisId?: string | number;
-	yAxisId?: string | number;
-	zAxisId?: string | number;
-	line?: boolean | any | React.ReactElement<any> | RechartsFunction;
-	shape?: 'circle' | 'cross' | 'diamond' | 'square' | 'star' | 'triangle' | 'wye' | React.ReactElement<any> | RechartsFunction;
-	lineType?: 'joint' | 'fitting';
-	points: any[];
-	isAnimationActive?: boolean;
-	animationBegin?: number;
-	animationEasing?: AnimationEasingType;
-	onClick?: RechartsFunction;
-	onMouseDown?: RechartsFunction;
-	onMouseUp?: RechartsFunction;
-	onMouseMove?: RechartsFunction;
-	onMouseOver?: RechartsFunction;
-	onMouseOut?: RechartsFunction;
-	onMouseEnter?: RechartsFunction;
-	onMouseLeave?: RechartsFunction;
+export interface ScatterPoint {
+    cx?: number;
+    cy?: number;
+    size?: number;
+    node?: {
+        x?: number | string;
+        y?: number | string;
+        z?: number | string;
+    };
+    payload?: any;
+}
+
+export interface ScatterProps extends EventAttributes, Partial<PresentationAttributes>, Animatable {
+    xAxisId?: string | number;
+    yAxisId?: string | number;
+    zAxisId?: string | number;
+    line?: boolean | object | RechartsFunction | React.ReactElement<any>;
+    lineType?: 'joint' | 'fitting';
+    lineJointType?: LineType;
+    legendType?: LegendType;
+    activeIndex?: number;
+    activeShape?: object | RechartsFunction | React.ReactElement<any>;
+    shape?: 'circle' | 'cross' | 'diamond' | 'square' | 'star' | 'triangle' | 'wye' | React.ReactElement<any> | ContentRenderer<any>;
+    points?: ScatterPoint[];
+    hide?: boolean;
 }
 
 export class Scatter extends React.Component<ScatterProps> { }
 
-export interface ScatterChartProps {
-	width: number;
-	height: number;
-	margin?: Margin;
-	onClick?: RechartsFunction;
-	onMouseDown?: RechartsFunction;
-	onMouseUp?: RechartsFunction;
-	onMouseMove?: RechartsFunction;
-	onMouseOver?: RechartsFunction;
-	onMouseOut?: RechartsFunction;
-	onMouseEnter?: RechartsFunction;
-	onMouseLeave?: RechartsFunction;
-}
+// NOTE: the lib's implementation doesn't inherits the event props (it's kept in this definition due to the previous typing definition has it).
+export type ScatterChartProps = CategoricalChartWrapper & EventAttributes;
 
 export class ScatterChart extends React.Component<ScatterChartProps> { }
 
-export interface SectorProps {
-	cx?: number;
-	cy?: number;
-	innerRadius?: number;
-	outerRadius?: number;
-	startAngle?: number;
-	endAngle?: number;
-	cornerRadius?: number;
-	fill?: string;
-	onClick?: RechartsFunction;
-	onMouseDown?: RechartsFunction;
-	onMouseUp?: RechartsFunction;
-	onMouseMove?: RechartsFunction;
-	onMouseOver?: RechartsFunction;
-	onMouseOut?: RechartsFunction;
-	onMouseEnter?: RechartsFunction;
-	onMouseLeave?: RechartsFunction;
+export interface SectorProps extends EventAttributes, Partial<PresentationAttributes> {
+    className?: string;
+    cx?: number;
+    cy?: number;
+    innerRadius?: number;
+    outerRadius?: number;
+    startAngle?: number;
+    endAngle?: number;
+    cornerRadius?: number | string;
 }
 
 export class Sector extends React.Component<SectorProps> { }
 
-export interface TextProps extends Partial<CSSStyleDeclaration> {
-	scaleToFit?: boolean;
-	angle?: number;
-	textAnchor?: 'start' | 'middle' | 'end' | 'inherit';
-	verticalAnchor?: 'start' | 'middle' | 'end';
+export interface TextProps extends Partial<PresentationAttributes> {
+    scaleToFit?: boolean;
+    angle?: number;
+    textAnchor?: 'start' | 'middle' | 'end' | 'inherit';
+    verticalAnchor?: 'start' | 'middle' | 'end';
+    style?: object;
 }
 
 export class Text extends React.Component<TextProps> { }
 
 export interface ViewBox {
-	x?: number;
-	y?: number;
-	width?: number;
-	height?: number;
+    x?: number;
+    y?: number;
+    width?: number;
+    height?: number;
 }
+
 export interface PolarViewBox {
-	cx?: number;
-	cy?: number;
-	innerRadius?: number;
-	outerRadius?: number;
-	startAngle?: number;
-	endAngle?: number;
+    cx?: number;
+    cy?: number;
+    innerRadius?: number;
+    outerRadius?: number;
+    startAngle?: number;
+    endAngle?: number;
 }
+
 export interface Coordinate {
-	x: number;
-	y: number;
+    x: number;
+    y: number;
 }
+
 export interface TooltipPayload {
-	name: string;
-	value: string | number | Array<string | number>;
-	unit: string;
+    name: string;
+    value: string | number | Array<string | number>;
+    unit: string;
 }
-export interface TooltipProps {
-	separator?: string;
-	offset?: number;
-	itemStyle?: any;
-	wrapperStyle?: any;
-	labelStyle?: any;
-	cursor?: boolean | any | React.ReactElement<any> | React.StatelessComponent<any>;
-	viewBox?: ViewBox;
-	active?: boolean;
-	coordinate?: Coordinate;
-	payload?: TooltipPayload[];
-	label?: string | number;
-	content?: React.ReactElement<any> | React.StatelessComponent<any> | ContentRenderer<TooltipProps>;
-	formatter?: TooltipFormatter;
-	labelFormatter?: LabelFormatter;
-	itemSorter?: ItemSorter<TooltipPayload>;
-	isAnimationActive?: boolean;
-	animationBegin?: number;
-	animationDuration?: number;
-	animationEasing?: AnimationEasingType;
-	filterNull?: boolean;
+
+export interface TooltipProps extends Animatable {
+    content?: React.ReactElement<any> | React.StatelessComponent<any> | ContentRenderer<TooltipProps>;
+    viewBox?: ViewBox;
+    active?: boolean;
+    separator?: string;
+    formatter?: TooltipFormatter;
+    offset?: number;
+    itemStyle?: object;
+    labelStyle?: object;
+    wrapperStyle?: object;
+    cursor?: boolean | object | React.ReactElement<any> | React.StatelessComponent<any>;
+    coordinate?: Coordinate;
+    position?: Coordinate;
+    label?: string | number;
+	  labelFormatter?: LabelFormatter;
+    payload?: TooltipPayload[];
+    itemSorter?: ItemSorter<TooltipPayload>;
+    filterNull?: boolean;
 }
 
 export class Tooltip extends React.Component<TooltipProps> { }
 
-export interface TreemapProps {
-	data: any[];
-	width?: number;
-	height?: number;
-	dataKey?: string;
-	aspectRatio: number;
-	isAnimationActive?: boolean;
-	animationBegin?: number;
-	animationEasing?: AnimationEasingType;
-}
-
-export interface Label {
-	viewBox?: ViewBox | PolarViewBox;
-	formatter?: LabelFormatter;
-	value: string | number;
-	position?: PositionType;
-	offset?: number;
-	content?: React.ReactElement<any> | ContentRenderer<Label>;
-	children?: any;
+export interface TreemapProps extends EventAttributes, Animatable {
+    width?: number;
+    height?: number;
+    data?: any[];
+    style?: object;
+    aspectRatio?: number;
+    content?: React.ReactElement<any> | ContentRenderer<any>;
+    fill?: string;
+    stroke?: string;
+    className?: string;
+    nameKey?: string | number | RechartsFunction;
+    dataKey?: DataKey; // As the source code states, dataKey will replace valueKey in 1.1.0 and it'll be required (it's already required in current implementation).
+    children?: React.ReactNode[] | React.ReactNode;
 }
 
 export class Treemap extends React.Component<TreemapProps> { }
 
-export interface XPadding {
-	left: number;
-	right: number;
+export interface Label {
+    className?: string;
+    viewBox?: ViewBox | PolarViewBox;
+    formatter?: LabelFormatter;
+    value: string | number;
+    offset?: number;
+    position?: PositionType;
+    children?: React.ReactNode[] | React.ReactNode;
+    content?: React.ReactElement<any> | ContentRenderer<Label>;
 }
 
-export interface XAxisProps {
-	hide?: boolean;
-	dataKey?: string | number;
-	xAxisId?: string | number;
-	width?: number;
-	height?: number;
-	orientation?: 'bottom' | 'top';
-	type?: 'number' | 'category';
-	allowDecimals?: boolean;
-	allowDataOverflow?: boolean;
-	tickCount?: number;
-	domain?: any[];
-	interval?: "preserveStart" | "preserveEnd" | "preserveStartEnd" | number;
-	padding?: XPadding;
-	minTickGap?: number;
-	axisLine?: boolean | any;
-	tickLine?: boolean | any;
-	tickSize?: number;
-	tickFormatter?: TickFormatterFunction;
-	ticks?: any[];
-	tick?: boolean | any | React.ReactElement<any>;
-	mirror?: boolean;
-	reversed?: boolean;
-	label?: string | number | React.ReactElement<any> | Label;
-	scale?: ScaleType | RechartsFunction;
-	unit?: string | number;
-	name?: string | number;
-	onClick?: RechartsFunction;
-	onMouseDown?: RechartsFunction;
-	onMouseUp?: RechartsFunction;
-	onMouseMove?: RechartsFunction;
-	onMouseOver?: RechartsFunction;
-	onMouseOut?: RechartsFunction;
-	onMouseEnter?: RechartsFunction;
-	onMouseLeave?: RechartsFunction;
+export type AxisDomain = string | number | ContentRenderer<any> | 'auto' | 'dataMin' | 'dataMax';
+
+export interface XPadding {
+    left: number;
+    right: number;
+}
+
+/**
+ * In the current lib, there is not actual implementation for XAxis.
+ */
+// NOTE: the lib's implementation doesn't inherits the event props (it's kept in this definition due to the previous typing definition has it).
+export interface XAxisProps extends EventAttributes {
+    allowDecimals?: boolean;
+    hide?: boolean;
+    // The name of data displayed in the axis
+    name?: string | number;
+    // The unit of data displayed in the axis
+    unit?: string | number;
+    // The unique id of x-axis
+    xAxisId?: string | number;
+    domain?: AxisDomain[];
+    // The key of data displayed in the axis
+    dataKey?: DataKey;
+    // The width of axis which is usually calculated internally
+    width?: number;
+    // The height of axis, which need to be set by user
+    height?: number;
+    mirror?: boolean;
+    // The orientation of axis
+    orientation?: 'top' | 'bottom';
+    type?: 'number' | 'category';
+    // Ticks can be any type when the axis is the type of category
+    // Ticks must be numbers when the axis is the type of number
+    ticks?: any[];
+    // The count of ticks
+    tickCount?: number;
+    // The formatter function of tick
+    tickFormatter?: TickFormatterFunction;
+    padding?: XPadding;
+    allowDataOverflow?: boolean;
+    scale?: ScaleType | RechartsFunction;
+    tick?: boolean | ContentRenderer<any> | object | React.ReactElement<any>;
+    axisLine?: boolean | object;
+    tickLine?: boolean | object;
+    minTickGap?: number;
+    tickSize?: number;
+    interval?: AxisInterval;
+    reversed?: boolean;
 }
 
 export class XAxis extends React.Component<XAxisProps> { }
 
 export interface YPadding {
-	top: number;
-	bottom: number;
+    top: number;
+    bottom: number;
 }
-export interface YAxisProps {
-	hide?: boolean;
-	dataKey?: string | number;
-	yAxisId?: string | number;
-	width?: number;
-	height?: number;
-	orientation?: 'left' | 'right';
-	type?: 'number' | 'category';
-	domain?: any[];
-	interval?: "preserveStart" | "preserveEnd" | "preserveStartEnd" | number;
-	padding?: YPadding;
-	minTickGap?: number;
-	allowDecimals?: boolean;
-	allowDataOverflow?: boolean;
-	axisLine?: boolean | any;
-	tickCount?: number;
-	tickLine?: boolean | any;
-	tickSize?: number;
-	tickFormatter?: TickFormatterFunction;
-	ticks?: any[];
-	tick?: boolean | any | React.ReactElement<any>;
-	mirror?: boolean;
-	reversed?: boolean;
-	label?: string | number | React.ReactElement<any> | Label;
-	scale?: ScaleType | RechartsFunction;
-	unit?: string | number;
-	name?: string | number;
-	onClick?: RechartsFunction;
-	onMouseDown?: RechartsFunction;
-	onMouseUp?: RechartsFunction;
-	onMouseMove?: RechartsFunction;
-	onMouseOver?: RechartsFunction;
-	onMouseOut?: RechartsFunction;
-	onMouseEnter?: RechartsFunction;
-	onMouseLeave?: RechartsFunction;
+
+// NOTE: the lib's implementation doesn't inherits the event props (it's kept in this definition due to the previous typing definition has it).
+export interface YAxisProps extends EventAttributes {
+    allowDecimals?: boolean;
+    hide?: boolean;
+    // The name of data displayed in the axis
+    name?: string | number;
+    // The unit of data displayed in the axis
+    unit?: string | number;
+    // The unique id of y-axis
+    yAxisId?: string | number;
+    domain?: AxisDomain[];
+    // The key of data displayed in the axis
+    dataKey?: DataKey;
+    // Ticks can be any type when the axis is the type of category
+    // Ticks must be numbers when the axis is the type of number
+    ticks?: any[];
+    // The count of ticks
+    tickCount?: number;
+    // The formatter function of tick
+    tickFormatter?: TickFormatterFunction;
+    // The width of axis, which need to be set by user
+    width?: number;
+    // The height of axis which is usually calculated in Chart
+    height?: number;
+    mirror?: boolean;
+    // The orientation of axis
+    orientation?: 'left' | 'right';
+    type?: 'number' | 'category';
+    padding?: YPadding;
+    allowDataOverflow?: boolean;
+    scale?: ScaleType | RechartsFunction;
+    tick?: boolean | ContentRenderer<any> | object | React.ReactElement<any>;
+    axisLine?: boolean | object;
+    tickLine?: boolean | object;
+    minTickGap?: number;
+    tickSize?: number;
+    interval?: AxisInterval;
+    reversed?: boolean;
 }
 
 export class YAxis extends React.Component<YAxisProps> { }
 
 export interface ZAxisProps {
-	dataKey: string | number;
-	zAxisId?: string | number;
-	range?: any[];
-	unit?: string | number;
-	name?: string | number;
-	scale?: ScaleType | RechartsFunction;
+    type?: 'number' | 'category';
+    // The name of data displayed in the axis
+    name?: string | number;
+    // The unit of data displayed in the axis
+    unit?: string | number;
+    // The unique id of z-axis
+    zAxisId?: string | number;
+    // The key of data displayed in the axis
+    dataKey?: DataKey;
+    // The range of axis
+    range?: number[];
+    scale?: ScaleType | RechartsFunction;
 }
 
 export class ZAxis extends React.Component<ZAxisProps> { }
diff --git a/types/recharts/recharts-tests.tsx b/types/recharts/recharts-tests.tsx
index 9783a264d5..8ca211113d 100644
--- a/types/recharts/recharts-tests.tsx
+++ b/types/recharts/recharts-tests.tsx
@@ -97,6 +97,7 @@ class Component extends React.Component<{}, ComponentState> {
                 </LineChart>
                 <PieChart width={800} height={400}>
                     <Pie
+                        dataKey="value"
                         activeIndex={this.state.activeIndex}
                         activeShape={renderActiveShape}
                         data={data}
diff --git a/types/redux-actions/index.d.ts b/types/redux-actions/index.d.ts
index 45ecf21933..6051ab7afe 100644
--- a/types/redux-actions/index.d.ts
+++ b/types/redux-actions/index.d.ts
@@ -22,8 +22,10 @@ export interface ActionMeta<Payload, Meta> extends Action<Payload> {
     meta: Meta;
 }
 
+export type ReducerMapValue<State, Payload> = Reducer<State, Payload> | ReducerNextThrow<State, Payload> | ReducerMap<State, Payload>;
+
 export interface ReducerMap<State, Payload> {
-    [actionType: string]: Reducer<State, Payload> | ReducerNextThrow<State, Payload>;
+    [actionType: string]: ReducerMapValue<State, Payload>;
 }
 
 export interface ReducerMapMeta<State, Payload, Meta> {
diff --git a/types/redux-actions/redux-actions-tests.ts b/types/redux-actions/redux-actions-tests.ts
index b7eeb2e62f..7fa5744f22 100644
--- a/types/redux-actions/redux-actions-tests.ts
+++ b/types/redux-actions/redux-actions-tests.ts
@@ -51,6 +51,15 @@ const actionsHandlerWithInitialState = ReduxActions.handleActions({
 
 state = actionsHandlerWithInitialState(0, { type: 'INCREMENT' });
 
+const actionsHandlerWithRecursiveReducerMap = ReduxActions.handleActions<number, number>({
+    ADJUST: {
+        UP: (state: number, action: ReduxActions.Action<number>) => state + action.payload,
+        DOWN: (state: number, action: ReduxActions.Action<number>) => state - action.payload,
+    }
+}, 0);
+
+state = actionsHandlerWithRecursiveReducerMap(0, { type: 'ADJUST/UP', payload: 1 });
+
 // ----------------------------------------------------------------------------------------------------
 
 interface TypedState {
diff --git a/types/redux-form/v6/lib/FieldArray.d.ts b/types/redux-form/v6/lib/FieldArray.d.ts
index 9629eecb27..42308c4f76 100644
--- a/types/redux-form/v6/lib/FieldArray.d.ts
+++ b/types/redux-form/v6/lib/FieldArray.d.ts
@@ -103,6 +103,10 @@ interface WrappedFieldArrayProps<T> {
 }
 
 interface FieldsProps<T> {
+    /**
+     * true if field is field array
+     */
+    _isFieldArray: boolean
     /**
      * A method to iterate over each value of the array.
      */
@@ -134,6 +138,15 @@ interface FieldsProps<T> {
      */
     map(callback: (name: string, index: number, fields: FieldsProps<T>) => any): any;
 
+    /**
+     * A method to move value in array on on different index in the field array
+     */
+    move(from: number, to: number): void;
+
+    /**
+     * Name of field array
+     */
+    name: string;
     /**
      * Removes an item from the end of the array. Returns the item removed.
      */
@@ -144,16 +157,32 @@ interface FieldsProps<T> {
      */
     push(value: T): void;
 
+    /**
+     * TODO: Need to figure out what does this do, its taken
+     * directly form redux-form repo and flow types
+     */
+    reduce(callback: Function): any
+
     /**
      * Removes an item from the array at an arbitrary index.
      */
     remove(index: number): void;
 
+    /**
+     * It will remove all fields in field array
+     */
+    removeAll(): void
+
     /**
      * Removes an item from beginning of the array. Returns the item removed.
      */
     shift(): T;
 
+    /**
+     * TODO: Need to figure out what does this do, its taken
+     * directly form redux-form repo and flow types
+     */
+    some(callback: Function): void
     /**
      * Swaps two items in the array at the given indexes.
      */
@@ -197,6 +226,15 @@ interface FieldArrayMetaProps {
      */
     pristine: boolean;
 
+    /**
+     * true if field array is being submitted
+     */
+    submitting: boolean;
+
+    /**
+     * true if some field value in the field array fails validation on submit
+    */
+    submitFailed: boolean;
     /**
      * true if any of the fields have been touched.
      */
diff --git a/types/redux-immutable-state-invariant/index.d.ts b/types/redux-immutable-state-invariant/index.d.ts
index b81b6cc47f..6ad2a0e588 100644
--- a/types/redux-immutable-state-invariant/index.d.ts
+++ b/types/redux-immutable-state-invariant/index.d.ts
@@ -3,8 +3,6 @@
 // Definitions by: Remo H. Jansen <https://github.com/remojansen>, Ben Rogers <https://github.com/highflying>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference types="redux" />
-
 import * as Redux from "redux";
 
 type isImmutableDefault = (value: any) => boolean;
diff --git a/types/rollup/index.d.ts b/types/rollup/index.d.ts
index 946b4f6786..36ac764bbd 100644
--- a/types/rollup/index.d.ts
+++ b/types/rollup/index.d.ts
@@ -135,11 +135,11 @@ export interface Plugin {
 	 * Returning null or undefined defers to other resolveId functions (and eventually the default resolution behavior);
 	 * returning any other falsy value signals that importee should be treated as an external module and not included in the bundle.
 	 */
-	resolveId?(importee: string, importer: string): string | null | undefined | false | 0 | ''
+	resolveId?(importee: string, importer: string | undefined): string | null | undefined | false | 0 | ''
 	/** A module transformer function */
-	transform?(this: TransformContext, source: string, id: string): string | { code: string, map: SourceMap }
+	transform?(this: TransformContext, source: string, id: string): string | null | undefined | { code: string, map: SourceMap }
 	/** A bundle transformer function */
-	transformBundle?(source: string, options: { format: Format }): string | { code: string, map: SourceMap }
+	transformBundle?(source: string, options: { format: Format }): string | null | undefined | { code: string, map: SourceMap }
 	/** Function hook called when bundle.generate() is being executed. */
 	ongenerate?(options: GenerateOptions, bundle: Bundle): void
 	/** Function hook called when bundle.write() is being executed, after the file has been written to disk. */
@@ -164,3 +164,54 @@ export interface TransformContext {
 
 /** Returns a Promise that resolves with a bundle */
 export function rollup(options: Options): Promise<Bundle>
+
+export interface WatchOptions extends ConfigFileOptions {
+	watch?: {
+		/**
+		 * If set to true, will use chokidar for file watching (requires installation).
+		 * If set to object, the settings are passed on to chokidar
+		 */
+		chokidar?: boolean | { [key: string]: any };
+		/** Limit the file-watching to certain files, e.g. 'src/**' */
+		include?: string;
+		/** Prevent files from being watched, e.g. 'node_modules/**' */
+		exclude?: string;
+	}
+}
+
+export interface StartEvent {
+	code: 'START'
+}
+export interface EndEvent {
+	code: 'END'
+}
+export interface ErrorEvent {
+	code: 'ERROR'
+	error: Error
+}
+export interface FatalEvent {
+	code: 'FATAL'
+	error: Error
+}
+export interface BundleStartEvent {
+	code: 'BUNDLE_START'
+	input: string
+	output: string[]
+}
+export interface BundleEndEvent {
+	code: 'BUNDLE_END'
+	input: string
+	output: string[]
+	duration: number
+}
+export type WatchEvent = StartEvent | EndEvent | ErrorEvent | FatalEvent | BundleStartEvent | BundleEndEvent
+
+export class Watcher {
+	/** Listen to the events that are emitted by rollup during watching */
+	on(type: 'event', callback: (e: WatchEvent) => void): void
+	/** Stop watching for file changes */
+	close(): void
+}
+
+/** Starts rollup in watch mode. Returns a watcher instance for closing or listening to events */
+export function watch(options: WatchOptions): Watcher
diff --git a/types/rollup/rollup-tests.ts b/types/rollup/rollup-tests.ts
index 924e675373..3ec00a357a 100644
--- a/types/rollup/rollup-tests.ts
+++ b/types/rollup/rollup-tests.ts
@@ -1,19 +1,36 @@
-import { rollup, Bundle, Plugin, ConfigFileOptions } from 'rollup'
+import { rollup, watch, Bundle, Plugin, ConfigFileOptions } from 'rollup'
 
 declare const console: { log(...messages: any[]): void, warn(message: string): void }
 
 let cache: Bundle | undefined
 const plugin: Plugin = {
     name: 'test-plugin',
+    resolveId(importee, importer) {
+        if (importer === undefined) {
+            return 'custom/entry/point.js'
+        }
+        return importer.trim()
+    },
     transform(source, id) {
         if (id === 'rxjs') {
             this.error(new Error(`Don't import this directly`))
+            return null
         }
         const indexOfQuote = source.indexOf('"')
         if (indexOfQuote >= 0) {
             this.warn(`Prefer ' over " for strings`, indexOfQuote)
+            return undefined
         }
         return source
+    },
+    transformBundle(source, options) {
+        if (options.format === 'iife') {
+            return `window.nonModule = true\n${source}`
+        } else if (options.format === 'cjs') {
+            return null
+        }
+
+        return undefined
     }
 }
 
@@ -69,6 +86,42 @@ async function main() {
         sourcemapFile: 'bundle.js.map',
         strict: true,
     })
+
+    const watcher = watch({
+        input: 'main.js',
+        output: {
+            file: 'bundle.js',
+            format: 'es'
+        },
+        watch: {
+            chokidar: true
+        }
+    })
+
+    watcher.on('event', e => {
+        switch (e.code) {
+            case 'START':
+                console.log(`We're rolling!`)
+                return
+            case 'END':
+                console.log(`We're all rolled up!`)
+                return
+            case 'ERROR':
+            case 'FATAL':
+                console.log(e.error.message)
+                return
+            case 'BUNDLE_START':
+                console.log(`Bundling: ${e.input}`)
+                return
+            case 'BUNDLE_END':
+                console.log(`Bundling: ${e.input}`)
+                return
+        }
+
+        assertNever(e)
+    })
+
+    watcher.close()
 }
 
 main()
@@ -94,3 +147,7 @@ export const multiConfig: ConfigFileOptions = {
         }
     ]
 }
+
+function assertNever(nope: never) {
+    throw new Error('Oh no!')
+}
diff --git a/types/rrc/index.d.ts b/types/rrc/index.d.ts
index f4ef84e568..24b20a6376 100644
--- a/types/rrc/index.d.ts
+++ b/types/rrc/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/pshrmn/rrc#readme
 // Definitions by: Deividas Bakanas <https://github.com/DeividasBakanas>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.4
 
 import * as React from "react";
 import * as H from "history";
diff --git a/types/sharepoint/index.d.ts b/types/sharepoint/index.d.ts
index 4401c8c308..4852d8440c 100644
--- a/types/sharepoint/index.d.ts
+++ b/types/sharepoint/index.d.ts
@@ -1,9 +1,10 @@
-// Type definitions for Microsoft SharePoint: 2016.0
+// Type definitions for Microsoft SharePoint: 2016.1
 // Project: https://msdn.microsoft.com/en-us/library/office/jj193034.aspx
 // Definitions by: Stanislav Vyshchepan <https://github.com/gandjustas>
 //                 Andrey Markeev <https://github.com/andrei-markeev>
 //                 Vincent Biret <https://github.com/baywet>
 //                 Tero Arvola <https://github.com/teroarvola>
+//                 Dennis George <https://github.com/dennispg>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -16,26 +17,43 @@ declare function ExecuteOrDelayUntilBodyLoaded(initFunc: () => void): void;
 declare function ExecuteOrDelayUntilScriptLoaded(func: () => void, depScriptFileName: string): boolean;
 declare function ExecuteOrDelayUntilEventNotified(func: (...args: any[]) => void, eventName: string): boolean;
 declare var Strings: any;
-
+declare const enum Sods {
+    missing =  1,
+    loading = 2,
+    pending = 3,
+    loaded = 4,
+    error = 5
+}
+interface Sod {
+    url: string;
+    key: string;
+    loaded: boolean;
+    depkeys?: string[];
+    state: Sods;
+    qfn?: any[];
+    reset?: boolean;
+}
+declare var _v_dictSod: { [address: string]: Sod };
 declare namespace SP {
-    class SOD {
-        static execute(fileName: string, functionName: string, ...args: any[]): void;
-        static executeFunc(fileName: string, typeName: string, fn: () => void): void;
-        static executeOrDelayUntilEventNotified(func: (...args: any[]) => void, eventName: string): boolean;
-        static executeOrDelayUntilScriptLoaded(func: () => void, depScriptFileName: string): boolean;
-        static notifyScriptLoadedAndExecuteWaitingJobs(scriptFileName: string): void;
-        static notifyEventAndExecuteWaitingJobs(eventName: string, args?: any[]): void;
-        static registerSod(fileName: string, url: string): void;
-        static registerSodDep(fileName: string, dependentFileName: string): void;
-        static loadMultiple(keys: string[], fn: () => void, bSync?: boolean): void;
-        static delayUntilEventNotified(func: (...args: any[]) => void, eventName: string): void;
+    interface SOD {
+        execute(fileName: string, functionName: string, ...args: any[]): void;
+        executeFunc(fileName: string, typeName: string, fn: () => void): void;
+        executeOrDelayUntilEventNotified(func: (...args: any[]) => void, eventName: string): boolean;
+        executeOrDelayUntilScriptLoaded(func: () => void, depScriptFileName: string): boolean;
+        notifyScriptLoadedAndExecuteWaitingJobs(scriptFileName: string): void;
+        notifyEventAndExecuteWaitingJobs(eventName: string, args?: any[]): void;
+        registerSod(fileName: string, url: string): void;
+        registerSodDep(fileName: string, dependentFileName: string): void;
+        loadMultiple(keys: string[], fn: () => void, bSync?: boolean): void;
+        delayUntilEventNotified(func: (...args: any[]) => void, eventName: string): void;
 
-        static get_prefetch(): boolean;
-        static set_prefetch(value: boolean): void;
+        get_prefetch(): boolean;
+        set_prefetch(value: boolean): void;
 
-        static get_ribbonImagePrefetchEnabled(): boolean;
-        static set_ribbonImagePrefetchEnabled(value: boolean): void;
+        get_ribbonImagePrefetchEnabled(): boolean;
+        set_ribbonImagePrefetchEnabled(value: boolean): void;
     }
+    let SOD: SOD;
 
     enum ListLevelPermissionMask {
         viewListItems, // : 1,
@@ -88,27 +106,33 @@ declare namespace SP {
         static resizeImageToSquareLength(imgElement: HTMLImageElement, squareLength: number): void;
     }
 
-    class PageContextInfo {
-        static get_siteServerRelativeUrl(): string;
-        static get_webServerRelativeUrl(): string;
-        static get_webAbsoluteUrl(): string;
-        static get_serverRequestPath(): string;
-        static get_siteAbsoluteUrl(): string;
-        static get_webTitle(): string;
-        static get_tenantAppVersion(): string;
-        static get_webLogoUrl(): string;
-        static get_webLanguage(): number;
-        static get_currentLanguage(): number;
-        static get_pageItemId(): number;
-        static get_pageListId(): string;
-        static get_webPermMasks(): { High: number; Low: number; };
-        static get_currentCultureName(): string;
-        static get_currentUICultureName(): string;
-        static get_clientServerTimeDelta(): number;
-        static get_userLoginName(): string;
-        static get_webTemplate(): string;
+    interface PageContextInfo {
+        new(): PageContextInfoInstance;
+        get_siteServerRelativeUrl(): string;
+        get_webServerRelativeUrl(): string;
+        get_webAbsoluteUrl(): string;
+        get_serverRequestPath(): string;
+        get_siteAbsoluteUrl(): string;
+        get_webTitle(): string;
+        get_tenantAppVersion(): string;
+        get_isAppWeb(): boolean;
+        get_webLogoUrl(): string;
+        get_webLanguage(): number;
+        get_currentLanguage(): number;
+        get_pageItemId(): number;
+        get_pageListId(): string;
+        get_webPermMasks(): { High: number; Low: number; };
+        get_currentCultureName(): string;
+        get_currentUICultureName(): string;
+        get_clientServerTimeDelta(): number;
+        get_userLoginName(): string;
+        get_webTemplate(): string;
+    }
+
+    interface PageContextInfoInstance {
         get_pagePersonalizationScope(): string;
     }
+    let PageContextInfo: PageContextInfo;
 
     class ContextPermissions {
         has(perm: number): boolean;
@@ -154,97 +178,99 @@ declare class JSRequest {
     static PathName: string;
 }
 
-declare class _spPageContextInfo {
-    static alertsEnabled: boolean; // true
-    static allowSilverlightPrompt: string; // "True"
-    static blockDownloadsExperienceEnabled: boolean; // true
-    static canUserCreateMicrosoftForm: boolean; // true
-    static cdnPrefix: string; // "static.sharepointonline.com/bld"
-    static clientServerTimeDelta: number; // -182
-    static CorrelationId: string; // "6161f99d-10e5-4000-ad30-1016270fe31d"
-    static crossDomainPhotosEnabled: boolean; // true
-    static currentCultureName: string; // "ru-RU"
-    static currentLanguage: number; // 1049
-    static currentUICultureName: string; // "ru-RU"
-    static disableAppViews: boolean; // true
-    static disableFlows: boolean; // true
-    static env: string; // "prod"
-    static farmLabel: string; // "US_4_Content"
-    static formDigestValue: string; // "0x5F3FE84E7EE9089C7D11DCDAFFB9E69CF8241E68B9EF071FA92CD419E878AC4F7C16E34696EFA667EFD0712FC1DF4945DDC0D09B5D23153A698A727AF076B5DE,07 Jun 2017 18:55:22 -0000"
-    static formDigestTimeoutSeconds: number; // 1800
-    static groupColor: string; // "#d40ac7"
-    static groupHasHomepage: boolean; // true
-    static groupId: string; //
-    static guestsEnabled: boolean; // true
-    static hasManageWebPermissions: boolean; // true
-    static isAnonymousGuestUser: boolean; // true
-    static isAppWeb: boolean; // true
-    static isExternalGuestUser: boolean; // true
-    static isNoScriptEnabled: boolean; // true
-    static isSiteAdmin: boolean; // true
-    static isSPO: boolean; // true
-    static isTenantDevSite: boolean; // true
-    static isWebWelcomePage: boolean; // true
-    static layoutsUrl: string;  // "_layouts/15"
-    static listBaseTemplate: number; // 119
-    static listId: string; // "{06ee6d96-f27f-4160-b6bb-c18f187b18a7}"
-    static listPermsMask: { High: number; Low: number; };
-    static listTitle: string; // "Site Pages"
-    static listUrl: string; // "/sites/site/list"
-    static maximumFileSize: number; // 15360
-    static openInClient: boolean; // true
-    static pageListId: string;  // "{06ee6d96-f27f-4160-b6bb-c18f187b18a7}"
-    static pageItemId: number;
-    static pagePermsMask: { High: number; Low: number; };
-    static pagePersonalizationScope: string; // 1
-    static PreviewFeaturesEnabled: boolean; // true
-    static preferUserTimeZone: boolean; // false
-    static ProfileUrl: string; // "https://tenant-my.sharepoint.com/person.aspx"
-    static PublishingFeatureOn: boolean; // true
-    static RecycleBinItemCount: number; // -1
-    static serverRedirectedUrl: string;
-    static serverRequestPath: string; // "/SPTypeScript/Lists/ConditionalFormattingTasksList/AllItems.aspx"
-    static serverTime: string; // "2017-06-07T18:55:22.3499459Z"
-    static siteAbsoluteUrl: string; // "https:// gandjustas-7b20d3715e8ed4.sharepoint.com"
-    static siteClassification: string; //
-    static siteClientTag: string; // "0$$15.0.4454.1021"
-    static siteColor: string; // "#d40ac7"
-    static siteId: string; // "{3e09a056-f68f-44a3-8e0f-ff2c123b82cb}"
-    static sitePagesEnabled: boolean; // true
-    static siteServerRelativeUrl: string; // "/"
-    static siteSubscriptionId: string; // 4eedf5f3-f71f-4e73-82ee-e19081363c8c
-    static supportPoundStorePath: boolean; // true
-    static supportPercentStorePath: boolean; // true
-    static systemUserKey: string; // "i:0h.f|membership|10033fff84e7cb2b@live.com"
-    static tenantAppVersion: string; // "0"
-    static themeCacheToken: string; // "/sites/site::0:16.0.6525.1206"
-    static themedCssFolderUrl: string;
-    static themedImageFileNames: string;
-    static updateFormDigestPageLoaded: string; // "2017-06-07T18:55:25.821Z"
-    static userDisplayName: string; // "John Doe"
-    static userEmail: string; // "john.doe@fabrikam.onmicrosoft.com"
-    static userId: number; // 12
-    static userLoginName: string; // "john.doe@fabrikam.onmicrosoft.com"
-    static viewOnlyExperienceEnabled: boolean; // true
-    static viewId: string; // "{06ee6d96-f27f-4160-b6bb-c18f187b18a7}"
-    static webAbsoluteUrl: string; // "https:// gandjustas-7b20d3715e8ed4.sharepoint.com/SPTypeScript"
-    static webDescription: string; // "Some description"
-    static webId: string; // "{06ee6d96-f27f-4160-b6bb-c18f187b18a7}"
-    static webLanguage: number; // 1049
-    static webLogoUrl: string; // "/_layouts/15/images/siteIcon.png?rev=23"
-    static webPermMasks: { High: number; Low: number; };
-    static webServerRelativeUrl: string; // "/SPTypeScript"
-    static webTemplate: string; // "17"
-    static webTitle: string; // "SPTypeScript"
-    static webUIVersion: number; // 15
+interface _spPageContextInfo {
+    alertsEnabled: boolean; // true
+    allowSilverlightPrompt: string; // "True"
+    blockDownloadsExperienceEnabled: boolean; // true
+    canUserCreateMicrosoftForm: boolean; // true
+    cdnPrefix: string; // "static.sharepointonline.com/bld"
+    clientServerTimeDelta: number; // -182
+    CorrelationId: string; // "6161f99d-10e5-4000-ad30-1016270fe31d"
+    crossDomainPhotosEnabled: boolean; // true
+    currentCultureName: string; // "ru-RU"
+    currentLanguage: number; // 1049
+    currentUICultureName: string; // "ru-RU"
+    disableAppViews: boolean; // true
+    disableFlows: boolean; // true
+    env: string; // "prod"
+    farmLabel: string; // "US_4_Content"
+    formDigestValue: string; // "0x5F3FE84E7EE9089C7D11DCDAFFB9E69CF8241E68B9EF071FA92CD419E878AC4F7C16E34696EFA667EFD0712FC1DF4945DDC0D09B5D23153A698A727AF076B5DE,07 Jun 2017 18:55:22 -0000"
+    formDigestTimeoutSeconds: number; // 1800
+    groupColor: string; // "#d40ac7"
+    groupHasHomepage: boolean; // true
+    groupId: string; //
+    guestsEnabled: boolean; // true
+    hasManageWebPermissions: boolean; // true
+    isAnonymousGuestUser: boolean; // true
+    isAppWeb: boolean; // true
+    isExternalGuestUser: boolean; // true
+    isNoScriptEnabled: boolean; // true
+    isSiteAdmin: boolean; // true
+    isSPO: boolean; // true
+    isTenantDevSite: boolean; // true
+    isWebWelcomePage: boolean; // true
+    layoutsUrl: string;  // "_layouts/15"
+    listBaseTemplate: number; // 119
+    listId: string; // "{06ee6d96-f27f-4160-b6bb-c18f187b18a7}"
+    listPermsMask: { High: number; Low: number; };
+    listTitle: string; // "Site Pages"
+    listUrl: string; // "/sites/site/list"
+    maximumFileSize: number; // 15360
+    openInClient: boolean; // true
+    pageListId: string;  // "{06ee6d96-f27f-4160-b6bb-c18f187b18a7}"
+    pageItemId: number;
+    pagePermsMask: { High: number; Low: number; };
+    pagePersonalizationScope: string; // 1
+    PreviewFeaturesEnabled: boolean; // true
+    preferUserTimeZone: boolean; // false
+    ProfileUrl: string; // "https://tenant-my.sharepoint.com/person.aspx"
+    PublishingFeatureOn: boolean; // true
+    RecycleBinItemCount: number; // -1
+    serverRedirectedUrl: string;
+    serverRequestPath: string; // "/SPTypeScript/Lists/ConditionalFormattingTasksList/AllItems.aspx"
+    serverTime: string; // "2017-06-07T18:55:22.3499459Z"
+    siteAbsoluteUrl: string; // "https:// gandjustas-7b20d3715e8ed4.sharepoint.com"
+    siteClassification: string; //
+    siteClientTag: string; // "0$$15.0.4454.1021"
+    siteColor: string; // "#d40ac7"
+    siteId: string; // "{3e09a056-f68f-44a3-8e0f-ff2c123b82cb}"
+    sitePagesEnabled: boolean; // true
+    siteServerRelativeUrl: string; // "/"
+    siteSubscriptionId: string; // 4eedf5f3-f71f-4e73-82ee-e19081363c8c
+    supportPoundStorePath: boolean; // true
+    supportPercentStorePath: boolean; // true
+    systemUserKey: string; // "i:0h.f|membership|10033fff84e7cb2b@live.com"
+    tenantAppVersion: string; // "0"
+    themeCacheToken: string; // "/sites/site::0:16.0.6525.1206"
+    themedCssFolderUrl: string;
+    themedImageFileNames: string;
+    updateFormDigestPageLoaded: string; // "2017-06-07T18:55:25.821Z"
+    userDisplayName: string; // "John Doe"
+    userEmail: string; // "john.doe@fabrikam.onmicrosoft.com"
+    userId: number; // 12
+    userLoginName: string; // "john.doe@fabrikam.onmicrosoft.com"
+    viewOnlyExperienceEnabled: boolean; // true
+    viewId: string; // "{06ee6d96-f27f-4160-b6bb-c18f187b18a7}"
+    webAbsoluteUrl: string; // "https:// gandjustas-7b20d3715e8ed4.sharepoint.com/SPTypeScript"
+    webDescription: string; // "Some description"
+    webId: string; // "{06ee6d96-f27f-4160-b6bb-c18f187b18a7}"
+    webLanguage: number; // 1049
+    webLogoUrl: string; // "/_layouts/15/images/siteIcon.png?rev=23"
+    webPermMasks: { High: number; Low: number; };
+    webServerRelativeUrl: string; // "/SPTypeScript"
+    webTemplate: string; // "17"
+    webTitle: string; // "SPTypeScript"
+    webUIVersion: number; // 15
 }
+declare var _spPageContextInfo: _spPageContextInfo;
 
-declare class _spFriendlyUrlPageContextInfo {
-    static termId: string;
-    static termSetId: string;
-    static termStoreId: string;
-    static title: string;
+interface _spFriendlyUrlPageContextInfo {
+    termId: string;
+    termSetId: string;
+    termStoreId: string;
+    title: string;
 }
+declare var _spFriendlyUrlPageContextInfo: _spFriendlyUrlPageContextInfo;
 
 declare function STSHtmlEncode(value: string): string;
 declare function STSHtmlDecode(value: string): string;
@@ -2113,7 +2139,7 @@ declare namespace SP {
         constructor();
     }
     /** Provides a base class for a collection of objects on a remote client. */
-    class ClientObjectCollection<T> extends SP.ClientObject implements IEnumerable<T> {
+    interface ClientObjectCollection<T> extends SP.ClientObject, IEnumerable<T> {
         get_areItemsAvailable(): boolean;
         /** Gets the data for all of the items in the collection. */
         retrieveItems(): SP.ClientObjectPrototype;
@@ -2126,12 +2152,20 @@ declare namespace SP {
         getItemAtIndex(index: number): T;
         fromJson(obj: any): void;
     }
+    interface ClientObjectCollectionConstructor {
+        new<T>(): ClientObjectCollection<T>;
+    }
+    let ClientObjectCollection: ClientObjectCollectionConstructor;
 
-    class ClientObjectList<T> extends SP.ClientObjectCollection<T> {
-        constructor(context: SP.ClientRuntimeContext, objectPath: SP.ObjectPath, childItemType: any);
+    interface ClientObjectList<T> extends SP.ClientObjectCollection<T> {
+        new(context: SP.ClientRuntimeContext, objectPath: SP.ObjectPath, childItemType: any);
         fromJson(initValue: any): void;
         customFromJson(initValue: any): boolean;
     }
+    interface ClientObjectListConstructor {
+        new<T>(context: SP.ClientRuntimeContext, objectPath: SP.ObjectPath, childItemType: any): ClientObjectList<T>;
+    }
+    let ClientObjectList: ClientObjectListConstructor;
     class ClientObjectPrototype {
         retrieve(propertyNames?: string[]): void;
         retrieveObject(propertyName: string): SP.ClientObjectPrototype;
@@ -2175,8 +2209,8 @@ declare namespace SP {
     }
     class ClientRequestSucceededEventArgs extends SP.ClientRequestEventArgs {
     }
-    class ClientRuntimeContext implements Sys.IDisposable {
-        constructor(serverRelativeUrlOrFullUrl: string);
+    interface ClientRuntimeContext extends Sys.IDisposable {
+        new(serverRelativeUrlOrFullUrl: string);
         get_url(): string;
         get_viaUrl(): string;
         set_viaUrl(value: string): void;
@@ -2413,13 +2447,16 @@ declare namespace SP {
         assemblyVersion: string;
         wssMajorVersion: string;
     }
-    class ClientContext extends SP.ClientRuntimeContext {
-        constructor(serverRelativeUrlOrFullUrl?: string);
-        static get_current(): SP.ClientContext;
+    interface ClientContext extends SP.ClientRuntimeContext {
         get_web(): SP.Web;
         get_site(): SP.Site;
         get_serverVersion(): string;
     }
+    interface ClientContextConstructor {
+        new(serverRelativeUrlOrFullUrl?: string): ClientContext;
+        get_current(): SP.ClientContext;
+    }
+    let ClientContext: ClientContextConstructor;
     enum ULSTraceLevel {
         verbose,
     }
@@ -2557,7 +2594,7 @@ declare namespace SP {
         get_serverRelativeUrl(): string;
         deleteObject(): void;
     }
-    class AttachmentCollection extends SP.ClientObjectCollection<Attachment> {
+    interface AttachmentCollection extends SP.ClientObjectCollection<Attachment> {
         itemAt(index: number): SP.Attachment;
         get_item(index: number): SP.Attachment;
         getByFileName(fileName: string): SP.Attachment;
@@ -2654,7 +2691,7 @@ declare namespace SP {
         get_alertId(): SP.Guid;
         get_webId(): SP.Guid;
     }
-    class ChangeCollection extends SP.ClientObjectCollection<Change> {
+    interface ChangeCollection extends SP.ClientObjectCollection<Change> {
         itemAt(index: number): SP.Change;
         get_item(index: number): SP.Change;
     }
@@ -2874,7 +2911,7 @@ declare namespace SP {
         update(updateChildren: boolean): void;
         deleteObject(): void;
     }
-    class ContentTypeCollection extends SP.ClientObjectCollection<ContentType> {
+    interface ContentTypeCollection extends SP.ClientObjectCollection<ContentType> {
         itemAt(index: number): SP.ContentType;
         get_item(index: number): SP.ContentType;
         getById(contentTypeId: string): SP.ContentType;
@@ -2932,7 +2969,7 @@ declare namespace SP {
         update(): void;
         deleteObject(): void;
     }
-    class EventReceiverDefinitionCollection extends SP.ClientObjectCollection<EventReceiverDefinition> {
+    interface EventReceiverDefinitionCollection extends SP.ClientObjectCollection<EventReceiverDefinition> {
         itemAt(index: number): SP.EventReceiverDefinition;
         get_item(index: number): SP.EventReceiverDefinition;
         getById(eventReceiverId: SP.Guid): SP.EventReceiverDefinition;
@@ -3043,7 +3080,7 @@ declare namespace SP {
     class Feature extends SP.ClientObject {
         get_definitionId(): SP.Guid;
     }
-    class FeatureCollection extends SP.ClientObjectCollection<Feature> {
+    interface FeatureCollection extends SP.ClientObjectCollection<Feature> {
         itemAt(index: number): SP.Feature;
         get_item(index: number): SP.Feature;
         getById(featureId: SP.Guid): SP.Feature;
@@ -3136,7 +3173,7 @@ declare namespace SP {
         get_editFormat(): SP.ChoiceFormatType;
         set_editFormat(value: SP.ChoiceFormatType): void;
     }
-    class FieldCollection extends SP.ClientObjectCollection<Field> {
+    interface FieldCollection extends SP.ClientObjectCollection<Field> {
         itemAt(index: number): SP.Field;
         get_item(index: number): SP.Field;
         get_schemaXml(): string;
@@ -3195,7 +3232,7 @@ declare namespace SP {
         set_required(value: boolean): void;
         deleteObject(): void;
     }
-    class FieldLinkCollection extends SP.ClientObjectCollection<FieldLink> {
+    interface FieldLinkCollection extends SP.ClientObjectCollection<FieldLink> {
         itemAt(index: number): SP.FieldLink;
         get_item(index: number): SP.FieldLink;
         getById(id: SP.Guid): SP.FieldLink;
@@ -3408,7 +3445,7 @@ declare namespace SP {
         recycle(): SP.GuidResult;
         checkOut(): void;
     }
-    class FileCollection extends SP.ClientObjectCollection<File> {
+    interface FileCollection extends SP.ClientObjectCollection<File> {
         itemAt(index: number): SP.File;
         get_item(index: number): SP.File;
         getByUrl(url: string): SP.File;
@@ -3461,7 +3498,7 @@ declare namespace SP {
         get_versionLabel(): string;
         deleteObject(): void;
     }
-    class FileVersionCollection extends SP.ClientObjectCollection<FileVersion> {
+    interface FileVersionCollection extends SP.ClientObjectCollection<FileVersion> {
         itemAt(index: number): SP.FileVersion;
         get_item(index: number): SP.FileVersion;
         getById(versionid: number): SP.FileVersion;
@@ -3488,7 +3525,7 @@ declare namespace SP {
         deleteObject(): void;
         recycle(): SP.GuidResult;
     }
-    class FolderCollection extends SP.ClientObjectCollection<Folder> {
+    interface FolderCollection extends SP.ClientObjectCollection<Folder> {
         itemAt(index: number): SP.Folder;
         get_item(index: number): SP.Folder;
         getByUrl(url: string): SP.Folder;
@@ -3499,7 +3536,7 @@ declare namespace SP {
         get_serverRelativeUrl(): string;
         get_formType(): SP.PageType;
     }
-    class FormCollection extends SP.ClientObjectCollection<Form> {
+    interface FormCollection extends SP.ClientObjectCollection<Form> {
         itemAt(index: number): SP.Form;
         get_item(index: number): SP.Form;
         getByPageType(formType: SP.PageType): SP.Form;
@@ -3535,7 +3572,7 @@ declare namespace SP {
         get_users(): SP.UserCollection;
         update(): void;
     }
-    class GroupCollection extends SP.ClientObjectCollection<Group> {
+    interface GroupCollection extends SP.ClientObjectCollection<Group> {
         itemAt(index: number): SP.Group;
         get_item(index: number): SP.Group;
         getByName(name: string): SP.Group;
@@ -3826,7 +3863,7 @@ declare namespace SP {
         addItem(parameters: SP.ListItemCreationInformation): SP.ListItem<T>;
     }
     /** Represents a collection of SP.List objects */
-    class ListCollection extends SP.ClientObjectCollection<List> {
+    interface ListCollection extends SP.ClientObjectCollection<List> {
         /** Gets the list at the specified index in the collection. */
         itemAt<T = any>(index: number): SP.List<T>;
         /** Gets the list at the specified index in the collection. */
@@ -3949,7 +3986,7 @@ declare namespace SP {
         /** Validates form values specified for the list item. Errors are returned through hasException and errorMessage properties of the ListItemFormUpdateValue objects */
         validateUpdateListItem(formValues: SP.ListItemFormUpdateValue[], bNewDocumentUpdate: boolean): SP.ListItemFormUpdateValue[];
     }
-    class ListItemCollection<T = any> extends SP.ClientObjectCollection<ListItem<T>> {
+    interface ListItemCollection<T = any> extends SP.ClientObjectCollection<ListItem<T>> {
         itemAt(index: number): SP.ListItem<T>;
         get_item(index: number): SP.ListItem<T>;
         getById(id: number | string): SP.ListItem<T>;
@@ -3977,7 +4014,7 @@ declare namespace SP {
         writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
         constructor();
     }
-    class ListItemEntityCollection<T> extends SP.ClientObjectCollection<ListItem<T>> {
+    interface ListItemEntityCollection<T> extends SP.ClientObjectCollection<ListItem<T>> {
         itemAt(index: number): SP.ListItem<T>;
         get_item(index: number): SP.ListItem<T>;
     }
@@ -4008,7 +4045,7 @@ declare namespace SP {
         get_listTemplateTypeKind(): number;
         get_unique(): boolean;
     }
-    class ListTemplateCollection extends SP.ClientObjectCollection<ListTemplate> {
+    interface ListTemplateCollection extends SP.ClientObjectCollection<ListTemplate> {
         itemAt(index: number): SP.ListTemplate;
         get_item(index: number): SP.ListTemplate;
         getByName(name: string): SP.ListTemplate;
@@ -4102,7 +4139,7 @@ declare namespace SP {
         update(): void;
         deleteObject(): void;
     }
-    class NavigationNodeCollection extends SP.ClientObjectCollection<NavigationNode> {
+    interface NavigationNodeCollection extends SP.ClientObjectCollection<NavigationNode> {
         itemAt(index: number): SP.NavigationNode;
         get_item(index: number): SP.NavigationNode;
         add(parameters: SP.NavigationNodeCreationInformation): SP.NavigationNode;
@@ -4192,7 +4229,7 @@ declare namespace SP {
         get_user(): SP.User;
         update(): void;
     }
-    class PushNotificationSubscriberCollection extends SP.ClientObjectCollection<PushNotificationSubscriber> {
+    interface PushNotificationSubscriberCollection extends SP.ClientObjectCollection<PushNotificationSubscriber> {
         itemAt(index: number): SP.PushNotificationSubscriber;
         get_item(index: number): SP.PushNotificationSubscriber;
         getByStoreId(id: string): SP.PushNotificationSubscriber;
@@ -4216,7 +4253,7 @@ declare namespace SP {
         deleteObject(): void;
         restore(): void;
     }
-    class RecycleBinItemCollection extends SP.ClientObjectCollection<RecycleBinItem> {
+    interface RecycleBinItemCollection extends SP.ClientObjectCollection<RecycleBinItem> {
         itemAt(index: number): SP.RecycleBinItem;
         get_item(index: number): SP.RecycleBinItem;
         getById(id: SP.Guid): SP.RecycleBinItem;
@@ -4281,7 +4318,7 @@ declare namespace SP {
         get_relationshipDeleteBehavior(): SP.RelationshipDeleteBehaviorType;
         get_webId(): SP.Guid;
     }
-    class RelatedFieldCollection extends SP.ClientObjectCollection<RelatedField> {
+    interface RelatedFieldCollection extends SP.ClientObjectCollection<RelatedField> {
         itemAt(index: number): SP.RelatedField;
         get_item(index: number): SP.RelatedField;
     }
@@ -4293,7 +4330,7 @@ declare namespace SP {
         get_toolTipDescription(): string;
         get_webId(): SP.Guid;
     }
-    class RelatedFieldExtendedDataCollection extends SP.ClientObjectCollection<RelatedFieldExtendedData> {
+    interface RelatedFieldExtendedDataCollection extends SP.ClientObjectCollection<RelatedFieldExtendedData> {
         itemAt(index: number): SP.RelatedFieldExtendedData;
         get_item(index: number): SP.RelatedFieldExtendedData;
     }
@@ -4342,7 +4379,7 @@ declare namespace SP {
         update(): void;
         deleteObject(): void;
     }
-    class RoleAssignmentCollection extends SP.ClientObjectCollection<RoleAssignment> {
+    interface RoleAssignmentCollection extends SP.ClientObjectCollection<RoleAssignment> {
         itemAt(index: number): SP.RoleAssignment;
         get_item(index: number): SP.RoleAssignment;
         get_groups(): SP.GroupCollection;
@@ -4365,16 +4402,19 @@ declare namespace SP {
         update(): void;
         deleteObject(): void;
     }
-    class RoleDefinitionBindingCollection extends SP.ClientObjectCollection<RoleDefinition> {
+    interface RoleDefinitionBindingCollectionConstructor {
+        new(context: SP.ClientRuntimeContext): SP.RoleDefinitionBindingCollection;
+        newObject(context: SP.ClientRuntimeContext): SP.RoleDefinitionBindingCollection;
+    }
+    interface RoleDefinitionBindingCollection extends SP.ClientObjectCollection<RoleDefinition> {
         itemAt(index: number): SP.RoleDefinition;
         get_item(index: number): SP.RoleDefinition;
-        constructor(context: SP.ClientRuntimeContext);
-        static newObject(context: SP.ClientRuntimeContext): SP.RoleDefinitionBindingCollection;
         add(roleDefinition: SP.RoleDefinition): void;
         remove(roleDefinition: SP.RoleDefinition): void;
         removeAll(): void;
     }
-    class RoleDefinitionCollection extends SP.ClientObjectCollection<RoleDefinition> {
+    let RoleDefinitionBindingCollection: RoleDefinitionBindingCollectionConstructor;
+    interface RoleDefinitionCollection extends SP.ClientObjectCollection<RoleDefinition> {
         itemAt(index: number): SP.RoleDefinition;
         get_item(index: number): SP.RoleDefinition;
         getByName(name: string): SP.RoleDefinition;
@@ -4487,7 +4527,7 @@ declare namespace SP {
         localTimeToUTC(date: Date): SP.DateTimeResult;
         utcToLocalTime(date: Date): SP.DateTimeResult;
     }
-    class TimeZoneCollection extends SP.ClientObjectCollection<TimeZone> {
+    interface TimeZoneCollection extends SP.ClientObjectCollection<TimeZone> {
         itemAt(index: number): SP.TimeZone;
         get_item(index: number): SP.TimeZone;
         getById(id: number): SP.TimeZone;
@@ -4556,7 +4596,7 @@ declare namespace SP {
         get_userId(): SP.UserIdInfo;
         update(): void;
     }
-    class UserCollection extends SP.ClientObjectCollection<User> {
+    interface UserCollection extends SP.ClientObjectCollection<User> {
         itemAt(index: number): SP.User;
         get_item(index: number): SP.User;
         getByLoginName(loginName: string): SP.User;
@@ -4614,7 +4654,7 @@ declare namespace SP {
         update(): void;
         deleteObject(): void;
     }
-    class UserCustomActionCollection extends SP.ClientObjectCollection<UserCustomAction> {
+    interface UserCustomActionCollection extends SP.ClientObjectCollection<UserCustomAction> {
         itemAt(index: number): SP.UserCustomAction;
         get_item(index: number): SP.UserCustomAction;
         getById(id: SP.Guid): SP.UserCustomAction;
@@ -4707,7 +4747,7 @@ declare namespace SP {
         renderAsHtml(): SP.StringResult;
         update(): void;
     }
-    class ViewCollection extends SP.ClientObjectCollection<View> {
+    interface ViewCollection extends SP.ClientObjectCollection<View> {
         itemAt(index: number): SP.View;
         get_item(index: number): SP.View;
         getByTitle(strTitle: string): SP.View;
@@ -4735,7 +4775,7 @@ declare namespace SP {
         writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
         constructor();
     }
-    class ViewFieldCollection extends SP.ClientObjectCollection<string> {
+    interface ViewFieldCollection extends SP.ClientObjectCollection<string> {
         itemAt(index: number): string;
         get_item(index: number): string;
         get_schemaXml(): string;
@@ -4867,7 +4907,7 @@ declare namespace SP {
         /** Available after March 2015 CU for SharePoint 2013*/
         getList(url: string): List;
     }
-    class WebCollection extends SP.ClientObjectCollection<Web> {
+    interface WebCollection extends SP.ClientObjectCollection<Web> {
         itemAt(index: number): SP.Web;
         get_item(index: number): SP.Web;
         add(parameters: SP.WebCreationInformation): SP.Web;
@@ -4940,7 +4980,7 @@ declare namespace SP {
         get_name(): string;
         get_title(): string;
     }
-    class WebTemplateCollection extends SP.ClientObjectCollection<WebTemplate> {
+    interface WebTemplateCollection extends SP.ClientObjectCollection<WebTemplate> {
         itemAt(index: number): SP.WebTemplate;
         get_item(index: number): SP.WebTemplate;
         getByName(name: string): SP.WebTemplate;
@@ -5268,14 +5308,17 @@ declare namespace Microsoft.SharePoint.Client.Search {
             exportPopularQueries: (web: SP.Web, sourceId: SP.Guid) => SP.JsonObjectResult;
         }
 
-        class StringCollection extends SP.ClientObjectCollection<string> {
-            constructor(context: SP.ClientContext);
+        interface StringCollection extends SP.ClientObjectCollection<string> {
             itemAt: (index: number) => string;
             get_item: (index: number) => string;
             get_childItemType: () => typeof String;
             add: (property: string) => void;
             clear: () => void;
         }
+        interface StringCollectionConstructor {
+            new(context: SP.ClientContext): StringCollection;
+        }
+        let StringCollection: StringCollectionConstructor;
 
         class QueryPersonalizationData extends SP.ClientObject {
             // It's really empty;
@@ -5349,7 +5392,7 @@ declare namespace Microsoft.SharePoint.Client.Search {
             static getQueryPropertyValueType: (val: QueryPropertyValue) => QueryPropertyValueType;
             static queryPropertyValueToObject: (val: QueryPropertyValue) => any;
         }
-        class ReorderingRuleCollection extends SP.ClientObjectCollection<ReorderingRule> {
+        interface ReorderingRuleCollection extends SP.ClientObjectCollection<ReorderingRule> {
             itemAt: (index: number) => ReorderingRule;
             get_item: (index: number) => ReorderingRule;
             get_childItemType: () => typeof ReorderingRule;
@@ -5380,7 +5423,7 @@ declare namespace Microsoft.SharePoint.Client.Search {
             set_matchValue: (value: string) => void;
         }
 
-        class SortCollection extends SP.ClientObjectCollection<Sort> {
+        interface SortCollection extends SP.ClientObjectCollection<Sort> {
             itemAt: (index: number) => Sort;
             get_item: (index: number) => Sort;
             get_childItemType: () => typeof Sort;
@@ -5714,7 +5757,7 @@ declare namespace SP {
         class MethodExecutionResult extends SP.ClientObject {
             get_returnParameterCollection(): SP.BusinessData.ReturnParameterCollection;
         }
-        class ReturnParameterCollection extends SP.ClientObjectCollection<SP.BusinessData.Runtime.EntityFieldValueDictionary> {
+        interface ReturnParameterCollection extends SP.ClientObjectCollection<SP.BusinessData.Runtime.EntityFieldValueDictionary> {
             itemAt(index: number): SP.BusinessData.Runtime.EntityFieldValueDictionary;
             get_item(index: number): SP.BusinessData.Runtime.EntityFieldValueDictionary;
         }
@@ -5733,28 +5776,28 @@ declare namespace SP {
             getParentTypeDescriptor(): SP.BusinessData.TypeDescriptor;
         }
         namespace Collections {
-            class EntityFieldCollection extends SP.ClientObjectCollection<SP.BusinessData.EntityField> {
+            interface EntityFieldCollection extends SP.ClientObjectCollection<SP.BusinessData.EntityField> {
                 itemAt(index: number): SP.BusinessData.EntityField;
                 get_item(index: number): SP.BusinessData.EntityField;
             }
-            class EntityIdentifierCollection extends SP.ClientObjectCollection<SP.BusinessData.EntityIdentifier> {
+            interface EntityIdentifierCollection extends SP.ClientObjectCollection<SP.BusinessData.EntityIdentifier> {
                 itemAt(index: number): SP.BusinessData.EntityIdentifier;
                 get_item(index: number): SP.BusinessData.EntityIdentifier;
             }
-            class EntityInstanceCollection extends SP.ClientObjectCollection<SP.BusinessData.Runtime.EntityInstance> {
+            interface EntityInstanceCollection extends SP.ClientObjectCollection<SP.BusinessData.Runtime.EntityInstance> {
                 itemAt(index: number): SP.BusinessData.Runtime.EntityInstance;
                 get_item(index: number): SP.BusinessData.Runtime.EntityInstance;
             }
-            class FilterCollection extends SP.ClientObjectCollection<SP.BusinessData.Filter> {
+            interface FilterCollection extends SP.ClientObjectCollection<SP.BusinessData.Filter> {
                 itemAt(index: number): SP.BusinessData.Filter;
                 get_item(index: number): SP.BusinessData.Filter;
                 setFilterValue(inputFilterName: string, valueIndex: number, value: any): void;
             }
-            class LobSystemInstanceCollection extends SP.ClientObjectCollection<SP.BusinessData.LobSystemInstance> {
+            interface LobSystemInstanceCollection extends SP.ClientObjectCollection<SP.BusinessData.LobSystemInstance> {
                 itemAt(index: number): SP.BusinessData.LobSystemInstance;
                 get_item(index: number): SP.BusinessData.LobSystemInstance;
             }
-            class TypeDescriptorCollection extends SP.ClientObjectCollection<SP.BusinessData.TypeDescriptor> {
+            interface TypeDescriptorCollection extends SP.ClientObjectCollection<SP.BusinessData.TypeDescriptor> {
                 itemAt(index: number): SP.BusinessData.TypeDescriptor;
                 get_item(index: number): SP.BusinessData.TypeDescriptor;
             }
@@ -6563,7 +6606,7 @@ declare namespace SP {
             getDefaultSiteCollectionTermStore(): TermStore;
         }
 
-        class TermStoreCollection extends SP.ClientObjectCollection<TermStore> {
+        interface TermStoreCollection extends SP.ClientObjectCollection<TermStore> {
             itemAt(index: number): TermStore;
             get_item(index: number): TermStore;
             getById(id: SP.Guid): TermStore;
@@ -6624,7 +6667,7 @@ declare namespace SP {
             deleteObject(): void;
         }
 
-        class TermGroupCollection extends SP.ClientObjectCollection<TermGroup> {
+        interface TermGroupCollection extends SP.ClientObjectCollection<TermGroup> {
             itemAt(index: number): TermGroup;
             get_item(index: number): TermGroup;
             getById(id: SP.Guid): TermGroup;
@@ -6661,7 +6704,7 @@ declare namespace SP {
             setCustomProperty(name: string, value: string): void;
         }
 
-        class TermSetCollection extends SP.ClientObjectCollection<TermSet> {
+        interface TermSetCollection extends SP.ClientObjectCollection<TermSet> {
             itemAt(index: number): TermSet;
             get_item(index: number): TermSet;
             getById(id: SP.Guid): TermSet;
@@ -6691,7 +6734,7 @@ declare namespace SP {
             move(targetGroup: TermGroup): void;
         }
 
-        class TermCollection extends SP.ClientObjectCollection<Term> {
+        interface TermCollection extends SP.ClientObjectCollection<Term> {
             itemAt(index: number): Term;
             get_item(index: number): Term;
             getById(id: SP.Guid): Term;
@@ -6745,7 +6788,7 @@ declare namespace SP {
             getPath(lcid: number): SP.StringResult;
         }
 
-        class LabelCollection extends SP.ClientObjectCollection<Label> {
+        interface LabelCollection extends SP.ClientObjectCollection<Label> {
             itemAt(index: number): Label;
             get_item(index: number): Label;
             getByValue(name: string): Label;
@@ -6808,7 +6851,7 @@ declare namespace SP {
             set_withinTimeSpan(value: number): void;
         }
 
-        class ChangedItemCollection extends SP.ClientObjectCollection<ChangedItem> {
+        interface ChangedItemCollection extends SP.ClientObjectCollection<ChangedItem> {
             itemAt(index: number): ChangedItem;
             get_item(index: number): ChangedItem;
         }
@@ -6885,12 +6928,15 @@ declare namespace SP {
             getValidatedString(value: TaxonomyFieldValue): SP.StringResult;
         }
 
-        class TaxonomyFieldValueCollection extends SP.ClientObjectCollection<TaxonomyFieldValue> {
-            constructor(context: SP.ClientContext, fieldValue: string, creatingField: SP.Field);
+        interface TaxonomyFieldValueCollection extends SP.ClientObjectCollection<TaxonomyFieldValue> {
             itemAt(index: number): TaxonomyFieldValue;
             get_item(index: number): TaxonomyFieldValue;
             populateFromLabelGuidPairs(text: string): void;
         }
+        interface TaxonomyFieldValueCollectionConstructor {
+            new(context: SP.ClientContext, fieldValue: string, creatingField: SP.Field): TaxonomyFieldValueCollection;
+        }
+        let TaxonomyFieldValueCollection: TaxonomyFieldValueCollectionConstructor;
 
         class TaxonomyFieldValue extends SP.ClientValueObject {
             get_label(): string;
@@ -7509,7 +7555,7 @@ declare namespace SP {
             get_useCount(): number;
         }
 
-        class HashTagCollection extends SP.ClientObjectCollection<HashTag> {
+        interface HashTagCollection extends SP.ClientObjectCollection<HashTag> {
             itemAt(index: number): HashTag;
             get_item(index: number): HashTag;
         }
@@ -8141,7 +8187,7 @@ declare namespace SP {
             deleteWebPart(): void;
             moveWebPartTo(zoneID: string, zoneIndex: number): void;
         }
-        class WebPartDefinitionCollection extends SP.ClientObjectCollection<WebPartDefinition> {
+        interface WebPartDefinitionCollection extends SP.ClientObjectCollection<WebPartDefinition> {
             itemAt(index: number): SP.WebParts.WebPartDefinition;
             get_item(index: number): SP.WebParts.WebPartDefinition;
             getById(id: SP.Guid): SP.WebParts.WebPartDefinition;
@@ -8183,7 +8229,7 @@ declare namespace SP {
             update(): void;
             deleteObject(): void;
         }
-        class WorkflowAssociationCollection extends SP.ClientObjectCollection<WorkflowAssociation> {
+        interface WorkflowAssociationCollection extends SP.ClientObjectCollection<WorkflowAssociation> {
             itemAt(index: number): SP.Workflow.WorkflowAssociation;
             get_item(index: number): SP.Workflow.WorkflowAssociation;
             getById(associationId: SP.Guid): SP.Workflow.WorkflowAssociation;
@@ -8218,7 +8264,7 @@ declare namespace SP {
             get_name(): string;
             get_permissionsManual(): SP.BasePermissions;
         }
-        class WorkflowTemplateCollection extends SP.ClientObjectCollection<WorkflowTemplate> {
+        interface WorkflowTemplateCollection extends SP.ClientObjectCollection<WorkflowTemplate> {
             itemAt(index: number): SP.Workflow.WorkflowTemplate;
             get_item(index: number): SP.Workflow.WorkflowTemplate;
             getById(templateId: SP.Guid): SP.Workflow.WorkflowTemplate;
@@ -8314,7 +8360,7 @@ declare namespace SP.WorkflowServices {
     }
 
     /** Represents a collection of WorkflowDefinition objects */
-    class WorkflowDefinitionCollection extends SP.ClientObjectCollection<WorkflowDefinition> {
+    interface WorkflowDefinitionCollection extends SP.ClientObjectCollection<WorkflowDefinition> {
         itemAt(index: number): WorkflowDefinition;
         get_item(index: number): WorkflowDefinition;
         /** returns SP.WorkflowDefinition class */
@@ -8391,7 +8437,7 @@ declare namespace SP.WorkflowServices {
     }
 
     /** Represents a collection of WorkflowInstance objects */
-    class WorkflowInstanceCollection extends SP.ClientObjectCollection<WorkflowInstance> {
+    interface WorkflowInstanceCollection extends SP.ClientObjectCollection<WorkflowInstance> {
         itemAt(index: number): WorkflowInstance;
         get_item(index: number): WorkflowInstance;
         /** returns SP.WorkflowInstance class */
@@ -8504,7 +8550,7 @@ declare namespace SP.WorkflowServices {
     }
 
     /** Represents a collection of WorkflowSubscription objects */
-    class WorkflowSubscriptionCollection extends SP.ClientObjectCollection<WorkflowSubscription> {
+    interface WorkflowSubscriptionCollection extends SP.ClientObjectCollection<WorkflowSubscription> {
         itemAt(index: number): WorkflowSubscription;
         get_item(index: number): WorkflowSubscription;
         /** returns SP.WorkflowInstance class */
@@ -8772,7 +8818,7 @@ declare namespace SP {
                 getResolvedDisplayUrl(browserQueryString: string): StringResult;
             }
 
-            class NavigationTermCollection extends ClientObjectCollection<NavigationTerm> {
+            interface NavigationTermCollection extends ClientObjectCollection<NavigationTerm> {
             }
 
             class NavigationTerm extends NavigationTermSetItem {
@@ -8860,7 +8906,7 @@ declare namespace SP {
                 static getAsResolvedByView(context: ClientContext, termSet: Taxonomy.TermSet, view: NavigationTermSetView): NavigationTermSet;
             }
 
-            class NavigationTermProviderNameCollection extends ClientObjectCollection<string> {
+            interface NavigationTermProviderNameCollection extends ClientObjectCollection<string> {
                 Add(item: string): void;
                 Clear(): void;
                 Remove(item: string): BooleanResult;
diff --git a/types/stripe/index.d.ts b/types/stripe/index.d.ts
index 1f5ac99223..c8d228a612 100644
--- a/types/stripe/index.d.ts
+++ b/types/stripe/index.d.ts
@@ -1,10 +1,11 @@
-// Type definitions for stripe 4.8
+// Type definitions for stripe 4.9
 // Project: https://github.com/stripe/stripe-node/
 // Definitions by: William Johnston <https://github.com/wjohnsto>
 //                 Peter Harris <https://github.com/codeanimal>
 //                 Sampson Oliver <https://github.com/sampsonjoliver>
 //                 Linus Unnebäck <https://github.com/LinusU>
 //                 Brannon Jones <https://github.com/brannon>
+//                 Kyle Kamperschroer <https://github.com/kkamperschroer>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />
@@ -735,7 +736,7 @@ declare namespace Stripe {
              * The application fee (if any) for the charge. See the Connect documentation
              * for details. [Expandable]
              */
-            application_fee?: string;
+            application_fee?: string | applicationFees.IApplicationFee;
 
             /**
              * ID of the balance transaction that describes the impact of this charge on
@@ -4258,7 +4259,10 @@ declare namespace Stripe {
              */
             current_period_start: number;
 
-            customer: string;
+            /**
+             * ID of the customer who owns the subscription. [Expandable]
+             */
+            customer: string | customers.ICustomer;
 
             /**
              * Describes the current discount applied to this subscription, if there is one. When billing, a discount applied to a
diff --git a/types/stripe/stripe-tests.ts b/types/stripe/stripe-tests.ts
index f0687aa9f1..0df4ec257c 100644
--- a/types/stripe/stripe-tests.ts
+++ b/types/stripe/stripe-tests.ts
@@ -82,9 +82,15 @@ stripe.charges.create({
 
 stripe.charges.retrieve("ch_15fvyXEe31JkLCeQOo0SwFk9", function (err, charge) {
     // asynchronously called
+    if (typeof charge.application_fee === "object") {
+        charge.application_fee.amount;
+    }
 });
 stripe.charges.retrieve("ch_15fvyXEe31JkLCeQOo0SwFk9").then(function (charge) {
     // asynchronously called
+    if (typeof charge.application_fee === "object") {
+        charge.application_fee.amount;
+    }
 });
 
 stripe.charges.update(
@@ -1083,9 +1089,15 @@ stripe.subscriptions.create({ plan: "platypi-dev", customer: "cus_5rfJKDJkuxzh5Q
 
 stripe.subscriptions.retrieve("sub_8QwCiwZ9tmMSpt", function(err, subscription) {
     // asynchronously called
+    if (typeof subscription.customer === "object") {
+        subscription.customer.email;
+    }
 });
 stripe.subscriptions.retrieve("sub_8QwCiwZ9tmMSpt").then(function(subscription) {
     // asynchronously called
+    if (typeof subscription.customer === "object") {
+        subscription.customer.email;
+    }
 });
 
 stripe.subscriptions.update("sub_8QwCiwZ9tmMSpt", { plan: "platypi" }, function(err, subscription) {
diff --git a/types/supertest/index.d.ts b/types/supertest/index.d.ts
index 6da2f54206..0716f9e1b5 100644
--- a/types/supertest/index.d.ts
+++ b/types/supertest/index.d.ts
@@ -32,7 +32,10 @@ declare namespace supertest {
       end(callback?: CallbackHandler): this;
     }
 
-    function agent(app?: any): SuperTest<Test>;
+    interface AgentOptions {
+      ca?: any;
+    }
+    function agent(app?: any, options?: AgentOptions): SuperTest<Test>;
 
     interface SuperTest<T extends superagent.SuperAgentRequest> extends superagent.SuperAgent<T> {
     }
diff --git a/types/supertest/supertest-tests.ts b/types/supertest/supertest-tests.ts
index 7241aac5c3..868aa8fdce 100644
--- a/types/supertest/supertest-tests.ts
+++ b/types/supertest/supertest-tests.ts
@@ -42,6 +42,11 @@ client
       });
   });
 
+// allow passing trusted CA as option to TestAgent
+supertest.agent(app, {
+  ca: 'test ca',
+});
+
 // functional expect
 (request
   .get('/') as supertest.Test)
diff --git a/types/swagger-tools/index.d.ts b/types/swagger-tools/index.d.ts
index 4f39031477..0fc0c91969 100644
--- a/types/swagger-tools/index.d.ts
+++ b/types/swagger-tools/index.d.ts
@@ -8,32 +8,42 @@ import { NextHandleFunction } from 'connect';
 import { IncomingMessage, ServerResponse } from 'http';
 
 export interface SwaggerParameterSchema {
+    allowMultiple?: boolean;
+    description?: string;
+    format?: string;
+    in?: string;
+    maximum?: string;
+    minimum?: string;
     name: string;
-    in: string;
+    paramType?: string;
+    required?: boolean;
+    type: string;
 }
 
-export interface SwaggerRequestParameter {
-    path: string;
+export interface SwaggerRequestParameter<T> {
+    path: string[];
     schema: SwaggerParameterSchema;
     originalValue: any;
-    value: any;
+    value: T;
 }
 
 export interface SwaggerRequestParameters {
-    [paramName: string]: SwaggerRequestParameter;
+    [paramName: string]: SwaggerRequestParameter<any>;
 }
 
 export interface Swagger12Request extends IncomingMessage {
     swagger: {
-        api: string;
+        api: any;
         apiDeclaration: any;
         apiIndex: number;
-        authorizations?: any[];
-        operation?: string;
-        operationPath?: string;
+        authorizations?: any;
+        operation?: any;
+        operationPath?: string[];
         params: SwaggerRequestParameters;
         resourceIndex: number;
         resourceListing: any;
+        swaggerVersion: string;
+        useStubs?: boolean;
     };
 }
 
@@ -50,20 +60,40 @@ export interface SwaggerRouter12Options {
 }
 
 export interface OperationParameter {
-    path: string;
+    path: string[];
     schema: SwaggerParameterSchema;
 }
 
+export interface Swagger20Security {
+    [name: string]: any;
+}
+
+export interface Swagger20Response {
+    description?: string;
+    schema?: any;
+}
+
+export interface Swagger20Operation {
+    operationId?: string;
+    parameters?: SwaggerParameterSchema[];
+    responses: { [code: string]: Swagger20Response };
+    security?: Swagger20Security[];
+    summary?: string;
+    tags?: string[];
+}
+
 export interface Swagger20Request extends IncomingMessage {
     swagger: {
         apiPath: string;
-        operation?: string;
-        operationPath?: string;
+        operation?: Swagger20Operation;
+        operationPath?: string[];
         operationParameters?: OperationParameter[];
-        path: string;
+        path: any;
         params: SwaggerRequestParameters;
         security: any[];
         swaggerObject: any;
+        swaggerVersion: string;
+        useStubs?: boolean;
     };
 }
 
diff --git a/types/swagger-tools/swagger-tools-tests.ts b/types/swagger-tools/swagger-tools-tests.ts
index 12a7993819..8bf1b94800 100644
--- a/types/swagger-tools/swagger-tools-tests.ts
+++ b/types/swagger-tools/swagger-tools-tests.ts
@@ -37,17 +37,102 @@ swaggerTools.initializeMiddleware(swaggerDoc20, middleware => {
     // Test passing in the handlers directly
     app.use(middleware.swaggerRouter({
         controllers: {
-            foo_bar: (req, res, next) => {
-                console.log(req.swagger.apiPath);
-                console.log(req.swagger.operation);
-                console.log(req.swagger.operationParameters);
-                console.log(req.swagger.operationPath);
-                console.log(req.swagger.path);
-                console.log(req.swagger.security);
-                console.log(req.swagger.swaggerObject);
+            // These tests are based on tests here:
+            // https://github.com/apigee-127/swagger-tools/blob/0cea535b122265c6d01546e199e2e8fda4c0f5da/test/2.0/test-middleware-swagger-metadata.js#L102-L138
 
-                console.log(req.swagger.params.location.value);
-                console.log(req.swagger.params.unit.value);
+            foo_bar: (req, res, next) => {
+                req.swagger.swaggerVersion = '2.0';
+                req.swagger.apiPath = '/pets/{id}';
+                req.swagger.operation = {
+                    security: [
+                        {
+                            oauth2: ["read"]
+                        }
+                    ],
+                    tags: [ "Pet Operations" ],
+                    operationId: "getPetById",
+                    summary: "Finds the pet by id",
+                    responses: {
+                        200: {
+                            description: "Pet response",
+                            schema: {
+                                $ref: "#/definitions/Pet"
+                            }
+                        },
+                        default: {
+                            description: "Unexpected error",
+                            schema: {
+                                $ref: "#/definitions/Error"
+                            }
+                        }
+                    },
+                    parameters: [
+                        {
+                            in: 'query',
+                            name: 'mock',
+                            description: 'Mock mode',
+                            required: false,
+                            type: 'boolean'
+                        }
+                    ]
+                };
+
+                req.swagger.operationParameters = [
+                    {
+                        path: ['paths', '/pets/{id}', 'get', 'parameters', '0'],
+                        schema: {
+                            in: 'query',
+                            name: 'mock',
+                            description: 'Mock mode',
+                            required: false,
+                            type: 'boolean'
+                        },
+                    },
+                    {
+                        path: ['paths', '/pets/{id}', 'parameters', '0'],
+                        schema: {
+                            name: "id",
+                            in: "path",
+                            description: "ID of pet",
+                            required: true,
+                            type: "integer",
+                            format: "int64"
+                        }
+                    }
+                ];
+                req.swagger.operationPath = ['paths', '/pets/{id}', 'get'];
+                req.swagger.security = [
+                    {
+                        oauth2: [ 'read' ]
+                    }
+                ];
+                req.swagger.params = {
+                    id: {
+                        path: ['paths', '/pets/{id}', 'parameters', '0'],
+                        schema: {
+                            name: "id",
+                            in: "path",
+                            description: "ID of pet",
+                            required: true,
+                            type: "integer",
+                            format: "int64"
+                        },
+                        originalValue: '1',
+                        value: 1
+                    },
+                    mock: {
+                        path: ['paths', '/pets/{id}', 'get', 'parameters', '0'],
+                        schema: {
+                            in: 'query',
+                            name: 'mock',
+                            description: 'Mock mode',
+                            required: false,
+                            type: 'boolean'
+                        },
+                        originalValue: 'false',
+                        value: false
+                    }
+                };
 
                 res.setHeader('Content-Type', 'application/json');
                 res.end([ 'foo', 0 ]);
@@ -90,17 +175,139 @@ swaggerTools.initializeMiddleware(apiDoc12, apiDeclarations, middleware => {
     // Test passing in the handlers directly
     app.use(middleware.swaggerRouter({
         controllers: {
-            foo_bar: (req, res, next) => {
-                console.log(req.swagger.api);
-                console.log(req.swagger.apiDeclaration);
-                console.log(req.swagger.apiIndex);
-                console.log(req.swagger.operation);
-                console.log(req.swagger.operationPath);
-                console.log(req.swagger.resourceIndex);
-                console.log(req.swagger.resourceListing);
+            // These tests are based on tests here:
+            // https://github.com/apigee-127/swagger-tools/blob/0cea535b122265c6d01546e199e2e8fda4c0f5da/test/1.2/test-middleware-swagger-metadata.js#L72-L89
 
-                console.log(req.swagger.params.location.value);
-                console.log(req.swagger.params.unit.value);
+            foo_bar: (req, res, next) => {
+                req.swagger.swaggerVersion = '1.2';
+                req.swagger.api = {
+                    operations: [
+                        {
+                            authorizations: {},
+                            method: "GET",
+                            nickname: "getPetById",
+                            notes: "Returns a pet based on ID",
+                            parameters: [
+                                {
+                                    allowMultiple: false,
+                                    description: "ID of pet that needs to be fetched",
+                                    format: "int64",
+                                    maximum: "100000.0",
+                                    minimum: "1.0",
+                                    name: "petId",
+                                    paramType: "path",
+                                    required: true,
+                                    type: "integer"
+                                }
+                            ],
+                            responseMessages: [
+                                {
+                                    code: 400,
+                                    message: "Invalid ID supplied"
+                                },
+                                {
+                                    code: 404,
+                                    message: "Pet not found"
+                                }
+                            ],
+                            summary: "Find pet by ID",
+                            type: "Pet"
+                        },
+                        {
+                            authorizations: {
+                                oauth2: [
+                                    {
+                                        description: "modify pets in your account",
+                                        scope: "write:pets"
+                                    }
+                                ]
+                            },
+                            method: "DELETE",
+                            nickname: "deletePet",
+                            notes: "",
+                            parameters: [
+                                {
+                                    allowMultiple: false,
+                                    description: "Pet id to delete",
+                                    name: "petId",
+                                    paramType: "path",
+                                    required: true,
+                                    type: "string"
+                                }
+                            ],
+                            responseMessages: [
+                                {
+                                    code: 400,
+                                    message: "Invalid pet value"
+                                }
+                            ],
+                            summary: "Deletes a pet",
+                            type: "void"
+                        },
+                    ],
+                    path: "/pet/{petId}"
+                };
+
+                req.swagger.apiDeclaration = {};
+                req.swagger.apiIndex = 0;
+                req.swagger.authorizations = {
+                    oauth2: [
+                        {
+                            description: "modify pets in your account",
+                            scope: "write:pets"
+                        }
+                    ]
+                };
+                req.swagger.operation = {
+                    authorizations: {},
+                    method: "GET",
+                    nickname: "getPetById",
+                    notes: "Returns a pet based on ID",
+                    parameters: [
+                        {
+                            allowMultiple: false,
+                            description: "ID of pet that needs to be fetched",
+                            format: "int64",
+                            maximum: "100000.0",
+                            minimum: "1.0",
+                            name: "petId",
+                            paramType: "path",
+                            required: true,
+                            type: "integer"
+                        }
+                    ],
+                    responseMessages: [
+                        {
+                            code: 400,
+                            message: "Invalid ID supplied"
+                        },
+                        {
+                            code: 404,
+                            message: "Pet not found"
+                        }
+                    ],
+                    summary: "Find pet by ID",
+                    type: "Pet"
+                };
+                req.swagger.operationPath = ['apis', '0', 'operations', '0'];
+                req.swagger.params = {
+                    petId: {
+                        path: ['apis', '0', 'operations', '0', 'parameters', '0'],
+                        schema: {
+                            allowMultiple: false,
+                            description: "ID of pet that needs to be fetched",
+                            format: "int64",
+                            maximum: "100000.0",
+                            minimum: "1.0",
+                            name: "petId",
+                            paramType: "path",
+                            required: true,
+                            type: "integer"
+                        },
+                        originalValue: '1',
+                        value: 1
+                    }
+                };
 
                 res.setHeader('Content-Type', 'application/json');
                 res.end([ 'foo', 0 ]);
diff --git a/types/three/index.d.ts b/types/three/index.d.ts
index f9dcc7a762..473964d59d 100644
--- a/types/three/index.d.ts
+++ b/types/three/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for three.js 0.84
 // Project: http://mrdoob.github.com/three.js/
-// Definitions by: Kon <http://phyzkit.net/>, Satoru Kimura <https://github.com/gyohk>, Florent Poujol <https://github.com/florentpoujol>, SereznoKot <https://github.com/SereznoKot>, HouChunlei <https://github.com/omni360>, Ivo <https://github.com/ivoisbelongtous>, David Asmuth <https://github.com/piranha771>, Brandon Roberge, Qinsi ZHU <https://github.com/qszhusightp>, Toshiya Nakakura <https://github.com/nakakura>, Poul Kjeldager Sørensen <https://github.com/s093294>, Stefan Profanter <https://github.com/Pro>, Edmund Fokschaner <https://github.com/efokschaner>
+// Definitions by: Kon <http://phyzkit.net/>, Satoru Kimura <https://github.com/gyohk>, Florent Poujol <https://github.com/florentpoujol>, SereznoKot <https://github.com/SereznoKot>, HouChunlei <https://github.com/omni360>, Ivo <https://github.com/ivoisbelongtous>, David Asmuth <https://github.com/piranha771>, Brandon Roberge, Qinsi ZHU <https://github.com/qszhusightp>, Toshiya Nakakura <https://github.com/nakakura>, Poul Kjeldager Sørensen <https://github.com/s093294>, Stefan Profanter <https://github.com/Pro>, Edmund Fokschaner <https://github.com/efokschaner>, Roelof Jooste <https://github.com/PsychoSTS>
 // Definitions: https://github.com//DefinitelyTyped
 
 export * from "./three-core";
@@ -22,9 +22,11 @@ export * from "./three-objloader";
 export * from "./three-octree";
 export * from "./three-orbitcontrols";
 export * from "./three-orthographictrackballcontrols";
+export * from "./three-outlinepass";
 export * from "./three-projector";
 export * from "./three-renderpass";
 export * from "./three-shaderpass";
+export * from "./three-smaapass";
 export * from "./three-trackballcontrols";
 export * from "./three-transformcontrols";
 export * from "./three-vrcontrols";
diff --git a/types/three/three-core.d.ts b/types/three/three-core.d.ts
index 3252661b75..5ea903080b 100644
--- a/types/three/three-core.d.ts
+++ b/types/three/three-core.d.ts
@@ -463,6 +463,8 @@ export class CubeCamera extends Object3D {
     renderTarget: WebGLRenderTargetCube;
 
     updateCubeMap(renderer: Renderer, scene: Scene): void;
+
+    update(renderer: Renderer, scene: Scene): void;
 }
 
 /**
@@ -862,7 +864,8 @@ export class BufferGeometry extends EventDispatcher {
 
     center(): Vector3;
 
-    setFromObject(object: Object3D): void;
+    setFromObject(object: Object3D): BufferGeometry;
+    setFromPoints(points: Vector3[]): BufferGeometry;
     updateFromObject(object: Object3D): void;
 
     fromGeometry(geometry: Geometry, settings?: any): BufferGeometry;
@@ -2757,7 +2760,7 @@ export interface MeshStandardMaterialParameters extends MaterialParameters {
     lightMapIntensity?: number;
     aoMap?: Texture;
     aoMapIntensity?: number;
-    emissive?: Color;
+    emissive?: number|string|Color;
     emissiveIntensity?: number;
     emissiveMap?: Texture;
     bumpMap?: Texture;
@@ -4487,6 +4490,7 @@ export class Vector3 implements Vector {
      * http://en.wikipedia.org/wiki/Taxicab_geometry
      */
     lengthManhattan(): number;
+    manhattanDistanceTo(v:Vector3):number;
 
     /**
      * Normalizes this vector.
diff --git a/types/three/three-outlinepass.d.ts b/types/three/three-outlinepass.d.ts
new file mode 100644
index 0000000000..4cc7ad92d6
--- /dev/null
+++ b/types/three/three-outlinepass.d.ts
@@ -0,0 +1,17 @@
+import { Camera, Color, Object3D, Scene, Vector2 } from './three-core';
+
+export class OutlinePass {
+    constructor(size: Vector2, scene: Scene, camer: Camera, selectedObjects?: Array<Object3D>);
+    selectedObjects: Array<Object3D>;
+    renderCamera: Camera;
+    visibleEdgeColor: Color;
+    hiddenEdgeColor: Color;
+    edgeGlow: number;
+    usePatternTexture: boolean;
+    edgeThickness: number;
+    edgeStrength: number;
+    downSampleRatio: number;
+    pulsePeriod: number;
+    resolution: Vector2;
+}
+
diff --git a/types/three/three-smaapass.d.ts b/types/three/three-smaapass.d.ts
new file mode 100644
index 0000000000..2b48811697
--- /dev/null
+++ b/types/three/three-smaapass.d.ts
@@ -0,0 +1,5 @@
+export class SMAAPass {
+    constructor(width: number, height: number);
+    renderToScreen: boolean;
+}
+
diff --git a/types/tinymce/index.d.ts b/types/tinymce/index.d.ts
index 65c33f4adb..3719b35784 100644
--- a/types/tinymce/index.d.ts
+++ b/types/tinymce/index.d.ts
@@ -826,7 +826,7 @@ export namespace dom {
 
     parseStyle(cssText: string): {};
 
-    remove<T>(node: string, keepChildren?: boolean): Element | T[];
+    remove<T>(node: string | Element, keepChildren?: boolean): Element | T[];
 
     removeAllAttribs(e: Element): void;
 
diff --git a/types/webpack-manifest-plugin/index.d.ts b/types/webpack-manifest-plugin/index.d.ts
index 6c90731424..cb61e42c18 100644
--- a/types/webpack-manifest-plugin/index.d.ts
+++ b/types/webpack-manifest-plugin/index.d.ts
@@ -34,7 +34,7 @@ declare namespace WebpackManifestPlugin {
          * The manifest filename in your output directory.
          * Default: manifest.json
          */
-        filename?: string;
+        fileName?: string;
 
         /**
          * A path prefix for all file references. Useful for including your output path in the manifest.
diff --git a/types/webpack-manifest-plugin/webpack-manifest-plugin-tests.ts b/types/webpack-manifest-plugin/webpack-manifest-plugin-tests.ts
index 134e6825e6..3c34f052fa 100644
--- a/types/webpack-manifest-plugin/webpack-manifest-plugin-tests.ts
+++ b/types/webpack-manifest-plugin/webpack-manifest-plugin-tests.ts
@@ -3,7 +3,7 @@ import path = require('path');
 import WebpackManifestPlugin = require('webpack-manifest-plugin');
 
 const options: WebpackManifestPlugin.Options = {
-    filename: 'manifest.json',
+    fileName: 'manifest.json',
     basePath: '/src/',
     seed: {
         name: 'Hello world',
@@ -28,7 +28,7 @@ const c: Configuration = {
     plugins: [
         new WebpackManifestPlugin(),
         new WebpackManifestPlugin({
-            filename: 'my-manifest.json',
+            fileName: 'my-manifest.json',
             basePath: '/app/',
             seed: {
                 name: 'My Manifest',
diff --git a/types/websocket/index.d.ts b/types/websocket/index.d.ts
index 3b41a5f6da..ab4e453e80 100644
--- a/types/websocket/index.d.ts
+++ b/types/websocket/index.d.ts
@@ -1,7 +1,8 @@
 // Type definitions for websocket
 // Project: https://github.com/theturtle32/WebSocket-Node
 // Definitions by: Paul Loyd <https://github.com/loyd>,
-//                 Kay Schecker <https://github.com/flynetworks>
+//                 Kay Schecker <https://github.com/flynetworks>,
+//                 Zhao Lei <https://github.com/zhaoleimxd>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />
@@ -563,10 +564,10 @@ declare class client extends events.EventEmitter {
      *                 any scripting content that caused the connection to be requested.
      * @param requestUrl should be a standard websocket url
      */
-    connect(requestUrl: url.Url, protocols?: string[], origin?: string, headers?: any[]): void;
-    connect(requestUrl: string, protocols?: string[], origin?: string, headers?: any[]): void;
-    connect(requestUrl: url.Url, protocols?: string, origin?: string, headers?: any[]): void;
-    connect(requestUrl: string, protocols?: string, origin?: string, headers?: any[]): void;
+    connect(requestUrl: url.Url, protocols?: string[], origin?: string, headers?: any[], extraRequestOptions?: http.RequestOptions): void;
+    connect(requestUrl: string, protocols?: string[], origin?: string, headers?: any[], extraRequestOptions?: http.RequestOptions): void;
+    connect(requestUrl: url.Url, protocols?: string, origin?: string, headers?: any[], extraRequestOptions?: http.RequestOptions): void;
+    connect(requestUrl: string, protocols?: string, origin?: string, headers?: any[], extraRequestOptions?: http.RequestOptions): void;
 
     // Events
     on(event: string, listener: () => void): this;
diff --git a/types/websocket/websocket-tests.ts b/types/websocket/websocket-tests.ts
index 5ecee0080d..3044f9bf7d 100644
--- a/types/websocket/websocket-tests.ts
+++ b/types/websocket/websocket-tests.ts
@@ -1,8 +1,10 @@
 
 import websocket = require('websocket');
 import http = require('http');
+import os = require('os');
 
-{
+/*
+function serverTest() {
     var server = http.createServer((req, res) => {
         console.log((new Date()) + ' Received request for ' + req.url);
         res.writeHead(404);
@@ -88,7 +90,7 @@ import http = require('http');
     wsRouter.unmount(/^route\/[a-zA-Z]+$/, 'protocol');
 }
 
-{
+function clientTest() {
     var WebSocketClient = require('websocket').client;
     var client = new WebSocketClient();
 
@@ -124,4 +126,62 @@ import http = require('http');
     });
 
     client.connect('ws://localhost:8080/', 'echo-protocol');
+}*/
+
+function getLocalIpArray(): Array<string> {
+    var interfaces: any = os.networkInterfaces();
+    var ipArray: Array<string> = [];
+    for (var dev in interfaces) {
+        for (var i = 0; i < interfaces[dev].length; i++) {
+            if (interfaces[dev][i].family == "IPv4" && interfaces[dev][i].internal == false) {
+                ipArray.push(interfaces[dev][i].address);
+            }
+        }
+    }
+    return ipArray;
+}
+
+function serverTest2() {
+    var server = http.createServer((req, rsp) => {
+        rsp.writeHead(200);
+        rsp.end("Hello, world!");
+    });
+    server.listen(8888);
+
+    var wsServer = new websocket.server({
+        httpServer: server,
+        autoAcceptConnections: true
+    });
+
+    wsServer.on("connect", (conn) => {
+        conn.sendUTF(`Your IP Address is - ${conn.remoteAddress}`)
+    });
+}
+
+function clientTest2() {
+    var ipArray = getLocalIpArray();
+    
+    var client = new websocket.client();
+    client.on("connect", (conn) => {
+        console.log(`on connect`);
+        conn.on("frame", (frame) => {
+            console.log(`on frame - ${frame.binaryPayload.toString()}`);
+        });
+        conn.on("message", (data) => {
+            console.log(`on message - ${data.utf8Data}`);
+        });
+    });
+    client.on("connectFailed", (err) => {
+        console.log(`on failed: ${err}`);
+    });
+    client.connect(`ws://${ipArray[0]}:8888`, undefined, undefined, undefined, {
+        localAddress: ipArray[0]
+    });
+    
+}
+
+{
+    console.log(`websocket test start.`);
+    serverTest2();
+    clientTest2();
 }
diff --git a/types/winrt-uwp/index.d.ts b/types/winrt-uwp/index.d.ts
index 348ca65c55..6e0a460e33 100644
--- a/types/winrt-uwp/index.d.ts
+++ b/types/winrt-uwp/index.d.ts
@@ -20,7 +20,7 @@ declare namespace Windows {
 }
 
 declare namespace Windows.Foundation {
-    interface IPromise<TResult> {
+    interface IPromise<TResult> extends PromiseLike<TResult> {
         then<U>(success?: (value: TResult) => IPromise<U>, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>;
         then<U>(success?: (value: TResult) => IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>;
         then<U>(success?: (value: TResult) => U, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>;
@@ -49396,7 +49396,7 @@ declare namespace Windows {
                  * @param parametersAsJson A JSON-formatted string that contains the arguments to pass to the request.
                  * @return An asynchronous operation that, on successful completion, returns a StoreSendRequestResult object that provides status and error info about the request.
                  */
-                sendRequestAsync(context: StoreContext, requestKind: number, parametersAsJson: string): Windows.Foundation.IPromiseWithIAsyncOperation<StoreSendRequestResult>;
+                static sendRequestAsync(context: StoreContext, requestKind: number, parametersAsJson: string): Windows.Foundation.IPromiseWithIAsyncOperation<StoreSendRequestResult>;
             }
 
             /** Provides response data for a request that is sent to the Windows Store. */
diff --git a/types/xrm/index.d.ts b/types/xrm/index.d.ts
index 2362daf1b7..3f6cac4711 100644
--- a/types/xrm/index.d.ts
+++ b/types/xrm/index.d.ts
@@ -7,16 +7,28 @@
 //                  Tully H <https://github.com/clownwilleatme>
 //                  Scott Durow <https://github.com/scottdurow>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.4
 
 declare var Xrm: Xrm.XrmStatic;
-declare function GetGlobalContext(): Xrm.Context;
+
+/**
+ * Gets the global context.
+ * The method provides access to the global context without going through the form context.
+ *
+ * It is preferreed to use {@link Xrm.Utility.getGlobalContext Xrm.Utility.getGlobalContext()} instead.
+ * @see {@link Xrm.Utility.getGlobalContext}
+ */
+declare function GetGlobalContext(): Xrm.GlobalContext;
 
 interface Window {
     Xrm: Xrm.XrmStatic;
-    GetGlobalContext(): Xrm.Context;
+    GetGlobalContext(): Xrm.GlobalContext;
 }
 
+/**
+ * Xrm Namespace
+ * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference External Link: Client API Reference}
+ */
 declare namespace Xrm {
     /**
      * Static xRM object.
@@ -24,7 +36,8 @@ declare namespace Xrm {
     interface XrmStatic {
         /**
          * Provides a namespace container for the context, data and ui objects.
-         * @deprecated: Deprecated in v9. See {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated}
+         * @deprecated Deprecated in v9.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
          */
         Page: Page;
 
@@ -34,55 +47,88 @@ declare namespace Xrm {
 
         /**
          * Provides a container for useful functions not directly related to the current page.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-utility External Link: Xrm.Utility (Client API reference)}
          */
         Utility: Utility;
 
         /**
          * Provides methods to create and manage records in the mobile clients (for phones tablets).
+         * @deprecated Use {@link Xrm.WebApi} instead.
          */
         Mobile: Mobile;
 
         /**
-         * Provides methods to display a web page in the side pane of web client.
+         * Provides a method to display a web page in the side pane of the Customer Engagement form.
          *
-         * @see {@link https://msdn.microsoft.com/en-us/library/mt790281.aspx} for details.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-panel External Link: Xrm.Panel}
          */
         Panel: Panel;
 
         /**
          * Provides properties and methods to use Web API to create and manage records and execute Web API actions and functions in Customer Engagement.
          *
-         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-webapi} for details
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-webapi External Link: Xrm.WebApi (Client API reference)}
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/use-microsoft-dynamics-365-web-api External Link: Use the Customer Engagement Web API}
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/webapi/get-started-web-api-client-side-javascript External Link: Get started with the Customer Engagement Web API (client-side JavaScript)}
          */
         WebApi: WebApi;
 
         /**
          * Provides methods to use native device capabilities of mobile devices.
          *
-         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-device} for details
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-device External Link: Xrm.Device (Client API reference)}
          */
         Device: Device;
 
         /**
          * Provides methods to encode strings.
-         *
-         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-encoding} for details
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-encoding External Link: Xrm.Encoding (Client API reference)}
          */
         Encoding: Encoding;
     }
 
     /**
-     * Client Types for Xrm.Page.context.getClient().
+     * Client Types for {@link ClientContext.getClient clientContext.getClient()}.
+     * @see {@link XrmEnum.Client}
      */
-    type Client = "Web" | "Outlook" | "Mobile";
+    type Client = "Web" | "Outlook" | "Mobile" | "UnifiedServiceDesk";
 
     /**
-     * Client States for Xrm.Page.context.getClientState().
+     * Client States for {@link ClientContext.getClientState clientContext.getClientState()}.
+     * @see {@link XrmEnum.ClientState}
      */
     type ClientState = "Online" | "Offline";
 
     /**
-     * Themes for Xrm.Page.context.getCurrentTheme().
+     * Display States for setDisplayState() on {@link Controls.ProcessControl.setDisplayState Processes} and {@link Controls.Tab.setDisplayState Tabs}.
+     * @see {@link XrmEnum.DisplayState}
+     */
+    type DisplayState = "collapsed" | "expanded";
+
+    /**
+     * The {@link Entity.save Entity}'s Save Mode
+     * @see {@link XrmEnum.EntitySaveMode}
+     * @see {@link Entity}
+     * @see {@link Entity.save}
+     */
+    type EntitySaveMode = "saveandclose" | "saveandnew";
+
+    /**
+     * Form Notification Levels for {@link Ui.setFormNotification formContext.ui.setFormNotification()}.
+     * @see {@link XrmEnum.FormNotificationLevel}
+     */
+    type FormNotificationLevel = "ERROR" | "INFO" | "WARNING";
+
+    /**
+     * Submit Mode for {@link Attributes.Attribute.setSubmitMode} Attributes.Attribute.setSubmitMode().
+     * @see {@link XrmEnum.SubmitMode}
+     */
+    type SubmitMode = "always" | "dirty" | "never";
+
+    /**
+     * Themes for {@link GlobalContext.getCurrentTheme globalContext.getCurrentTheme()}.
+     * @remarks getCurrentTheme() does not work with Dynamics CRM for tablets or in the unified interface.
+     * @see {@link XrmEnum.Theme}
      */
     type Theme = "default" | "Office12Blue" | "Office14Silver";
 
@@ -92,15 +138,13 @@ declare namespace Xrm {
     interface ClientContext {
         /**
          * Returns a value to indicate which client the script is executing in.
-         *
-         * @return The client, as either "Web", "Outlook", or "Mobile"
+         * @returns The client, as either "Web", "Outlook", or "Mobile"
          */
         getClient(): Client;
 
         /**
          * Gets client's current state.
-         *
-         * @return The client state, as either "Online" or "Offline"
+         * @returns The client state, as either "Online" or "Offline"
          */
         getClientState(): ClientState;
 
@@ -266,8 +310,9 @@ declare namespace Xrm {
 
     /**
      * Interface for the xRM application context.
+     * GetGlobalContext()
      */
-    interface Context {
+    interface GlobalContext {
         /**
          * The client's context instance.
          */
@@ -285,18 +330,18 @@ declare namespace Xrm {
 
         /**
          * Returns information about the advanced configuration settings for the organization.
-         * @param setting  Name of the configuration setting.
+         * @param setting Name of the configuration setting.
+         * @see {@link XrmEnum.AdvancedConfigSettingOption}
          */
         getAdvancedConfigSetting(setting: "MaxChildIncidentNumber" | "MaxIncidentMergeNumber"): number;
 
         /**
          * Gets client's base URL for Dynamics CRM
-         *
-         * @return The client's base URL
-         *
-         * @remarks For Dynamics CRM On-Premises:               http(s)://server/org
-         *          For Dynamics CRM Online:                    https://org.crm.dynamics.com
-         *          For Dynamics CRM for Outlook (Offline):     http://localhost:2525
+         * @returns The client's base URL
+         * @example
+         * * For Dynamics CRM On-Premises:               http(s)://server/org
+         * * For Dynamics CRM Online:                    https://org.crm.dynamics.com
+         * * For Dynamics CRM for Outlook (Offline):     http://localhost:2525
          */
         getClientUrl(): string;
 
@@ -310,93 +355,100 @@ declare namespace Xrm {
          */
         getCurrentAppProperties(): Async.PromiseLike<AppProperties>;
 
+        /**
+         * Returns the URL of the current business app in Customer Engagement.
+         * @example
+         * * Online        https://**org**.crm.dynamics.com/main.aspx?appid=**GUID**
+         * * OnPrem        https://**server**\/**org**\/main.aspx?appid=**GUID**
+         * @returns A string containing the url of the current business app.
+         */
+        getCurrentAppUrl(): string;
+
         /**
          * Gets current styling theme.
-         *
-         * @return The name of the current theme, as either "default", "Office12Blue", or "Office14Silver"
-         *
-         * @remarks This function does not work with Dynamics CRM for tablets.
+         * @remarks This function does not work with Dynamics CRM for tablets or in the unified interface.
+         * @returns The name of the current theme, as either "default", "Office12Blue", or "Office14Silver"
          */
         getCurrentTheme(): Theme;
 
         /**
          * Gets whether automatic save is enabled.
-         * @deprecated: Deprecated in v9. See {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated}
-         * @return true if automatic saving is enabled, otherwise false.
+         * @deprecated Deprecated in v9. Use {@link Xrm.OrganizationSettings.isAutoSaveEnabled globalContext.organizationSettings.isAutoSaveEnabled} instead.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
+         * @returns true if automatic saving is enabled, otherwise false.
          */
         getIsAutoSaveEnabled(): boolean;
 
         /**
          * Gets organization's LCID (language code).
-         * @deprecated: Deprecated in v9. See {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated}
-         * @return The organization language code.
-         *
-         * @see  {@link http://msdn.microsoft.com/en-us/library/ms912047(WinEmbedded.10).aspx|Microsoft Locale ID Values}
+         * @deprecated Deprecated in v9. Use {@link Xrm.OrganizationSettings.languageId globalContext.organizationSettings.languageId} instead.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
+         * @returns The organization language code.
+         * @see {@link http://msdn.microsoft.com/en-us/library/ms912047(WinEmbedded.10).aspx External Link: Microsoft Locale ID Values}
          */
         getOrgLcid(): number;
 
         /**
          * Gets organization's unique name.
-         * @deprecated: Deprecated in v9. See {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated}
-         * @return The organization's unique name.
-         *
-         * @remarks This value can be found on the Developer Resources page within Dynamics CRM
+         * @remarks This value can be found on the Developer Resources page within Dynamics CRM.
+         * @deprecated Deprecated in v9. Use {@link Xrm.OrganizationSettings.uniqueName} globalContext.organizationSettings.uniqueName instead.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
+         * @returns The organization's unique name.
          */
         getOrgUniqueName(): string;
 
         /**
          * Gets query string parameters.
-         *
-         * @return The query string parameters, in a dictionary object representing name and value pairs.
-         * @deprecated: Deprecated in v9 (Still applicable in Web Client). See {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated}
+         * @returns The query string parameters, in a dictionary object representing name and value pairs.
+         * @deprecated Deprecated in v9 (Still applicable in Web Client).
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
          */
         getQueryStringParameters(): { [index: string]: any };
 
         /**
          * Returns the difference between the local time and Coordinated Universal Time (UTC).
-         *
-         * @return The time zone offset, in minutes.
+         * @returns The time zone offset, in minutes.
          */
         getTimeZoneOffsetMinutes(): number;
 
         /**
          * Gets user's unique identifier.
-         * @deprecated: Deprecated in v9. See {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated}
-         * @return The user's identifier in Guid format.
-         *
-         * @remarks Example: "{B05EC7CE-5D51-DF11-97E0-00155DB232D0}"
+         * @deprecated Deprecated in v9.  Use {@link Xrm.UserSettings.userId globalContext.userSettings.userId} instead.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
+         * @returns The user's identifier in Guid format.
+         * @example Example: "{B05EC7CE-5D51-DF11-97E0-00155DB232D0}"
          */
         getUserId(): string;
 
         /**
          * Gets user's LCID (language code).
-         * @deprecated: Deprecated in v9. See {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated}
-         * @return The user's language code.
-         *
-         * @see  {@link http://msdn.microsoft.com/en-us/library/ms912047(WinEmbedded.10).aspx|Microsoft Locale ID Values}
+         * @deprecated Deprecated in v9. Use {@link Xrm.UserSettings.languageId globalContext.userSetings.languageId} instead.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
+         * @returns The user's language code.
+         * @see {@link http://msdn.microsoft.com/en-us/library/ms912047(WinEmbedded.10).aspx External Link: Microsoft Locale ID Values}
          */
         getUserLcid(): number;
 
         /**
          * Gets the name of the current user.
-         * @deprecated: Deprecated in v9. See {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated}
-         * @return The user's name.
+         * @deprecated Deprecated in v9. Use {@link Xrm.UserSettings.userName globalContext.userSettings.userName} instead.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
+         * @returns The user's name.
          */
         getUserName(): string;
 
         /**
          * Gets all user security roles.
-         * @deprecated: Deprecated in v9. See {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated}
-         * @return An array of user role identifiers, in Guid format.
-         *
-         * @remarks Example: ["cf4cc7ce-5d51-df11-97e0-00155db232d0"]
+         * @deprecated Deprecated in v9.  Use {@link Xrm.UserSettings.securityRoles globalContext.userSettings.securityRoles} instead.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
+         * @returns An array of user role identifiers, in Guid format.
+         * @example Example: ["cf4cc7ce-5d51-df11-97e0-00155db232d0"]
          */
         getUserRoles(): string[];
 
         /**
          * Returns the version number of the Dynamics 365 server.
-         *
-         * @return The version number
+         * @returns The version number
          */
         getVersion(): string;
 
@@ -407,19 +459,176 @@ declare namespace Xrm {
 
         /**
          * Prefixes the current organization's unique name to a string; typically a URL path.
-         *
          * @param sPath Local pathname of the resource.
-         * @return A path string with the organization name.
-         *
-         * @remarks Format: "/"+ OrgName + sPath
+         * @returns A path string with the organization name. Format: "/"+ OrgName + sPath
          */
         prependOrgName(sPath: string): string;
     }
 
+    namespace Events {
+        /**
+         * Interface for save event arguments.
+         */
+        interface SaveEventArguments {
+            /**
+             * @summary Gets save mode, as an integer.
+             * @returns The save mode.
+             * @description Gets save mode, as an integer.<BR>
+             * **Values returned are**:
+             * * 1      Save
+             * * 2      Save and Close
+             * * 59     Save and New
+             * * 70     AutoSave (Where enabled; can be used with an OnSave handler to conditionally disable auto-saving)
+             * * 58     Save as Completed (Activities)
+             * * 5      Deactivate
+             * * 6      Reactivate
+             * * 47     Assign (All user- or team-owned entities)
+             * * 7      Send (Email)
+             * * 16     Qualify (Lead)
+             * * 15     Disqualify (Lead)
+             */
+            getSaveMode(): XrmEnum.SaveMode;
+
+            /**
+             * Returns a boolean value to indicate if the record's save has been prevented.
+             * @returns true if saving is prevented, otherwise false.
+             */
+            isDefaultPrevented(): boolean;
+
+            /**
+             * Prevents the save operation from being submitted to the server.
+             * All remaining "on save" handlers will continue execution.
+             */
+            preventDefault(): void;
+        }
+
+        /**
+         * Interface for process stage change event arguments.
+         */
+        interface StageChangeEventArguments {
+            /**
+             * Gets the direction of the stage change.
+             * @returns The direction: "next" or "previous"
+             */
+            getDirection(): ProcessFlow.StageChangeDirection;
+
+            /**
+             * Gets the destination stage object
+             * @returns The stage object. For switching between entities, returns the previous stage object
+             */
+            getStage(): ProcessFlow.Stage;
+        }
+
+        /**
+         * Interface for process stage selected event arguments.
+         */
+        interface StageSelectedEventArguments {
+            /**
+             * Gets the selected stage object
+             * @returns The stage object
+             */
+            getStage(): ProcessFlow.Stage;
+        }
+
+        /**
+         * Interface for the event context.
+         * In the API documentation, this is sometimes refferred to as the executionContext.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/clientapi-execution-context External Link: Client API execution context}
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/execution-context External Link: Execution context (Client API reference)}
+         */
+        interface EventContext {
+            /**
+             * Gets the Xrm context.
+             * @returns The Xrm context.
+             */
+            getContext(): GlobalContext;
+
+            /**
+             * Gets the handler's depth, which is the order in which the handler is executed.
+             * @returns The depth, a 0-based index.
+             */
+            getDepth(): number;
+
+            /**
+             * Gets a reference to the object for which event occurred.
+             * @returns The event source.
+             */
+            getEventSource(): Attributes.Attribute | Controls.Control | Entity;
+
+            /**
+             * Gets a reference to the currnet form context
+             * @returns The {@link FormContext form context}
+             */
+            getFormContext(): FormContext;
+
+            /**
+             * @summary Gets the shared variable with the specified key.
+             * @param T Generic type parameter.
+             * @param key The key.
+             * @returns The shared variable.
+             * @desc Gets the shared variable with the specified key.
+             * Used to pass values between handlers of an event.
+             */
+            getSharedVariable<T>(key: string): T;
+
+            /**
+             * @summary Sets a shared variable.
+             * @param T Generic type parameter.
+             * @param key The key.
+             * @param value The value.
+             * @desc Sets the shared variable with the specified key.
+             * Used to pass values between handlers of an event.
+             */
+            setSharedVariable<T>(key: string, value: T): void;
+        }
+
+        /**
+         * Interface for a save event context
+         */
+        interface SaveEventContext extends EventContext {
+            /**
+             * Gets save-event arguments.
+             * @returns The event arguments.  Returns null for all but the "save" event.
+             */
+            getEventArgs(): SaveEventArguments;
+        }
+
+        /**
+         * Interface for a process stage change event context
+         */
+        interface StageChangeEventContext extends EventContext {
+            /**
+             * Gets process stage change event arguments.
+             * @returns The event arguments.
+             */
+            getEventArgs(): StageChangeEventArguments;
+        }
+
+        interface StageSelectedEventContext extends EventContext {
+            /**
+             * Gets process stage selected event arguments.
+             * @returns The event arguments.
+             */
+            getEventArgs(): StageSelectedEventArguments;
+        }
+
+        /**
+         * Type for a context-sensitive handler.
+         * @param context The context.
+         */
+        type ContextSensitiveHandler = (context: EventContext) => void;
+
+        /**
+         * Type for a process status change handler.
+         * @param status The process status.
+         */
+        type ProcessStatusChangeHandler = (status: ProcessFlow.ProcessStatus) => void;
+    }
+
     /**
      * Defines save options to control how appointment, recurring appointment, or service activity records are processed.
      *
-     * @see {@link https://msdn.microsoft.com/en-us/library/dn481607.aspx#Anchor_2} for details.
+     * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/formcontext-data/save External Link: save(Client API reference)}
      */
     interface SaveOptions {
         /**
@@ -430,29 +639,28 @@ declare namespace Xrm {
     }
 
     /**
-     * Interface for the Xrm.Page.data object.
+     * Interface for the formContext.data object.
+     * @note NTOE NOTE
+     * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/formcontext-data External Link: formContext.data (Client API reference)}
      */
     interface Data {
         /**
          * Asynchronously refreshes data on the form, without reloading the page.
-         *
          * @param save true to save the record, after the refresh.
-         * @return Returns an asynchronous promise.
+         * @returns Returns an asynchronous promise.
          */
         refresh(save: boolean): Async.PromiseLike<undefined>;
 
         /**
          * Asynchronously saves the record.
-         *
-         * @return Returns an asynchronous promise.
+         * @returns Returns an asynchronous promise.
          */
         save(): Async.PromiseLike<undefined>;
 
         /**
          * Asynchronously saves the record  with the option to set callback functions to be executed after the save operation is completed.
-         *
          * @param saveOptions Options to control how appointment, recurring appointment, or service activity records are processed.
-         * @return Returns an asynchronous promise.
+         * @returns Returns an asynchronous promise.
          */
         save(saveOptions: SaveOptions): Async.PromiseLike<undefined>;
 
@@ -460,158 +668,146 @@ declare namespace Xrm {
          * Collection of non-entity data on the form.
          * Items in this collection are of the same type as the attributes collection, but they are not attributes of the form entity.
          * In V9 this is only available in the Unified Client
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/attributes External Link: Attributes (Client API reference)}
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/collections External Link: Collections (Client API reference)}
+         * @see {@link Attributes}
          */
-        attributes: Collection.ItemCollection<Page.Attribute>;
+        attributes: Collection.ItemCollection<Attributes.Attribute>;
 
         /**
-         * The record context of the form.
+         * The record context of the form, {@link Entity formContext.data.entity}
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/formcontext-data-entity External Link: formContext.data.entity (Client API reference)}
          */
-        entity: Page.Entity;
+        entity: Entity;
 
         /**
-         * The process API for Xrm.Page.data.
+         * The process API for {@link ProcessFlow.ProcessManager formContext.ui.process}.
          * @remarks This member may be undefined when Process Flows are not used by the current entity.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/formcontext-data-process External Link: formContext.data.process (Client API reference)}
          */
-        process: Page.data.ProcessManager;
+        process: ProcessFlow.ProcessManager;
     }
 
     /**
-     * Interface for Page context
+     * Interface for formContext
+     * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/executioncontext/getformcontext External Link: getFormContext (Client API reference)}
      */
-    interface Page {
-        /**
-         * Provides methods to retrieve information specific to an organization, a user, or parameters passed to a page.
-         * @deprecated: Deprecated in v9. See {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated}
-         */
-        context: Context;
-
+    interface FormContext {
         /**
          * Provides methods to work with the form.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/formcontext-data External Link: formContext.data (Client API reference)}
          */
         data: Data;
 
         /**
          * Contains properties and methods to retrieve information about the user interface as well as collections for several subcomponents of the form.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/formcontext-ui External Link: formContext.ui (Client API reference)}
          */
         ui: Ui;
 
         /**
          * Gets all attributes.
-         *
-         * @return An array of attributes.
+         * @returns An array of attributes.
          */
-        getAttribute(): Page.Attribute[];
+        getAttribute(): Attributes.Attribute[];
 
         /**
          * Gets an attribute matching attributeName.
-         *
-         * @tparam T   An Attribute type.
+         * @param T An Attribute type.
          * @param attributeName Name of the attribute.
-         * @return The attribute.
+         * @returns The attribute.
          */
-        getAttribute<T extends Page.Attribute>(attributeName: string): T;
+        getAttribute<T extends Attributes.Attribute>(attributeName: string): T;
 
         /**
          * Gets an attribute matching attributeName.
-         *
          * @param attributeName Name of the attribute.
-         * @return The attribute.
+         * @returns The attribute.
          */
-        getAttribute(attributeName: string): Page.Attribute;
+        getAttribute(attributeName: string): Attributes.Attribute;
 
         /**
          * Gets an attribute by index.
-         *
          * @param index The attribute index.
-         * @return The attribute.
+         * @returns The attribute.
          */
-        getAttribute(index: number): Page.Attribute;
+        getAttribute(index: number): Attributes.Attribute;
 
         /**
          * Gets an attribute.
-         *
          * @param delegateFunction A matching delegate function
-         * @return An array of attribute.
+         * @returns An array of attribute.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/collections External Link: Collections (Client API reference)}
          */
-        getAttribute(delegateFunction: Collection.MatchingDelegate<Page.Attribute>): Page.Attribute[];
+        getAttribute(delegateFunction: Collection.MatchingDelegate<Attributes.Attribute>): Attributes.Attribute[];
 
         /**
          * Gets all controls.
-         *
-         * @return An array of controls.
+         * @returns An array of controls.
          */
-        getControl(): Page.Control[];
+        getControl(): Controls.Control[];
 
         /**
          * Gets a control matching controlName.
-         *
          * @param T A Control type
          * @param controlName Name of the control.
-         *
-         * @return The control.
+         * @returns The control.
          */
-        getControl<T extends Page.Control>(controlName: string): T;
+        getControl<T extends Controls.Control>(controlName: string): T;
 
         /**
          * Gets a control matching controlName.
-         *
-         * @param controlName Name of the control.
-         * @return The control.
+         * @param controlName   Name of the control.
+         * @returns The control.
          */
-        getControl(controlName: string): Page.Control;
+        getControl(controlName: string): Controls.Control;
 
         /**
          * Gets a control by index.
-         *
          * @param T A Control type
          * @param index The control index.
-         *
-         * @return The control.
+         * @returns The control.
          */
-        getControl<T extends Page.Control>(index: number): T;
+        getControl<T extends Controls.Control>(index: number): T;
 
         /**
          * Gets a control by index.
-         *
          * @param index The control index.
-         * @return The control.
+         * @returns The control.
          */
-        getControl(index: number): Page.Control;
+        getControl(index: number): Controls.Control;
 
         /**
          * Gets a control.
-         *
          * @param delegateFunction A matching delegate function.
-         * @return An array of control.
+         * @returns An array of control.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/collections External Link: Collections (Client API reference)}
          */
-        getControl(delegateFunction: Collection.MatchingDelegate<Page.Control>): Page.Control[];
+        getControl(delegateFunction: Collection.MatchingDelegate<Controls.Control>): Controls.Control[];
     }
 
     /**
-     * Interface for the Xrm.Page.ui object.
+     * Interface for the formContext.ui object.
+     * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/formcontext-ui External Link: formContext.ui (Client API reference)}
      */
     interface Ui {
         /**
          * Displays a form level notification. Any number of notifications can be displayed and will remain until removed using clearFormNotification.
          * The height of the notification area is limited so each new message will be added to the top.
-         *
          * @param message The text of the notification message.
          * @param level The level of the notification which defines how the message will be displayed, such as the icon.
+         * ERROR: Notification will use the system error icon.
+         * WARNING: Notification will use the system warning icon.
+         * INFO: Notification will use the system info icon.
          * @param uniqueId Unique identifier for the notification which is used with clearFormNotification to remove the notification.
-         *
-         * @return true if it succeeds, otherwise false.
-         *
-         * @remarks     Values for level are:    ERROR   Notification will use the system error icon.
-         *                                       WARNING Notification will use the system warning icon.
-         *                                       INFO    Notification will use the system info icon.
+         * @returns true if it succeeds, otherwise false.
          */
-        setFormNotification(message: string, level: Page.ui.FormNotificationLevel, uniqueId: string): boolean;
+        setFormNotification(message: string, level: FormNotificationLevel, uniqueId: string): boolean;
 
         /**
          * Clears the form notification described by uniqueId.
-         *
          * @param uniqueId Unique identifier.
-         * @return True if it succeeds, otherwise false.
+         * @returns True if it succeeds, otherwise false.
          */
         clearFormNotification(uniqueId: string): boolean;
 
@@ -622,40 +818,34 @@ declare namespace Xrm {
 
         /**
          * Gets form type.
-         *
-         * @return The form type.
-         *
-         * @remarks     Values returned are: 0  Undefined
-         *                                   1  Create
-         *                                   2  Update
-         *                                   3  Read Only
-         *                                   4  Disabled
-         *                                   6  Bulk Edit
-         *              Deprecated values are 5 (Quick Create), and 11 (Read Optimized)
+         * @returns The form type.
+         * @remarks **Values returned are**:
+         * * 0  Undefined
+         * * 1  Create
+         * * 2  Update
+         * * 3  Read Only
+         * * 4  Disabled
+         * * 6  Bulk Edit
+         * * Deprecated values are 5 (Quick Create), and 11 (Read Optimized)
          */
         getFormType(): XrmEnum.FormType;
 
         /**
          * Gets view port height.
-         *
-         * @return The view port height, in pixels.
-         *
+         * @returns The view port height, in pixels.
          * @remarks This method does not work with Microsoft Dynamics CRM for tablets.
          */
         getViewPortHeight(): number;
 
         /**
          * Gets view port width.
-         *
-         * @return The view port width, in pixels.
-         *
+         * @returns The view port width, in pixels.
          * @remarks This method does not work with Microsoft Dynamics CRM for tablets.
          */
         getViewPortWidth(): number;
 
         /**
          * Re-evaluates the ribbon's configured EnableRules.
-         *
          * @remarks This method does not work with Microsoft Dynamics CRM for tablets.
          */
         refreshRibbon(): void;
@@ -663,36 +853,38 @@ declare namespace Xrm {
         /**
          * The business process flow API, used to interact with the business process flow control in a form.
          */
-        process: Page.ui.ProcessManager;
+        process: Controls.ProcessControl;
 
         /**
          * A reference to the collection of controls on the form.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/collections External Link: Collections (Client API reference)}
          */
-        controls: Collection.ItemCollection<Page.Control>;
+        controls: Collection.ItemCollection<Controls.Control>;
 
         /**
          * The form selector API.
-         *
          * @remarks This API does not exist with Microsoft Dynamics CRM for tablets.
          */
-        formSelector: Page.FormSelector;
+        formSelector: Controls.FormSelector;
 
         /**
          * The navigation API.
-         *
          * @remarks This API does not exist with Microsoft Dynamics CRM for tablets.
          */
-        navigation: Page.Navigation;
+        navigation: Controls.Navigation;
 
         /**
          * A reference to the collection of tabs on the form.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/collections External Link: Collections (Client API reference)}
          */
-        tabs: Collection.ItemCollection<Page.Tab>;
+        tabs: Collection.ItemCollection<Controls.Tab>;
 
         /**
          * A collection of all the quick view controls on a form using the new form rendering engine (also called "turbo forms").
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/formcontext-ui-quickforms ExternalLink: formContext.ui.quickForms (Client API reference)}
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/formcontext-ui External Link: formContext.ui (Client API reference)}
          */
-        quickForms: Collection.ItemCollection<Page.ui.QuickForm>;
+        quickForms: Collection.ItemCollection<Controls.QuickFormControl>;
     }
 
     /**
@@ -727,6 +919,7 @@ declare namespace Xrm {
 
     /**
      * Interface for the Xrm.Utility API
+     * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-utility External Link: Xrm.Utility (Client API reference)}
      */
     interface Utility {
         /**
@@ -737,8 +930,8 @@ declare namespace Xrm {
         /**
          * Returns the valid state transitions for the specified entity type and state code.
          * TODO: No info on the return type is available
-         * @param entityName The logical name of the entity.
-         * @param stateCode The state code to find out the allowed status transition values.
+         * @param entityName    The logical name of the entity.
+         * @param stateCode     The state code to find out the allowed status transition values.
          */
         getAllowedStatusTransitions(entityName: string, stateCode: number): Async.PromiseLike<any>;
 
@@ -751,8 +944,9 @@ declare namespace Xrm {
 
         /**
          * The method provides access to the global context without going through the form context.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-utility/getglobalcontext External Link: getGlobalContext (Client API reference)}
          */
-        getGlobalContext(): Context;
+        getGlobalContext(): GlobalContext;
 
         /**
          * Returns the localized string for a given key associated with the specified web resource.
@@ -766,6 +960,9 @@ declare namespace Xrm {
          * Invokes an action based on the specified parameters
          * @param name Name of the process action to invoke.
          * @param parameters An object containing input parameters for the action. You define an object using key:value pairs of items, where key is of String type.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-utility/invokeprocessaction External Link: invokeProcessAction (Client API reference)}
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/customize/actions External Link: Actions overview}
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/create-own-actions External Link: Create your own actions}
          */
         invokeProcessAction(name: string, parameters: Collection.Dictionary<any>): Async.PromiseLike<any>;
 
@@ -773,12 +970,13 @@ declare namespace Xrm {
          * Opens a lookup control to select one or more items.
          * @param lookupOptions Defines the options for opening the lookup dialog
          */
-        lookupObjects(lookupOptions: LookupOptions): Async.PromiseLike<Page.LookupValue>;
+        lookupObjects(lookupOptions: LookupOptions): Async.PromiseLike<LookupValue>;
 
         /**
          * Refreshes the parent grid containing the specified record.
+         * @param lookupOptions: The lookup value of the parent object to refresh.
          */
-        refreshParentGrid(lookupOptions: Page.LookupValue): void;
+        refreshParentGrid(lookupOptions: LookupValue): void;
 
         /**
          * Displays a progress dialog with the specified message.
@@ -789,8 +987,8 @@ declare namespace Xrm {
 
         /**
          * Displays an alert dialog, with an "OK" button.
-         * @deprecated: Deprecated in v9. Use Xrm.Navigation. See {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated}
-         *
+         * @deprecated Deprecated in v9. Use {@link Xrm.Navigation.openAlertDialog} instead.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
          * @param message The message.
          * @param onCloseCallback The "OK" callback.
          */
@@ -798,8 +996,8 @@ declare namespace Xrm {
 
         /**
          * Displays a confirmation dialog, with "OK" and "Cancel" buttons.
-         * @deprecated: Deprecated in v9. Use Xrm.Navigation. See {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated}
-         *
+         * @deprecated Deprecated in v9. Use {@link Xrm.Navigation.openConfirmDialog} instead.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
          * @param message The message.
          * @param yesCloseCallback The "OK" callback.
          * @param noCloseCallback The "Cancel" callback.
@@ -808,30 +1006,31 @@ declare namespace Xrm {
 
         /**
          * Query if 'entityType' is an Activity entity.
-         * @deprecated: Deprecated in v9. See {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated}
-         * @param entityType  Type of the entity.
-         *
-         * @return true if the entity is an Activity, false if not.
+         * @deprecated Deprecated in v9. Use {@link Xrm.Utility.getEntityMetadata  Xrm.Utility.getEntityMetadata(entityName, ["IsActivity"])} instead.
+         * @remarks The isActivityType method is synchronous so it was suitable for ribbon rules.
+         * However, the replacement method, getEntityMetadata, is asynchronous, and is not suitable for ribbon rules.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
+         * @param entityType Type of the entity.
+         * @returns true if the entity is an Activity, false if not.
          */
         isActivityType(entityType: string): boolean;
 
         /**
          * Opens quick create.
-         * @deprecated: Deprecated in v9. Use Xrm.Navigation. See {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated}
-         * @param entityLogicalName The logical name of the entity to create.
-         * @param createFromEntity (Optional) Designates a record that will provide default values
-         *                         based on mapped attribute values.
-         * @param parameters (Optional) A dictionary object that passes extra query string
-         *                   parameters to the form. Invalid query string parameters will cause an
-         *                   error.
-         * @return Returns an asynchronous promise.
+         * @deprecated Deprecated in v9. Use {@link Xrm.Navigation.openForm} instead with the option {useQuickCreateForm:true}.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
+         * @param entityLogicalName  The logical name of the entity to create.
+         * @param createFromEntity (Optional) Designates a record that will provide default values based on mapped attribute values.
+         * @param parameters (Optional) A dictionary object that passes extra query string parameters to the form. Invalid query string parameters will cause an error.
+         * @returns Returns an asynchronous promise.
          */
-        openQuickCreate(entityLogicalName: string, createFromEntity?: Page.LookupValue, parameters?: Utility.OpenParameters):
+        openQuickCreate(entityLogicalName: string, createFromEntity?: LookupValue, parameters?: Utility.OpenParameters):
             Async.PromiseLike<Async.OpenQuickCreateSuccessCallbackObject>;
 
         /**
          * Opens an entity form.
-         * @deprecated: Deprecated in v9. Use Xrm.Navigation. See {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated}
+         * @deprecated Deprecated in v9. Use {@link Xrm.Navigation.openForm} instead.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
          * @param name The entity's logical name.
          * @param id (Optional) The unique identifier for the record.
          * @param parameters (Optional) A dictionary object that passes extra query string parameters to the form.
@@ -841,24 +1040,22 @@ declare namespace Xrm {
 
         /**
          * Opens an HTML Web Resource in a new browser window.
-         * @deprecated: Deprecated in v9. See {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated}
-         * @param webResourceName Name of the HTML web resource. Can be used to pass URL
-         *                        parameters.  See Remarks.
-         * @param webResourceData (Optional) Data to pass into the Web Resource's data parameter.
-         *                        It is advised to use encodeURIcomponent() to encode the value.
+         * @deprecated Deprecated in v9. Use {@link Xrm.Navigation.openWebResource} instead.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
+         * @param webResourceName Name of the HTML web resource. Can be used to pass URL parameters.  See Remarks.
+         * @param webResourceData (Optional) Data to pass into the Web Resource's data parameter. It is advised to use encodeURIcomponent() to encode the value.
          * @param width (Optional) The width of the new window.
          * @param height (Optional) The height of the new window.
-         *
-         * @return A Window reference, containing the opened Web Resource.
-         *
-         * @remarks This function will not work with Microsoft Dynamics CRM for tablets.
-         *          Valid WebResource URL Parameters:   typename
-         *                                              type
-         *                                              id
-         *                                              orgname
-         *                                              userlcid
-         *                                              data (identical to this method's webResourceData parameter)
-         *                                              formid
+         * @returns A Window reference, containing the opened Web Resource.
+         * @remarks This function will not work with Microsoft Dynamics CRM for tablets.<BR>
+         * **Valid WebResource URL Parameters**:
+         * * typename
+         * * type
+         * * id
+         * * orgname
+         * * userlcid
+         * * data (identical to this method's webResourceData parameter)
+         * * formid
          */
         openWebResource(webResourceName: string, webResourceData?: string, width?: number, height?: number): Window;
     }
@@ -869,39 +1066,41 @@ declare namespace Xrm {
     interface Mobile {
         /**
          * Provides methods to create and manage records in the mobile clients while working in the offline mode.
-         *
-         * @see {@link https://msdn.microsoft.com/en-us/library/mt787123.aspx} for details.
+         * @see {@link https://msdn.microsoft.com/en-us/library/mt787123.aspx External Link: Xrm.Mobile.offline (client-side reference)}
+         * @deprecated Use {@link Xrm.WebApi.offline} instead.  Xrm.WebApi.offline is implemented differently than Xrm.Mobile.offline
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
          */
         offline: MobileOffline;
     }
 
     /**
      * Interface for the Mobile.offline methods to create and manage records in the mobile clients while working in the offline mode.
-     *
-     * @see {@link https://msdn.microsoft.com/en-us/library/mt787123.aspx} for details.
+     * @deprecated Use {@link Xrm.WebApi.offline} instead.  Xrm.WebApi.offline is implemented differently than Xrm.Mobile.offline
+     * @see {@link https://msdn.microsoft.com/en-us/library/mt787123.aspx External Link: Xrm.Mobile.offline (client-side reference)}
+     * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
      */
     interface MobileOffline {
         /**
          * Returns whether an entity is offline enabled.
-         *
          * @param entityType The logical name of the entity.
-         * @return True if the entity is offline enabled; otherwise False.
+         * @returns True if the entity is offline enabled; otherwise False.
+         * @deprecated Use {@link Xrm.WebApi.isAvailableOffline} instead.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
          */
         isOfflineEnabled(entityType: string): boolean;
 
         /**
          * Creates an entity record in mobile clients while working in the offline mode.
-         *
          * @param entityType The logical name of the entity.
          * @param data A dictionary object containing key : value pairs for the record to create.
-         *
-         * @return Returns an asynchronous promise.
-         *
-         * @remarks  You cannot create intersect and activity party entities.
-         *           Only the following attribute types are supported in offline mode:
-         *             BigInt, Boolean, Customer, DateTime, Decimal, Double, EntityName
-         *             Integer, Lookup, Memo, Money, Owner, Picklist, String, State
+         * @returns Returns an asynchronous promise.
+         * @remarks  You cannot create intersect and activity party entities.<BR>
+         *           Only the following attribute types are supported in offline mode:<BR>
+         *             BigInt, Boolean, Customer, DateTime, Decimal, Double, EntityName<BR>
+         *             Integer, Lookup, Memo, Money, Owner, Picklist, String, State<BR>
          *             Status, UniqueIdentifier
+         * @deprecated Use {@link Xrm.WebApi.createRecord} instead.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
          */
         createRecord(entityType: string, data: { [attributeName: string]: any }): Async.PromiseLike<Async.OfflineOperationSuccessCallbackObject>;
 
@@ -911,15 +1110,16 @@ declare namespace Xrm {
          * @param entityType The logical name of the entity.
          * @param id GUID of the record to retrieve.
          * @param options (Optional) OData system query options to retrieve your data. Supports $select and $expand
-         *                 Example: ?$select=name&$expand=primarycontactid($select=contactid,fullname)
-         *
-         * @return Returns an asynchronous promise.
-         *
-         * @remarks  Only $select option can be specified within $expand.
-         *           Only the following attribute types are supported in offline mode:
-         *             BigInt, Boolean, Customer, DateTime, Decimal, Double, EntityName
-         *             Integer, Lookup, Memo, Money, Owner, Picklist, String, State
+         * @example <caption>Example options</caption>
+         * options: ?$select=name&$expand=primarycontactid($select=contactid,fullname)
+         * @returns Returns an asynchronous promise.
+         * @remarks  Only $select option can be specified within $expand.<BR>
+         *           Only the following attribute types are supported in offline mode:<BR>
+         *             BigInt, Boolean, Customer, DateTime, Decimal, Double, EntityName<BR>
+         *             Integer, Lookup, Memo, Money, Owner, Picklist, String, State<BR>
          *             Status, UniqueIdentifier
+         * @deprecated Use {@link Xrm.WebApi.retrieveRecord} instead.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
          */
         retrieveRecord(entityType: string, id: string, options: string): Async.PromiseLike<Async.OfflineOperationSuccessCallbackObject>;
 
@@ -929,66 +1129,64 @@ declare namespace Xrm {
          * @param entityType The logical name of the entity.
          * @param options (Optional) The logical name of the enti
          * @param maxPageSize (Optional) A positive number to indicates the number of entity records to be returned per page.
-         *                    If you do not specify this parameter, the default value is passed as 5000.
-         *                    If the number of records being retrieved is more than maxPageSize, an @odata.nextLink property
-         *                    will be returned, and you can use the value of the @odata.nextLink property with a new GET
-         *                    request to return next set of records.
-         *
-         * @return Returns an asynchronous promise.
-         *
+         * * If you do not specify this parameter, the default value is passed as 5000.
+         * * If the number of records being retrieved is more than maxPageSize, an @odata.nextLink property
+         * will be returned, and you can use the value of the @odata.nextLink property with a new GET
+         * request to return next set of records.
+         * @returns Returns an asynchronous promise.
          * @remarks  A maximum of 5000 related records can be retrieved when using $expand.
-         *           Only $select option can be specified within $expand.
-         *           $skip query option is not supported.
-         *           Only the following attribute types are supported in offline mode:
-         *             BigInt, Boolean, Customer, DateTime, Decimal, Double, EntityName
-         *             Integer, Lookup, Memo, Money, Owner, Picklist, String, State
+         * * Only $select option can be specified within $expand.
+         * * $skip query option is not supported.
+         * * Only the following attribute types are supported in offline mode:<BR>
+         *             BigInt, Boolean, Customer, DateTime, Decimal, Double, EntityName<BR>
+         *             Integer, Lookup, Memo, Money, Owner, Picklist, String, State<BR>
          *             Status, UniqueIdentifier
+         * @deprecated Use {@link Xrm.WebApi.retrieveMultipleRecords} instead.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
          */
         retrieveMultipleRecords(entityType: string, options: string, maxPageSize: number): Async.PromiseLike<Array<{ [key: string]: any }>>;
 
         /**
          * Updates an entity record in mobile clients while working in the offline mode.
-         *
          * @param entityType The logical name of the entity.
          * @param id GUID of the record to update.
          * @param data A dictionary object containing key : value pairs for the record to update.
-         *
-         * @return Returns an asynchronous promise.
-         *
-         * @remarks  You cannot update intersect and activity party entities.
-         *           Only the following attribute types are supported in offline mode:
-         *             BigInt, Boolean, Customer, DateTime, Decimal, Double, EntityName
-         *             Integer, Lookup, Memo, Money, Owner, Picklist, String, State
+         * @returns Returns an asynchronous promise.
+         * @remarks  You cannot update intersect and activity party entities.<BR>
+         *           Only the following attribute types are supported in offline mode:<BR>
+         *             BigInt, Boolean, Customer, DateTime, Decimal, Double, EntityName<BR>
+         *             Integer, Lookup, Memo, Money, Owner, Picklist, String, State<BR>
          *             Status, UniqueIdentifier
+         * @deprecated Use {@link Xrm.WebApi.updateRecord} instead.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
          */
         updateRecord(entityType: string, id: string, data: { [attributeName: string]: any }): Async.PromiseLike<Async.OfflineOperationSuccessCallbackObject>;
 
         /**
          * Deletes an entity record in mobile clients while working in the offline mode.
-         *
          * @param entityType The logical name of the entity.
          * @param id GUID of the record to delete.
-         *
-         * @return Returns an asynchronous promise.
-         *
+         * @returns Returns an asynchronous promise.
          * @remarks  You cannot delete intersect and activity party entities.
+         * @deprecated Use {@link Xrm.WebApi.deleteRecord} instead.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
          */
         deleteRecord(entityType: string, id: string): Async.PromiseLike<Async.OfflineOperationSuccessCallbackObject>;
     }
 
     /**
      * Interface for the Xrm.Panel API
+     * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-panel External Link: Xrm.Panel}
      */
     interface Panel {
         /**
-         * Displays the web page represented by a URL in the static area in the side pane, which appears on all pages in the web client.
-         *
+         * Displays the web page represented by a URL in the static area in the side pane, which appears on all pages in the Customer Engagement web client.
          * @param url URL of the page to be loaded in the side pane static area.
          * @param title Title of the side pane static area.
-         *
          * @remarks  This method is only supported for the web client.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-panel/loadpanel External Link: loadPanel (Client-side reference)}
          */
-        LoadPanel(url: string, title: string): void;
+        loadPanel(url: string, title: string): void;
     }
 
     /**
@@ -1017,7 +1215,7 @@ declare namespace Xrm {
             /**
              * A lookup value which identifies the record which has been created.
              */
-            savedEntityReference: Page.LookupValue;
+            savedEntityReference: LookupValue;
         }
 
         /**
@@ -1055,7 +1253,8 @@ declare namespace Xrm {
              * @param onrejected The callback to execute when the Promise is rejected.
              * @returns A Promise for the completion of which ever callback is executed.
              */
-            then<U>(onFulfilled?: (value: T) => U | PromiseLike<U>, onRejected?: (error: any) => U | PromiseLike<U>): PromiseLike<U>;
+            then<U>(onFulfilled?: (value: T) => U | PromiseLike<U>, onRejected?: (error: any) => U | PromiseLike<U>):
+                PromiseLike<U>;
             then<U>(onFulfilled?: (value: T) => U | PromiseLike<U>, onRejected?: (error: any) => void): PromiseLike<U>;
 
             /**
@@ -1086,17 +1285,14 @@ declare namespace Xrm {
     namespace Collection {
         /**
          * Called for each item in an array
-         *
          * @param item The item.
          * @param index Zero-based index of the item array.
-         *
-         * @return true if the item matches, false if it does not.
+         * @returns true if the item matches, false if it does not.
          */
         type MatchingDelegate<T> = (item: T, index?: number) => boolean;
 
         /**
          * Called for each item in an array
-         *
          * @param item The item.
          * @param index Zero-based index of the item array.
          */
@@ -1104,7 +1300,6 @@ declare namespace Xrm {
 
         /**
          * Interface for an item collection.
-         *
          * @param T Generic type parameter.
          */
         interface Dictionary<T> {
@@ -1112,377 +1307,1182 @@ declare namespace Xrm {
             [index: number]: T;
         }
 
+        /**
+         * Collections are structures to provide access to data that represent an array, but without the ability to modify the data in the array.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/collections External Link: Collections (Client API reference)}
+         */
         type ItemCollection<T> = Dictionary<T> & {
             /**
              * Applies an operation to all items in this collection.
-             *
              * @param delegate An iterative delegate function
              */
             forEach(delegate: IterativeDelegate<T>): void;
 
             /**
              * Gets the item using a delegate matching function
-             *
              * @param delegate A matching delegate function
-             *
-             * @return A T[] whose members have been validated by delegate.
+             * @returns A T[] whose members have been validated by delegate.
              */
             get(delegate: MatchingDelegate<T>): T[];
 
             /**
              * Gets the item given by the index.
-             *
              * @param itemNumber The item number to get.
-             *
-             * @return The T in the itemNumber-th place.
+             * @returns The T in the itemNumber-th place.
              */
             get(itemNumber: number): T;
 
             /**
              * Gets the item given by the index.
-             *
              * @param itemNumber The item number to get.
-             *
-             * @return The T in the itemNumber-th place.
-             *
-             * @see {@link Xrm.Page.Control.getName()} for Control-naming schemes.
+             * @returns The T in the itemNumber-th place.
+             * @see {@link Controls.Control.getName Controls.Control.getName()} for Control-naming schemes.
              */
             get<TSubType extends T>(itemNumber: number): TSubType;
 
             /**
              * Gets the item given by the key.
-             *
              * @param itemName The item name to get.
-             *
-             * @return The T matching the key itemName.
-             *
-             * @see {@link Xrm.Page.Control.getName()} for Control-naming schemes.
+             * @returns The T matching the key itemName.
+             * @see {@link Controls.Control.getName Controls.Control.getName()} for Control-naming schemes.
              */
             get(itemName: string): T;
 
             /**
              * Gets the item given by the key.
-             *
              * @param itemName The item name to get.
-             *
-             * @return The T matching the key itemName.
-             *
-             * @see {@link Xrm.Page.Control.getName()} for Control-naming schemes.
+             * @returns The T matching the key itemName.
+             * @see {@link Controls.Control.getName Controls.Control.getName()} for Control-naming schemes.
              */
             get<TSubType extends T>(attributeName: string): TSubType;
 
             /**
              * Gets the entire array of T.
-             *
-             * @return A T[].
+             * @returns A T[].
              */
             get(): T[];
 
             /**
              * Gets the length of the collection.
-             *
-             * @return The length.
+             * @returns The length.
              */
             getLength(): number;
         };
     }
 
     /**
-     * The Xrm.Page API
-     *
-     * @see {@link http://msdn.microsoft.com/en-us/library/gg328255.aspx|Documentation} for details.
+     * Interface for Page context
+     * @deprecated Use {@link Xrm.Events.EventContext.getFormContext formContext} instead.
+     * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}a
+     */
+    interface Page extends FormContext {
+        /**
+         * Provides methods to retrieve information specific to an organization, a user, or parameters passed to a page.
+         * @deprecated Deprecated in v9.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
+         */
+        context: GlobalContext;
+    }
+
+    /**
+     * Xrm.Page namespace has been deprecated
+     * @deprecated Use {@link Xrm.Events.EventContext.getFormContext formContext} instead.
+     * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
      */
     namespace Page {
         /**
-         * Requirement Level for Xrm.Page.Attribute.getRequiredLevel() and Xrm.Page.Attribute.setRequiredLevel().
+         * @deprecated Use {@link Xrm.Controls.AddControlNotificationOptions} instead.
          */
-        type RequirementLevel = "none" | "recommended" | "required";
+        interface AddControlNotificationOptions extends Controls.AddControlNotificationOptions { }
+
+        /**
+         * Interface to define the actions on a control notification
+         * @deprecated Use {@link Xrm.Controls.ControlNotificationAction} instead.
+         */
+        interface ControlNotificationAction extends Controls.ControlNotificationAction { }
+
+        /**
+         * Interface for an entity's form selector item.
+         * @deprecated Use {@link Xrm.Controls.FormItem} instead.
+         */
+        interface FormItem extends Controls.FormItem { }
+
+        /**
+         * Interface for the form selector API.
+         * @deprecated Use {@link Xrm.Controls.FormSelector} instead.
+         */
+        interface FormSelector extends Controls.FormSelector { }
+
+        /**
+         * Interface for Xrm.Page.ui.navigation.
+         * @deprecated Use {@link Xrm.Controls.Navigation} instead.
+         */
+        interface Navigation extends Controls.Navigation { }
+
+        /**
+         * Interface for a navigation item.
+         * @see {@link UiElement}
+         * @see {@link UiFocusable}
+         * @deprecated Use {@link Xrm.Controls.NavigationItem} instead.
+         */
+        interface NavigationItem extends Controls.NavigationItem { }
+
+        /**
+         * Constants to use with the addNotification method of form controls
+         * @deprecated Use {@link Xrm.Controls.NotificationLevel} instead.
+         */
+        type NotificationLevel = Controls.NotificationLevel;
+        /**
+         * Requirement Level for Xrm.Page.Attribute.getRequiredLevel() and Xrm.Page.Attribute.setRequiredLevel().
+         * @deprecated Use {@link Xrm.Attributes.RequirementLevel} instead.
+         */
+        type RequirementLevel = Attributes.RequirementLevel;
 
         /**
          * Save Modes for Xrm.Page.Entity.save().
+         * @deprecated Use {@link Xrm.EntitySaveMode} instead.
          */
-        type SaveMode = "saveandclose" | "saveandnew";
+        type SaveMode = EntitySaveMode;
 
         /**
          * Status for Xrm.Page.Stage.getStatus().
+         * @deprecated Use {@link Xrm.ProcessFlow.StageStatus} instead.
          */
-        type StageStatus = "active" | "inactive";
+        type StageStatus = ProcessFlow.StageStatus;
 
         /**
          * Status for Xrm.Page.Process.getStatus().
+         * @deprecated Use {@link Xrm.ProcessFlow.ProcessStatus} instead
          */
-        type ProcessStatus = "active" | "aborted" | "finished";
+        type ProcessStatus = ProcessFlow.ProcessStatus;
 
         /**
          * Submit Mode for Xrm.Page.Attribute.getSubmitMode() and Xrm.Page.Attribute.setSubmitMode().
+         * @deprecated Use {@link Xrm.SubmitMode} instead.
          */
-        type SubmitMode = "always" | "dirty" | "never";
+        type SubmitMode = Xrm.SubmitMode;
 
         /**
          * Control type for Xrm.Page.ui.QuickForm.getControlType().
+         * @deprecated Use {@link Xrm.Controls.ControlQuickFormType} instead.
+         *
          */
-        type ControlQuickFormType = "quickform";
+        type ControlQuickFormType = Controls.ControlQuickFormType;
 
         /**
          * Control types for Xrm.Page.Control.getControlType().
+         * @deprecated Use {@link Xrm.Controls.ControlType} instead.
          */
-        type ControlType = "standard" | "iframe" | "lookup" | "optionset" | "subgrid" | "webresource" | "notes" | "timercontrol" | "kbsearch" | "timelinewall" | ControlQuickFormType;
+        type ControlType = Controls.ControlType;
 
         /**
          * Date attribute formats for Xrm.Page.Attribute.getFormat(), used by DateAttribute.
+         * @deprecated Use {@link Xrm.Attributes.DateAttributeFormat} instead.
          */
-        type DateAttributeFormat = "date" | "datetime";
+        type DateAttributeFormat = Attributes.DateAttributeFormat;
 
         /**
          * Integer attribute formats for Xrm.Page.Attribute.getFormat(), used by NumberAttribute.
+         * @deprecated Use {@link Xrm.Attributes.IntegerAttributeFormat} instead.
          */
-        type IntegerAttributeFormat = "duration" | "none";
+        type IntegerAttributeFormat = Attributes.IntegerAttributeFormat;
 
         /**
          * OptionSet attribute formats for Xrm.Page.Attribute.getFormat(), used by OptionSetAttribute.
+         * @deprecated Use {@link Xrm.Attributes.OptiopnSetAttributeFormat} instead.
          */
-        type OptionSetAttributeFormat = "language" | "timezone";
+        type OptionSetAttributeFormat = Attributes.OptionSetAttributeFormat;
 
         /**
          * String attribute formats for Xrm.Page.Attribute.getFormat(), used by StringAttribute.
+         * @deprecated Use {@link Xrm.Attributes.StringAttributeFormat} instead.
          */
-        type StringAttributeFormat = "email" | "phone" | "text" | "textarea" | "tickersymbol" | "url";
+        type StringAttributeFormat = Attributes.StringAttributeFormat;
 
         /**
          * Attribute types for Xrm.ui.ProcessMonitor Xrm.Page.Attribute.setDisplayState().
+         * @deprecated Use {@link Xrm.Attributes.AttributeType} instead.
          */
-        type AttributeType = "boolean" | "datetime" | "decimal" | "double" | "integer" | "lookup" | "memo" | "money" | "optionset" | "string";
+        type AttributeType = Attributes.AttributeType;
 
         /**
          * Direction types for a process stage change event
+         * @deprecated Use {@link Xrm.ProcessFlow.StageChangeDirection} instead.
          */
-        type StageChangeDirection = "Next" | "Previous";
+        type StageChangeDirection = ProcessFlow.StageChangeDirection;
 
         /**
          * Attribute formats for Xrm.Page.Attribute.getFormat().
+         * @deprecated Use {@link Xrm.Attributes.AttributeFormat} instead.
          */
-        type AttributeFormat = DateAttributeFormat | IntegerAttributeFormat | OptionSetAttributeFormat | StringAttributeFormat;
+        type AttributeFormat = Attributes.AttributeFormat;
 
         /**
          * Interface for a CRM Business Process Flow instance.
+         * @deprecated Use {@link Xrm.ProcessFlow.Process} instead.
          */
-        interface Process {
-            /**
-             * Returns the unique identifier of the process.
-             *
-             * @return The identifier for this process, in GUID format.
-             *
-             * @remarks  Example: "{825CB223-A651-DF11-AA8B-00155DBA3804}".
-             */
-            getId(): string;
-
-            /**
-             * Returns the name of the process.
-             *
-             * @return The name.
-             */
-            getName(): string;
-
-            /**
-             * Returns an collection of stages in the process.
-             *
-             * @return The stages.
-             */
-            getStages(): Collection.ItemCollection<Stage>;
-
-            /**
-             * Returns a boolean value to indicate if the process is rendered.
-             *
-             * @return true if the process is rendered, false if not.
-             */
-            isRendered(): boolean;
-        }
+        interface Process extends ProcessFlow.Process { }
 
         /**
          * Interface for CRM Business Process Flow stages.
+         * @deprecated Use {@link Xrm.ProcessFlow.Stage} instead.
          */
-        interface Stage {
-            /**
-             * Returns an object with a getValue method which will return the integer value of the business process flow
-             * category.
-             *
-             * @return The stage category.
-             */
-            getCategory(): { getValue(): XrmEnum.StageCategory };
+        interface Stage extends ProcessFlow.Stage { }
 
-            /**
-             * Returns the logical name of the entity associated with the stage.
-             *
-             * @return The entity name.
-             */
-            getEntityName(): string;
-
-            /**
-             * Returns the unique identifier of the stage.
-             *
-             * @return The identifier of the Stage, in GUID format.
-             *
-             * @remarks  Example: "{825CB223-A651-DF11-AA8B-00155DBA3804}".
-             */
-            getId(): string;
-
-            /**
-             * Returns the name of the stage.
-             *
-             * @return The name.
-             */
-            getName(): string;
-
-            /**
-             * Returns the status of the stage.
-             *
-             * @return The status.
-             *
-             * @remarks  This method will return either "active" or "inactive".
-             */
-            getStatus(): StageStatus;
-
-            /**
-             * Returns a collection of steps in the stage.
-             *
-             * @return An array of Step.
-             */
-            getSteps(): Step[];
-        }
-
-        interface Step {
-            /**
-             * Returns the logical name of the attribute associated to the step.
-             *
-             * @return The attribute.
-             *
-             * @remarks  Some steps don’t contain an attribute value.
-             */
-            getAttribute(): string;
-
-            /**
-             * Returns the name of the step.
-             *
-             * @return The name.
-             */
-            getName(): string;
-
-            /**
-             * Returns whether the step is required in the business process flow.
-             *
-             * @return true if required, false if not.
-             *
-             * @remarks     Returns true if the step is marked as required in the Business Process Flow editor; otherwise, false.
-             *              There is no connection between this value and the values you can change in the Xrm.Page.data.entity
-             *              attribute RequiredLevel methods.
-             */
-            isRequired(): boolean;
-        }
+        /**
+         * Interface for CRM Business Process Flow steps.
+         * @deprecated Use {@link Xrm.ProcessFlow.Step} instead.
+         */
+        interface Step extends ProcessFlow.Step { }
 
         /**
          * Interface for the event context.
+         * @deprecated Use {@link Xrm.Events.EventContext} instead.
          */
-        interface EventContext {
-            /**
-             * Gets the Xrm context.
-             *
-             * @return The Xrm context.
-             */
-            getContext(): Context;
-
-            /**
-             * Gets the handler's depth, which is the order in which the handler is executed.
-             *
-             * @return The depth, a 0-based index.
-             */
-            getDepth(): number;
-
-            /**
-             * Gets a reference to the object for which event occurred.
-             *
-             * @return The event source.
-             */
-            getEventSource(): Attribute | Control | Entity;
-
-            /**
-             * Gets a reference to the currnet form context
-             *
-             * @return  The form context
-             */
-            getFormContext(): Page;
-
-            /**
-             * Gets the shared variable with the specified key.
-             *
-             * @param T Generic type parameter.
-             * @param key The key.
-             *
-             * @return The shared variable.
-             *
-             * @remarks Used to pass values between handlers of an event.
-             */
-            getSharedVariable<T>(key: string): T;
-
-            /**
-             * Sets a shared variable.
-             *
-             * @param T Generic type parameter.
-             * @param key The key.
-             * @param value The value.
-             *
-             * @remarks Used to pass values between handlers of an event.
-             */
-            setSharedVariable<T>(key: string, value: T): void;
-        }
+        interface EventContext extends Events.EventContext { }
 
         /**
          * Interface for a save event context
+         * @deprecated Use {@link Xrm.Events.SaveEventContext} instead.
          */
-        interface SaveEventContext extends EventContext {
-            /**
-             * Gets save-event arguments.
-             *
-             * @return The event arguments.
-             *
-             * @remarks Returns null for all but the "save" event.
-             */
-            getEventArgs(): SaveEventArguments;
-        }
+        interface SaveEventContext extends Events.SaveEventContext { }
 
         /**
          * Interface for a process stage change event context
+         * @deprecated Use {@link Xrm.Events.StageChangeEventContext} instead.
          */
-        interface StageChangeEventContext extends EventContext {
-            /**
-             * Gets process stage change event arguments.
-             *
-             * @return The event arguments.
-             *
-             */
-            getEventArgs(): StageChangeEventArguments;
-        }
+        interface StageChangeEventContext extends Events.StageChangeEventContext { }
 
-        interface StageSelectedEventContext extends EventContext {
-            /**
-             * Gets process stage selected event arguments.
-             *
-             * @return The event arguments.
-             *
-             */
-            getEventArgs(): StageSelectedEventArguments;
-        }
+        /**
+         * Interface for a process stage select event context
+         * @deprecated  Use {@link Xrm.Events.StageSelectedEventContext} instead.
+         */interface StageSelectedEventContext extends Events.StageSelectedEventContext { }
 
         /**
          * Type for a context-sensitive handler.
          * @param context The context.
+         * @deprecated Use {@link Xrm.Events.ContextSensitiveHandler} instead.
          */
-        type ContextSensitiveHandler = (context: EventContext) => void;
+        type ContextSensitiveHandler = Events.ContextSensitiveHandler;
 
         /**
          * Type for a process status change handler.
          * @param status The process status.
+         * @deprecated Use {@link Xrm.Events.ProcessStatusChangeHandler} instead.
          */
-        type ProcessStatusChangeHandler = (status: ProcessStatus) => void;
+        type ProcessStatusChangeHandler = Events.ProcessStatusChangeHandler;
+
+        /**
+         * Interface for UI elements with labels.
+         * @deprecated Use {@link Xrm.Controls.UiLabelElement} instead.
+         */
+        interface UiLabelElement extends Controls.UiLabelElement { }
+
+        /**
+         * Interface for UI elements which can have the visibility value read.
+         * @deprecated Use {@link Xrm.Controls.UiCanGetVisibleElement} instead.
+         */
+        interface UiCanGetVisibleElement extends Controls.UiCanGetVisibleElement { }
+
+        /**
+         * Interface for UI elements which can have the visibility value updated.
+         * @deprecated Use {@link Xrm.Controls.UiCanSetVisibleElement} instead.
+         */
+        interface UiCanSetVisibleElement extends Controls.UiCanSetVisibleElement { }
+
+        /**
+         * Base interface for standard UI elements.
+         * @deprecated Use {@link Xrm.Controls.UiStandardElement} instead.
+         */
+        interface UiStandardElement extends Controls.UiStandardElement { }
+
+        /**
+         * Interface for focusable UI elements.
+         * @deprecated Use {@link Xrm.Controls.UiFocusable} instead.
+         */
+        interface UiFocusable extends Controls.UiFocusable { }
+
+        /**
+         * Interface for controls which methods provide immediate feedback or take actions as user types in a control.
+         * Contains methods which can be used to perform data validations in a control even before the user commits (saves) the value in a form.
+         * @deprecated Use {@link Xrm.Controls.UiKeyPressable} instead.
+         */
+        interface UiKeyPressable extends Controls.UiKeyPressable { }
+
+        /**
+         * Interface for Result value of AutoCompleteResultSet
+         * @deprecated Use {@link Xrm.Controls.AutoCompleteResult} instead.
+         */
+        interface AutoCompleteResult extends Controls.AutoCompleteResult { }
+
+        /**
+         * Interface for command of AutoCompleteResultSet.  This is displayed at the bottom of the auto complete view
+         * @deprecated Use {@link Xrm.Controls.AutoCompleteCommand} instead.
+         */
+        interface AutoCompleteCommand extends Controls.AutoCompleteCommand { }
+
+        /**
+         * Interface for showAutoComplete argument
+         * @deprecated Use {@link Xrm.Controls.AutoCompleteResultSet} instead.
+         */
+        interface AutoCompleteResultSet extends Controls.AutoCompleteResultSet { }
+
+        /**
+         * Interface for a Lookup value.
+         * @deprecated Use {@link Xrm.LookupValue} instead.
+         */
+        interface LookupValue extends Xrm.LookupValue { }
+
+        /**
+         * Interface for an OptionSet value.
+         * @deprecated Use {@link Xrm.OptionSetValue} instead.
+         */
+        interface OptionSetValue extends Xrm.OptionSetValue { }
+
+        /**
+         * Interface for a privilege.
+         * @deprecated Use {@link Xrm.Privilege} instead.
+         */
+        interface Privilege extends Xrm.Privilege { }
+
+        /**
+         * Interface for an Entity attribute.
+         * @deprecated Use {@link Xrm.Attributes.Attribute} instead.
+         */
+        interface Attribute extends Attributes.Attribute { }
+
+        /**
+         * Interface for a Number attribute.
+         * @see {@link Attribute}
+         * @deprecated Use {@link Xrm.Attributes.NumberAttribute} instead.
+         */
+        interface NumberAttribute extends Attributes.NumberAttribute { }
+
+        /**
+         * Interface for a String attribute.
+         * @see {@link Attribute}
+         * @deprecated Use {@link Xrm.Attributes.StringAttribute} instead.
+         */
+        interface StringAttribute extends Attributes.StringAttribute { }
+
+        /**
+         * Common interface for enumeration attributes (OptionSet and Boolean).
+         * @see {@link Attribute}
+         * @deprecated Use {@link Xrm.Attributes.EnumAttribute} instead.
+         */
+        interface EnumAttribute extends Attributes.EnumAttribute { }
+
+        /**
+         * Interface for a Boolean attribute.
+         * @see {@link EnumAttribute}
+         * @deprecated Use {@link Xrm.Attributes.BooleanAttribute} instead.
+         */
+        interface BooleanAttribute extends Attributes.BooleanAttribute { }
+
+        /**
+         * Interface for a Date attribute.
+         * @see {@link Attribute}
+         * @deprecated Use {@link Xrm.Attributes.DateAttribute} instead.
+         */
+        interface DateAttribute extends Attributes.DateAttribute { }
+
+        /**
+         * Interface an OptionSet attribute.
+         * @see {@link EnumAttribute}
+         * @deprecated Use {@link Xrm.Attributes.OptionSetAttribute} instead.
+         */
+        interface OptionSetAttribute extends Attributes.OptionSetAttribute { }
+
+        /**
+         * Interface a Lookup attribute.
+         * @see {@link Attribute}
+         * @deprecated Use {@link Xrm.Attributes.LookupAttribute} instead.
+         */
+        interface LookupAttribute extends Attributes.LookupAttribute { }
+
+        /**
+         * Interface for the form's record context, Xrm.Page.data.entity
+         * @deprecated Use {@link Xrm.Entity} instead.
+         */
+        interface Entity extends Xrm.Entity { }
+
+        /**
+         * Interface for save event arguments.
+         * @deprecated Use {@link Xrm.Events.SaveEventContext} instead.
+         */
+        interface SaveEventArguments extends Events.SaveEventContext { }
+
+        /**
+         * Interface for process stage change event arguments.
+         * @deprecated Use {@link Xrm.Events.StageChangeEventArguments} instead.
+         */
+        interface StageChangeEventArguments extends Events.StageChangeEventArguments { }
+
+        /**
+         * Interface for process stage selected event arguments.
+         * @deprecated Use {@link Xrm.Events.StageSelectedEventArguments} instead.
+         */
+        interface StageSelectedEventArguments extends Events.StageSelectedEventArguments { }
+
+        /**
+         * Interface for Xrm.Page.ui controls.
+         * @see {@link UiElement}
+         * @deprecated Use {@link Xrm.Controls.Control} instead.
+         */
+        interface Control extends Controls.Control { }
+
+        /**
+         * Interface for a standard control.
+         * @see {@link Control}
+         * @deprecated Use {@link Xrm.Controls.StandardControl} instead.
+         */
+        interface StandardControl extends Controls.StandardControl { }
+
+        /**
+         * Interface for Auto Lookup Control.
+         * This is not an Entity Lookup, but a control that supports AutoComplete / KeyPress Events (Text or Number)
+         * @remarks This interface is not supported for CRM mobile clients (phones or tablets) and the interactive service hub.  It is only available for Updated entities.
+         * @see {@link StandardControl}
+         * @deprecated Use {@link Xrm.Controls.AutoLookupControl} instead.
+         */
+        interface AutoLookupControl extends Controls.AutoLookupControl { }
+
+        /**
+         * Interface for a String control.
+         * @see {@link StandardControl}
+         * @deprecated Use {@link Xrm.Controls.StringControl} instead.
+         */
+        interface StringControl extends Controls.StringControl { }
+
+        /**
+         * Interface for a Number control.
+         * @see {@link StandardControl}
+         * @deprecated Use {@link Xrm.Controls.NumberControl} instead.
+         */
+        interface NumberControl extends AutoLookupControl { }
+
+        /**
+         * Interface for a Date control.
+         * @see {@link StandardControl}
+         * @deprecated Use {@link Xrm.Controls.DateControl} instead.
+         */
+        interface DateControl extends StandardControl { }
+
+        /**
+         * Interface for a Lookup control.
+         * @see {@link StandardControl}
+         * @deprecated Use {@link Xrm.Controls.LookupControl} instead.
+         */
+        interface LookupControl extends Controls.LookupControl { }
+
+        /**
+         * Interface for an OptionSet control.
+         * @see {@link StandardControl}
+         * @deprecated Use {@link Xrm.Controls.OptionSetControl} instead.
+         */
+        interface OptionSetControl extends Controls.OptionSetControl { }
+
+        /**
+         * Interface for a CRM grid control.
+         *
+         * @see {@link Control}
+         * @deprecated  Use {@link Xrm.Controls.GridControl} instead.
+         */
+        interface GridControl extends Controls.GridControl { }
+
+        /**
+         * Interface for a framed control, which is either a Web Resource or an Iframe.
+         * @see {@link Control}
+         * @remarks     An Iframe control provides additional methods, so use {@link IframeControl} where
+         *              appropriate.  Silverlight controls should use {@link SilverlightControl}.
+         * @deprecated  Use {@link Xrm.Controls.FramedControl} instead.
+         */
+        interface FramedControl extends Controls.FramedControl { }
+
+        /**
+         * Interface for an Iframe control.
+         * @see {@link FramedControl}
+         * @deprecated  Use {@link Xrm.Controls.IframeControl} instead.
+         */
+        interface IframeControl extends Controls.IframeControl { }
+
+        /**
+         * Interface for a Silverlight control.
+         * @see {@link Control}
+         * @deprecated Use {@link Xrm.Controls.SilverlightControl} instead.
+         */
+        interface SilverlightControl extends Controls.SilverlightControl { }
+
+        /**
+         * Interface for a Timeline control.
+         * @see {@link Control}
+         * @deprecated Use {@link Xrm.Controls.TimelineWall} instead.
+         */
+        interface TimelineWall extends Controls.TimelineWall { }
+
+        /**
+         * Interface for a form tab.
+         * @see {@link UiElement}
+         * @see {@link UiFocusable}
+         * @deprecated Use {@link Xrm.Controls.Tab} instead.
+         */
+        interface Tab extends Controls.Tab { }
+
+        /**
+         * Interface for a form section.
+         * @see {@link UiElement}
+         * @deprecated Use {@link Xrm.Controls.Section} instead.
+         */
+        interface Section extends Controls.Section { }
+
+        /**
+         * Module for the Xrm.Page.data API.
+         * @deprecated Use {@link Xrm.Form.data formContext.data} has been deprecated.
+         */
+        namespace data {
+            /**
+             * Interface for the Xrm.Page.data.process API.
+             * @deprecated Use {@link Xrm.ProcessFlow.ProcessManager} instead.
+             */
+            interface ProcessManager extends ProcessFlow.ProcessManager {
+            }
+
+            /**
+             * Called when method to get active processes is complete
+             * @param status The result of the get active processes operation.
+             * @remarks **Returns object with the following key-value pairs**:
+             * * CreatedOn
+             * * ProcessDefinitionID
+             * * ProcessDefinitionName
+             * * ProcessInstanceID
+             * * ProcessInstanceName
+             * * StatusCodeName
+             * @deprecated Use {@link Xrm.ProcessFlow.GetProcessInstancesDelegate} instead.
+             */
+            type GetProcessInstancesDelegate = ProcessFlow.GetProcessInstancesDelegate;
+
+            /**
+             * Called when method to set active process is complete
+             * @param status The result of the set active process operation.
+             * @remarks **Values returned are**:
+             * * success        (The operation succeeded.)
+             * * invalid        (The processInstanceId isn’t valid or the process isn’t enabled.)
+             * @deprecated Use {@link Xrm.ProcessFlow.SetProcessInstanceDelegate} instead.
+             */
+            type SetProcessInstanceDelegate = ProcessFlow.SetProcessInstanceDelegate;
+
+            /**
+             * Called when process change methods have completed.
+             * @param status The result of the process change operation.
+             * @remarks **Values returned are**:
+             * * success        (The operation succeeded.)
+             * * crossEntity    (The previous stage is for a different entity.)
+             * * beginning      (The active stage is the first stage of the active path.)
+             * * invalid        (The operation failed because the selected stage isn’t the same as the active stage.)
+             * * unreachable    (The stage exists on a different path.)
+             * @deprecated Use {@link Xrm.ProcessFlow.ProcessCallbackDelegate} instead.
+             */
+            type ProcessCallbackDelegate = ProcessFlow.ProcessCallbackDelegate;
+
+            /**
+             * Called when process set status method has completed.
+             * @param status The new status of the process instance
+             * @remarks **Values returned are**:
+             * * active
+             * * aborted
+             * * finished
+             * @deprecated Use {@link Xrm.ProcessFlow.ProcessSetStatusDelegate} instead.
+             */
+            type ProcessSetStatusDelegate = ProcessFlow.ProcessSetStatusDelegate;
+
+            /**
+             * Represents a key-value pair, where the key is the Process Flow's ID, and the value is the name thereof.
+             * @deprecated Use {@link Xrm.ProcessFlow.ProcessDictionary} instead.
+             */
+            interface ProcessDictionary extends ProcessFlow.ProcessDictionary { }
+        }
+
+        /**
+         * Contains properties and methods to retrieve information about the user interface as well as collections for several subcomponents of the form.
+         * @deprecated Use {@link Xrm.Form.ui formContext.ui} instead.
+         */
+        namespace ui {
+            /**
+             * Form Notification Levels for Xrm.Ui.setFormNotification().
+             * @deprecated Use {@link Xrm.FormNotificationLevel} instead.
+             */
+            type FormNotificationLevel = Xrm.FormNotificationLevel;
+
+            /**
+             * Display States for Xrm.ui.ProcessMonitor.setDisplayState().
+             * @deprecated Use {@link Xrm.DisplayState} instead.
+             */
+            type DisplayState = Xrm.DisplayState;
+
+            /**
+             * Interface for Xrm.Page.ui.process API
+             * @deprecated Use {@link Xrm.Controls.ProcessControl} instead.
+             */
+            interface ProcessManager extends Controls.ProcessControl { }
+
+            /**
+             * Interface for a grid.  Use Grid methods to access information about data in the grid. Grid is returned by the
+             * GridControl.getGrid method.
+             * @deprecated Use {@link Xrm.Controls.Grid} instead.
+             */
+            interface Grid extends Controls.Grid { }
+
+            /**
+             * Interface for a grid row.  Use the GridRow.getData method to access the GridRowData. A collection of GridRow is
+             * returned by Grid.getRows and Grid.getSelectedRows methods.
+             * In V9 - this is essentailly a form context.
+             * @deprecated Use {@link Xrm.Controls.Grid.GridRow} instead.
+             */
+            interface GridRow extends Controls.Grid.GridRow { }
+
+            /**
+             * Interface for grid row data.  Use the GridRowData.getEntity method to access the GridEntity. GridRowData is
+             * returned by the GridRow.getData method.
+             * @deprecated Use {@link Xrm.Controls.Grid.GridRowData} instead.
+             */
+            interface GridRowData extends Controls.Grid.GridRowData { }
+
+            /**
+             * Interface for a grid entity.  Use the GridEntity methods to access data about the specific records in the rows.
+             * GridEntity is returned by the GridRowData.getEntity method.
+             * @deprecated Use {@link Xrm.Controls.Grid.GridRowData} instead.v
+             */
+            interface GridEntity extends Controls.Grid.GridEntity { }
+
+            /**
+             * Interface for the view selector.  Use the ViewSelector methods to get or set information about the view selector
+             * of the grid control.
+             * @deprecated Use {@link Xrm.Controls.ViewSelector} instead.
+             */
+            interface ViewSelector extends Controls.ViewSelector { }
+
+            /**
+             * Interface for a view selector item. This object contains data that identifies a view. Use this as a parameter to
+             * the ViewSelector.setCurrentView method.
+             * @deprecated Use {@link Xrm.Controls.ViewSelectorItem} instead.
+             */
+            interface ViewSelectorItem extends Controls.ViewSelectorItem { }
+
+            /**
+             * Interface for a quick view control instance on a form.
+             * @see {@link https://msdn.microsoft.com/en-us/library/mt736908.aspx External Link: Xrm.Page.ui quickForms (client-side reference)}
+             * @deprecated Use {@link Xrm.Controls.ViewSelectorItem} instead.
+             */
+            interface QuickForm extends Controls.QuickFormControl { }
+        }
+    }
+
+    /**
+     * Interface for a Lookup value.
+     */
+    interface LookupValue {
+        /**
+         * The identifier.
+         */
+        id: string;
+
+        /**
+         * The name
+         */
+        name?: string;
+
+        /**
+         * Type of the entity.
+         */
+        entityType: string;
+    }
+
+    /**
+     * Interface for an OptionSet value.
+     */
+    interface OptionSetValue {
+        /**
+         * The label text.
+         */
+        text: string;
+
+        /**
+         * The value, as a number
+         */
+        value: number;
+    }
+
+    /**
+     * A collection of types and methods for working with formContext attributes.
+     * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/attributes External Link: Attributes (Client API reference)}
+     * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/collections External Link: Collections (Client API reference)}
+     */
+    namespace Attributes {
+        /**
+         * Requirement Level for {@link Attributes.Attribute.getRequiredLevel Attributes.Attribute.getRequiredLevel()} and
+         * {@link Attributes.Attribute.setRequiredLevel Attributes.Attribute.setRequiredLevel()}.
+         * @see {@link XrmEnum.AttributeRequirementLevel}
+         */
+        type RequirementLevel = "none" | "recommended" | "required";
+
+        /**
+         * Date attribute formats for Attributes.Attribute.getFormat(), used by {@link Attributes.DateAttribute DateAttribute}.
+         * @see {@link XrmEnum.DateAttributeFormat}
+         */
+        type DateAttributeFormat = "date" | "datetime";
+
+        /**
+         * Integer attribute formats for Attributes.Attribute.getFormat(), used by {@link Attributes.NumberAttribute NumberAttribute}.
+         * @see {@link XrmEnum.IntegerAttributeFormat}
+         */
+        type IntegerAttributeFormat = "duration" | "none";
+
+        /**
+         * OptionSet attribute formats for Attributes.Attribute.getFormat(), used by {@link Attributes.OptionSetAttribute OptionSetAttribute}.
+         * @see {@link XrmEnum.OptionSetAttributeFormat}
+         */
+        type OptionSetAttributeFormat = "language" | "timezone";
+
+        /**
+         * String attribute formats for Attributes.Attribute.getFormat(), used by {@link Attributes.StringAttribute StringAttribute}.
+         * @see {@link XrmEnum.StringAttributeFormat}
+         */
+        type StringAttributeFormat = "email" | "phone" | "text" | "textarea" | "tickersymbol" | "url";
+
+        /**
+         * Attribute types for {@link Attributes.Attribute.setDisplayState()}.
+         * @see {@link XrmEnum.AttributeType}
+         */
+        type AttributeType = "boolean" | "datetime" | "decimal" | "double" | "integer" |
+            "lookup" | "memo" | "money" | "multioptionset" | "optionset" | "string";
+
+        /**
+         * Attribute formats for {@link Attributes.Attribute.getFormat Attributes.Attribute.getFormat()}.
+         * @see {@link XrmEnum.DateAttributeFormat}
+         * @see {@link XrmEnum.IntegerAttributeFormat}
+         * @see {@link XrmEnum.OptionSetAttributeFormat}
+         * @see {@link XrmEnum.StringAttributeFormat}
+         */
+        type AttributeFormat = DateAttributeFormat | IntegerAttributeFormat | OptionSetAttributeFormat | StringAttributeFormat;
+
+        /**
+         * Interface for an Entity attribute.
+         */
+        interface Attribute {
+            /**
+             * Adds a handler to be called when the attribute's value is changed.
+             * @param handler The function reference.
+             */
+            addOnChange(handler: Events.ContextSensitiveHandler): void;
+
+            /**
+             * Fire all "on change" event handlers.
+             */
+            fireOnChange(): void;
+
+            /**
+             * Gets attribute type.
+             * @returns The attribute's type name.<BR><BR>
+             * **Values returned are**:
+             * * boolean
+             * * datetime
+             * * decimal
+             * * double
+             * * integer
+             * * lookup
+             * * memo
+             * * money
+             * * optionset
+             * * string
+             */
+            getAttributeType(): string;
+
+            /**
+             * Gets the attribute format.
+             * @returns The format of the attribute.<BR><BR>
+             * **Values returned are**:
+             * * date           (datetime)
+             * * datetime       (datetime)
+             * * duration       (integer)
+             * * email          (string)
+             * * language       (optionset)
+             * * none           (integer)
+             * * phone          (string)
+             * * text           (string)
+             * * textarea       (string)
+             * * tickersymbol   (string)
+             * * timezone       (optionset)
+             * * url            (string)
+             * @see {@link getAttributeType}
+             */
+            getFormat(): AttributeFormat;
+
+            /**
+             * Gets a boolean value indicating whether this Attribute has unsaved changes.
+             * @returns true if there are unsaved changes, otherwise false.
+             */
+            getIsDirty(): boolean;
+
+            /**
+             * Gets the logical name of the attribute.
+             * @returns The logical name.
+             */
+            getName(): string;
+
+            /**
+             * Gets a reference to the record context of this attribute.
+             * @returns The parent record context.
+             */
+            getParent(): Entity;
+
+            /**
+             * Gets the current level of requirement for the attribute.
+             * @returns The required level, as either "none", "required", or "recommended"
+             */
+            getRequiredLevel(): RequirementLevel;
+
+            /**
+             * Gets current submit mode for the attribute.
+             * @returns The submit mode, as either "always", "never", or "dirty"
+             * @remarks The default value is "dirty"
+             */
+            getSubmitMode(): SubmitMode;
+
+            /**
+             * Gets the current user's privileges for the attribute.
+             * @returns The user privileges.
+             */
+            getUserPrivilege(): Privilege;
+
+            /**
+             * Removes the handler from the "on change" event.
+             * @param handler The handler.
+             */
+            removeOnChange(handler: Events.ContextSensitiveHandler): void;
+
+            /**
+             * Sets the required level.
+             * @param requirementLevel The requirement level, as either "none", "required", or "recommended"
+             * @see {@link XrmEnum.AttributeRequirementLevel}
+             */
+            setRequiredLevel(requirementLevel: RequirementLevel): void;
+
+            /**
+             * Sets the submit mode.
+             * @param submitMode The submit mode, as either "always", "never", or "dirty".
+             * @default submitMode "dirty"
+             * @see {@link XrmEnum.AttributeRequirementLevel}
+             */
+            setSubmitMode(submitMode: SubmitMode): void;
+
+            /**
+             * A collection of all the controls on the form that interface with this attribute.
+             * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/collections External Link: Collections (Client API reference)}
+             */
+            controls: Collection.ItemCollection<Controls.Control>;
+
+            /**
+             * Gets the value.
+             * @returns The value.
+             */
+            getValue(): any;
+
+            /**
+             * Sets the value.
+             * @param value The value.
+             */
+            setValue(value: any): void;
+        }
+
+        /**
+         * Interface for a Number attribute.
+         * @see {@link Attribute}
+         */
+        interface NumberAttribute extends Attribute {
+            /**
+             * Gets the attribute format.
+             * @returns The format of the attribute.
+             * Values returned are: duration, none
+             */
+            getFormat(): IntegerAttributeFormat;
+
+            /**
+             * Gets the maximum value allowed.
+             * @returns The maximum value allowed.
+             */
+            getMax(): number;
+
+            /**
+             * Gets the minimum value allowed.
+             * @returns The minimum value allowed.
+             */
+            getMin(): number;
+
+            /**
+             * Gets the attribute's configured precision.
+             * @returns The total number of allowed decimal places.
+             */
+            getPrecision(): number;
+
+            /**
+             * Gets the value.
+             * @returns The value.
+             */
+            getValue(): number;
+
+            /**
+             * Sets the value.
+             * @param value The value.
+             * @remarks Attributes on Quick Create Forms will not save values set with this method.
+             */
+            setValue(value: number): void;
+
+            /**
+             * A collection of all the controls on the form that interface with this attribute.
+             * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/collections External Link: Collections (Client API reference)}
+             */
+            controls: Collection.ItemCollection<Controls.NumberControl>;
+        }
+
+        /**
+         * Interface for a String attribute.
+         * @see {@link Attribute}
+         */
+        interface StringAttribute extends Attribute {
+            /**
+             * Gets the attribute format.
+             * @returns The format of the attribute.
+             * Values returned are: email, phone, text, textarea, tickersymbol, url
+             */
+            getFormat(): StringAttributeFormat;
+
+            /**
+             * Gets maximum length allowed.
+             * @returns The maximum length allowed.
+             * @remarks The email form's "Description" attribute does not have the this method.
+             */
+            getMaxLength(): number;
+
+            /**
+             * Gets the value.
+             *
+             * @returns The value.
+             */
+            getValue(): string;
+
+            /**
+             * Sets the value.
+             * @param value The value.
+             * @remarks A String field with the {@link Attribute.getFormat|email} format enforces email
+             *          address formatting. Attributes on Quick Create Forms will not save values set
+             *          with this method.
+             */
+            setValue(value: string): void;
+
+            /**
+             * A collection of all the controls on the form that interface with this attribute.
+             * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/collections External Link: Collections (Client API reference)}
+             */
+            controls: Collection.ItemCollection<Controls.StringControl>;
+        }
+
+        /**
+         * Common interface for enumeration attributes (OptionSet and Boolean).
+         * @see {@link Attribute}
+         */
+        interface EnumAttribute extends Attribute {
+            /**
+             * Gets the initial value of the attribute.
+             * @returns The initial value.
+             * @remarks Valid for OptionSet and boolean attribute types
+             */
+            getInitialValue(): number | boolean;
+        }
+
+        /**
+         * Interface for a Boolean attribute.
+         * @see {@link EnumAttribute}
+         */
+        interface BooleanAttribute extends EnumAttribute {
+            /**
+             * Gets the initial value of the attribute.
+             * @returns The initial value.
+             * @remarks Valid for OptionSet and boolean attribute types
+             */
+            getInitialValue(): boolean;
+
+            /**
+             * Gets the value.
+             * @returns true if it succeeds, false if it fails.
+             */
+            getValue(): boolean;
+
+            /**
+             * Sets the value.
+             * @param value The value.
+             * @remarks Attributes on Quick Create Forms will not save values set with this method.
+             */
+            setValue(value: boolean): void;
+        }
+
+        /**
+         * Interface for a Date attribute.
+         *
+         * @see {@link Attribute}
+         */
+        interface DateAttribute extends Attribute {
+            /**
+             * Gets the attribute format.
+             *
+             * @returns The format of the attribute.
+             * Values returned are: date, datetime
+             */
+            getFormat(): DateAttributeFormat;
+
+            /**
+             * Gets the value.
+             * @returns The value.
+             */
+            getValue(): Date;
+
+            /**
+             * Sets the value.
+             * @param value The value.
+             * @remarks Attributes on Quick Create Forms will not save values set with this method.
+             */
+            setValue(value: Date): void;
+
+            /**
+             * A collection of all the controls on the form that interface with this attribute.
+             * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/collections External Link: Collections (Client API reference)}
+             */
+            controls: Collection.ItemCollection<Controls.DateControl>;
+        }
+
+        /**
+         * Interface an OptionSet attribute.
+         * @see {@link EnumAttribute}
+         */
+        interface OptionSetAttribute extends EnumAttribute {
+            /**
+             * Gets the attribute format.
+             * @returns The format of the attribute.
+             * Values returned are: language, timezone
+             */
+            getFormat(): OptionSetAttributeFormat;
+
+            /**
+             * Gets the initial value of the attribute.
+             * @returns The initial value.
+             * @remarks Valid for OptionSet and boolean attribute types
+             */
+            getInitialValue(): number;
+
+            /**
+             * Gets the option matching a value.
+             * @param value The enumeration value of the option desired.
+             * @returns The option.
+             */
+            getOption(value: number): OptionSetValue;
+
+            /**
+             * Gets the option matching a label.
+             * @param label The label of the option desired.
+             * @returns The option.
+             */
+            getOption(label: string): OptionSetValue;
+
+            /**
+             * Gets all of the options.
+             * @returns An array of options.
+             */
+            getOptions(): OptionSetValue[];
+
+            /**
+             * Gets selected option.
+             * @returns The selected option.
+             */
+            getSelectedOption(): OptionSetValue;
+
+            /**
+             * Gets the label of the currently selected option.
+             * @returns The current value's label.
+             */
+            getText(): string;
+
+            /**
+             * Gets the value.
+             * @returns The value.
+             */
+            getValue(): number;
+
+            /**
+             * Sets the value.
+             * @param value The value.
+             * @remarks     The getOptions() method returns option values as strings. You must use parseInt
+             *              to convert them to numbers before you can use those values to set the value of an
+             *              OptionSet attribute. Attributes on Quick Create Forms will not save values set
+             *              with this method.
+             */
+            setValue(value: number): void;
+
+            /**
+             * A collection of all the controls on the form that interface with this attribute.
+             * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/collections External Link: Collections (Client API reference)}
+             */
+            controls: Collection.ItemCollection<Controls.OptionSetControl>;
+        }
+
+        /**
+         * Interface a Lookup attribute.
+         *
+         * @see {@link Attribute}
+         */
+        interface LookupAttribute extends Attribute {
+            /**
+             * Gets a boolean value indicating whether the Lookup is a multi-value PartyList.
+             * @returns true the attribute is a PartyList, otherwise false.
+             */
+            getIsPartyList(): boolean;
+
+            /**
+             * Gets the value.
+             * @returns An array of LookupValue.
+             */
+            getValue(): LookupValue[];
+
+            /**
+             * Sets the value.
+             * @param value The value.
+             * @remarks Attributes on Quick Create Forms will not save values set with this method.
+             */
+            setValue(value: LookupValue[]): void;
+
+            /**
+             * A collection of all the controls on the form that interface with this attribute.
+             * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/collections External Link: Collections (Client API reference)}
+             */
+            controls: Collection.ItemCollection<Controls.LookupControl>;
+        }
+    }
+
+    /**
+     * A collection of types and methods for working with formContext controls.
+     * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/collections External Link: Collections (Client API reference)}
+     */
+    namespace Controls {
+        /**
+         * Control type for formContext.ui.quickForms.getControlType().
+         */
+        type ControlQuickFormType = "quickform";
+
+        /**
+         * Control types for {@link Controls.Control.getControlType Controls.Control.getControlType()}.
+         * @see {@link XrmEnum.StandardControlType}
+         */
+        type ControlType = "standard" | "iframe" | "lookup" | "optionset" |
+            "subgrid" | "webresource" | "notes" | "timercontrol" | "kbsearch" |
+            "timelinewall" | ControlQuickFormType;
 
         /**
          * Interface for UI elements with labels.
@@ -1490,14 +2490,12 @@ declare namespace Xrm {
         interface UiLabelElement {
             /**
              * Gets the label.
-             *
-             * @return The label.
+             * @returns The label.
              */
             getLabel(): string;
 
             /**
              * Sets the label.
-             *
              * @param label The label.
              */
             setLabel(label: string): void;
@@ -1509,8 +2507,7 @@ declare namespace Xrm {
         interface UiCanGetVisibleElement {
             /**
              * Gets the visibility state.
-             *
-             * @return true if the tab is visible, otherwise false.
+             * @returns true if the tab is visible, otherwise false.
              */
             getVisible(): boolean;
         }
@@ -1521,7 +2518,6 @@ declare namespace Xrm {
         interface UiCanSetVisibleElement {
             /**
              * Sets the visibility state.
-             *
              * @param visible true to show, false to hide.
              */
             setVisible(visible: boolean): void;
@@ -1533,7 +2529,6 @@ declare namespace Xrm {
         interface UiStandardElement extends UiCanGetVisibleElement, UiLabelElement {
             /**
              * Sets the visibility state.
-             *
              * @param visible true to show, false to hide.
              */
             setVisible(visible: boolean): void;
@@ -1557,10 +2552,11 @@ declare namespace Xrm {
             /**
              * Use this to add a function as an event handler for the keypress event so that the function is called when you type a character in the specific text or number field.
              * For a sample JavaScript code that uses the addOnKeyPress method to configure the auto-completion experience, see Sample: Auto-complete in CRM controls.
-             * @deprecated: Deprecated in v9. See {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated}
+             * @deprecated Deprecated in v9.
+             * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
              * @param handler The function reference.
              */
-            addOnKeyPress(handler: ContextSensitiveHandler): void;
+            addOnKeyPress(handler: Events.ContextSensitiveHandler): void;
 
             /**
              * Use this to manually fire an event handler that you created for a specific text or number field to be executed on the keypress event.
@@ -1569,11 +2565,12 @@ declare namespace Xrm {
 
             /**
              * Use this to remove an event handler for a text or number field that you added using addOnKeyPress.
-             * @deprecated: Deprecated in v9. See {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated}
+             * @deprecated Deprecated in v9.
+             * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
              * Remarks:  If an anonymous function is set using addOnKeyPress, it can’t be removed using this method.
              * @param handler The function reference.
              */
-            removeOnKeyPress(handler: ContextSensitiveHandler): void;
+            removeOnKeyPress(handler: Events.ContextSensitiveHandler): void;
         }
 
         /**
@@ -1637,964 +2634,33 @@ declare namespace Xrm {
         }
 
         /**
-         * Interface for a Lookup value.
-         */
-        interface LookupValue {
-            /**
-             * The identifier.
-             */
-            id: string;
-
-            /**
-             * The name
-             */
-            name?: string;
-
-            /**
-             * Type of the entity.
-             */
-            entityType: string;
-        }
-
-        /**
-         * Interface for an OptionSet value.
-         */
-        interface OptionSetValue {
-            /**
-             * The label text.
-             */
-            text: string;
-
-            /**
-             * The value, as a number
-             */
-            value: number;
-        }
-
-        /**
-         * Interface for a privilege.
-         */
-        interface Privilege {
-            /**
-             * True if the user can read.
-             */
-            canRead: boolean;
-
-            /**
-             * True if the user can update.
-             */
-            canUpdate: boolean;
-
-            /**
-             * True if the user can create.
-             */
-            canCreate: boolean;
-        }
-
-        /**
-         * Interface for an Entity attribute.
-         */
-        interface Attribute {
-            /**
-             * Adds a handler to be called when the attribute's value is changed.
-             *
-             * @param handler The function reference.
-             */
-            addOnChange(handler: ContextSensitiveHandler): void;
-
-            /**
-             * Fire all "on change" event handlers.
-             */
-            fireOnChange(): void;
-
-            /**
-             * Gets attribute type.
-             *
-             * @return The attribute's type name.
-             *
-             * @remarks Values returned are: boolean
-             *                               datetime
-             *                               decimal
-             *                               double
-             *                               integer
-             *                               lookup
-             *                               memo
-             *                               money
-             *                               optionset
-             *                               string
-             */
-            getAttributeType(): string;
-
-            /**
-             * Gets the attribute format.
-             *
-             * @return The format of the attribute.
-             *
-             * @see {@link getAttributeType()}
-             *
-             * @remarks Values returned are: date           (datetime)
-             *                               datetime       (datetime)
-             *                               duration       (integer)
-             *                               email          (string)
-             *                               language       (optionset)
-             *                               none           (integer)
-             *                               phone          (string)
-             *                               text           (string)
-             *                               textarea       (string)
-             *                               tickersymbol   (string)
-             *                               timezone       (optionset)
-             *                               url            (string)
-             */
-            getFormat(): AttributeFormat;
-
-            /**
-             * Gets a boolean value indicating whether this Attribute has unsaved changes.
-             *
-             * @return true if there are unsaved changes, otherwise false.
-             */
-            getIsDirty(): boolean;
-
-            /**
-             * Gets the logical name of the attribute.
-             *
-             * @return The logical name.
-             */
-            getName(): string;
-
-            /**
-             * Gets a reference to the record context of this attribute.
-             *
-             * @return The parent record context.
-             */
-            getParent(): Entity;
-
-            /**
-             * Gets the current level of requirement for the attribute.
-             *
-             * @return The required level, as either "none", "required", or "recommended"
-             */
-            getRequiredLevel(): RequirementLevel;
-
-            /**
-             * Gets current submit mode for the attribute.
-             *
-             * @return The submit mode, as either "always", "never", or "dirty"
-             *
-             * @remarks The default value is "dirty"
-             */
-            getSubmitMode(): SubmitMode;
-
-            /**
-             * Gets the current user's privileges for the attribute.
-             *
-             * @return The user privileges.
-             */
-            getUserPrivilege(): Privilege;
-
-            /**
-             * Removes the handler from the "on change" event.
-             *
-             * @param handler The handler.
-             */
-            removeOnChange(handler: ContextSensitiveHandler): void;
-
-            /**
-             * Sets the required level.
-             *
-             * @param requirementLevel The requirement level, as either "none", "required", or "recommended"
-             */
-            setRequiredLevel(requirementLevel: RequirementLevel): void;
-
-            /**
-             * Sets the submit mode.
-             *
-             * @param submitMode The submit mode, as either "always", "never", or "dirty".
-             *
-             * @remarks The default value is "dirty"
-             */
-            setSubmitMode(submitMode: SubmitMode): void;
-
-            /**
-             * A collection of all the controls on the form that interface with this attribute.
-             */
-            controls: Collection.ItemCollection<Control>;
-
-            /**
-             * Gets the value.
-             *
-             * @return The value.
-             */
-            getValue(): any;
-
-            /**
-             * Sets the value.
-             *
-             * @param value The value.
-             */
-            setValue(value: any): void;
-        }
-
-        /**
-         * Interface for a Number attribute.
+         * Interface for controls.
          *
-         * @sa  Attribute
-         */
-        interface NumberAttribute extends Attribute {
-            /**
-             * Gets the attribute format.
-             *
-             * @return The format of the attribute.
-             *
-             * @remarks Values returned are: duration
-             *                               none
-             */
-            getFormat(): IntegerAttributeFormat;
-
-            /**
-             * Gets the maximum value allowed.
-             *
-             * @return The maximum value allowed.
-             */
-            getMax(): number;
-
-            /**
-             * Gets the minimum value allowed.
-             *
-             * @return The minimum value allowed.
-             */
-            getMin(): number;
-
-            /**
-             * Gets the attribute's configured precision.
-             *
-             * @return The total number of allowed decimal places.
-             */
-            getPrecision(): number;
-
-            /**
-             * Gets the value.
-             *
-             * @return The value.
-             */
-            getValue(): number;
-
-            /**
-             * Sets the value.
-             *
-             * @param value The value.
-             *
-             * @remarks Attributes on Quick Create Forms will not save values set with this method.
-             */
-            setValue(value: number): void;
-
-            /**
-             * A collection of all the controls on the form that interface with this attribute.
-             */
-            controls: Collection.ItemCollection<NumberControl>;
-        }
-
-        /**
-         * Interface for a String attribute.
-         *
-         * @sa  Attribute
-         */
-        interface StringAttribute extends Attribute {
-            /**
-             * Gets the attribute format.
-             *
-             * @return The format of the attribute.
-             *
-             * @remarks Values returned are: email
-             *                               phone
-             *                               text
-             *                               textarea
-             *                               tickersymbol
-             *                               url
-             */
-            getFormat(): StringAttributeFormat;
-
-            /**
-             * Gets maximum length allowed.
-             *
-             * @return The maximum length allowed.
-             *
-             * @remarks The email form's "Description" attribute does not have the this method.
-             */
-            getMaxLength(): number;
-
-            /**
-             * Gets the value.
-             *
-             * @return The value.
-             */
-            getValue(): string;
-
-            /**
-             * Sets the value.
-             *
-             * @param value The value.
-             *
-             * @remarks     A String field with the {@link Attribute.getFormat|email} format enforces email
-             *              address formatting. Attributes on Quick Create Forms will not save values set
-             *              with this method.
-             */
-            setValue(value: string): void;
-
-            /**
-             * A collection of all the controls on the form that interface with this attribute.
-             */
-            controls: Collection.ItemCollection<StringControl>;
-        }
-
-        /**
-         * Common interface for enumeration attributes (OptionSet and Boolean).
-         *
-         * @sa  Attribute
-         */
-        interface EnumAttribute extends Attribute {
-            /**
-             * Gets the initial value of the attribute.
-             *
-             * @return The initial value.
-             *
-             * @remarks Valid for OptionSet and boolean attribute types
-             */
-            getInitialValue(): number | boolean;
-        }
-
-        /**
-         * Interface for a Boolean attribute.
-         *
-         * @sa  EnumAttribute
-         */
-        interface BooleanAttribute extends EnumAttribute {
-            /**
-             * Gets the initial value of the attribute.
-             *
-             * @return The initial value.
-             *
-             * @remarks Valid for OptionSet and boolean attribute types
-             */
-            getInitialValue(): boolean;
-
-            /**
-             * Gets the value.
-             *
-             * @return true if it succeeds, false if it fails.
-             */
-            getValue(): boolean;
-
-            /**
-             * Sets the value.
-             *
-             * @param value The value.
-             *
-             * @remarks  Attributes on Quick Create Forms will not save values set with this method.
-             */
-            setValue(value: boolean): void;
-        }
-
-        /**
-         * Interface for a Date attribute.
-         *
-         * @sa  Attribute
-         */
-        interface DateAttribute extends Attribute {
-            /**
-             * Gets the attribute format.
-             *
-             * @return The format of the attribute.
-             *
-             * @remarks Values returned are: date
-             *                               datetime
-             */
-            getFormat(): DateAttributeFormat;
-
-            /**
-             * Gets the value.
-             *
-             * @return The value.
-             */
-            getValue(): Date;
-
-            /**
-             * Sets the value.
-             *
-             * @param value The value.
-             *
-             * @remarks  Attributes on Quick Create Forms will not save values set with this method.
-             */
-            setValue(value: Date): void;
-
-            /**
-             * A collection of all the controls on the form that interface with this attribute.
-             */
-            controls: Collection.ItemCollection<DateControl>;
-        }
-
-        /**
-         * Interface an OptionSet attribute.
-         *
-         * @sa  EnumAttribute
-         */
-        interface OptionSetAttribute extends EnumAttribute {
-            /**
-             * Gets the attribute format.
-             *
-             * @return The format of the attribute.
-             *
-             * @remarks Values returned are: language
-             *                               timezone
-             */
-            getFormat(): OptionSetAttributeFormat;
-
-            /**
-             * Gets the initial value of the attribute.
-             *
-             * @return The initial value.
-             *
-             * @remarks Valid for OptionSet and boolean attribute types
-             */
-            getInitialValue(): number;
-
-            /**
-             * Gets the option matching a value.
-             *
-             * @param value The enumeration value of the option desired.
-             *
-             * @return The option.
-             */
-            getOption(value: number): OptionSetValue;
-
-            /**
-             * Gets the option matching a label.
-             *
-             * @param  label The label of the option desired.
-             *
-             * @return The option.
-             */
-            getOption(label: string): OptionSetValue;
-
-            /**
-             * Gets all of the options.
-             *
-             * @return An array of options.
-             */
-            getOptions(): OptionSetValue[];
-
-            /**
-             * Gets selected option.
-             *
-             * @return The selected option.
-             */
-            getSelectedOption(): OptionSetValue;
-
-            /**
-             * Gets the label of the currently selected option.
-             *
-             * @return The current value's label.
-             */
-            getText(): string;
-
-            /**
-             * Gets the value.
-             *
-             * @return The value.
-             */
-            getValue(): number;
-
-            /**
-             * Sets the value.
-             *
-             * @param value The value.
-             *
-             * @remarks     The getOptions() method returns option values as strings. You must use parseInt
-             *              to convert them to numbers before you can use those values to set the value of an
-             *              OptionSet attribute. Attributes on Quick Create Forms will not save values set
-             *              with this method.
-             */
-            setValue(value: number): void;
-
-            /**
-             * A collection of all the controls on the form that interface with this attribute.
-             */
-            controls: Collection.ItemCollection<OptionSetControl>;
-        }
-
-        /**
-         * Interface a Lookup attribute.
-         *
-         * @sa  Attribute
-         */
-        interface LookupAttribute extends Attribute {
-            /**
-             * Gets a boolean value indicating whether the Lookup is a multi-value PartyList.
-             *
-             * @return true the attribute is a PartyList, otherwise false.
-             */
-            getIsPartyList(): boolean;
-
-            /**
-             * Gets the value.
-             *
-             * @return An array of LookupValue.
-             */
-            getValue(): LookupValue[];
-
-            /**
-             * Sets the value.
-             *
-             * @param value The value.
-             *
-             * @remarks Attributes on Quick Create Forms will not save values set with this method.
-             */
-            setValue(value: LookupValue[]): void;
-
-            /**
-             * A collection of all the controls on the form that interface with this attribute.
-             */
-            controls: Collection.ItemCollection<LookupControl>;
-        }
-
-        /**
-         * Interface for the form's record context, Xrm.Page.data.entity
-         */
-        interface Entity {
-            /**
-             * Adds a handler to be called when the record is saved.
-             *
-             * @param handler The handler.
-             */
-            addOnSave(handler: ContextSensitiveHandler): void;
-
-            /**
-             * Gets an serialized-XML string representing data that will be passed to the server upon saving
-             * the record.
-             *
-             * @return The XML in string format.
-             *
-             * @remarks     This function does not work with Microsoft Dynamics CRM for tablets. Example:
-             *              "<account><name>Contoso</name><accountnumber>55555</accountnumber><telephone2>425
-             *              555-1234</telephone2></account>".
-             */
-            getDataXml(): string;
-
-            /**
-             * Gets entity's logical name.
-             *
-             * @return The logical name.
-             */
-            getEntityName(): string;
-
-            /**
-             * Gets the record's unique identifier.
-             *
-             * @return The identifier, in Guid format.
-             *
-             * @remarks  Example: "{825CB223-A651-DF11-AA8B-00155DBA3804}".
-             */
-            getId(): string;
-
-            /**
-             * Gets a boolean value indicating whether the record has unsaved changes.
-             *
-             * @return true if there are unsaved changes, otherwise false.
-             */
-            getIsDirty(): boolean;
-
-            /**
-             * Gets the record's primary attribute value.
-             *
-             * @return The primary attribute value.
-             *
-             * @remarks The value for this attribute is used when links to the record are displayed.
-             */
-            getPrimaryAttributeValue(): string;
-
-            /**
-             * Removes the handler from the "on save" event.
-             *
-             * @param handler The handler.
-             */
-            removeOnSave(handler: ContextSensitiveHandler): void;
-
-            /**
-             * Saves the record.
-             * @deprecated: Deprecated in v9. See {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated}
-             * @remarks  When using quick create forms in the web application the saveandnew option is not
-             *           applied. It will always work as if saveandclose were used. Quick create forms in
-             *           Microsoft Dynamics CRM for tablets will apply the saveandnew behavior.
-             */
-            save(): void;
-
-            /**
-             * Saves the record with the given save mode.
-             * @deprecated: Deprecated in v9. See {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated}
-             * @param saveMode (Optional) the save mode to save, as either "saveandclose" or
-             *                 "saveandnew".
-             */
-            save(saveMode: SaveMode): void;
-
-            /**
-             * The collection of attributes for the record.
-             */
-            attributes: Collection.ItemCollection<Attribute>;
-        }
-
-        /**
-         * Interface for save event arguments.
-         */
-        interface SaveEventArguments {
-            /**
-             * Gets save mode, as an integer.
-             *
-             * @return The save mode.
-             *
-             * @remarks Values returned are: 1      Save
-             *                               2      Save and Close
-             *                               59     Save and New
-             *                               70     AutoSave (Where enabled; can be used with an OnSave handler
-             *                                                to conditionally disable auto-saving)
-             *                               58     Save as Completed (Activities)
-             *                               5      Deactivate
-             *                               6      Reactivate
-             *                               47     Assign (All user- or team-owned entities)
-             *                               7      Send (Email)
-             *                               16     Qualify (Lead)
-             *                               15     Disqualify (Lead)
-             */
-            getSaveMode(): XrmEnum.SaveMode;
-
-            /**
-             * Returns a boolean value to indicate if the record's save has been prevented.
-             *
-             * @return true if saving is prevented, otherwise false.
-             */
-            isDefaultPrevented(): boolean;
-
-            /**
-             * Prevents the save operation from being submitted to the server.
-             *
-             * @remarks All remaining "on save" handlers will continue execution.
-             */
-            preventDefault(): void;
-        }
-
-        /**
-         * Interface for process stage change event arguments.
-         */
-        interface StageChangeEventArguments {
-            /**
-             * Gets the direction of the stage change.
-             *
-             * @return The direction.
-             *
-             * @remarks Values returned are: "next" or "previous"
-             */
-            getDirection(): StageChangeDirection;
-
-            /**
-             * Gets the destination stage object
-             *
-             * @return The stage object
-             *
-             * @remarks For switching between entities, returns the previous stage object
-             */
-            getStage(): Stage;
-        }
-
-        /**
-         * Interface for process stage selected event arguments.
-         */
-        interface StageSelectedEventArguments {
-            /**
-             * Gets the selected stage object
-             *
-             * @return The stage object
-             */
-            getStage(): Stage;
-        }
-
-        /**
-         * Module for the Xrm.Page.data API.
-         */
-        namespace data {
-            /**
-             * Interface for the Xrm.Page.data.process API.
-             */
-            interface ProcessManager {
-                /**
-                 * Returns a Process object representing the active process.
-                 *
-                 * @return current active process.
-                 */
-                getActiveProcess(): Process;
-
-                /**
-                 * Set a Process as the active process.
-                 *
-                 * @param processId The Id of the process to make the active process.
-                 * @param callbackFunction (Optional) a function to call when the operation is complete.
-                 */
-                setActiveProcess(processId: string, callbackFunction?: ProcessCallbackDelegate): void;
-
-                /**
-                 * Returns all process instances for the entity record that the calling user has access to.
-                 *
-                 * @param callbackFunction (Optional) a function to call when the operation is complete.
-                 */
-                getProcessInstances(callbackFunction: GetProcessInstancesDelegate): void;
-
-                /**
-                 * Sets a process instance as the active instance
-                 *
-                 * @param processInstanceId The Id of the process instance to make the active instance.
-                 * @param callbackFunction (Optional) a function to call when the operation is complete.
-                 */
-                setActiveProcessInstance(processInstanceId: string, callbackFunction: SetProcessInstanceDelegate): void;
-
-                /**
-                 * Returns a Stage object representing the active stage.
-                 *
-                 * @return current active stage.
-                 */
-                getActiveStage(): Stage;
-
-                /**
-                 * Set a stage as the active stage.
-                 *
-                 * @param stageId the Id of the stage to make the active stage.
-                 * @param callbackFunction (Optional) a function to call when the operation is complete.
-                 */
-                setActiveStage(stageId: string, callbackFunction?: ProcessCallbackDelegate): void;
-
-                /**
-                 * Use this method to get a collection of stages currently in the active path with methods to interact with the
-                 * stages displayed in the business process flow control. The active path represents stages currently rendered in
-                 * the process control based on the branching rules and current data in the record.
-                 *
-                 * @return A collection of all completed stages, the currently active stage, and the predicted set of future stages
-                 *          based on satisfied conditions in the branching rule. This may be a subset of the stages returned with
-                 *          Xrm.Page.data.process.getActiveProcess because it will only include those stages which represent a valid
-                 *          transition from the current stage based on branching that has occurred in the process.
-                 */
-                getActivePath(): Collection.ItemCollection<Stage>;
-
-                /**
-                 * Use this method to asynchronously retrieve the enabled business process flows that the user can switch to for an
-                 * entity.
-                 *
-                 * @param callbackFunction The callback function must accept a parameter that contains an object with
-                 *                         dictionary properties where the name of the property is the Id of the
-                 *                         business process flow and the value of the property is the name of the
-                 *                         business process flow.
-                 *                         The enabled processes are filtered according to the user’s privileges. The
-                 *                         list of enabled processes is the same ones a user can see in the UI if they
-                 *                         want to change the process manually.
-                 */
-                getEnabledProcesses(callbackFunction: (enabledProcesses: ProcessDictionary) => void): void;
-
-                /**
-                 * Use this method to get the currently selected stage.
-                 *
-                 * @return The currently selected stage.
-                 */
-                getSelectedStage(): Stage;
-
-                /**
-                 * Use this to add a function as an event handler for the OnStageChange event so that it will be called when the
-                 * business process flow stage changes.
-                 * @param handler The function will be added to the bottom of the event
-                 *                handler pipeline. The execution context is automatically
-                 *                set to be the first parameter passed to the event handler.
-                 *                Use a reference to a named function rather than an
-                 *                anonymous function if you may later want to remove the
-                 *                event handler.
-                 */
-                addOnStageChange(handler: ContextSensitiveHandler): void;
-
-                /**
-                 * Use this to add a function as an event handler for the OnProcessStatusChange event so that it will be called when the
-                 * business process flow status changes.
-                 * @param handler The function will be added to the bottom of the event
-                 *                handler pipeline. The execution context is automatically
-                 *                set to be the first parameter passed to the event handler.
-                 *                Use a reference to a named function rather than an
-                 *                anonymous function if you may later want to remove the
-                 *                event handler.
-                 */
-                addOnProcessStatusChange(handler: ProcessStatusChangeHandler): void;
-
-                /**
-                 * Use this to add a function as an event handler for the OnStageSelected event so that it will be called
-                 * when a business process flow stage is selected.
-                 *
-                 * @param handler The function will be added to the bottom of the event
-                 *                handler pipeline. The execution context is automatically
-                 *                set to be the first parameter passed to the event handler.
-                 *                Use a reference to a named function rather than an
-                 *                anonymous function if you may later want to remove the
-                 *                event handler.
-                 */
-                addOnStageSelected(handler: ContextSensitiveHandler): void;
-
-                /**
-                 * Use this to remove a function as an event handler for the OnProcessStatusChange event.
-                 *
-                 * @param handler If an anonymous function is set using the addOnProcessStatusChange method it
-                 *                cannot be removed using this method.
-                 */
-                removeOnProcessStatusChange(handler: ProcessStatusChangeHandler): void;
-
-                /**
-                 * Use this to remove a function as an event handler for the OnStageChange event.
-                 *
-                 * @param handler If an anonymous function is set using the addOnStageChange method it
-                 *                cannot be removed using this method.
-                 */
-                removeOnStageChange(handler: ContextSensitiveHandler): void;
-
-                /**
-                 * Use this to remove a function as an event handler for the OnStageChange event.
-                 *
-                 * @param handler If an anonymous function is set using the addOnStageChange method it
-                 *                cannot be removed using this method.
-                 */
-                removeOnStageSelected(handler: ContextSensitiveHandler): void;
-
-                /**
-                 * Progresses to the next stage.
-                 *
-                 * @param callbackFunction (Optional) A function to call when the operation is complete.
-                 *
-                 */
-                moveNext(callbackFunction?: ProcessCallbackDelegate): void;
-
-                /**
-                 * Moves to the previous stage.
-                 *
-                 * @param callbackFunction (Optional) A function to call when the operation is complete.
-                 *                                                          .
-                 */
-                movePrevious(callbackFunction?: ProcessCallbackDelegate): void;
-
-                /**
-                 * Use this method to get the unique identifier of the process instance
-                 *
-                 * @return The unique identifier of the process instance
-                 */
-                getInstanceId(): string;
-
-                /**
-                 * Use this method to get the name of the process instance
-                 *
-                 * @return The name of the process instance
-                 */
-                getInstanceName(): string;
-
-                /**
-                 * Use this method to get the current status of the process instance
-                 *
-                 * @return The current status of the process
-                 */
-                getStatus(): ProcessStatus;
-
-                /**
-                 * Use this method to set the current status of the process instance
-                 *
-                 * @param status The new status for the process
-                 * @param callbackFunction (Optional) a function to call when the operation is complete.
-                 */
-                setStatus(status: ProcessStatus, callbackFunction: ProcessSetStatusDelegate): void;
-            }
-
-            /**
-             * Called when method to get active processes is complete
-             *
-             * @param status The result of the get active processes operation.
-             *
-             * @remarks     Returns object with the following key-value pairs:
-             *                          CreatedOn
-             *                          ProcessDefinitionID
-             *                          ProcessDefinitionName
-             *                          ProcessInstanceID
-             *                          ProcessInstanceName
-             *                          StatusCodeName
-             */
-            type GetProcessInstancesDelegate = (object: ProcessDictionary) => void;
-
-            /**
-             * Called when method to set active process is complete
-             *
-             * @param status The result of the set active process operation.
-             *
-             * @remarks     Values returned are: success        (The operation succeeded.)
-             *                                   invalid        (The processInstanceId isn’t valid or the process isn’t enabled.)
-             */
-            type SetProcessInstanceDelegate = (status: string) => void;
-
-            /**
-             * Called when process change methods have completed.
-             *
-             * @param status The result of the process change operation.
-             *
-             * @remarks     Values returned are: success        (The operation succeeded.)
-             *                                   crossEntity    (The previous stage is for a different entity.)
-             *                                   beginning      (The active stage is the first stage of the active path.)
-             *                                   invalid        (The operation failed because the selected stage isn’t the same
-             *                                   as the active stage.)
-             *                                   unreachable    (The stage exists on a different path.)
-             */
-            type ProcessCallbackDelegate = (status: string) => void;
-
-            /**
-             * Called when process set status method has completed.
-             *
-             * @param status The new status of the process instance
-             *
-             * @remarks     Values returned are: active
-             *                                   aborted
-             *                                   finished
-             */
-            type ProcessSetStatusDelegate = (status: ProcessStatus) => void;
-
-            /**
-             * Represents a key-value pair, where the key is the Process Flow's ID, and the value is the name thereof.
-             */
-            interface ProcessDictionary { [index: string]: string; }
-        }
-
-        /**
-         * Interface for Xrm.Page.ui controls.
-         *
-         * @sa  UiElement
+         * @see {@link UiElement}
          */
         interface Control extends UiLabelElement, UiCanGetVisibleElement {
             /**
              * Gets the controls type.
-             *
-             * @return The control type.
-             *
-             * @remarks Values returned are: standard
-             *                               iframe
-             *                               lookup
-             *                               optionset
-             *                               subgrid
-             *                               webresource
-             *                               notes
-             *                               timercontrol
-             *                               kbsearch (CRM Online Only, use parature.d.ts)
-             *                               quickform (see ui.QuickForm)
-             *                               customcontrol: <namespace>.<name> (A custom control for mobile phone and tablet clients).
-             *                               customsubgrid: <namespace>.<name> (A custom dataset control for mobile phone and tablet clients).
+             * @returns The control type.<BR><BR>
+             * **Values returned are**:
+             * * standard
+             * * iframe
+             * * lookup
+             * * optionset
+             * * subgrid
+             * * webresource
+             * * notes
+             * * timercontrol
+             * * kbsearch (CRM Online Only, use parature.d.ts)
+             * * quickform (see ui.QuickForm)
+             * * customcontrol: <namespace>.<name> (A custom control for mobile phone and tablet clients).
+             * * customsubgrid: <namespace>.<name> (A custom dataset control for mobile phone and tablet clients).
              */
             getControlType(): ControlType | string;
 
             /**
              * Gets the name of the control on the form.
-             *
-             * @return The name of the control.
-             *
+             * @returns The name of the control.
              * @remarks     The name assigned to a control is not determined until the form loads. Changes to
              *              the form may change the name assigned to a given control.
              *              When you use the control getName method the name of the first control will be the
@@ -2610,51 +2676,66 @@ declare namespace Xrm {
 
             /**
              * Gets a reference to the Section parent of the control.
-             *
-             * @return The parent Section.
+             * @returns The parent Section.
              */
             getParent(): Section;
         }
 
+        /**
+         * Interface for {@link Ui.navigation formContext.ui.navigation}.
+         */
+        interface Navigation {
+            /**
+             * A reference to the collection of available navigation items.
+             * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/collections External Link: Collections (Client API reference)}
+             */
+            items: Collection.ItemCollection<NavigationItem>;
+        }
+
+        /**
+         * Interface for a navigation item.
+         * @see {@link UiElement}
+         * @see {@link UiFocusable}
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/formcontext-ui-navigation External Link: formContext.ui.navigation item (Client API reference)}
+         */
+        interface NavigationItem extends UiStandardElement, UiFocusable {
+            /**
+             * Gets the name of the item.
+             * @returns The identifier.
+             */
+            getId(): string;
+        }
+
         /**
          * Interface for a standard control.
-         *
-         * @sa  Control
+         * @see {@link Control}
          */
         interface StandardControl extends Control, UiStandardElement, UiFocusable {
             /**
              * Clears the notification identified by uniqueId.
-             *
              * @param uniqueId (Optional) Unique identifier.
-             *
-             * @return true if it succeeds, false if it fails.
-             *
+             * @returns true if it succeeds, false if it fails.
              * @remarks If the uniqueId parameter is not used, the current notification shown will be removed.
              */
             clearNotification(uniqueId?: string): boolean;
 
             /**
              * Gets a boolean value, indicating whether the control is disabled.
-             *
-             * @return true if it is disabled, otherwise false.
+             * @returns true if it is disabled, otherwise false.
              */
             getDisabled(): boolean;
 
             /**
              * Sets the state of the control to either enabled, or disabled.
-             *
              * @param disabled true to disable, false to enable.
              */
             setDisabled(disabled: boolean): void;
 
             /**
              * Sets a control-local notification message.
-             *
              * @param message The message.
              * @param uniqueId Unique identifier.
-             *
-             * @return true if it succeeds, false if it fails.
-             *
+             * @returns true if it succeeds, false if it fails.
              * @remarks     When this method is used on Microsoft Dynamics CRM for tablets a red "X" icon
              *              appears next to the control. Tapping on the icon will display the message.
              */
@@ -2667,28 +2748,25 @@ declare namespace Xrm {
 
             /**
              * Gets the control's bound attribute.
-             *
-             * @tparam T   An Attribute type.
-             *
-             * @return The attribute.
+             * @template T An Attribute type.
+             * @returns The attribute.
              */
-            getAttribute<T extends Attribute>(): T;
+            getAttribute<T extends Attributes.Attribute>(): T;
 
             /**
              * Gets the control's bound attribute.
-             *
-             * @return The attribute.
+             * @returns The attribute.
              */
-            getAttribute(): Attribute;
+            getAttribute(): Attributes.Attribute;
         }
 
         /**
          * Interface for Auto Lookup Control.
          * This is not an Entity Lookup, but a control that supports AutoComplete / KeyPress Events (Text or Number)
-         *
          * @remarks This interface is not supported for CRM mobile clients (phones or tablets) and the interactive service hub.  It is only available for Updated entities.
-         *
-         * @sa  StandardControl
+         * @deprecated Deprecated in v9.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
+         * @see {@link StandardControl}
          */
         interface AutoLookupControl extends StandardControl, UiKeyPressable {
             /**
@@ -2701,14 +2779,16 @@ declare namespace Xrm {
 
             /**
              * Hides the auto-completion drop-down list configured for a specific text field
-             * @deprecated: Deprecated in v9. See {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated}
+             * @deprecated Deprecated in v9.
+             * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
              */
             hideAutoComplete(): void;
 
             /**
              * Shows upt to 10 matching strings in a drop-down list as users press keys to type charactrer in a specific text field.
              * On selecting an item in the drop-down list, the value in the text field changes to the selected item, the drop-down list disappears, and the OnChange event for the text field is invoked
-             * @deprecated: Deprecated in v9. See {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated}
+             * @deprecated Deprecated in v9.
+             * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
              * @param resultSet The results to show
              */
             showAutoComplete(resultSet: AutoCompleteResultSet): void;
@@ -2716,55 +2796,47 @@ declare namespace Xrm {
 
         /**
          * Interface for a String control.
-         *
-         * @sa  StandardControl
+         * @see {@link StandardControl}
          */
         interface StringControl extends AutoLookupControl {
             /**
              * Gets the control's bound attribute.
-             *
-             * @return The attribute.
+             * @returns The attribute.
              */
-            getAttribute(): StringAttribute;
+            getAttribute(): Attributes.StringAttribute;
         }
 
         /**
          * Interface for a Number control.
-         *
-         * @sa  StandardControl
+         * @see {@link StandardControl}
          */
         interface NumberControl extends AutoLookupControl {
             /**
              * Gets the control's bound attribute.
-             *
-             * @return The attribute.
+             * @returns The attribute.
              */
-            getAttribute(): NumberAttribute;
+            getAttribute(): Attributes.NumberAttribute;
         }
 
         /**
          * Interface for a Date control.
-         *
-         * @sa  StandardControl
+         * @see {@link StandardControl}
          */
         interface DateControl extends StandardControl {
             /**
              * Gets the control's bound attribute.
-             *
-             * @return The attribute.
+             * @returns The attribute.
              */
-            getAttribute(): DateAttribute;
+            getAttribute(): Attributes.DateAttribute;
 
             /**
              * Gets the status of the time-of-day component of the Date control.
-             *
-             * @return true if the time is shown, otherwise false.
+             * @returns true if the time is shown, otherwise false.
              */
             getShowTime(): boolean;
 
             /**
              * Sets the visibility of the time component of the Date control.
-             *
              * @param showTimeValue true to show, false to hide the time value.
              */
             setShowTime(showTimeValue: boolean): void;
@@ -2772,30 +2844,24 @@ declare namespace Xrm {
 
         /**
          * Interface for a Lookup control.
-         *
-         * @sa  StandardControl
+         * @see {@link StandardControl}
          */
         interface LookupControl extends StandardControl {
             /**
              * Adds a handler to the "pre search" event of the Lookup control.
-             *
              * @param handler The handler.
              */
-            addPreSearch(handler: ContextSensitiveHandler): void;
+            addPreSearch(handler: Events.ContextSensitiveHandler): void;
 
             /**
              * Adds an additional custom filter to the lookup, with the "AND" filter operator.
              * Can only be used within a "pre search" event handler
-             *
-             * @sa addPreSearch
-             *
-             * @param filter Specifies the filter, as a serialized FetchXML
-             *                                          "filter" node.
+             * @see {@link addPreSearch}
+             * @param filter Specifies the filter, as a serialized FetchXML "filter" node.
              * @param entityLogicalName (Optional) The logical name of the entity.
-             *
              * @remarks     If entityLogicalName is not specified, the filter will be applied to all entities
              *              valid for the Lookup control.
-             *              Example filter: <filter type="and">
+             * @example     Example filter: <filter type="and">
              *                              <condition attribute="address1_city" operator="eq" value="Redmond" />
              *                              </filter>
              */
@@ -2803,51 +2869,43 @@ declare namespace Xrm {
 
             /**
              * Adds a custom view for the Lookup dialog.
-             *
              * @param viewId Unique identifier for the view, in Guid format.
              * @param entityName Name of the entity.
              * @param viewDisplayName Name of the view to display.
              * @param fetchXml The FetchXML query for the view's contents, serialized as a string.
              * @param layoutXml The Layout XML, serialized as a string.
              * @param isDefault true, to treat this view as default.
-             *
              * @remarks Cannot be used on "Owner" Lookup controls.
              *          The viewId is never saved to CRM, but must be unique across available views.  Generating
-             *          a new value can be accomplished with a {@link http://www.guidgen.com/|Guid generator}.
-             *          Example viewId value: "{00000000-0000-0000-0000-000000000001}"
-             *          Layout XML Reference: {@link http://msdn.microsoft.com/en-us/library/gg334522.aspx}.
+             *          a new value can be accomplished with a {@link http://www.guidgen.com/ Guid generator(external link)}.
+             * @example Example viewId value: "{00000000-0000-0000-0000-000000000001}"
+             * @see {@link http://msdn.microsoft.com/en-us/library/gg334522.aspx External Link: Layout XML Reference}
              */
             addCustomView(viewId: string, entityName: string, viewDisplayName: string, fetchXml: string, layoutXml: string, isDefault: boolean): void;
 
             /**
              * Gets the control's bound attribute.
-             *
-             * @return The attribute.
+             * @returns The attribute.
              */
-            getAttribute(): LookupAttribute;
+            getAttribute(): Attributes.LookupAttribute;
 
             /**
              * Gets the unique identifier of the default view.
-             *
-             * @return The default view, in Guid format.
-             *
-             * @remarks Example: "{00000000-0000-0000-0000-000000000000}"
+             * @returns The default view, in Guid format.
+             * @example Example return: "{00000000-0000-0000-0000-000000000000}"
              */
             getDefaultView(): string;
 
             /**
              * Removes the handler from the "pre search" event of the Lookup control.
-             *
              * @param handler The handler.
              */
             removePreSearch(handler: () => void): void;
 
             /**
              * Sets the Lookup's default view.
-             *
              * @param viewGuid Unique identifier for the view.
-             *
-             * @remarks Example viewGuid value: "{00000000-0000-0000-0000-000000000000}"
+             * @example Example viewGuid value: "{00000000-0000-0000-0000-000000000000}"
              */
             setDefaultView(viewGuid: string): void;
 
@@ -2865,7 +2923,7 @@ declare namespace Xrm {
         /**
          * Interface for an OptionSet control.
          *
-         * @sa  StandardControl
+         * @see {@link StandardControl}
          */
         interface OptionSetControl extends StandardControl {
             /**
@@ -2887,9 +2945,9 @@ declare namespace Xrm {
             /**
              * Gets the control's bound attribute.
              *
-             * @return The attribute.
+             * @returns The attribute.
              */
-            getAttribute(): OptionSetAttribute;
+            getAttribute(): Attributes.OptionSetAttribute;
 
             /**
              * Removes the option matching the value.
@@ -2902,7 +2960,7 @@ declare namespace Xrm {
         /**
          * Interface for a CRM grid control.
          *
-         * @sa  Control
+         * @see {@link Control}
          */
         interface GridControl extends Control {
             /**
@@ -2915,277 +2973,73 @@ declare namespace Xrm {
             /**
              * This method returns context information about the GridControl.
              *
-             * @return The context type.
+             * @returns The context type.
              */
             getContextType(): XrmEnum.GridControlContext;
 
             /**
              * Use this method to get the logical name of the entity data displayed in the grid.
              *
-             * @return The entity name.
+             * @returns The entity name.
              */
             getEntityName(): string;
 
             /**
              * Use this method to get access to the Grid available in the GridControl.
-             *
-             * @return The grid.
+             * @returns The grid.
              */
-            getGrid(): ui.Grid;
+            getGrid(): Grid;
 
             /**
              * Use this method to get access to the ViewSelector available for the GridControl when it is configured to display views.
-             *
-             * @return The view selector.
+             * @returns The view selector.
              */
-            getViewSelector(): ui.ViewSelector;
+            getViewSelector(): ViewSelector;
 
             /**
              * Refreshes the sub grid.
-             *
              * @remarks Not available during the "on load" event of the form.
              */
             refresh(): void;
 
             /**
              * Use this method to remove event handlers from the GridControl's OnLoad event.
-             *
              * @param handler The handler.
              */
             removeOnLoad(handler: () => void): void;
         }
 
         /**
-         * Interface for a framed control, which is either a Web Resource or an Iframe.
-         *
-         * @sa  Control
-         *
-         * @remarks     An Iframe control provides additional methods, so use {@link IframeControl} where
-         *              appropriate.  Silverlight controls should use {@link SilverlightControl}.
+         * Interface for a grid.  Use Grid methods to access information about data in the grid. Grid is returned by the
+         * GridControl.getGrid method.
          */
-        interface FramedControl extends Control {
+        interface Grid {
             /**
-             * Gets the DOM element containing the control.
-             *
-             * @return The container object.
-             *
-             * @remarks Unavailable for Microsoft Dynamics CRM for tablets.
+             * Returns a collection of every GridRow in the Grid.
+             * @returns The rows.
+             * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/collections External Link: Collections (Client API reference)}
              */
-            getObject(): HTMLIFrameElement;
+            getRows(): Collection.ItemCollection<Grid.GridRow>;
 
             /**
-             * Gets the URL value of the control.
-             *
-             * @return The source URL.
-             *
-             * @remarks Unavailable for Microsoft Dynamics CRM for tablets.
+             * Returns a collection of every selected GridRow in the Grid.
+             * @returns The selected rows.
+             * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/collections External Link: Collections (Client API reference)}
              */
-            getSrc(): string;
+            getSelectedRows(): Collection.ItemCollection<Grid.GridRow>;
 
             /**
-             * Sets the URL value of the control.
-             *
-             * @param src The source URL.
-             *
-             * @remarks Unavailable for Microsoft Dynamics CRM for tablets.
+             * Returns the total number of records in the Grid.
+             * @returns The total record count.
              */
-            setSrc(src: string): void;
+            getTotalRecordCount(): number;
         }
 
-        /**
-         * Interface for an Iframe control.
-         *
-         * @sa  FramedControl
-         */
-        interface IframeControl extends FramedControl, UiCanSetVisibleElement {
-            /**
-             * Gets initial URL defined for the Iframe.
-             *
-             * @return The initial URL.
-             *
-             * @remarks Unavailable for Microsoft Dynamics CRM for tablets.
-             */
-            getInitialUrl(): string;
-        }
-
-        /**
-         * Interface for a Silverlight control.
-         *
-         * @sa  Control
-         */
-        interface SilverlightControl extends Control {
-            /**
-             * Gets the query string value passed to Silverlight.
-             *
-             * @return The data.
-             *
-             * @remarks Unavailable for Microsoft Dynamics CRM for tablets.
-             */
-            getData(): string;
-
-            /**
-             * Sets the query string value passed to Silverlight.
-             *
-             * @param data The data.
-             *
-             * @remarks Unavailable for Microsoft Dynamics CRM for tablets.
-             */
-            setData(data: string): void;
-
-            /**
-             * Gets the DOM element containing the control.
-             *
-             * @return The container object.
-             *
-             * @remarks Unavailable for Microsoft Dynamics CRM for tablets.
-             */
-            getObject(): HTMLObjectElement;
-        }
-
-        /**
-         * Interface for a Timeline control.
-         *
-         * @sa  Control
-         */
-        interface TimelineWall extends Control {
-            /**
-             * Refreshes the data displayed in a timelinewall and timer control.
-             *
-             */
-            refresh(): void;
-        }
-
-        /**
-         * Interface for a form tab.
-         *
-         * @sa  UiElement
-         * @sa  UiFocusable
-         */
-        interface Tab extends UiStandardElement, UiFocusable {
-            /**
-             * Gets display state of the tab.
-             *
-             * @return The display state, as either "expanded" or "collapsed"
-             */
-            getDisplayState(): ui.DisplayState;
-
-            /**
-             * Gets the name of the tab.
-             *
-             * @return The name.
-             */
-            getName(): string;
-
-            /**
-             * Gets a reference to the Xrm.Page.ui parent of the tab.
-             *
-             * @return The parent.
-             */
-            getParent(): Ui;
-
-            /**
-             * Sets display state of the tab.
-             *
-             * @param displayState Display state of the tab, as either "expanded" or "collapsed"
-             */
-            setDisplayState(displayState: ui.DisplayState): void;
-
-            /**
-             * A reference to the collection of form sections within this tab.
-             */
-            sections: Collection.ItemCollection<Section>;
-        }
-
-        /**
-         * Interface for a form section.
-         *
-         * @sa  UiElement
-         */
-        interface Section extends UiStandardElement {
-            /**
-             * Gets the name of the section.
-             *
-             * @return The name.
-             */
-            getName(): string;
-
-            /**
-             * Gets a reference to the Xrm.Page.Tab parent of this item.
-             *
-             * @return The parent.
-             */
-            getParent(): Tab;
-
-            /**
-             * A reference to the collection of controls within this tab.
-             */
-            controls: Collection.ItemCollection<Control>;
-        }
-
-        /**
-         * Module for Xrm.Page.ui API.
-         */
-        namespace ui {
-            /**
-             * Form Notification Levels for Xrm.Ui.setFormNotification().
-             */
-            type FormNotificationLevel = "ERROR" | "INFO" | "WARNING";
-
-            /**
-             * Display States for Xrm.ui.ProcessMonitor.setDisplayState().
-             */
-            type DisplayState = "collapsed" | "expanded";
-
-            /**
-             * Interface for Xrm.Page.ui.process API
-             */
-            interface ProcessManager {
-                /**
-                 * Sets display state of the process flow control.
-                 *
-                 * @param displayState Display state of the process flow control, as either "expanded" or "collapsed"
-                 */
-                setDisplayState(displayState: DisplayState): void;
-
-                /**
-                 * Sets the visibility state.
-                 *
-                 * @param visible true to show, false to hide.
-                 */
-                setVisible(visible: boolean): void;
-            }
-
-            /**
-             * Interface for a grid.  Use Grid methods to access information about data in the grid. Grid is returned by the
-             * GridControl.getGrid method.
-             */
-            interface Grid {
-                /**
-                 * Returns a collection of every GridRow in the Grid.
-                 *
-                 * @return The rows.
-                 */
-                getRows(): Collection.ItemCollection<GridRow>;
-
-                /**
-                 * Returns a collection of every selected GridRow in the Grid.
-                 *
-                 * @return The selected rows.
-                 */
-                getSelectedRows(): Collection.ItemCollection<GridRow>;
-
-                /**
-                 * Returns the total number of records in the Grid.
-                 *
-                 * @return The total record count.
-                 */
-                getTotalRecordCount(): number;
-            }
-
+        namespace Grid {
             /**
              * Interface for a grid row.  Use the GridRow.getData method to access the GridRowData. A collection of GridRow is
              * returned by Grid.getRows and Grid.getSelectedRows methods.
-             * In V9 - this is essentailly a form context.
+             * In V9 - this is essentailly a form context
              */
             interface GridRow {
                 /**
@@ -3195,7 +3049,7 @@ declare namespace Xrm {
                 /**
                  * Returns the GridRowData for the GridRow.
                  * @deprecated Deprecated in V9 - use data field instead
-                 * @return The data.
+                 * @returns The data.
                  */
                 getData(): GridRowData;
             }
@@ -3207,8 +3061,8 @@ declare namespace Xrm {
             interface GridRowData {
                 /**
                  * Returns the GridEntity for the GridRowData.
-                 *
-                 * @return The entity.
+                 * @returns The entity.
+                 * @deprecated Use GridRow.data.entity instead of using GridRow.getData().getEntity().
                  */
                 getEntity(): GridEntity;
             }
@@ -3216,232 +3070,254 @@ declare namespace Xrm {
             /**
              * Interface for a grid entity.  Use the GridEntity methods to access data about the specific records in the rows.
              * GridEntity is returned by the GridRowData.getEntity method.
+             *
+             * @deprecated Use GridRow.data.entity instead.
              */
             interface GridEntity {
                 /**
                  * Returns the logical name for the record in the row.
                  *
-                 * @return The entity name.
+                 * @returns The entity name.
+                 * @deprecated Use GridRow.data.entity.getEntityName() instead.
                  */
                 getEntityName(): string;
 
                 /**
                  * Returns a LookupValue that references this record.
                  *
-                 * @return The entity reference.
+                 * @returns The entity reference.
+                 * @deprecated Use GridRow.data.entity.getEntityReference() instead.
                  */
                 getEntityReference(): LookupValue;
 
                 /**
                  * Returns the id for the record in the row.
                  *
-                 * @return The identifier of the GridEntity, in GUID format.
-                 *
-                 * @remarks Example return: "{00000000-0000-0000-0000-000000000000}"
+                 * @returns The identifier of the GridEntity, in GUID format.
+                 * @example Example return: "{00000000-0000-0000-0000-000000000000}"
+                 * @deprecated Use GridRow.data.entity.getId() instead.
                  */
                 getId(): string;
 
                 /**
                  * Returns the primary attribute value for the record in the row.  (Commonly the name.)
                  *
-                 * @return The primary attribute value.
+                 * @returns The primary attribute value.
+                 * @deprecated Use GridRow.data.entity.getPrimaryAttributeValue() instead.
                  */
                 getPrimaryAttributeValue(): string;
             }
-
-            /**
-             * Interface for the view selector.  Use the ViewSelector methods to get or set information about the view selector
-             * of the grid control.
-             */
-            interface ViewSelector {
-                /**
-                 * Use this method to get a reference to the current view.
-                 *
-                 * @return The current view.
-                 */
-                getCurrentView(): ViewSelectorItem;
-
-                /**
-                 * Use this method to determine whether the view selector is visible.
-                 *
-                 * @return true if visible, false if not.
-                 */
-                isVisible(): boolean;
-
-                /**
-                 * Use this method to set the current view.
-                 *
-                 * @param viewSelectorItem The view selector item.
-                 */
-                setCurrentView(viewSelectorItem: ViewSelectorItem): void;
-            }
-
-            /**
-             * Interface for a view selector item. This object contains data that identifies a view. Use this as a parameter to
-             * the ViewSelector.setCurrentView method.
-             */
-            interface ViewSelectorItem {
-                /**
-                 * Returns a LookupValue that references this view.
-                 *
-                 * @return The entity reference.
-                 */
-                getEntityReference(): LookupValue;
-            }
-
-            /**
-             * Interface for a quick view control instance on a form.
-             *
-             * @see {@link https://msdn.microsoft.com/en-us/library/mt736908.aspx#bkmk_isLoaded} for details.
-             */
-            interface QuickForm extends Control, UiLabelElement, UiCanGetVisibleElement {
-                /**
-                 * Gets the constituent controls in a quick view control.
-                 *
-                 * @return An array of controls.
-                 *
-                 * @remarks Constituent controls in a quick view control are read only.
-                 */
-                getControl(): Control[];
-
-                /**
-                 * Gets the constituent controls in a quick view control.
-                 *
-                 * @param T A Control type
-                 * @param controlName Name of the control.
-                 *
-                 * @return The control.
-                 *
-                 * @remarks Constituent controls in a quick view control are read only.
-                 */
-                getControl<T extends Control>(controlName: string): T;
-
-                /**
-                 * Gets the constituent controls in a quick view control.
-                 *
-                 * @param controlName Name of the control.
-                 *
-                 * @return The control.
-                 *
-                 * @remarks Constituent controls in a quick view control are read only.
-                 */
-                getControl(controlName: string): Control;
-
-                /**
-                 * Gets a control by index.
-                 *
-                 * @param T A Control type
-                 * @param index The control index.
-                 *
-                 * @return The control.
-                 *
-                 * @remarks Constituent controls in a quick view control are read only.
-                 */
-                getControl<T extends Control>(index: number): T;
-
-                /**
-                 * Gets a control by index.
-                 *
-                 * @param index The control index.
-                 *
-                 * @return The control.
-                 *
-                 * @remarks Constituent controls in a quick view control are read only.
-                 */
-                getControl(index: number): Control;
-
-                /**
-                 * Gets the controls type.
-                 *
-                 * @return Returns a string value that categorizes quick view controls.
-                 */
-                getControlType(): ControlQuickFormType;
-
-                /**
-                 * Returns whether the data binding for the constituent controls in a quick view control is complete.
-                 *
-                 * @return  True is the data binding for a constituent control is complete, otherwise false.
-                 *          because the quick view form that the control is bound to may not have loaded completely.
-                 *          As a result, using the getAttribute or any data-related methods on a constituent control might not work.
-                 *          The isLoaded method for the quick view control helps determine the data binding status for constituent controls in a quick view control.
-                 *
-                 *  @remarks The data binding for the constituent controls in a quick view control may not be complete during the main form OnLoad event
-                 */
-                isLoaded(): boolean;
-
-                /**
-                 * Refreshes the data displayed in a quick view control.
-                 */
-                refresh(): void;
-            }
         }
 
         /**
-         * Interface for a navigation item.
-         *
-         * @sa  UiElement
-         * @sa  UiFocusable
+         * Interface for a framed control, which is either a Web Resource or an Iframe.
+         * @see {@link Control}
+         * @remarks     An Iframe control provides additional methods, so use {@link IframeControl} where
+         *              appropriate.  Silverlight controls should use {@link SilverlightControl}.
          */
-        interface NavigationItem extends UiStandardElement, UiFocusable {
+        interface FramedControl extends Control {
             /**
-             * Gets the name of the item.
-             *
-             * @return The identifier.
+             * Gets the DOM element containing the control.
+             * @returns The container object.
+             * @remarks Unavailable for Microsoft Dynamics CRM for tablets.
              */
-            getId(): string;
+            getObject(): HTMLIFrameElement;
+
+            /**
+             * Gets the URL value of the control.
+             * @returns The source URL.
+             * @remarks Unavailable for Microsoft Dynamics CRM for tablets.
+             */
+            getSrc(): string;
+
+            /**
+             * Sets the URL value of the control.
+             * @param src The source URL.
+             * @remarks Unavailable for Microsoft Dynamics CRM for tablets.
+             */
+            setSrc(src: string): void;
         }
 
         /**
-         * Interface for Xrm.Page.ui.navigation.
+         * Interface for an Iframe control.
+         * @see {@link FramedControl}
          */
-        interface Navigation {
+        interface IframeControl extends FramedControl, UiCanSetVisibleElement {
             /**
-             * A reference to the collection of available navigation items.
+             * Gets initial URL defined for the Iframe.
+             * @returns The initial URL.
+             * @remarks Unavailable for Microsoft Dynamics CRM for tablets.
              */
-            items: Collection.ItemCollection<NavigationItem>;
+            getInitialUrl(): string;
         }
 
         /**
-         * Interface for an entity's form selector item.
+         * Interface for a quick view control instance on a form.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/formcontext-ui-quickforms External Link: formContext.ui.quickForms (Client API reference)}
          */
-        interface FormItem {
+        interface QuickFormControl extends Control, UiLabelElement, UiCanGetVisibleElement {
             /**
-             * Gets the unique identifier of the form.
-             *
-             * @return The identifier, in Guid format.
+             * Gets the constituent controls in a quick view control.
+             * @returns An array of controls.
+             * @remarks Constituent controls in a quick view control are read only.
              */
-            getId(): string;
+            getControl(): Control[];
 
             /**
-             * Gets the label for the form.
-             *
-             * @return The label.
+             * Gets the constituent controls in a quick view control.
+             * @param T A Control type
+             * @param controlName Name of the control.
+             * @returns The control.
+             * @remarks Constituent controls in a quick view control are read only.
              */
-            getLabel(): string;
+            getControl<T extends Control>(controlName: string): T;
 
             /**
-             * Navigates the user to this form.
+             * Gets the constituent controls in a quick view control.
+             * @param controlName Name of the control.
+             * @returns The control.
+             * @remarks Constituent controls in a quick view control are read only.
              */
-            navigate(): void;
+            getControl(controlName: string): Control;
+
+            /**
+             * Gets a control by index.
+             * @param T A Control type
+             * @param index The control index.
+             * @returns The control.
+             * @remarks Constituent controls in a quick view control are read only.
+             */
+            getControl<T extends Control>(index: number): T;
+
+            /**
+             * Gets a control by index.
+             * @param index The control index.
+             * @returns The control.
+             * @remarks Constituent controls in a quick view control are read only.
+             */
+            getControl(index: number): Control;
+
+            /**
+             * Gets the controls type.
+             * @returns Returns a string value ("quickform") that categorizes quick view controls.
+             */
+            getControlType(): ControlQuickFormType;
+
+            /**
+             * Returns whether the data binding for the constituent controls in a quick view control is complete.
+             * @returns  True is the data binding for a constituent control is complete, otherwise false.
+             *          because the quick view form that the control is bound to may not have loaded completely.
+             *          As a result, using the getAttribute or any data-related methods on a constituent control might not work.
+             *          The isLoaded method for the quick view control helps determine the data binding status for constituent controls in a quick view control.
+             * @remarks The data binding for the constituent controls in a quick view control may not be complete during the main form OnLoad event
+             */
+            isLoaded(): boolean;
+
+            /**
+             * Refreshes the data displayed in a quick view control.
+             */
+            refresh(): void;
         }
 
         /**
-         * Interface for the form selector API.
+         * Interface for a Silverlight control.
+         * @see {@link Control}
+         * @deprecated The Silverlight WebResource is deprecated on the web client, and is not supported on the new Unified Interface in v9.
+         * Instead of silverlight, use custom controls created using the HTML web resources with HTML5 to create UI components to visualize and interact with data.
          */
-        interface FormSelector {
+        interface SilverlightControl extends Control {
             /**
-             * Gets current form.
-             *
-             * @return The current item.
-             *
-             * @remarks When only one form is available this method will return null.
+             * Gets the query string value passed to Silverlight.
+             * @returns The data.
+             * @remarks Unavailable for Microsoft Dynamics CRM for tablets.
              */
-            getCurrentItem(): FormItem;
+            getData(): string;
 
             /**
-             * A reference to the collection of available forms.
+             * Sets the query string value passed to Silverlight.
+             * @param data The data.
+             * @remarks Unavailable for Microsoft Dynamics CRM for tablets.
              */
-            items: Collection.ItemCollection<FormItem>;
+            setData(data: string): void;
+
+            /**
+             * Gets the DOM element containing the control.
+             * @returns The container object.
+             * @remarks Unavailable for Microsoft Dynamics CRM for tablets.
+             */
+            getObject(): HTMLObjectElement;
+        }
+
+        /**
+         * Interface for a Timeline control.
+         * @see {@link Control}
+         */
+        interface TimelineWall extends Control {
+            /**
+             * Refreshes the data displayed in a timelinewall and timer control.
+             */
+            refresh(): void;
+        }
+
+        /**
+         * Interface for a form tab.
+         * @see {@link UiElement}
+         * @see {@link UiFocusable}
+         */
+        interface Tab extends UiStandardElement, UiFocusable {
+            /**
+             * Gets display state of the tab.
+             * @returns The display state, as either "expanded" or "collapsed"
+             */
+            getDisplayState(): DisplayState;
+
+            /**
+             * Gets the name of the tab.
+             * @returns The name.
+             */
+            getName(): string;
+
+            /**
+             * Gets a reference to the {@link FormContext.ui formContext.ui} parent of the tab.
+             * @returns The parent.
+             */
+            getParent(): Ui;
+
+            /**
+             * Sets display state of the tab.
+             * @param displayState Display state of the tab, as either "expanded" or "collapsed"
+             */
+            setDisplayState(displayState: DisplayState): void;
+
+            /**
+             * A reference to the collection of form sections within this tab.
+             * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/collections External Link: Collections (Client API reference)}
+             */
+            sections: Collection.ItemCollection<Section>;
+        }
+
+        /**
+         * Interface for a form section.
+         * @see {@link UiElement}
+         */
+        interface Section extends UiStandardElement {
+            /**
+             * Gets the name of the section.
+             * @returns The name.
+             */
+            getName(): string;
+
+            /**
+             * Gets a reference to the parent {@link Tab}.
+             * @returns The parent.
+             */
+            getParent(): Tab;
+
+            /**
+             * A reference to the collection of controls within this tab.
+             * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/collections External Link: Collections (Client API reference)}
+             */
+            controls: Collection.ItemCollection<Control>;
         }
 
         interface AddControlNotificationOptions {
@@ -3486,26 +3362,558 @@ declare namespace Xrm {
              */
             actions: Array<() => void>;
         }
+
+        interface ProcessControl extends UiCanGetVisibleElement, UiCanSetVisibleElement {
+            /**
+             * Sets display state of the process flow control.
+             * @param displayState Display state of the process flow control, as either "expanded" or "collapsed"
+             */
+            setDisplayState(displayState: DisplayState): void;
+
+            /**
+             * Gets the display state of the process flow control.
+             */
+            getDisplayState(): DisplayState;
+
+            /**
+             * Reflow the UI of the process control
+             * @param updateUI Specify true to update the UI of the process control; false otherwise.
+             * @param parentStage ID of the parent stage.
+             * @param nextStage ID of the next stage.
+             */
+            reflow(updateUI: boolean, parentStage: string, nextStage: string): void;
+        }
+
+        /**
+         * Interface for an entity's form selector item.
+         */
+        interface FormItem {
+            /**
+             * Gets the unique identifier of the form.
+             * @returns The identifier, in Guid format.
+             */
+            getId(): string;
+
+            /**
+             * Gets the label for the form.
+             * @returns The label.
+             */
+            getLabel(): string;
+
+            /**
+             * Navigates the user to this form.
+             */
+            navigate(): void;
+        }
+
+        /**
+         * Interface for the form selector API.
+         */
+        interface FormSelector {
+            /**
+             * Gets current form.
+             * @returns The current item.
+             * @remarks When only one form is available this method will return null.
+             */
+            getCurrentItem(): FormItem;
+
+            /**
+             * A reference to the collection of available forms.
+             * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/collections External Link: Collections (Client API reference)}
+             */
+            items: Collection.ItemCollection<FormItem>;
+        }
+
+        /**
+         * Interface for the view selector.  Use the ViewSelector methods to get or set information about the view selector
+         * of the grid control.
+         */
+        interface ViewSelector {
+            /**
+             * Use this method to get a reference to the current view.
+             * @returns The current view.
+             */
+            getCurrentView(): ViewSelectorItem;
+
+            /**
+             * Use this method to determine whether the view selector is visible.
+             * @returns true if visible, false if not.
+             */
+            isVisible(): boolean;
+
+            /**
+             * Use this method to set the current view.
+             * @param viewSelectorItem The view selector item.
+             */
+            setCurrentView(viewSelectorItem: ViewSelectorItem): void;
+        }
+
+        /**
+         * Interface for a view selector item. This object contains data that identifies a view. Use this as a parameter to
+         * the ViewSelector.setCurrentView method.
+         */
+        interface ViewSelectorItem {
+            /**
+             * Returns a LookupValue that references this view.
+             * @returns The entity reference.
+             */
+            getEntityReference(): LookupValue;
+        }
+    }
+
+    /**
+     * Interface for the form's record context, {@link Data.entity formContext.data.entity}
+     * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/formcontext-data-entity External Link: formContext.data.entity (Client API reference)}
+     */
+    interface Entity {
+        /**
+         * Adds a handler to be called when the record is saved.
+         * @param handler The handler.
+         */
+        addOnSave(handler: Events.ContextSensitiveHandler): void;
+
+        /**
+         * Gets an serialized-XML string representing data that will be passed to the server upon saving the record.
+         * @returns The XML in string format.
+         * @remarks This function does not work with Microsoft Dynamics CRM for tablets.
+         * @example "<account><name>Contoso</name><accountnumber>55555</accountnumber><telephone2>425
+         *          555-1234</telephone2></account>".
+         */
+        getDataXml(): string;
+
+        /**
+         * Gets entity's logical name.
+         * @returns  The logical name.
+         */
+        getEntityName(): string;
+
+        /**
+         * Gets the record's unique identifier.
+         * @returns The identifier, in Guid format.
+         * @example Example: "{825CB223-A651-DF11-AA8B-00155DBA3804}".
+         */
+        getId(): string;
+
+        /**
+         * Gets a boolean value indicating whether the record has unsaved changes.
+         * @returns true if there are unsaved changes, otherwise false.
+         */
+        getIsDirty(): boolean;
+
+        /**
+         * Gets the record's primary attribute value.
+         * @returns The primary attribute value.
+         * @remarks The value for this attribute is used when links to the record are displayed.
+         */
+        getPrimaryAttributeValue(): string;
+
+        /**
+         * Removes the handler from the "on save" event.
+         * @param handler The handler.
+         */
+        removeOnSave(handler: Events.ContextSensitiveHandler): void;
+
+        /**
+         * Saves the record.
+         * @deprecated Deprecated in v9.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
+         * @remarks  When using quick create forms in the web application the saveandnew option is not
+         *           applied. It will always work as if saveandclose were used. Quick create forms in
+         *           Microsoft Dynamics CRM for tablets will apply the saveandnew behavior.
+         */
+        save(): void;
+
+        /**
+         * Saves the record with the given save mode.
+         * @deprecated Deprecated in v9.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
+         * @param saveMode (Optional) the save mode to save, as either "saveandclose" or "saveandnew".
+         */
+        save(saveMode: EntitySaveMode): void;
+
+        /**
+         * The collection of attributes for the record.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/attributes External Link: Attributes (Client API reference)}
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/collections External Link: Collections (Client API reference)}
+         */
+        attributes: Collection.ItemCollection<Attributes.Attribute>;
+    }
+
+    namespace ProcessFlow {
+        /**
+         * Direction types for a process stage change event
+         * @see {@link XrmEnum.StageChangeDirection}
+         */
+        type StageChangeDirection = "Next" | "Previous";
+
+        /**
+         * Status for {@link ProcessFlow.Stage.getStatus Stage.getStatus()}.
+         * @see {@link XrmEnum.StageStatus}
+         */
+        type StageStatus = "active" | "inactive";
+
+        /**
+         * Status for {@link ProcessFlow.Process.getStatus Process.getStatus()}.
+         * @see {@link XrmEnum.ProcessStatus}
+         */
+        type ProcessStatus = "active" | "aborted" | "finished";
+
+        /**
+         * Interface for a CRM Business Process Flow instance.
+         */
+        interface Process {
+            /**
+             * Returns the unique identifier of the process.
+             * @returns The identifier for this process, in GUID format.
+             * @example Example: "{825CB223-A651-DF11-AA8B-00155DBA3804}".
+             */
+            getId(): string;
+
+            /**
+             * Returns the name of the process.
+             * @returns The name.
+             */
+            getName(): string;
+
+            /**
+             * Returns an collection of stages in the process.
+             * @returns The stages.
+             * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/collections External Link: Collections (Client API reference)}
+             */
+            getStages(): Collection.ItemCollection<Stage>;
+
+            /**
+             * Returns a boolean value to indicate if the process is rendered.
+             * @returns true if the process is rendered, false if not.
+             */
+            isRendered(): boolean;
+        }
+
+        /**
+         * Interface for CRM Business Process Flow stages.
+         */
+        interface Stage {
+            /**
+             * Returns an object with a getValue method which will return the integer value of the business process flow
+             * category.
+             * @returns The stage category.
+             */
+            getCategory(): { getValue(): XrmEnum.StageCategory };
+
+            /**
+             * Returns the logical name of the entity associated with the stage.
+             * @returns The entity name.
+             */
+            getEntityName(): string;
+
+            /**
+             * Returns the unique identifier of the stage.
+             * @returns The identifier of the Stage, in GUID format.
+             * @example Example: "{825CB223-A651-DF11-AA8B-00155DBA3804}".
+             */
+            getId(): string;
+
+            /**
+             * Returns the name of the stage.
+             * @returns The name.
+             */
+            getName(): string;
+
+            /**
+             * Returns the status of the stage.
+             * @returns The status, either "active" or "inactive".
+             */
+            getStatus(): StageStatus;
+
+            /**
+             * Returns a collection of steps in the stage.
+             * @returns An array of Step.
+             */
+            getSteps(): Step[];
+        }
+
+        interface Step {
+            /**
+             * Returns the logical name of the attribute associated to the step.
+             * @returns The attribute.
+             * @remarks Some steps don’t contain an attribute value.
+             */
+            getAttribute(): string;
+
+            /**
+             * Returns the name of the step.
+             * @returns The name.
+             */
+            getName(): string;
+
+            /**
+             * Returns whether the step is required in the business process flow.
+             * @returns true if required, false if not.
+             * @remarks     Returns true if the step is marked as required in the Business Process Flow editor; otherwise, false.
+             *              There is no connection between this value and the values you can change in the formContext.data.entity
+             *              attribute RequiredLevel methods.
+             */
+            isRequired(): boolean;
+        }
+
+        /**
+         * Interface for the formContext.data.process API.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/formcontext-data-process External Link: formContext.data.process (Client API reference)}
+         */
+        interface ProcessManager {
+            /**
+             * Returns a Process object representing the active process.
+             * @returns current active process.
+             */
+            getActiveProcess(): Process;
+
+            /**
+             * Set a Process as the active process.
+             * @param processId The Id of the process to make the active process.
+             * @param callbackFunction (Optional) a function to call when the operation is complete.
+             */
+            setActiveProcess(processId: string, callbackFunction?: ProcessCallbackDelegate): void;
+
+            /**
+             * Returns all process instances for the entity record that the calling user has access to.
+             * @param callbackFunction (Optional) a function to call when the operation is complete.
+             */
+            getProcessInstances(callbackFunction: GetProcessInstancesDelegate): void;
+
+            /**
+             * Sets a process instance as the active instance
+             * @param processInstanceId The Id of the process instance to make the active instance.
+             * @param callbackFunction (Optional) a function to call when the operation is complete.
+             */
+            setActiveProcessInstance(processInstanceId: string, callbackFunction: SetProcessInstanceDelegate): void;
+
+            /**
+             * Returns a Stage object representing the active stage.
+             * @returns current active stage.
+             */
+            getActiveStage(): Stage;
+
+            /**
+             * Set a stage as the active stage.
+             * @param stageId the Id of the stage to make the active stage.
+             * @param callbackFunction (Optional) a function to call when the operation is complete.
+             */
+            setActiveStage(stageId: string, callbackFunction?: ProcessCallbackDelegate): void;
+
+            /**
+             * Use this method to get a collection of stages currently in the active path with methods to interact with the
+             * stages displayed in the business process flow control. The active path represents stages currently rendered in
+             * the process control based on the branching rules and current data in the record.
+             * @returns A collection of all completed stages, the currently active stage, and the predicted set of future stages
+             *          based on satisfied conditions in the branching rule. This may be a subset of the stages returned with
+             *          formContext.data.process.getActiveProcess because it will only include those stages which represent a valid
+             *          transition from the current stage based on branching that has occurred in the process.
+             * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/collections External Link: Collections (Client API reference)}
+             */
+            getActivePath(): Collection.ItemCollection<Stage>;
+
+            /**
+             * Use this method to asynchronously retrieve the enabled business process flows that the user can switch to for an
+             * entity.
+             * @param callbackFunction The callback function must accept a parameter that contains an object with
+             *                         dictionary properties where the name of the property is the Id of the
+             *                         business process flow and the value of the property is the name of the
+             *                         business process flow.
+             *                         The enabled processes are filtered according to the user’s privileges. The
+             *                         list of enabled processes is the same ones a user can see in the UI if they
+             *                         want to change the process manually.
+             */
+            getEnabledProcesses(callbackFunction: (enabledProcesses: ProcessDictionary) => void): void;
+
+            /**
+             * Use this method to get the currently selected stage.
+             * @returns The currently selected stage.
+             */
+            getSelectedStage(): Stage;
+
+            /**
+             * Use this to add a function as an event handler for the OnStageChange event so that it will be called when the
+             * business process flow stage changes.
+             * @param handler The function will be added to the bottom of the event
+             *                handler pipeline. The execution context is automatically
+             *                set to be the first parameter passed to the event handler.
+             *                Use a reference to a named function rather than an
+             *                anonymous function if you may later want to remove the
+             *                event handler.
+             */
+            addOnStageChange(handler: Events.ContextSensitiveHandler): void;
+
+            /**
+             * Use this to add a function as an event handler for the OnProcessStatusChange event so that it will be called when the
+             * business process flow status changes.
+             * @param handler The function will be added to the bottom of the event
+             *                handler pipeline. The execution context is automatically
+             *                set to be the first parameter passed to the event handler.
+             *                Use a reference to a named function rather than an
+             *                anonymous function if you may later want to remove the
+             *                event handler.
+             */
+            addOnProcessStatusChange(handler: Events.ProcessStatusChangeHandler): void;
+
+            /**
+             * Use this to add a function as an event handler for the OnStageSelected event so that it will be called
+             * when a business process flow stage is selected.
+             * @param handler The function will be added to the bottom of the event
+             *                handler pipeline. The execution context is automatically
+             *                set to be the first parameter passed to the event handler.
+             *                Use a reference to a named function rather than an
+             *                anonymous function if you may later want to remove the
+             *                event handler.
+             */
+            addOnStageSelected(handler: Events.ContextSensitiveHandler): void;
+
+            /**
+             * Use this to remove a function as an event handler for the OnProcessStatusChange event.
+             * @param handler If an anonymous function is set using the addOnProcessStatusChange method it
+             *                cannot be removed using this method.
+             */
+            removeOnProcessStatusChange(handler: Events.ProcessStatusChangeHandler): void;
+
+            /**
+             * Use this to remove a function as an event handler for the OnStageChange event.
+             * @param handler If an anonymous function is set using the addOnStageChange method it
+             *                cannot be removed using this method.
+             */
+            removeOnStageChange(handler: Events.ContextSensitiveHandler): void;
+
+            /**
+             * Use this to remove a function as an event handler for the OnStageChange event.
+             * @param handler If an anonymous function is set using the addOnStageChange method it
+             *                cannot be removed using this method.
+             */
+            removeOnStageSelected(handler: Events.ContextSensitiveHandler): void;
+
+            /**
+             * Progresses to the next stage.
+             * @param callbackFunction (Optional) A function to call when the operation is complete.
+             */
+            moveNext(callbackFunction?: ProcessCallbackDelegate): void;
+
+            /**
+             * Moves to the previous stage.
+             * @param callbackFunction (Optional) A function to call when the operation is complete.
+             */
+            movePrevious(callbackFunction?: ProcessCallbackDelegate): void;
+
+            /**
+             * Use this method to get the unique identifier of the process instance
+             * @returns The unique identifier of the process instance
+             */
+            getInstanceId(): string;
+
+            /**
+             * Use this method to get the name of the process instance
+             * @returns The name of the process instance
+             */
+            getInstanceName(): string;
+
+            /**
+             * Use this method to get the current status of the process instance
+             * @returns The current status of the process
+             */
+            getStatus(): ProcessStatus;
+
+            /**
+             * Use this method to set the current status of the process instance
+             * @param status The new status for the process
+             * @param callbackFunction (Optional) a function to call when the operation is complete.
+             */
+            setStatus(status: ProcessStatus, callbackFunction: ProcessSetStatusDelegate): void;
+        }
+
+        /**
+         * Called when method to get active processes is complete
+         * @param status The result of the get active processes operation.
+         * @remarks **Returns object with the following key-value pairs**:
+         * * CreatedOn
+         * * ProcessDefinitionID
+         * * ProcessDefinitionName
+         * * ProcessInstanceID
+         * * ProcessInstanceName
+         * * StatusCodeName
+         */
+        type GetProcessInstancesDelegate = (object: ProcessDictionary) => void;
+
+        /**
+         * Called when method to set active process is complete
+         * @param status The result of the set active process operation.
+         * @remarks **Values returned are**:
+         * * success        (The operation succeeded.)
+         * * invalid        (The processInstanceId isn’t valid or the process isn’t enabled.)
+         */
+        type SetProcessInstanceDelegate = (status: string) => void;
+
+        /**
+         * Called when process change methods have completed.
+         * @param status The result of the process change operation.
+         * @remarks **Values returned are**:
+         * * success        (The operation succeeded.)
+         * * crossEntity    (The previous stage is for a different entity.)
+         * * beginning      (The active stage is the first stage of the active path.)
+         * * invalid        (The operation failed because the selected stage isn’t the same as the active stage.)
+         * * unreachable    (The stage exists on a different path.)
+         */
+        type ProcessCallbackDelegate = (status: string) => void;
+
+        /**
+         * Called when process set status method has completed.
+         * @param status The new status of the process instance: active, aborted, or finished
+         */
+        type ProcessSetStatusDelegate = (status: ProcessStatus) => void;
+
+        /**
+         * Represents a key-value pair, where the key is the Process Flow's ID, and the value is the name thereof.
+         */
+        interface ProcessDictionary {
+            [index: string]: string;
+        }
+    }
+
+    /**
+     * Interface for a user attribute privilege.
+     */
+    interface Privilege {
+        /**
+         * True if the user can read.
+         */
+        canRead: boolean;
+
+        /**
+         * True if the user can update.
+         */
+        canUpdate: boolean;
+
+        /**
+         * True if the user can create.
+         */
+        canCreate: boolean;
     }
 
     /**
      * An definition module for URL-based, CRM component parameters.
-     *
-     * @see {@link http://msdn.microsoft.com/en-us/library/gg328483.aspx} for details.
+     * @see {@link http://msdn.microsoft.com/en-us/library/gg328483.aspx External Link: Open forms, views, dialogs, and reports with a URL}
      */
     namespace Url {
         /**
          * Command Bar Display options for Xrm.Url.FormOpenParameters.cmdbar, Xrm.Url.ViewOpenParameters.cmdbar, and Xrm.Utility.FormOpenParameters.cmdbar.
+         * @see {@link XrmEnum.CmdBarDisplay}
          */
-
         type CmdBarDisplay = "true" | "false";
+
         /**
          * Navigation Bar Display options for Xrm.Url.FormOpenParameters.navbar, Xrm.Url.ViewOpenParameters.navbar, and Xrm.Utility.FormOpenParameters.navbar.
+         * @see {@link XrmEnum.NavBarDisplay}
          */
         type NavBarDisplay = "entity" | "off" | "on";
 
         /**
          * Report Open Action options for Xrm.Url.ReportOpenParameters.actions.
+         * @see {@link XrmEnum.ReportAction}
          */
         type ReportAction = "filter" | "run";
 
@@ -3513,9 +3921,7 @@ declare namespace Xrm {
          * Interface for defining parameters on a request to open a form with main.aspx (as with
          * window.open). Useful for parsing the keys and values into a string of the format:
          * "&key=value".
-         *
-         * @see {@link http://msdn.microsoft.com/en-us/library/gg328483.aspx} for details.
-         *
+         * @see {@link http://msdn.microsoft.com/en-us/library/gg328483.aspx External Link: Open forms, views, dialogs, and reports with a URL}
          * @remarks  A member for "pagetype" is not provided.  The value "entityrecord" is required in
          *           the URL, for forms. Example:  "pagetype=entityrecord"
          */
@@ -3529,24 +3935,24 @@ declare namespace Xrm {
              * Additional parameters can be provided to the request. This can only be used to provide
              * default field values for the form, or pass data to custom parameters that have been
              * customized for the form.  See example below for setting the selected form.
-             *
-             * @remarks Example:  encodeURIComponent("formid={8c9f3e6f-7839-e211-831e-00155db7d98f}");
+             * @example Example:  encodeURIComponent("formid={8c9f3e6f-7839-e211-831e-00155db7d98f}");
              */
             extraqs?: string;
 
             /**
              * Controls whether the command bar is displayed.
-             * Accepted values are: "true"    (The command bar is displayed.)
-             *                      "false"   (The command bar is not displayed.)
+             * @remarks **Accepted values are**:
+             * * "true"    (The command bar is displayed.)
+             * * "false"   (The command bar is not displayed.)
              */
             cmdbar?: CmdBarDisplay;
 
             /**
              * Controls whether the Navigation bar is displayed on the form.
-             * Accepted values are: "on"      (The navigation bar is displayed.)
-             *                      "off"     (The navigation bar is not displayed.)
-             *                      "entity"  (On an entity form, only the navigation options for related
-             *                                entities are available.)
+             * @remarks **Accepted values are**:
+             * * "on"      (The navigation bar is displayed.)
+             * * "off"     (The navigation bar is not displayed.)
+             * * "entity"  (On an entity form, only the navigation options for related entities are available.)
              */
             navbar?: NavBarDisplay;
         }
@@ -3555,9 +3961,7 @@ declare namespace Xrm {
          * Interface for defining parameters on a request to open a view with main.aspx (as with
          * window.open). Useful for parsing the keys and values into a string of the format:
          * "&key=value".
-         *
-         * @see {@link http://msdn.microsoft.com/en-us/library/gg328483.aspx} for details.
-         *
+         * @see {@link http://msdn.microsoft.com/en-us/library/gg328483.aspx External Link: Open forms, views, dialogs, and reports with a URL}
          * @remarks  A member for "pagetype" is not provided.  The value "entitylist" is required in
          *           the URL, for views. Example:  "pagetype=entitylist"
          */
@@ -3575,25 +3979,26 @@ declare namespace Xrm {
 
             /**
              * The type of view identified by {@link viewid}.
-             *
-             * @remarks  Accepted values are:    1039    System View
-             *                                   4230    User View.
+             * @remarks **Accepted values are**:
+             * * 1039    System View
+             * * 4230    User View.
              */
             viewtype: XrmEnum.ViewType;
 
             /**
              * Controls whether the command bar is displayed.
-             * Accepted values are: "true"    (The command bar is displayed.)
-             *                      "false"   (The command bar is not displayed.)
+             * @remarks **Accepted values are**:
+             * * "true"    (The command bar is displayed.)
+             * * "false"   (The command bar is not displayed.)
              */
             cmdbar?: CmdBarDisplay;
 
             /**
              * Controls whether the Navigation bar is displayed on the form.
-             * Accepted values are: "on"      (The navigation bar is displayed.)
-             *                      "off"     (The navigation bar is not displayed.)
-             *                      "entity"  (On an entity form, only the navigation options for related
-             *                                entities are available.)
+             * @remarks **Accepted values are**:
+             * * "on"      (The navigation bar is displayed.)
+             * * "off"     (The navigation bar is not displayed.)
+             * * "entity"  (On an entity form, only the navigation options for related entities are available.)
              */
             navbar?: NavBarDisplay;
         }
@@ -3602,8 +4007,7 @@ declare namespace Xrm {
          * Interface for defining parameters of a request to open a dialog with rundialog.aspx (as with
          * window.open).  Useful for parsing the keys and values into a string of the format:
          * "&key=value".
-         *
-         * @see {@link http://msdn.microsoft.com/en-us/library/gg328483.aspx} for details.
+         * @see {@link http://msdn.microsoft.com/en-us/library/gg328483.aspx External Link: Open forms, views, dialogs, and reports with a URL}
          */
         interface DialogOpenParameters {
             /**
@@ -3628,14 +4032,14 @@ declare namespace Xrm {
          * window.open).  Useful for parsing out the keys and values into a string of the format:
          * "&key=value"
          *
-         * @see {@link http://msdn.microsoft.com/en-us/library/gg328483.aspx} for details.
+         * @see {@link http://msdn.microsoft.com/en-us/library/gg328483.aspx External Link: Open forms, views, dialogs, and reports with a URL}
          */
         interface ReportOpenParameters {
             /**
              * The action to perform, as either "run" or "filter".
-             *
-             * @remarks  "run"       Executes the report with default filters.
-             *           "filter"    Presents the user with the filter editor, and a "Run Report" button.
+             * @remarks **Actions**:
+             * * "run"       Executes the report with default filters.
+             * * "filter"    Presents the user with the filter editor, and a "Run Report" button.
              */
             action: ReportAction;
 
@@ -3655,7 +4059,7 @@ declare namespace Xrm {
     /**
      * The Xrm.Utility API
      *
-     * @see {@link http://msdn.microsoft.com/en-us/library/gg328255.aspx|Documentation} for details.
+     * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-utility External Link: Xrm.Utility (Client API reference)}
      */
     namespace Utility {
         /**
@@ -3682,17 +4086,18 @@ declare namespace Xrm {
 
             /**
              * Controls whether the Navigation bar is displayed on the form.
-             * Accepted values are: "on"      (The navigation bar is displayed.)
-             *                      "off"     (The navigation bar is not displayed.)
-             *                      "entity"  (On an entity form, only the navigation options for related
-             *                                entities are available.)
+             * @remarks **Accepted values are**:
+             * * "on"      (The navigation bar is displayed.)
+             * * "off"     (The navigation bar is not displayed.)
+             * * "entity"  (On an entity form, only the navigation options for related entities are available.)
              */
             navbar?: Url.NavBarDisplay;
 
             /**
              * Controls whether the command bar is displayed.
-             * Accepted values are: "true"    (The command bar is displayed.)
-             *                      "false"   (The command bar is not displayed.)
+             * @remarks **Accepted values are**:
+             * * "true"    (The command bar is displayed.)
+             * * "false"   (The command bar is not displayed.)
              */
             cmdbar?: Url.CmdBarDisplay;
         }
@@ -3710,8 +4115,7 @@ declare namespace Xrm {
 
     /**
      * Namespace to hold Xrm.Navigation related types
-     *
-     * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-navigation} for details
+     * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-navigation External Link: Xrm.Navigation (Client API reference)}
      */
     namespace Navigation {
         interface AlertStrings {
@@ -3742,12 +4146,12 @@ declare namespace Xrm {
             subtitle?: string;
 
             /**
-             *  (Optional) The title to be displyed in the confirmation dialog.
+             * (Optional) The title to be displyed in the confirmation dialog.
              */
-            title: string;
+            title?: string;
 
             /**
-             *  The message to be displyed in the alert dialog.
+             * The message to be displyed in the alert dialog.
              */
             text: string;
         }
@@ -3765,7 +4169,7 @@ declare namespace Xrm {
 
         interface OpenWebresourceOptions extends DialogSizeOptions {
             /**
-             *  Indicates whether to open the web resource in a new window.
+             * Indicates whether to open the web resource in a new window.
              */
             openInNewWindow: boolean;
         }
@@ -3831,7 +4235,7 @@ declare namespace Xrm {
             /**
              * Designates a record that will provide default values based on mapped attribute values.The lookup object has the following String properties: entityType, id, and name (optional).
              */
-            createFromEntity?: Page.LookupValue;
+            createFromEntity?: LookupValue;
             /**
              * ID of the entity record to display the form for.
              */
@@ -3858,9 +4262,9 @@ declare namespace Xrm {
             isOfflineSyncError?: boolean;
             /**
              * Controls whether the navigation bar is displayed and whether application navigation is available using the areas and subareas defined in the sitemap.Valid vlaues are: "on", "off", or "entity".
-             *      on: The navigation bar is displayed.This is the default behavior if the navBar parameter is not used.
-             *      off: The navigation bar is not displayed.People can navigate using other user interface elements or the back and forward buttons.
-             *      entity: On an entity form, only the navigation options for related entities are available.After navigating to a related entity, a back button is displayed in the navigation bar to allow returning to the original record.
+             * * on: The navigation bar is displayed.This is the default behavior if the navBar parameter is not used.
+             * * off: The navigation bar is not displayed.People can navigate using other user interface elements or the back and forward buttons.
+             * * entity: On an entity form, only the navigation options for related entities are available.After navigating to a related entity, a back button is displayed in the navigation bar to allow returning to the original record.
              */
             navBar?: Url.NavBarDisplay;
             /**
@@ -3869,8 +4273,8 @@ declare namespace Xrm {
             openInNewWindow?: boolean;
             /**
              * Specify one of the following values for the window position of the form on the screen:
-             *                  1:center
-             *                  2:side
+             * * 1:center
+             * * 2:side
              */
             windowPosition?: XrmEnum.WindowPositions;
             /**
@@ -3914,14 +4318,14 @@ declare namespace Xrm {
             navigationPropertyName?: string;
             /**
              * Relationship type.Specify one of the following values:
-             *                       0:OneToMany
-             *                       1:ManyToMany
+             * * 0:OneToMany
+             * * 1:ManyToMany
              */
-            relationshipType?: XrmEnum.RelationshipType;	//
+            relationshipType?: XrmEnum.RelationshipType;    //
             /**
              * Role type in relationship.Specify one of the following values:
-             *       1:Referencing
-             *       2:AssociationEntity
+             * * 1:Referencing
+             * * 2:AssociationEntity
              */
             roleType?: XrmEnum.RoleType;
         }
@@ -3933,7 +4337,7 @@ declare namespace Xrm {
     interface Navigation {
         /**
          * Displays an alert dialog containing a message and a button.
-         * @param  alertStrings The strings to be used in the alert dialog.
+         * @param alertStrings The strings to be used in the alert dialog.
          * @param alertOptions The height and width options for alert dialog
          */
         openAlertDialog(alertStrings: Navigation.AlertStrings, alertOptions: Navigation.DialogSizeOptions): Async.PromiseLike<any>;
@@ -3965,7 +4369,7 @@ declare namespace Xrm {
         /**
          * Opens a URL, including file URLs.
          * @param url URL to open.
-         * @param openUrlOptions  Options to open the URL
+         * @param openUrlOptions Options to open the URL
          */
         openUrl(url: string, openUrlOptions?: Navigation.DialogSizeOptions): void;
 
@@ -3973,7 +4377,7 @@ declare namespace Xrm {
          * Opens an HTML web resource.
          * @param webResourceName Name of the HTML web resource.
          * @param windowOptions (Optional) Window options for opening the web resource.
-         *                      It is advised to use encodeURIcomponent() to encode the value.
+         *                                                 It is advised to use encodeURIcomponent() to encode the value.
          */
         openWebResource(webResourceName: string, windowOptions?: Navigation.OpenWebresourceOptions, data?: string): void;
     }
@@ -3987,6 +4391,9 @@ declare namespace Xrm {
          */
         interface EntityMetadata {
             ActivityTypeMask: number;
+            /**
+             * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/collections External Link: Collections (Client API reference)}
+             */
             Attributes: Collection.ItemCollection<AttributeMetadata>;
             AutoRouteToOwnerQueue: boolean;
             CanEnableSyncToExternalSearchIndex: boolean;
@@ -4042,13 +4449,18 @@ declare namespace Xrm {
             RecurrenceBaseEntityLogicalName: string;
             PrimaryImageAttribute: string;
         }
+
         /**
          * Type to hold Labels as part of the EntityMetadata
          */
         interface Label {
+            /**
+             * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/collections External Link: Collections (Client API reference)}
+             */
             LocalizedLabels: Collection.ItemCollection<LocalizedLabel>;
             UserLocalizedLabel: LocalizedLabel;
         }
+
         /**
          * Type to hold a Label as part of the EntityMetadata
          */
@@ -4056,18 +4468,26 @@ declare namespace Xrm {
             Label: string;
             LanguageCode: number;
         }
+
         /**
          * Type to hold the Attribute metadata as part of the EntityMetadata
          */
         interface AttributeMetadata {
             defaultFormValue: number;
+            /**
+             * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/collections External Link: Collections (Client API reference)}
+             */
             options: Collection.ItemCollection<string>;
             logicalName: string;
             displayName: string;
             attributeType: XrmEnum.AttributeTypeCode;
             entityLogicalName: string;
+            /**
+             * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/collections External Link: Collections (Client API reference)}
+             */
             optionSet: Collection.ItemCollection<OptionMetadata>;
         }
+
         /**
          * Type to hold the optionset metadata as part of the EntityMetadata
          */
@@ -4087,7 +4507,7 @@ declare namespace Xrm {
 
     /**
      * Namespace to hold Xrm.Device related types
-     * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-device} for details
+     * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-device External Link: Xrm.Device (Client API reference)}
      */
     namespace Device {
         /**
@@ -4154,6 +4574,7 @@ declare namespace Xrm {
 
         /**
          * Posible file types for Xrm.Device.pickFile options
+         * @see {@link XrmEnum.DevicePickFileType}
          */
         type PickFileTypes = "audio" | "video" | "image";
 
@@ -4178,47 +4599,41 @@ declare namespace Xrm {
 
     /**
      * Interface for Xrm.Device API
-     * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-device} for details
+     * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-device External Link: Xrm.Device (Client API reference)}
      */
     interface Device {
         /**
          * Invokes the device microphone to record audio.
-         *
          * @returns On success, returns Base64 encoded file
          */
         captureAudio(): Async.PromiseLike<Device.CaptureFileResponse>;
 
         /**
          * Invokes the device camera to capture an image.
-         *
          * @returns On success, returns Base64 encoded file
          */
         captureImage(imageOptions: Device.CaptureImageOptions): Async.PromiseLike<Device.CaptureFileResponse>;
 
         /**
          * Invokes the device camera to capture video.
-         *
          * @returns On success, returns Base64 encoded file
          */
         captureVideo(): Async.PromiseLike<Device.CaptureFileResponse>;
 
         /**
          * Invokes the device camera to scan the barcode information, such as a product number.
-         *
          * @returns On success, Barcode value is returned as a String
          */
         getBarcodeValue(): Async.PromiseLike<string>;
 
         /**
          * Returns the current location using the device geolocation capability.
-         *
          * @returns On success, returns current geolocation information
          */
         getCurrentPosition(): Async.PromiseLike<Device.GetCurrentPositionResponse>;
 
         /**
          * Opens a dialog box to select files from your computer (web client) or mobile device (mobile clients).
-         *
          * @returns On success, returns an array of files
          */
         pickFile(pickFileOptions: Device.PickFileOptions): Async.PromiseLike<Device.CaptureFileResponse[]>;
@@ -4226,23 +4641,19 @@ declare namespace Xrm {
 
     /**
      * Interface for Xrm.Encoding API
-     * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-encoding} for details
+     * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-encoding External Link: Xrm.Encoding (Client API reference)}
      */
     interface Encoding {
         /**
          * Applies attribute encoding to a string.
-         *
          * @param arg String to be encoded.
-         *
          * @returns Encoded string.
          */
         xmlAttributeEncode(arg: string): string;
 
         /**
          * Applies XML encoding to a string.
-         *
          * @param arg String to be encoded.
-         *
          * @returns Encoded string.
          */
         xmlEncode(arg: string): string;
@@ -4250,14 +4661,12 @@ declare namespace Xrm {
 
     /**
      * Provides properties and methods to use Web API to create and manage records and execute Web API actions and functions in Customer Engagement.
-     * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-webapi} for details
+     * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-webapi External Link: Xrm.WebApi (Client API reference)}
      */
-    interface WebApi extends WebApiBase {
+    interface WebApi extends WebApiOffline {
         /**
          * Returns a boolean value indicating whether an entity is offline enabled.
-         *
-         * @param entityLogicalName Logical name of the entity. For example: "account".
-         *
+         * @param entityLogicalName    Logical name of the entity. For example: "account".
          * @returns true if the entity is offline enabled; otherwise false.
          */
         isAvailableOffline(entityLogicalName: string): boolean;
@@ -4265,55 +4674,103 @@ declare namespace Xrm {
         /**
          * Provides methods to use Web API to create and manage records and execute Web API actions and functions in Customer Engagement when connected to the Customer Engagement server (online mode).
          */
-        online: WebApi;
+        online: WebApiOnline;
 
         /**
          * Provides methods to create and manage records in the Dynamics 365 Customer Engagement mobile clients while working in the offline mode.
-         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-webapi/offline} for details
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-webapi/offline}
          */
-        offline: WebApi;
+        offline: WebApiOffline;
     }
 
     /**
-     * Interface for the Xrm.WebApi API
+     * Interface for the Xrm.WebApi.online API
+     * Execute and ExecuteMultiple are only available when online, not offline.
      */
-    interface WebApiBase {
+    interface WebApiOnline extends WebApiOffline {
+        /**
+         * Execute a single action, function, or CRUD operation.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-webapi/execute External Link: execute (Client API reference)}
+         * @param request Object that will be passed to the Web API endpoint to execute an action, function, or CRUD request.
+         * @remarks The object exposes a getMetadata method that lets you define the metadata for the action, function or CRUD request you want to execute.<BR>
+         * **The getMetadata method has the following parameters**:
+         *   - boundParameter: (Optional) String. The name of the bound parameter for the action or function to execute.
+         *       * Specify undefined if you are executing a CRUD request.
+         *       * Specify null if the action or function to execute is not bound to any entity.
+         *       * Specify entity logical name or entity set name in case the action or function to execute is bound to one.
+         *   - operationName: (Optional). String. Name of the action, function, or one of the following values if you are executing a CRUD request: "Create", "Retrieve", "RetrieveMultiple", "Update", or "Delete".
+         *   - operationType: (Optional). Number. Indicates the type of operation you are executing; specify one of the following values:
+         *       * 0: Action
+         *       * 1: Function
+         *       * 2: CRUD
+         *   - parameterTypes: Object. The metadata for parameter types. The object has the following attributes:
+         *   - enumProperties: (Optional) Object. The metadata for enum types. The object has two string attributes: name and value
+         *   - structuralProperty: Number. The category of the parameter type. Specify one of the following values:
+         *       * 0: Unknown
+         *       * 1: PrimitiveType
+         *       * 2: ComplexType
+         *       * 3: EnumerationType
+         *       * 4: Collection
+         *       * 5: EntityType
+         *   - typeName: String. The fully qualified name of the parameter type.
+         */
+        execute(request: any): Async.PromiseLike<ExecuteResponse>;
+
+        /**
+         * Execute a collection of action, function, or CRUD operations.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-webapi/executemultiple External Link: executeMultiple (Client API reference)}
+         * @param request   An array of one of one of the following types:
+         *    -objects where each object is an action, function, or CRUD request that you want to execute
+         *        * against the Web API endpoint. Each object exposes a getMetadata method that lets you define
+         *        the metadata for the action, function or CRUD request you want to execute. This is the same
+         *        object that you pass in the execute method. For information about the object, see execute.
+         *    -change set (an array of objects), where each object in the change set is as defined above.
+         *        * In this case, all the request objects specified in the change set will get executed in a
+         *        transaction.
+         */
+        executeMultiple(request: any[]): Async.PromiseLike<ExecuteResponse[]>;
+    }
+
+    /**
+     * Interface for the Xrm.WebApi.offline API
+     */
+    interface WebApiOffline {
         /**
          * Creates an entity record
-         *
          * @param entityLogicalName Logical name of the entity you want to create. For example: "account".
          * @param record A JSON object defining the attributes and values for the new entity record.
-         *
-         * @return On success, returns a promise object containing the attributes specified earlier in the description of the successCallback parameter.
+         * @returns On success, returns a promise object containing the attributes specified earlier in the description of the successCallback parameter.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-webapi/createrecord External Link: createRecord (Client API reference)}
          */
         createRecord(entityLogicalName: string, record: any): Async.PromiseLike<string>;
 
         /**
          * Deletes an entity record.
-         *
          * @param entityLogicalName The entity logical name of the record you want to delete. For example: "account".
          * @param id GUID of the entity record you want to delete.
-         *
-         * @return On success, returns a promise object containing the attributes specified earlier in the description of the successCallback parameter.
+         * @returns On success, returns a promise object containing the attributes specified earlier in the description of the successCallback parameter.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-webapi/deleterecord External Link: deleteRecord (Client API reference)}
          */
         deleteRecord(entityLogicalName: string, id: string): Async.PromiseLike<string>;
 
         /**
          * Retrieves an entity record.
-         *
          * @param entityLogicalName The entity logical name of the record you want to retrieve. For example: "account".
          * @param id GUID of the entity record you want to retrieve.
          * @param options (Optional) OData system query options, $select and $expand, to retrieve your data.
-         *                 -Use the $select system query option to limit the properties returned by including a comma-separated list of property names.
-         *                  This is an important performance best practice. If properties aren’t specified using $select, all properties will be returned.
-         *                 -Use the $expand system query option to control what data from related entities is returned.
-         *                  If you just include the name of the navigation property, you’ll receive all the properties for related records.
-         *                  You can limit the properties returned for related records using the $select system query option in parentheses
-         *                  after the navigation property name. Use this for both single-valued and collection-valued navigation properties.
-         *                  You can also specify multiple query options by using & to separate the query options. For example:
-         *                  $select=name&$expand=primarycontactid($select=contactid,fullname)
-         *
-         * @return On success, returns a promise containing a JSON object with the retrieved attributes and their values.
+         * - Use the $select system query option to limit the properties returned by including a comma-separated
+         *   list of property names. This is an important performance best practice. If properties aren’t
+         *   specified using $select, all properties will be returned.
+         * - Use the $expand system query option to control what data from related entities is returned. If you
+         *   just include the name of the navigation property, you’ll receive all the properties for related
+         *   records. You can limit the properties returned for related records using the $select system query
+         *   option in parentheses after the navigation property name. Use this for both single-valued and
+         *   collection-valued navigation properties.
+         * - You can also specify multiple query options by using & to separate the query options.
+         * @example <caption>options example:</caption>
+         * options: $select=name&$expand=primarycontactid($select=contactid,fullname)
+         * @returns On success, returns a promise containing a JSON object with the retrieved attributes and their values.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-webapi/retrieverecord External Link: retrieveRecord (Client API reference)}
          */
         retrieveRecord(entityLogicalName: string, id: string, options: string): Async.PromiseLike<any>;
 
@@ -4321,18 +4778,17 @@ declare namespace Xrm {
          * Retrieves a collection of entity records.
          * @param entityLogicalName The entity logical name of the records you want to retrieve. For example: "account".
          * @param options (Optional) OData system query options or FetchXML query to retrieve your data.
-         *                Following system query options are supported: $select, $top, $filter, $expand, and $orderby.
-         *                To specify a FetchXML query, use the fetchXml attribute to specify the query.
-         *                NOTE: You must always use the $select system query option to limit the properties returned for an entity record
-         *                by including a comma-separated list of property names. This is an important performance best practice.
-         *                If properties aren’t specified using $select, all properties will be returned.
-         *                You can specify multiple system query options by using & to separate the query options.
+         * * Following system query options are supported: $select, $top, $filter, $expand, and $orderby.
+         * * To specify a FetchXML query, use the fetchXml attribute to specify the query.
+         * * NOTE: You must always use the $select system query option to limit the properties returned for an entity
+         * record by including a comma-separated list of property names. This is an important performance best practice.
+         * * If properties aren’t specified using $select, all properties will be returned.
+         * * You can specify multiple system query options by using & to separate the query options.
          * @param maxPageSize (Optional) Specify a positive number that indicates the number of entity records to be returned per page.
-         *                    If you do not specify this parameter, the default value is passed as 5000.
-         *                    If the number of records being retrieved is more than the specified maxPageSize value, nextLink attribute in the returned
-         *                    Promise object will contain a link to retrieve the next set of entities.
-         *
-         * @return  On success, returns a promise object containing the attributes specified earlier in the description of the successCallback parameter.
+         * * If you do not specify this parameter, the default value is passed as 5000. If the number of records being retrieved is more than the specified
+         * maxPageSize value, nextLink attribute in the returned promise object will contain a link to retrieve the next set of entities.
+         * @returns On success, returns a promise object containing the attributes specified earlier in the description of the successCallback parameter.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-webapi/retrievemultiplerecords External Link: retrieveMultipleRecords (Client API reference)}
          */
         retrieveMultipleRecords(entityLogicalName: string, options?: string, maxPageSize?: number): Async.PromiseLike<RetrieveMultipleResult>;
 
@@ -4341,30 +4797,10 @@ declare namespace Xrm {
          * @param entityLogicalName The entity logical name of the record you want to update. For example: "account".
          * @param id GUID of the entity record you want to update.
          * @param Data A JSON object containing key: value pairs, where key is the property of the entity and value is the value of the property you want update.
-         *
-         * @return On success, returns a promise object containing the attributes specified earlier in the description of the successCallback parameter.
+         * @returns On success, returns a promise object containing the attributes specified earlier in the description of the successCallback parameter.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-webapi/updaterecord External Link: updateRecord (Client API reference)}
          */
         updateRecord(entityLogicalName: string, id: string, data: any): Async.PromiseLike<any>;
-
-        /**
-         * Execute a single action, function, or CRUD operation.
-         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-webapi/execute} for more info
-         * @param request Object that will be passed to the Web API endpoint to execute an action, function, or CRUD request.
-         */
-        execute(request: any): Async.PromiseLike<ExecuteResponse>;
-
-        /**
-         * Execute a collection of action, function, or CRUD operations.
-         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-webapi/executemultiple} for more info
-         * @param request An array of one of one of the following types:
-         *                 -objects where each object is an action, function, or CRUD request that you want to execute
-         *                     against the Web API endpoint. Each object exposes a getMetadata method that lets you
-         *                     define the metadata for the action, function or CRUD request you want to execute.
-         *                     This is the same object that you pass in the execute method. For information about the object, see execute.
-         *                 -Change set (an array of objects), where each object in the change set is as defined above.
-         *                     In this case, all the request objects specified in the change set will get executed in a transaction.
-         */
-        executeMultiple(request: any[]): Async.PromiseLike<ExecuteResponse[]>;
     }
 
     /**
@@ -4406,11 +4842,13 @@ declare namespace Xrm {
          */
         ok: boolean;
         /**
-         * Numeric value in the response status code.For example: 200
+         * Numeric value in the response status code.
+         * @example 200
          */
         status: number;
         /**
-         * Description of the response status code.For example: OK
+         * Description of the response status code.
+         * @example "OK"
          */
         statusText: string;
         /**
@@ -4434,7 +4872,15 @@ declare namespace XrmEnum {
         Update = 2,
         ReadOnly = 3,
         Disabled = 4,
-        BulkEdit = 6
+        BulkEdit = 6,
+        /**
+         * @deprecated QuickCreate has been deprecated
+         */
+        QuickCreate = 5,
+        /**
+         * @deprecated ReadOptimized has been deprecated.
+         */
+        ReadOptimized = 11
     }
 
     /**
@@ -4561,4 +5007,235 @@ declare namespace XrmEnum {
         Tablet = 3,
         Phone = 4
     }
+
+    /**
+     * Constant Enum: Client Types for {@link ClientContext.getClient clientContext.getClient()}.
+     * @see {@link Xrm.Client}
+     */
+    const enum Client {
+        Web = "Web",
+        Outlook = "Outlook",
+        Mobile = "Mobile",
+        UnifiedServiceDesk = "UnifiedServiceDesk",
+        USD = "UnifiedServiceDesk"
+    }
+
+    /**
+     * Constant Enum: Client States for {@link ClientContext.getClientState clientContext.getClientState()}.
+     * @see {@link Xrm.ClientState}
+     */
+    const enum ClientState {
+        Online = "Online",
+        Offline = "Offline"
+    }
+
+    /**
+     * Constant Enum: Display States for setDisplayState() on {@link Controls.ProcessControl.setDisplayState Processes} and {@link Controls.Tab.setDisplayState Tabs}.
+     * @see {@link Xrm.DisplayState}
+     */
+    const enum DisplayState {
+        Expanded = "expanded",
+        Collapsed = "collapsed"
+    }
+
+    /**
+     * Constant Enum: {@link Entity.save Entity} Save Modes
+     * @see {@link Xrm.EntitySaveMode}
+     * @see {@link Entity}
+     * @see {@link Entity.save}
+     */
+    const enum EntitySaveMode {
+        SaveAndClose = "saveandclose",
+        SaveAndNew = "saveandnew"
+    }
+
+    /**
+     * Constant Enum: Form Notification Levels for {@link Ui.setFormNotification formContext.ui.setFormNotification()}.
+     * @see {@link Xrm.FormNotificationLevel}
+     */
+    const enum FormNotificationLevel {
+        Error = "ERROR",
+        Info = "INFO",
+        Warning = "Warning"
+    }
+
+    /**
+     * Constant Enum: Submit Modes for {@link Attributes.Attribute.setSubmitMode} Attributes.Attribute.setSubmitMode().
+     * @see {@link Xrm.SubmitMode}
+     */
+    const enum SubmitMode {
+        Always = "always",
+        Dirty = "dirty",
+        Never = "never"
+    }
+
+    /**
+     * Constant Enum: Themes for {@link GlobalContext.getCurrentTheme globalContext.getCurrentTheme()}.
+     * @remarks getCurrentTheme() does not work with Dynamics CRM for tablets or in the unified interface.
+     */
+    const enum Theme {
+        Default = "default",
+        Office12Blue = "Office12Blue",
+        Office14Silver = "Office14Silver"
+    }
+
+    /**
+     * Constant Enum: Settings for {@link GlobalContext.getAdvancedConfigSetting globalContext.getAdvancedConfigSetting(setting)}
+     */
+    const enum AdvancedConfigSettingOption {
+        MaxChildIncidentNumber = "MaxChildIncidentNumber",
+        MaxIncidentMergeNumber = "MaxIncidentMergeNumber"
+    }
+
+    /**
+     * Constant Enum: Requirement Level for {@link Attributes.Attribute.getRequiredLevel Attributes.Attribute.getRequiredLevel()} and
+     * {@link Attributes.Attribute.setRequiredLevel Attributes.Attribute.setRequiredLevel()}.
+     * @see {@link Xrm.Attributes.RequirementLevel}
+     */
+    const enum AttributeRequirementLevel {
+        None = "none",
+        Recommended = "recommended",
+        Required = "required"
+    }
+
+    /**
+     * Constant Enum: Date attribute formats for Attributes.Attribute.getFormat(), used by {@link Attributes.DateAttribute DateAttribute}.
+     * @see {@link Xrm.Attributes.DateAttributeFormat}
+     */
+    const enum DateAttributeFormat {
+        Date = "date",
+        DateTime = "datetime"
+    }
+
+    /**
+     * Constant Enum: Integer attribute formats for Attributes.Attribute.getFormat(), used by {@link Attributes.NumberAttribute NumberAttribute}.
+     * @see {@link Xrm.Attributes.IntegerAttributeFormat}
+     */
+    const enum IntegerAttributeFormat {
+        Duration = "duration",
+        None = "none"
+    }
+
+    /**
+     * Constant Enum: OptionSet attribute formats for Attributes.Attribute.getFormat(), used by {@link Attributes.OptionSetAttribute OptionSetAttribute}.
+     * @see {@link Xrm.Attributes.OptionSetAttributeFormat}
+     */
+    const enum OptionSetAttributeFormat {
+        Language = "language",
+        TimeZone = "timezone"
+    }
+
+    /**
+     * Constant Enum: String attribute formats for Attributes.Attribute.getFormat(), used by {@link Attributes.StringAttribute StringAttribute}.
+     * @see {@link Xrm.Attributes.StringAttributeFormat}
+     */
+    const enum StringAttributeFormat {
+        Email = "email",
+        Phone = "phone",
+        Text = "text",
+        TextArea = "textarea",
+        TickerSymbol = "tickersymbol",
+        URL = "url"
+    }
+
+    /**
+     * Constant Enum: Attribute types for {@link Attributes.Attribute.setDisplayState()}.
+     * @see {@link Xrm.Attributes.AttributeType}
+     */
+    const enum AttributeType {
+        Boolean = "boolean",
+        DateTime = "datetime",
+        Decimal = "decimal",
+        Double = "double",
+        Integer = "integer",
+        Lookup = "lookup",
+        Memo = "memo",
+        Money = "money",
+        OptionSet = "optionset",
+        String = "string"
+    }
+
+    /**
+     * Constant Enum: Control types for {@link Controls.Control.getControlType Controls.Control.getControlType()}.
+     * @see {@link Xrm.Controls.ControlType}
+     */
+    const enum StandardControlType {
+        Standard = "standard",
+        IFrame = "iframe",
+        Lookup = "lookup",
+        OptionSet = "optionset",
+        SubGrid = "subgrid",
+        WebResource = "webresource",
+        Notes = "notes",
+        TimerControl = "timercontrol",
+        KBSearch = "kbsearch",
+        TimeLineWall = "timelinewall",
+        QuickForm = "quickform"
+    }
+
+    /**
+     * Constant Enum: Direction types for a process stage change event
+     * @see {@link ProcessFlow.StageChangeDirection}
+     */
+    const enum StageChangeDirection {
+        Next = "Next",
+        Previous = "Previous"
+    }
+
+    /**
+     * Constant Enum: Status for {@link ProcessFlow.Stage.getStatus Stage.getStatus()}.
+     * @see {@link ProcessFlow.StageStatus}
+     */
+    const enum StageStatus {
+        Active = "active",
+        Inactive = "inactive"
+    }
+
+    /**
+     * Constant Enum: Status for {@link ProcessFlow.Process.getStatus Process.getStatus()}.
+     * @see {@link ProcessFlow.ProcessStatus}
+     */
+    const enum ProcessStatus {
+        Active = "active",
+        Aborted = "aborted",
+        Finished = "finished"
+    }
+
+     /**
+      * Constant Enum: Command Bar Display options for Xrm.Url.FormOpenParameters.cmdbar, Xrm.Url.ViewOpenParameters.cmdbar, and Xrm.Utility.FormOpenParameters.cmdbar.
+      * @see {@link Xrm.Url.CmdBarDisplay}
+      */
+    const enum CmdBarDisplay {
+        True = "true",
+        False = "false"
+    }
+
+    /**
+     * Constant Enum: Navigation Bar Display options for Xrm.Url.FormOpenParameters.navbar, Xrm.Url.ViewOpenParameters.navbar, and Xrm.Utility.FormOpenParameters.navbar.
+     * @see {@link Xrm.Url.NavBarDisplay}
+     */
+    const enum NavBarDisplay {
+        Entity = "entity",
+        On = "on",
+        Off = "off"
+    }
+
+    /**
+     * Constant Enum: Report Open Action options for Xrm.Url.ReportOpenParameters.actions.
+     * @see {@link Xrm.Url.ReportAction}
+     */
+    const enum ReportAction {
+        Filter = "filter",
+        Run = "run"
+    }
+
+    /**
+     * Constant Enum: Posible file types for Xrm.Device.pickFile options
+     * @see {@link Xrm.Device.PickFileTypes}
+     */
+    const enum DevicePickFileType {
+        Audio = "audio",
+        Video = "vidoe",
+        Image = "image"
+    }
 }
diff --git a/types/xrm/tslint.json b/types/xrm/tslint.json
index f4cc3f2d22..6164356b33 100644
--- a/types/xrm/tslint.json
+++ b/types/xrm/tslint.json
@@ -18,6 +18,7 @@
             "double"
         ],
         "jsdoc-format": true,
-        "no-unnecessary-generics": false
+        "no-unnecessary-generics": false,
+        "no-empty-interface": false
     }
 }
diff --git a/types/xrm/v8/index.d.ts b/types/xrm/v8/index.d.ts
index b46b92ffa1..810d461033 100644
--- a/types/xrm/v8/index.d.ts
+++ b/types/xrm/v8/index.d.ts
@@ -1,6 +1,11 @@
 // Type definitions for Microsoft Dynamics xRM API 8.2
 // Project: http://www.microsoft.com/en-us/download/details.aspx?id=44567
-// Definitions by: David Berry <https://github.com/6ix4our>, Matt Ngan <https://github.com/mattngan>, Markus Mauch <https://github.com/markusmauch>, Daryl LaBar <https://github.com/daryllabar>, Tully H <https://github.com/clownwilleatme>
+// Definitions by: David Berry <https://github.com/6ix4our>
+//                 Matt Ngan <https://github.com/mattngan>
+//                 Markus Mauch <https://github.com/markusmauch>
+//                 Daryl LaBar <https://github.com/daryllabar>
+//                 Tully H <https://github.com/clownwilleatme>
+//                 Marius Agur <https://github.com/mariusagur>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.1
 
@@ -1084,6 +1089,14 @@ declare namespace Xrm {
              */
             getDepth(): number;
 
+            /**
+             * Returns the event arguments for the event context
+             * Get event args returns null for read operations
+             *
+             * @return The event arguments or null
+             */
+            getEventArgs(): SaveEventArguments | StageChangeEventArguments | StageSelectedEventArguments;
+
             /**
              * Gets a reference to the object for which event occurred.
              *
@@ -1101,6 +1114,18 @@ declare namespace Xrm {
              *
              * @remarks Used to pass values between handlers of an event.
              */
+            getFormContext(): Page;
+
+            /**
+             * Gets the shared variable with the specified key.
+             *
+             * @param T Generic type parameter.
+             * @param key The key.
+             *
+             * @return The shared variable.
+             *
+             * @remarks Used to pass values between handlers of an event.
+             */
             getSharedVariable<T>(key: string): T;
 
             /**