diff --git a/notNeededPackages.json b/notNeededPackages.json
index 7683c07522..3abaa12d26 100644
--- a/notNeededPackages.json
+++ b/notNeededPackages.json
@@ -558,6 +558,12 @@
             "sourceRepoURL": "http://arshaw.com/fullcalendar/",
             "asOfVersion": "3.8.0"
         },
+        {
+            "libraryName": "fuse",
+            "typingsPackageName": "fuse",
+            "sourceRepoURL": "https://github.com/krisk/Fuse",
+            "asOfVersion": "2.6.0"
+        },
         {
             "libraryName": "gaea-model",
             "typingsPackageName": "gaea-model",
diff --git a/scripts/generate-tsconfigs.ts b/scripts/generate-tsconfigs.ts
index 0115067e34..e1e1998950 100644
--- a/scripts/generate-tsconfigs.ts
+++ b/scripts/generate-tsconfigs.ts
@@ -5,7 +5,7 @@
 import * as fs from 'fs';
 import * as path from 'path';
 
-const home = path.join(__dirname, '..');
+const home = path.join(__dirname, "..", "types");
 
 for (const dirName of fs.readdirSync(home)) {
 	if (dirName.startsWith(".") || dirName === "node_modules" || dirName === "scripts") {
diff --git a/types/accepts/index.d.ts b/types/accepts/index.d.ts
index 33ee0db8a1..02cb0fbb97 100644
--- a/types/accepts/index.d.ts
+++ b/types/accepts/index.d.ts
@@ -12,36 +12,75 @@ declare namespace accepts {
     interface Accepts {
         /**
          * Return the first accepted charset. If nothing in `charsets` is accepted, then `false` is returned.
+         * If no charsets are supplied, all accepted charsets are returned, in the order of the client's preference
+         * (most preferred first).
          */
+        charset(): string[];
         charset(charsets: string[]): string | false;
         charset(...charsets: string[]): string | false;
 
         /**
-         * Return the charsets that the request accepts, in the order of the client's preference (most preferred first).
+         * Return the first accepted charset. If nothing in `charsets` is accepted, then `false` is returned.
+         * If no charsets are supplied, all accepted charsets are returned, in the order of the client's preference
+         * (most preferred first).
          */
         charsets(): string[];
+        charsets(charsets: string[]): string | false;
+        charsets(...charsets: string[]): string | false;
 
         /**
          * Return the first accepted encoding. If nothing in `encodings` is accepted, then `false` is returned.
+         * If no encodings are supplied, all accepted encodings are returned, in the order of the client's preference
+         * (most preferred first).
          */
+        encoding(): string[];
         encoding(encodings: string[]): string | false;
         encoding(...encodings: string[]): string | false;
 
         /**
-         * Return the encodings that the request accepts, in the order of the client's preference (most preferred first).
+         * Return the first accepted encoding. If nothing in `encodings` is accepted, then `false` is returned.
+         * If no encodings are supplied, all accepted encodings are returned, in the order of the client's preference
+         * (most preferred first).
          */
         encodings(): string[];
+        encodings(encodings: string[]): string | false;
+        encodings(...encodings: string[]): string | false;
 
         /**
          * Return the first accepted language. If nothing in `languages` is accepted, then `false` is returned.
+         * If no languaes are supplied, all accepted languages are returned, in the order of the client's preference
+         * (most preferred first).
          */
+        language(): string[];
         language(languages: string[]): string | false;
         language(...languages: string[]): string | false;
 
         /**
-         * Return the languages that the request accepts, in the order of the client's preference (most preferred first).
+         * Return the first accepted language. If nothing in `languages` is accepted, then `false` is returned.
+         * If no languaes are supplied, all accepted languages are returned, in the order of the client's preference
+         * (most preferred first).
          */
         languages(): string[];
+        languages(languages: string[]): string | false;
+        languages(...languages: string[]): string | false;
+
+        /**
+         * Return the first accepted language. If nothing in `languages` is accepted, then `false` is returned.
+         * If no languaes are supplied, all accepted languages are returned, in the order of the client's preference
+         * (most preferred first).
+         */
+        lang(): string[];
+        lang(languages: string[]): string | false;
+        lang(...languages: string[]): string | false;
+
+        /**
+         * Return the first accepted language. If nothing in `languages` is accepted, then `false` is returned.
+         * If no languaes are supplied, all accepted languages are returned, in the order of the client's preference
+         * (most preferred first).
+         */
+        langs(): string[];
+        langs(languages: string[]): string | false;
+        langs(...languages: string[]): string | false;
 
         /**
          * Return the first accepted type (and it is returned as the same text as what appears in the `types` array). If nothing in `types` is accepted, then `false` is returned.
diff --git a/types/actions-on-google/actions-on-google-tests.ts b/types/actions-on-google/actions-on-google-tests.ts
index e57e1e8d98..d24c3093b4 100644
--- a/types/actions-on-google/actions-on-google-tests.ts
+++ b/types/actions-on-google/actions-on-google-tests.ts
@@ -1,6 +1,6 @@
 import { ActionsSdkApp, ActionsSdkAppOptions, DialogflowApp, DialogflowAppOptions, AssistantApp,
     Responses, Transactions } from 'actions-on-google';
-import * as express from 'express';
+import express = require('express');
 
 function testActionsSdk(request: express.Request, response: express.Response) {
     const app = new ActionsSdkApp({request, response});
diff --git a/types/actions-on-google/index.d.ts b/types/actions-on-google/index.d.ts
index 23a2c1483d..937943e1f0 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.7
+// Type definitions for actions-on-google 1.8
 // 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 4ebb9b3007..227d102958 100644
--- a/types/actions-on-google/response-builder.d.ts
+++ b/types/actions-on-google/response-builder.d.ts
@@ -20,7 +20,9 @@ export enum ImageDisplays {
      */
     WHITE,
     /**
-     * Image is centered and resized so the image fits perfectly in the container.
+     * Image is scaled such that the image width matches the container width. This may crop the top
+     * and bottom of the image if the scaled image height is greater than the container height. This
+     * is similar to "Zoom Mode" on a widescreen TV when playing a 4:3 video.
      */
     CROPPED
 }
diff --git a/types/actions-on-google/transactions.d.ts b/types/actions-on-google/transactions.d.ts
index 59e6cd9b37..06e44b33dd 100644
--- a/types/actions-on-google/transactions.d.ts
+++ b/types/actions-on-google/transactions.d.ts
@@ -594,7 +594,12 @@ export namespace TransactionValues {
         /**
          * Use external payment gateway tokenization API to tokenize selected payment method.
          */
-        PAYMENT_GATEWAY
+        PAYMENT_GATEWAY,
+        /**
+         * Allows payment service to pass public key for payment info encryption and receive encrypted
+         * response.
+         */
+        DIRECT
     }
 }
 
diff --git a/types/actions-on-google/tsconfig.json b/types/actions-on-google/tsconfig.json
index 6682b5c194..776b12264b 100644
--- a/types/actions-on-google/tsconfig.json
+++ b/types/actions-on-google/tsconfig.json
@@ -25,4 +25,4 @@
         "transactions.d.ts",
         "actions-on-google-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/activex-diskquota/tsconfig.json b/types/activex-diskquota/tsconfig.json
index b7430e47f9..597d998a96 100644
--- a/types/activex-diskquota/tsconfig.json
+++ b/types/activex-diskquota/tsconfig.json
@@ -1,8 +1,10 @@
-
 {
     "compilerOptions": {
         "module": "commonjs",
-        "lib": ["es5", "scripthost"],
+        "lib": [
+            "es5",
+            "scripthost"
+        ],
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
diff --git a/types/activex-excel/index.d.ts b/types/activex-excel/index.d.ts
index ec2044f1e7..cdf2a79551 100644
--- a/types/activex-excel/index.d.ts
+++ b/types/activex-excel/index.d.ts
@@ -2,13 +2,14 @@
 // Project: https://msdn.microsoft.com/en-us/library/fp179694.aspx
 // Definitions by: Zev Spitz <https://github.com/zspitz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 /// <reference types="activex-office" />
 /// <reference types="activex-vbide" />
 /// <reference types="activex-stdole" />
 
 declare namespace Excel {
+    // tslint:disable-next-line:no-const-enum
     const enum Constants {
         xl3DBar = -4099,
         xl3DEffects1 = 13,
@@ -179,6 +180,7 @@ declare namespace Excel {
         xlWorksheetShort = 5,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlAboveBelow {
         xlAboveAverage = 0,
         xlAboveStdDev = 4,
@@ -188,6 +190,7 @@ declare namespace Excel {
         xlEqualBelowAverage = 3,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlActionType {
         xlActionTypeDrillthrough = 256,
         xlActionTypeReport = 128,
@@ -195,21 +198,25 @@ declare namespace Excel {
         xlActionTypeUrl = 1,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlAllocation {
         xlAutomaticAllocation = 2,
         xlManualAllocation = 1,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlAllocationMethod {
         xlEqualAllocation = 1,
         xlWeightedAllocation = 2,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlAllocationValue {
         xlAllocateIncrement = 2,
         xlAllocateValue = 1,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlApplicationInternational {
         xl24HourClock = 33,
         xl4DigitYears = 43,
@@ -258,11 +265,13 @@ declare namespace Excel {
         xlYearCode = 19,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlApplyNamesOrder {
         xlColumnThenRow = 2,
         xlRowThenColumn = 1,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlArabicModes {
         xlArabicBothStrict = 3,
         xlArabicNone = 0,
@@ -270,6 +279,7 @@ declare namespace Excel {
         xlArabicStrictFinalYaa = 2,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlArrangeStyle {
         xlArrangeStyleCascade = 7,
         xlArrangeStyleHorizontal = -4128,
@@ -277,12 +287,14 @@ declare namespace Excel {
         xlArrangeStyleVertical = -4166,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlArrowHeadLength {
         xlArrowHeadLengthLong = 3,
         xlArrowHeadLengthMedium = -4138,
         xlArrowHeadLengthShort = 1,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlArrowHeadStyle {
         xlArrowHeadStyleClosed = 3,
         xlArrowHeadStyleDoubleClosed = 5,
@@ -291,12 +303,14 @@ declare namespace Excel {
         xlArrowHeadStyleOpen = 2,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlArrowHeadWidth {
         xlArrowHeadWidthMedium = -4138,
         xlArrowHeadWidthNarrow = 1,
         xlArrowHeadWidthWide = 3,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlAutoFillType {
         xlFillCopy = 1,
         xlFillDays = 5,
@@ -311,6 +325,7 @@ declare namespace Excel {
         xlLinearTrend = 9,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlAutoFilterOperator {
         xlAnd = 1,
         xlBottom10Items = 4,
@@ -328,6 +343,7 @@ declare namespace Excel {
         xlTop10Percent = 5,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlAxisCrosses {
         xlAxisCrossesAutomatic = -4105,
         xlAxisCrossesCustom = -4114,
@@ -335,23 +351,27 @@ declare namespace Excel {
         xlAxisCrossesMinimum = 4,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlAxisGroup {
         xlPrimary = 1,
         xlSecondary = 2,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlAxisType {
         xlCategory = 1,
         xlSeriesAxis = 3,
         xlValue = 2,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlBackground {
         xlBackgroundAutomatic = -4105,
         xlBackgroundOpaque = 3,
         xlBackgroundTransparent = 2,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlBarShape {
         xlBox = 0,
         xlConeToMax = 5,
@@ -361,6 +381,7 @@ declare namespace Excel {
         xlPyramidToPoint = 1,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlBordersIndex {
         xlDiagonalDown = 5,
         xlDiagonalUp = 6,
@@ -372,6 +393,7 @@ declare namespace Excel {
         xlInsideVertical = 11,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlBorderWeight {
         xlHairline = 1,
         xlMedium = -4138,
@@ -379,6 +401,7 @@ declare namespace Excel {
         xlThin = 2,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlBuiltInDialog {
         _xlDialogChartSourceData = 541,
         _xlDialogPhonetic = 538,
@@ -641,53 +664,62 @@ declare namespace Excel {
         xlDialogZoom = 256,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlCalcFor {
         xlAllValues = 0,
         xlColGroups = 2,
         xlRowGroups = 1,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlCalculatedMemberType {
         xlCalculatedMember = 0,
         xlCalculatedSet = 1,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlCalculation {
         xlCalculationAutomatic = -4105,
         xlCalculationManual = -4135,
         xlCalculationSemiautomatic = 2,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlCalculationInterruptKey {
         xlAnyKey = 2,
         xlEscKey = 1,
         xlNoKey = 0,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlCalculationState {
         xlCalculating = 1,
         xlDone = 0,
         xlPending = 2,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlCategoryType {
         xlAutomaticScale = -4105,
         xlCategoryScale = 2,
         xlTimeScale = 3,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlCellChangedState {
         xlCellChangeApplied = 3,
         xlCellChanged = 2,
         xlCellNotChanged = 1,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlCellInsertionMode {
         xlInsertDeleteCells = 1,
         xlInsertEntireRows = 2,
         xlOverwriteCells = 0,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlCellType {
         xlCellTypeAllFormatConditions = -4172,
         xlCellTypeAllValidation = -4174,
@@ -701,17 +733,20 @@ declare namespace Excel {
         xlCellTypeVisible = 12,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlChartElementPosition {
         xlChartElementPositionAutomatic = -4105,
         xlChartElementPositionCustom = -4114,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlChartGallery {
         xlAnyGallery = 23,
         xlBuiltIn = 21,
         xlUserDefined = 22,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlChartItem {
         xlAxis = 21,
         xlAxisTitle = 17,
@@ -747,12 +782,14 @@ declare namespace Excel {
         xlYErrorBars = 11,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlChartLocation {
         xlLocationAsNewSheet = 1,
         xlLocationAsObject = 2,
         xlLocationAutomatic = 3,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlChartPicturePlacement {
         xlAllFaces = 7,
         xlEnd = 2,
@@ -763,12 +800,14 @@ declare namespace Excel {
         xlSides = 1,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlChartPictureType {
         xlStack = 2,
         xlStackScale = 3,
         xlStretch = 1,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlChartSplitType {
         xlSplitByCustomSplit = 4,
         xlSplitByPercentValue = 3,
@@ -776,6 +815,7 @@ declare namespace Excel {
         xlSplitByValue = 2,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlChartType {
         xl3DArea = -4098,
         xl3DAreaStacked = 78,
@@ -852,12 +892,14 @@ declare namespace Excel {
         xlXYScatterSmoothNoMarkers = 73,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlCheckInVersionType {
         xlCheckInMajorVersion = 1,
         xlCheckInMinorVersion = 0,
         xlCheckInOverwriteVersion = 2,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlClipboardFormat {
         xlClipboardFormatBIFF = 8,
         xlClipboardFormatBIFF12 = 63,
@@ -895,6 +937,7 @@ declare namespace Excel {
         xlClipboardFormatWK1 = 10,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlCmdType {
         xlCmdCube = 1,
         xlCmdDefault = 4,
@@ -903,11 +946,13 @@ declare namespace Excel {
         xlCmdTable = 3,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlColorIndex {
         xlColorIndexAutomatic = -4105,
         xlColorIndexNone = -4142,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlColumnDataType {
         xlDMYFormat = 4,
         xlDYMFormat = 7,
@@ -921,18 +966,21 @@ declare namespace Excel {
         xlYMDFormat = 5,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlCommandUnderlines {
         xlCommandUnderlinesAutomatic = -4105,
         xlCommandUnderlinesOff = -4146,
         xlCommandUnderlinesOn = 1,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlCommentDisplayMode {
         xlCommentAndIndicator = 1,
         xlCommentIndicatorOnly = -1,
         xlNoIndicator = 0,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlConditionValueTypes {
         xlConditionValueAutomaticMax = 7,
         xlConditionValueAutomaticMin = 6,
@@ -945,6 +993,7 @@ declare namespace Excel {
         xlConditionValuePercentile = 5,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlConnectionType {
         xlConnectionTypeODBC = 2,
         xlConnectionTypeOLEDB = 1,
@@ -953,6 +1002,7 @@ declare namespace Excel {
         xlConnectionTypeXMLMAP = 3,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlConsolidationFunction {
         xlAverage = -4106,
         xlCount = -4112,
@@ -968,6 +1018,7 @@ declare namespace Excel {
         xlVarP = -4165,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlContainsOperator {
         xlBeginsWith = 2,
         xlContains = 0,
@@ -975,27 +1026,32 @@ declare namespace Excel {
         xlEndsWith = 3,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlCopyPictureFormat {
         xlBitmap = 2,
         xlPicture = -4147,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlCorruptLoad {
         xlExtractData = 2,
         xlNormalLoad = 0,
         xlRepairFile = 1,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlCreator {
         xlCreatorCode = 1480803660,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlCredentialsMethod {
         xlCredentialsMethodIntegrated = 0,
         xlCredentialsMethodNone = 1,
         xlCredentialsMethodStored = 2,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlCubeFieldSubType {
         xlCubeAttribute = 4,
         xlCubeCalculatedMeasure = 5,
@@ -1009,17 +1065,20 @@ declare namespace Excel {
         xlCubeSet = 3,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlCubeFieldType {
         xlHierarchy = 1,
         xlMeasure = 2,
         xlSet = 3,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlCutCopyMode {
         xlCopy = 1,
         xlCut = 2,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlCVError {
         xlErrDiv0 = 2007,
         xlErrNA = 2042,
@@ -1030,27 +1089,32 @@ declare namespace Excel {
         xlErrValue = 2015,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlDataBarAxisPosition {
         xlDataBarAxisAutomatic = 0,
         xlDataBarAxisMidpoint = 1,
         xlDataBarAxisNone = 2,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlDataBarBorderType {
         xlDataBarBorderNone = 0,
         xlDataBarBorderSolid = 1,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlDataBarFillType {
         xlDataBarFillGradient = 1,
         xlDataBarFillSolid = 0,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlDataBarNegativeColorType {
         xlDataBarColor = 0,
         xlDataBarSameAsPositive = 1,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlDataLabelPosition {
         xlLabelPositionAbove = 0,
         xlLabelPositionBelow = 1,
@@ -1065,10 +1129,12 @@ declare namespace Excel {
         xlLabelPositionRight = -4152,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlDataLabelSeparator {
         xlDataLabelSeparatorDefault = 1,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlDataLabelsType {
         xlDataLabelsShowBubbleSizes = 6,
         xlDataLabelsShowLabel = 4,
@@ -1078,6 +1144,7 @@ declare namespace Excel {
         xlDataLabelsShowValue = 2,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlDataSeriesDate {
         xlDay = 1,
         xlMonth = 3,
@@ -1085,6 +1152,7 @@ declare namespace Excel {
         xlYear = 4,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlDataSeriesType {
         xlAutoFill = 4,
         xlChronological = 3,
@@ -1092,11 +1160,13 @@ declare namespace Excel {
         xlGrowth = 2,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlDeleteShiftDirection {
         xlShiftToLeft = -4159,
         xlShiftUp = -4162,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlDirection {
         xlDown = -4121,
         xlToLeft = -4159,
@@ -1104,18 +1174,21 @@ declare namespace Excel {
         xlUp = -4162,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlDisplayBlanksAs {
         xlInterpolated = 3,
         xlNotPlotted = 1,
         xlZero = 2,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlDisplayDrawingObjects {
         xlDisplayShapes = -4104,
         xlHide = 3,
         xlPlaceholders = 2,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlDisplayUnit {
         xlHundredMillions = -8,
         xlHundreds = -2,
@@ -1128,17 +1201,20 @@ declare namespace Excel {
         xlThousands = -3,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlDupeUnique {
         xlDuplicate = 1,
         xlUnique = 0,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlDVAlertStyle {
         xlValidAlertInformation = 3,
         xlValidAlertStop = 1,
         xlValidAlertWarning = 2,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlDVType {
         xlValidateCustom = 7,
         xlValidateDate = 4,
@@ -1150,6 +1226,7 @@ declare namespace Excel {
         xlValidateWholeNumber = 1,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlDynamicFilterCriteria {
         xlFilterAboveAverage = 33,
         xlFilterAllDatesInPeriodApril = 24,
@@ -1187,6 +1264,7 @@ declare namespace Excel {
         xlFilterYesterday = 2,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlEditionFormat {
         xlBIFF = 2,
         xlPICT = 1,
@@ -1194,6 +1272,7 @@ declare namespace Excel {
         xlVALU = 8,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlEditionOptionsOption {
         xlAutomaticUpdate = 4,
         xlCancel = 1,
@@ -1205,33 +1284,39 @@ declare namespace Excel {
         xlUpdateSubscriber = 2,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlEditionType {
         xlPublisher = 1,
         xlSubscriber = 2,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlEnableCancelKey {
         xlDisabled = 0,
         xlErrorHandler = 2,
         xlInterrupt = 1,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlEnableSelection {
         xlNoRestrictions = 0,
         xlNoSelection = -4142,
         xlUnlockedCells = 1,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlEndStyleCap {
         xlCap = 1,
         xlNoCap = 2,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlErrorBarDirection {
         xlX = -4168,
         xlY = 1,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlErrorBarInclude {
         xlErrorBarIncludeBoth = 1,
         xlErrorBarIncludeMinusValues = 3,
@@ -1239,6 +1324,7 @@ declare namespace Excel {
         xlErrorBarIncludePlusValues = 2,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlErrorBarType {
         xlErrorBarTypeCustom = -4114,
         xlErrorBarTypeFixedValue = 1,
@@ -1247,6 +1333,7 @@ declare namespace Excel {
         xlErrorBarTypeStError = 4,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlErrorChecks {
         xlEmptyCellReferences = 7,
         xlEvaluateToError = 1,
@@ -1259,11 +1346,13 @@ declare namespace Excel {
         xlUnlockedFormulaCells = 6,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlFileAccess {
         xlReadOnly = 3,
         xlReadWrite = 2,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlFileFormat {
         xlAddIn = 18,
         xlAddIn8 = 18,
@@ -1321,23 +1410,27 @@ declare namespace Excel {
         xlXMLSpreadsheet = 46,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlFileValidationPivotMode {
         xlFileValidationPivotDefault = 0,
         xlFileValidationPivotRun = 1,
         xlFileValidationPivotSkip = 2,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlFillWith {
         xlFillWithAll = -4104,
         xlFillWithContents = 2,
         xlFillWithFormats = -4122,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlFilterAction {
         xlFilterCopy = 2,
         xlFilterInPlace = 1,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlFilterAllDatesInPeriod {
         xlFilterAllDatesInPeriodDay = 2,
         xlFilterAllDatesInPeriodHour = 3,
@@ -1347,22 +1440,26 @@ declare namespace Excel {
         xlFilterAllDatesInPeriodYear = 0,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlFindLookIn {
         xlComments = -4144,
         xlFormulas = -4123,
         xlValues = -4163,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlFixedFormatQuality {
         xlQualityMinimum = 1,
         xlQualityStandard = 0,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlFixedFormatType {
         xlTypePDF = 0,
         xlTypeXPS = 1,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlFormatConditionOperator {
         xlBetween = 1,
         xlEqual = 3,
@@ -1374,6 +1471,7 @@ declare namespace Excel {
         xlNotEqual = 4,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlFormatConditionType {
         xlAboveAverageCondition = 12,
         xlBlanksCondition = 10,
@@ -1391,6 +1489,7 @@ declare namespace Excel {
         xlUniqueValues = 8,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlFormatFilterTypes {
         xlFilterBottom = 0,
         xlFilterBottomPercent = 2,
@@ -1398,6 +1497,7 @@ declare namespace Excel {
         xlFilterTopPercent = 3,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlFormControl {
         xlButtonControl = 0,
         xlCheckBox = 1,
@@ -1411,6 +1511,7 @@ declare namespace Excel {
         xlSpinner = 9,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlFormulaLabel {
         xlColumnLabels = 2,
         xlMixedLabels = 3,
@@ -1418,16 +1519,19 @@ declare namespace Excel {
         xlRowLabels = 1,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlGenerateTableRefs {
         xlGenerateTableRefA1 = 0,
         xlGenerateTableRefStruct = 1,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlGradientFillType {
         xlGradientFillLinear = 0,
         xlGradientFillPath = 1,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlHAlign {
         xlHAlignCenter = -4108,
         xlHAlignCenterAcrossSelection = 7,
@@ -1439,6 +1543,7 @@ declare namespace Excel {
         xlHAlignRight = -4152,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlHebrewModes {
         xlHebrewFullScript = 0,
         xlHebrewMixedAuthorizedScript = 3,
@@ -1446,12 +1551,14 @@ declare namespace Excel {
         xlHebrewPartialScript = 1,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlHighlightChangesTime {
         xlAllChanges = 2,
         xlNotYetReviewed = 3,
         xlSinceMyLastSave = 1,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlHtmlType {
         xlHtmlCalc = 1,
         xlHtmlChart = 3,
@@ -1459,6 +1566,7 @@ declare namespace Excel {
         xlHtmlStatic = 0,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlIcon {
         xlIcon0Bars = 37,
         xlIcon0FilledBoxes = 52,
@@ -1515,6 +1623,7 @@ declare namespace Excel {
         xlIconYellowUpInclineArrow = 25,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlIconSet {
         xl3Arrows = 1,
         xl3ArrowsGray = 2,
@@ -1539,6 +1648,7 @@ declare namespace Excel {
         xlCustomSet = -1,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlIMEMode {
         xlIMEModeAlpha = 8,
         xlIMEModeAlphaFull = 7,
@@ -1553,33 +1663,39 @@ declare namespace Excel {
         xlIMEModeOn = 1,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlImportDataAs {
         xlPivotTableReport = 1,
         xlQueryTable = 0,
         xlTable = 2,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlInsertFormatOrigin {
         xlFormatFromLeftOrAbove = 0,
         xlFormatFromRightOrBelow = 1,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlInsertShiftDirection {
         xlShiftDown = -4121,
         xlShiftToRight = -4161,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlLayoutFormType {
         xlOutline = 1,
         xlTabular = 0,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlLayoutRowType {
         xlCompactRow = 0,
         xlOutlineRow = 2,
         xlTabularRow = 1,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlLegendPosition {
         xlLegendPositionBottom = -4107,
         xlLegendPositionCorner = 2,
@@ -1589,6 +1705,7 @@ declare namespace Excel {
         xlLegendPositionTop = -4160,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlLineStyle {
         xlContinuous = 1,
         xlDash = -4115,
@@ -1600,6 +1717,7 @@ declare namespace Excel {
         xlSlantDashDot = 13,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlLink {
         xlExcelLinks = 1,
         xlOLELinks = 2,
@@ -1607,18 +1725,21 @@ declare namespace Excel {
         xlSubscribers = 6,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlLinkInfo {
         xlEditionDate = 2,
         xlLinkInfoStatus = 3,
         xlUpdateState = 1,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlLinkInfoType {
         xlLinkInfoOLELinks = 2,
         xlLinkInfoPublishers = 5,
         xlLinkInfoSubscribers = 6,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlLinkStatus {
         xlLinkStatusCopiedValues = 10,
         xlLinkStatusIndeterminate = 5,
@@ -1633,11 +1754,13 @@ declare namespace Excel {
         xlLinkStatusSourceOpen = 9,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlLinkType {
         xlLinkTypeExcelLinks = 1,
         xlLinkTypeOLELinks = 2,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlListConflict {
         xlListConflictDialog = 0,
         xlListConflictDiscardAllConflicts = 2,
@@ -1645,6 +1768,7 @@ declare namespace Excel {
         xlListConflictRetryAllConflicts = 1,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlListDataType {
         xlListDataTypeCheckbox = 9,
         xlListDataTypeChoice = 6,
@@ -1661,6 +1785,7 @@ declare namespace Excel {
         xlListDataTypeText = 1,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlListObjectSourceType {
         xlSrcExternal = 0,
         xlSrcQuery = 3,
@@ -1668,6 +1793,7 @@ declare namespace Excel {
         xlSrcXml = 2,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlLocationInTable {
         xlColumnHeader = -4110,
         xlColumnItem = 5,
@@ -1680,23 +1806,27 @@ declare namespace Excel {
         xlTableBody = 8,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlLookAt {
         xlPart = 2,
         xlWhole = 1,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlLookFor {
         xlLookForBlanks = 0,
         xlLookForErrors = 1,
         xlLookForFormulas = 2,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlMailSystem {
         xlMAPI = 1,
         xlNoMailSystem = 0,
         xlPowerTalk = 2,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlMarkerStyle {
         xlMarkerStyleAutomatic = -4105,
         xlMarkerStyleCircle = 8,
@@ -1712,18 +1842,21 @@ declare namespace Excel {
         xlMarkerStyleX = -4168,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlMeasurementUnits {
         xlCentimeters = 1,
         xlInches = 0,
         xlMillimeters = 2,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlMouseButton {
         xlNoButton = 0,
         xlPrimaryButton = 1,
         xlSecondaryButton = 2,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlMousePointer {
         xlDefault = -4143,
         xlIBeam = 3,
@@ -1731,6 +1864,7 @@ declare namespace Excel {
         xlWait = 2,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlMSApplication {
         xlMicrosoftAccess = 4,
         xlMicrosoftFoxPro = 5,
@@ -1741,39 +1875,46 @@ declare namespace Excel {
         xlMicrosoftWord = 1,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlOartHorizontalOverflow {
         xlOartHorizontalOverflowClip = 1,
         xlOartHorizontalOverflowOverflow = 0,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlOartVerticalOverflow {
         xlOartVerticalOverflowClip = 1,
         xlOartVerticalOverflowEllipsis = 2,
         xlOartVerticalOverflowOverflow = 0,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlObjectSize {
         xlFitToPage = 2,
         xlFullPage = 3,
         xlScreenSize = 1,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlOLEType {
         xlOLEControl = 2,
         xlOLEEmbed = 1,
         xlOLELink = 0,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlOLEVerb {
         xlVerbOpen = 2,
         xlVerbPrimary = 1,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlOrder {
         xlDownThenOver = 1,
         xlOverThenDown = 2,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlOrientation {
         xlDownward = -4170,
         xlHorizontal = -4128,
@@ -1781,22 +1922,26 @@ declare namespace Excel {
         xlVertical = -4166,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlPageBreak {
         xlPageBreakAutomatic = -4105,
         xlPageBreakManual = -4135,
         xlPageBreakNone = -4142,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlPageBreakExtent {
         xlPageBreakFull = 1,
         xlPageBreakPartial = 2,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlPageOrientation {
         xlLandscape = 2,
         xlPortrait = 1,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlPaperSize {
         xlPaper10x14 = 16,
         xlPaper11x17 = 17,
@@ -1842,6 +1987,7 @@ declare namespace Excel {
         xlPaperUser = 256,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlParameterDataType {
         xlParamTypeBigInt = -5,
         xlParamTypeBinary = -2,
@@ -1866,12 +2012,14 @@ declare namespace Excel {
         xlParamTypeWChar = -8,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlParameterType {
         xlConstant = 1,
         xlPrompt = 0,
         xlRange = 2,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlPasteSpecialOperation {
         xlPasteSpecialOperationAdd = 2,
         xlPasteSpecialOperationDivide = 5,
@@ -1880,6 +2028,7 @@ declare namespace Excel {
         xlPasteSpecialOperationSubtract = 3,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlPasteType {
         xlPasteAll = -4104,
         xlPasteAllExceptBorders = 7,
@@ -1895,6 +2044,7 @@ declare namespace Excel {
         xlPasteValuesAndNumberFormats = 12,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlPattern {
         xlPatternAutomatic = -4105,
         xlPatternChecker = 9,
@@ -1920,6 +2070,7 @@ declare namespace Excel {
         xlPatternVertical = -4166,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlPhoneticAlignment {
         xlPhoneticAlignCenter = 2,
         xlPhoneticAlignDistributed = 3,
@@ -1927,6 +2078,7 @@ declare namespace Excel {
         xlPhoneticAlignNoControl = 0,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlPhoneticCharacterType {
         xlHiragana = 2,
         xlKatakana = 1,
@@ -1934,11 +2086,13 @@ declare namespace Excel {
         xlNoConversion = 3,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlPictureAppearance {
         xlPrinter = 2,
         xlScreen = 1,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlPictureConvertorType {
         xlBMP = 1,
         xlCGM = 7,
@@ -1955,6 +2109,7 @@ declare namespace Excel {
         xlWPG = 3,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlPieSliceIndex {
         xlCenterPoint = 5,
         xlInnerCenterPoint = 8,
@@ -1967,11 +2122,13 @@ declare namespace Excel {
         xlOuterCounterClockwisePoint = 1,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlPieSliceLocation {
         xlHorizontalCoordinate = 1,
         xlVerticalCoordinate = 2,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlPivotCellType {
         xlPivotCellBlankCell = 9,
         xlPivotCellCustomSubtotal = 7,
@@ -1985,12 +2142,14 @@ declare namespace Excel {
         xlPivotCellValue = 0,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlPivotConditionScope {
         xlDataFieldScope = 2,
         xlFieldsScope = 1,
         xlSelectionScope = 0,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlPivotFieldCalculation {
         xlDifferenceFrom = 2,
         xlIndex = 9,
@@ -2009,12 +2168,14 @@ declare namespace Excel {
         xlRunningTotal = 5,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlPivotFieldDataType {
         xlDate = 2,
         xlNumber = -4145,
         xlText = -4158,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlPivotFieldOrientation {
         xlColumnField = 2,
         xlDataField = 4,
@@ -2023,11 +2184,13 @@ declare namespace Excel {
         xlRowField = 1,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlPivotFieldRepeatLabels {
         xlDoNotRepeatLabels = 1,
         xlRepeatLabels = 2,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlPivotFilterType {
         xlAfter = 33,
         xlAfterOrEqualTo = 34,
@@ -2099,6 +2262,7 @@ declare namespace Excel {
         xlYearToDate = 52,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlPivotFormatType {
         xlPTClassic = 20,
         xlPTNone = 21,
@@ -2124,6 +2288,7 @@ declare namespace Excel {
         xlTable9 = 18,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlPivotLineType {
         xlPivotLineBlank = 3,
         xlPivotLineGrandTotal = 2,
@@ -2131,6 +2296,7 @@ declare namespace Excel {
         xlPivotLineSubtotal = 1,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlPivotTableMissingItems {
         xlMissingItemsDefault = -1,
         xlMissingItemsMax = 32500,
@@ -2138,6 +2304,7 @@ declare namespace Excel {
         xlMissingItemsNone = 0,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlPivotTableSourceType {
         xlConsolidation = 3,
         xlDatabase = 1,
@@ -2146,6 +2313,7 @@ declare namespace Excel {
         xlScenario = 4,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlPivotTableVersionList {
         xlPivotTableVersion10 = 1,
         xlPivotTableVersion11 = 2,
@@ -2155,24 +2323,28 @@ declare namespace Excel {
         xlPivotTableVersionCurrent = -1,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlPlacement {
         xlFreeFloating = 3,
         xlMove = 2,
         xlMoveAndSize = 1,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlPlatform {
         xlMacintosh = 1,
         xlMSDOS = 3,
         xlWindows = 2,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlPortugueseReform {
         xlPortugueseBoth = 3,
         xlPortuguesePostReform = 2,
         xlPortuguesePreReform = 1,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlPrintErrors {
         xlPrintErrorsBlank = 1,
         xlPrintErrorsDash = 2,
@@ -2180,36 +2352,42 @@ declare namespace Excel {
         xlPrintErrorsNA = 3,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlPrintLocation {
         xlPrintInPlace = 16,
         xlPrintNoComments = -4142,
         xlPrintSheetEnd = 1,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlPriority {
         xlPriorityHigh = -4127,
         xlPriorityLow = -4134,
         xlPriorityNormal = -4143,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlPropertyDisplayedIn {
         xlDisplayPropertyInPivotTable = 1,
         xlDisplayPropertyInPivotTableAndTooltip = 3,
         xlDisplayPropertyInTooltip = 2,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlProtectedViewCloseReason {
         xlProtectedViewCloseEdit = 1,
         xlProtectedViewCloseForced = 2,
         xlProtectedViewCloseNormal = 0,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlProtectedViewWindowState {
         xlProtectedViewWindowMaximized = 2,
         xlProtectedViewWindowMinimized = 1,
         xlProtectedViewWindowNormal = 0,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlPTSelectionMode {
         xlBlanks = 4,
         xlButton = 15,
@@ -2220,6 +2398,7 @@ declare namespace Excel {
         xlOrigin = 3,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlQueryType {
         xlADORecordset = 7,
         xlDAORecordset = 2,
@@ -2229,6 +2408,7 @@ declare namespace Excel {
         xlWebQuery = 4,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlRangeAutoFormat {
         xlRangeAutoFormat3DEffects1 = 13,
         xlRangeAutoFormat3DEffects2 = 14,
@@ -2275,17 +2455,20 @@ declare namespace Excel {
         xlRangeAutoFormatTable9 = 40,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlRangeValueDataType {
         xlRangeValueDefault = 10,
         xlRangeValueMSPersistXML = 12,
         xlRangeValueXMLSpreadsheet = 11,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlReferenceStyle {
         xlA1 = 1,
         xlR1C1 = -4150,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlReferenceType {
         xlAbsolute = 1,
         xlAbsRowRelColumn = 2,
@@ -2293,6 +2476,7 @@ declare namespace Excel {
         xlRelRowAbsColumn = 3,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlRemoveDocInfoType {
         xlRDIAll = 99,
         xlRDIComments = 1,
@@ -2313,6 +2497,7 @@ declare namespace Excel {
         xlRDISendForReview = 7,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlRgbColor {
         rgbAliceBlue = 16775408,
         rgbAntiqueWhite = 14150650,
@@ -2460,28 +2645,33 @@ declare namespace Excel {
         rgbYellowGreen = 3329434,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlRobustConnect {
         xlAlways = 1,
         xlAsRequired = 0,
         xlNever = 2,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlRoutingSlipDelivery {
         xlAllAtOnce = 2,
         xlOneAfterAnother = 1,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlRoutingSlipStatus {
         xlNotYetRouted = 0,
         xlRoutingComplete = 2,
         xlRoutingInProgress = 1,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlRowCol {
         xlColumns = 2,
         xlRows = 1,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlRunAutoMacro {
         xlAutoActivate = 3,
         xlAutoClose = 2,
@@ -2489,43 +2679,51 @@ declare namespace Excel {
         xlAutoOpen = 1,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlSaveAction {
         xlDoNotSaveChanges = 2,
         xlSaveChanges = 1,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlSaveAsAccessMode {
         xlExclusive = 3,
         xlNoChange = 1,
         xlShared = 2,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlSaveConflictResolution {
         xlLocalSessionChanges = 2,
         xlOtherSessionChanges = 3,
         xlUserResolution = 1,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlScaleType {
         xlScaleLinear = -4132,
         xlScaleLogarithmic = -4133,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlSearchDirection {
         xlNext = 1,
         xlPrevious = 2,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlSearchOrder {
         xlByColumns = 2,
         xlByRows = 1,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlSearchWithin {
         xlWithinSheet = 1,
         xlWithinWorkbook = 2,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlSheetType {
         xlChart = -4109,
         xlDialogSheet = -4116,
@@ -2534,29 +2732,34 @@ declare namespace Excel {
         xlWorksheet = -4167,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlSheetVisibility {
         xlSheetHidden = 0,
         xlSheetVeryHidden = 2,
         xlSheetVisible = -1,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlSizeRepresents {
         xlSizeIsArea = 1,
         xlSizeIsWidth = 2,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlSlicerCrossFilterType {
         xlSlicerCrossFilterShowItemsWithDataAtTop = 2,
         xlSlicerCrossFilterShowItemsWithNoData = 3,
         xlSlicerNoCrossFilter = 1,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlSlicerSort {
         xlSlicerSortAscending = 2,
         xlSlicerSortDataSourceOrder = 1,
         xlSlicerSortDescending = 3,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlSmartTagControlType {
         xlSmartTagControlActiveX = 13,
         xlSmartTagControlButton = 6,
@@ -2574,27 +2777,32 @@ declare namespace Excel {
         xlSmartTagControlTextbox = 10,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlSmartTagDisplayMode {
         xlButtonOnly = 2,
         xlDisplayNone = 1,
         xlIndicatorAndButton = 0,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlSortDataOption {
         xlSortNormal = 0,
         xlSortTextAsNumbers = 1,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlSortMethod {
         xlPinYin = 1,
         xlStroke = 2,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlSortMethodOld {
         xlCodePage = 2,
         xlSyllabary = 1,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlSortOn {
         xlSortOnCellColor = 1,
         xlSortOnFontColor = 2,
@@ -2602,21 +2810,25 @@ declare namespace Excel {
         xlSortOnValues = 0,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlSortOrder {
         xlAscending = 1,
         xlDescending = 2,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlSortOrientation {
         xlSortColumns = 1,
         xlSortRows = 2,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlSortType {
         xlSortLabels = 2,
         xlSortValues = 1,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlSourceType {
         xlSourceAutoFilter = 3,
         xlSourceChart = 5,
@@ -2628,35 +2840,41 @@ declare namespace Excel {
         xlSourceWorkbook = 0,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlSpanishModes {
         xlSpanishTuteoAndVoseo = 1,
         xlSpanishTuteoOnly = 0,
         xlSpanishVoseoOnly = 2,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlSparklineRowCol {
         xlSparklineColumnsSquare = 2,
         xlSparklineNonSquare = 0,
         xlSparklineRowsSquare = 1,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlSparkScale {
         xlSparkScaleCustom = 3,
         xlSparkScaleGroup = 1,
         xlSparkScaleSingle = 2,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlSparkType {
         xlSparkColumn = 2,
         xlSparkColumnStacked100 = 3,
         xlSparkLine = 1,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlSpeakDirection {
         xlSpeakByColumns = 1,
         xlSpeakByRows = 0,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlSpecialCellsValue {
         xlErrors = 16,
         xlLogical = 4,
@@ -2664,6 +2882,7 @@ declare namespace Excel {
         xlTextValues = 2,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlStdColorScale {
         xlColorScaleBlackWhite = 3,
         xlColorScaleGYR = 2,
@@ -2671,31 +2890,37 @@ declare namespace Excel {
         xlColorScaleWhiteBlack = 4,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlSubscribeToFormat {
         xlSubscribeToPicture = -4147,
         xlSubscribeToText = -4158,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlSubtototalLocationType {
         xlAtBottom = 2,
         xlAtTop = 1,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlSummaryColumn {
         xlSummaryOnLeft = -4131,
         xlSummaryOnRight = -4152,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlSummaryReportType {
         xlStandardSummary = 1,
         xlSummaryPivotTable = -4148,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlSummaryRow {
         xlSummaryAbove = 0,
         xlSummaryBelow = 1,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlTableStyleElementType {
         xlBlankRow = 19,
         xlColumnStripe1 = 7,
@@ -2737,27 +2962,32 @@ declare namespace Excel {
         xlWholeTable = 0,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlTabPosition {
         xlTabPositionFirst = 0,
         xlTabPositionLast = 1,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlTextParsingType {
         xlDelimited = 1,
         xlFixedWidth = 2,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlTextQualifier {
         xlTextQualifierDoubleQuote = 1,
         xlTextQualifierNone = -4142,
         xlTextQualifierSingleQuote = 2,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlTextVisualLayoutType {
         xlTextVisualLTR = 1,
         xlTextVisualRTL = 2,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlThemeColor {
         xlThemeColorAccent1 = 5,
         xlThemeColorAccent2 = 6,
@@ -2773,17 +3003,20 @@ declare namespace Excel {
         xlThemeColorLight2 = 4,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlThemeFont {
         xlThemeFontMajor = 1,
         xlThemeFontMinor = 2,
         xlThemeFontNone = 0,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlThreadMode {
         xlThreadModeAutomatic = 0,
         xlThreadModeManual = 1,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlTickLabelOrientation {
         xlTickLabelOrientationAutomatic = -4105,
         xlTickLabelOrientationDownward = -4170,
@@ -2792,6 +3025,7 @@ declare namespace Excel {
         xlTickLabelOrientationVertical = -4166,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlTickLabelPosition {
         xlTickLabelPositionHigh = -4127,
         xlTickLabelPositionLow = -4134,
@@ -2799,6 +3033,7 @@ declare namespace Excel {
         xlTickLabelPositionNone = -4142,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlTickMark {
         xlTickMarkCross = 4,
         xlTickMarkInside = 2,
@@ -2806,6 +3041,7 @@ declare namespace Excel {
         xlTickMarkOutside = 3,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlTimePeriods {
         xlLast7Days = 2,
         xlLastMonth = 5,
@@ -2819,12 +3055,14 @@ declare namespace Excel {
         xlYesterday = 1,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlTimeUnit {
         xlDays = 0,
         xlMonths = 1,
         xlYears = 2,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlToolbarProtection {
         xlNoButtonChanges = 1,
         xlNoChanges = 4,
@@ -2833,11 +3071,13 @@ declare namespace Excel {
         xlToolbarProtectionNone = -4143,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlTopBottom {
         xlTop10Bottom = 0,
         xlTop10Top = 1,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlTotalsCalculation {
         xlTotalsCalculationAverage = 2,
         xlTotalsCalculationCount = 3,
@@ -2851,6 +3091,7 @@ declare namespace Excel {
         xlTotalsCalculationVar = 8,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlTrendlineType {
         xlExponential = 5,
         xlLinear = -4132,
@@ -2860,6 +3101,7 @@ declare namespace Excel {
         xlPower = 4,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlUnderlineStyle {
         xlUnderlineStyleDouble = -4119,
         xlUnderlineStyleDoubleAccounting = 5,
@@ -2868,12 +3110,14 @@ declare namespace Excel {
         xlUnderlineStyleSingleAccounting = 4,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlUpdateLinks {
         xlUpdateLinksAlways = 3,
         xlUpdateLinksNever = 2,
         xlUpdateLinksUserSetting = 1,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlVAlign {
         xlVAlignBottom = -4107,
         xlVAlignCenter = -4108,
@@ -2882,6 +3126,7 @@ declare namespace Excel {
         xlVAlignTop = -4160,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlWBATemplate {
         xlWBATChart = -4109,
         xlWBATExcel4IntlMacroSheet = 4,
@@ -2889,24 +3134,28 @@ declare namespace Excel {
         xlWBATWorksheet = -4167,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlWebFormatting {
         xlWebFormattingAll = 1,
         xlWebFormattingNone = 3,
         xlWebFormattingRTF = 2,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlWebSelectionType {
         xlAllTables = 2,
         xlEntirePage = 1,
         xlSpecifiedTables = 3,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlWindowState {
         xlMaximized = -4137,
         xlMinimized = -4140,
         xlNormal = -4143,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlWindowType {
         xlChartAsWindow = 5,
         xlChartInPlace = 4,
@@ -2915,29 +3164,34 @@ declare namespace Excel {
         xlWorkbook = 1,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlWindowView {
         xlNormalView = 1,
         xlPageBreakPreview = 2,
         xlPageLayoutView = 3,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlXLMMacroType {
         xlCommand = 2,
         xlFunction = 1,
         xlNotXLM = 3,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlXmlExportResult {
         xlXmlExportSuccess = 0,
         xlXmlExportValidationFailed = 1,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlXmlImportResult {
         xlXmlImportElementsTruncated = 1,
         xlXmlImportSuccess = 0,
         xlXmlImportValidationFailed = 2,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlXmlLoadOption {
         xlXmlLoadImportToList = 2,
         xlXmlLoadMapXml = 3,
@@ -2945,6 +3199,7 @@ declare namespace Excel {
         xlXmlLoadPromptUser = 0,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum XlYesNoGuess {
         xlGuess = 0,
         xlNo = 2,
@@ -6547,7 +6802,7 @@ declare namespace Excel {
 
         /** @param Excel.XlSearchDirection [SearchDirection=1] */
         Find(What: any, After?: any, LookIn?: XlFindLookIn, LookAt?: XlLookAt, SearchOrder?: XlSearchOrder, SearchDirection?: XlSearchDirection, MatchCase?: boolean,
-                    MatchByte?: boolean, SearchFormat?: any): Range;
+            MatchByte?: boolean, SearchFormat?: any): Range;
         FindNext(After?: any): Range;
         FindPrevious(After?: any): Range;
         readonly Font: Font;
@@ -7049,7 +7304,7 @@ declare namespace Excel {
         AddLabel(Orientation: Office.MsoTextOrientation, Left: number, Top: number, Width: number, Height: number): Shape;
         AddLine(BeginX: number, BeginY: number, EndX: number, EndY: number): Shape;
         AddOLEObject(ClassType?: any, Filename?: any, Link?: any, DisplayAsIcon?: any, IconFileName?: any, IconIndex?: any, IconLabel?: any, Left?: any, Top?: any, Width?: any,
-                            Height?: any): Shape;
+            Height?: any): Shape;
         AddPicture(Filename: string, LinkToFile: Office.MsoTriState, SaveWithDocument: Office.MsoTriState, Left: number, Top: number, Width: number, Height: number): Shape;
         AddPolyline(SafeArrayOfPoints: any): Shape;
         AddShape(Type: Office.MsoAutoShapeType, Left: number, Top: number, Width: number, Height: number): Shape;
@@ -9243,217 +9498,221 @@ declare namespace Excel {
 interface ActiveXObject {
     on(
         obj: Excel.Application, event: 'GetIDsOfNames', argNames: ['riid', 'rgszNames', 'cNames', 'lcid', 'rgdispid'], handler: (
-            this: Excel.Application, parameter: {readonly riid: stdole.GUID, readonly rgszNames: number, readonly cNames: number, readonly lcid: number, rgdispid: number}) => void): void;
+            this: Excel.Application, parameter: { readonly riid: stdole.GUID, readonly rgszNames: number, readonly cNames: number, readonly lcid: number, rgdispid: number }) => void): void;
     on(
         obj: Excel.Application, event: 'GetTypeInfo', argNames: ['itinfo', 'lcid', 'pptinfo'], handler: (
-            this: Excel.Application, parameter: {readonly itinfo: number, readonly lcid: number, pptinfo: undefined}) => void): void;
-    on(obj: Excel.Application, event: 'GetTypeInfoCount', argNames: ['pctinfo'], handler: (this: Excel.Application, parameter: {pctinfo: number}) => void): void;
+            this: Excel.Application, parameter: { readonly itinfo: number, readonly lcid: number, pptinfo: undefined }) => void): void;
+    on(obj: Excel.Application, event: 'GetTypeInfoCount', argNames: ['pctinfo'], handler: (this: Excel.Application, parameter: { pctinfo: number }) => void): void;
     on(
         obj: Excel.Application, event: 'Invoke', argNames: Excel.EventHelperTypes.Application_Invoke_ArgNames, handler: (
             this: Excel.Application, parameter: Excel.EventHelperTypes.Application_Invoke_Parameter) => void): void;
     on(
         obj: Excel.Application, event: 'NewWorkbook' | 'WorkbookActivate' | 'WorkbookAddinInstall' | 'WorkbookAddinUninstall' | 'WorkbookDeactivate' | 'WorkbookOpen',
-        argNames: ['Wb'], handler: (this: Excel.Application, parameter: {readonly Wb: Excel.Workbook}) => void): void;
+        argNames: ['Wb'], handler: (this: Excel.Application, parameter: { readonly Wb: Excel.Workbook }) => void): void;
     on(
         obj: Excel.Application, event: 'ProtectedViewWindowActivate' | 'ProtectedViewWindowDeactivate' | 'ProtectedViewWindowOpen' | 'ProtectedViewWindowResize',
-        argNames: ['Pvw'], handler: (this: Excel.Application, parameter: {readonly Pvw: Excel.ProtectedViewWindow}) => void): void;
+        argNames: ['Pvw'], handler: (this: Excel.Application, parameter: { readonly Pvw: Excel.ProtectedViewWindow }) => void): void;
     on(
         obj: Excel.Application, event: 'ProtectedViewWindowBeforeClose', argNames: ['Pvw', 'Reason', 'Cancel'], handler: (
-            this: Excel.Application, parameter: {readonly Pvw: Excel.ProtectedViewWindow, readonly Reason: Excel.XlProtectedViewCloseReason, Cancel: boolean}) => void): void;
+            this: Excel.Application, parameter: { readonly Pvw: Excel.ProtectedViewWindow, readonly Reason: Excel.XlProtectedViewCloseReason, Cancel: boolean }) => void): void;
     on(
         obj: Excel.Application, event: 'ProtectedViewWindowBeforeEdit', argNames: ['Pvw', 'Cancel'], handler: (
-            this: Excel.Application, parameter: {readonly Pvw: Excel.ProtectedViewWindow, Cancel: boolean}) => void): void;
-    on(obj: Excel.Application, event: 'QueryInterface', argNames: ['riid', 'ppvObj'], handler: (this: Excel.Application, parameter: {readonly riid: stdole.GUID, ppvObj: undefined}) => void): void;
-    on(obj: Excel.Application, event: 'SheetActivate' | 'SheetCalculate' | 'SheetDeactivate', argNames: ['Sh'], handler: (this: Excel.Application, parameter: {readonly Sh: any}) => void): void;
+            this: Excel.Application, parameter: { readonly Pvw: Excel.ProtectedViewWindow, Cancel: boolean }) => void): void;
+    on(obj: Excel.Application, event: 'QueryInterface', argNames: ['riid', 'ppvObj'], handler: (this: Excel.Application, parameter: { readonly riid: stdole.GUID, ppvObj: undefined }) => void): void;
+    on(obj: Excel.Application, event: 'SheetActivate' | 'SheetCalculate' | 'SheetDeactivate', argNames: ['Sh'], handler: (this: Excel.Application, parameter: { readonly Sh: any }) => void): void;
     on(
         obj: Excel.Application, event: 'SheetBeforeDoubleClick' | 'SheetBeforeRightClick', argNames: ['Sh', 'Target', 'Cancel'], handler: (
-            this: Excel.Application, parameter: {readonly Sh: any, readonly Target: Excel.Range, Cancel: boolean}) => void): void;
+            this: Excel.Application, parameter: { readonly Sh: any, readonly Target: Excel.Range, Cancel: boolean }) => void): void;
     on(
         obj: Excel.Application, event: 'SheetChange' | 'SheetSelectionChange', argNames: ['Sh', 'Target'], handler: (
-            this: Excel.Application, parameter: {readonly Sh: any, readonly Target: Excel.Range}) => void): void;
+            this: Excel.Application, parameter: { readonly Sh: any, readonly Target: Excel.Range }) => void): void;
     on(
         obj: Excel.Application, event: 'SheetFollowHyperlink', argNames: ['Sh', 'Target'], handler: (
-            this: Excel.Application, parameter: {readonly Sh: any, readonly Target: Excel.Hyperlink}) => void): void;
+            this: Excel.Application, parameter: { readonly Sh: any, readonly Target: Excel.Hyperlink }) => void): void;
     on(
         obj: Excel.Application, event: 'SheetPivotTableAfterValueChange', argNames: ['Sh', 'TargetPivotTable', 'TargetRange'], handler: (
-            this: Excel.Application, parameter: {readonly Sh: any, readonly TargetPivotTable: Excel.PivotTable, readonly TargetRange: Excel.Range}) => void): void;
+            this: Excel.Application, parameter: { readonly Sh: any, readonly TargetPivotTable: Excel.PivotTable, readonly TargetRange: Excel.Range }) => void): void;
     on(
         obj: Excel.Application, event: 'SheetPivotTableBeforeAllocateChanges' | 'SheetPivotTableBeforeCommitChanges',
         argNames: ['Sh', 'TargetPivotTable', 'ValueChangeStart', 'ValueChangeEnd', 'Cancel'], handler: (
             this: Excel.Application,
-            parameter: {readonly Sh: any, readonly TargetPivotTable: Excel.PivotTable, readonly ValueChangeStart: number, readonly ValueChangeEnd: number, Cancel: boolean}) => void): void;
+            parameter: { readonly Sh: any, readonly TargetPivotTable: Excel.PivotTable, readonly ValueChangeStart: number, readonly ValueChangeEnd: number, Cancel: boolean }) => void): void;
     on(
         obj: Excel.Application, event: 'SheetPivotTableBeforeDiscardChanges', argNames: ['Sh', 'TargetPivotTable', 'ValueChangeStart', 'ValueChangeEnd'],
         handler: (
-            this: Excel.Application, parameter: {readonly Sh: any, readonly TargetPivotTable: Excel.PivotTable, readonly ValueChangeStart: number, readonly ValueChangeEnd: number}) => void): void;
+            this: Excel.Application, parameter: { readonly Sh: any, readonly TargetPivotTable: Excel.PivotTable, readonly ValueChangeStart: number, readonly ValueChangeEnd: number }) => void): void;
     on(
         obj: Excel.Application, event: 'SheetPivotTableUpdate', argNames: ['Sh', 'Target'], handler: (
-            this: Excel.Application, parameter: {readonly Sh: any, readonly Target: Excel.PivotTable}) => void): void;
+            this: Excel.Application, parameter: { readonly Sh: any, readonly Target: Excel.PivotTable }) => void): void;
     on(
         obj: Excel.Application, event: 'WindowActivate' | 'WindowDeactivate' | 'WindowResize', argNames: ['Wb', 'Wn'], handler: (
-            this: Excel.Application, parameter: {readonly Wb: Excel.Workbook, readonly Wn: Excel.Window}) => void): void;
+            this: Excel.Application, parameter: { readonly Wb: Excel.Workbook, readonly Wn: Excel.Window }) => void): void;
     on(
         obj: Excel.Application, event: 'WorkbookAfterSave', argNames: ['Wb', 'Success'], handler: (
-            this: Excel.Application, parameter: {readonly Wb: Excel.Workbook, readonly Success: boolean}) => void): void;
+            this: Excel.Application, parameter: { readonly Wb: Excel.Workbook, readonly Success: boolean }) => void): void;
     on(
         obj: Excel.Application, event: 'WorkbookAfterXmlExport', argNames: ['Wb', 'Map', 'Url', 'Result'], handler: (
-            this: Excel.Application, parameter: {readonly Wb: Excel.Workbook, readonly Map: Excel.XmlMap, readonly Url: string, readonly Result: Excel.XlXmlExportResult}) => void): void;
+            this: Excel.Application, parameter: { readonly Wb: Excel.Workbook, readonly Map: Excel.XmlMap, readonly Url: string, readonly Result: Excel.XlXmlExportResult }) => void): void;
     on(
         obj: Excel.Application, event: 'WorkbookAfterXmlImport', argNames: ['Wb', 'Map', 'IsRefresh', 'Result'], handler: (
-            this: Excel.Application, parameter: {readonly Wb: Excel.Workbook, readonly Map: Excel.XmlMap, readonly IsRefresh: boolean, readonly Result: Excel.XlXmlImportResult}) => void): void;
+            this: Excel.Application, parameter: { readonly Wb: Excel.Workbook, readonly Map: Excel.XmlMap, readonly IsRefresh: boolean, readonly Result: Excel.XlXmlImportResult }) => void): void;
     on(
         obj: Excel.Application, event: 'WorkbookBeforeClose' | 'WorkbookBeforePrint', argNames: ['Wb', 'Cancel'], handler: (
-            this: Excel.Application, parameter: {readonly Wb: Excel.Workbook, Cancel: boolean}) => void): void;
+            this: Excel.Application, parameter: { readonly Wb: Excel.Workbook, Cancel: boolean }) => void): void;
     on(
         obj: Excel.Application, event: 'WorkbookBeforeSave', argNames: ['Wb', 'SaveAsUI', 'Cancel'], handler: (
-            this: Excel.Application, parameter: {readonly Wb: Excel.Workbook, readonly SaveAsUI: boolean, Cancel: boolean}) => void): void;
+            this: Excel.Application, parameter: { readonly Wb: Excel.Workbook, readonly SaveAsUI: boolean, Cancel: boolean }) => void): void;
     on(
         obj: Excel.Application, event: 'WorkbookBeforeXmlExport', argNames: ['Wb', 'Map', 'Url', 'Cancel'], handler: (
-            this: Excel.Application, parameter: {readonly Wb: Excel.Workbook, readonly Map: Excel.XmlMap, readonly Url: string, Cancel: boolean}) => void): void;
+            this: Excel.Application, parameter: { readonly Wb: Excel.Workbook, readonly Map: Excel.XmlMap, readonly Url: string, Cancel: boolean }) => void): void;
     on(
         obj: Excel.Application, event: 'WorkbookBeforeXmlImport', argNames: ['Wb', 'Map', 'Url', 'IsRefresh', 'Cancel'], handler: (
-            this: Excel.Application, parameter: {readonly Wb: Excel.Workbook, readonly Map: Excel.XmlMap, readonly Url: string, readonly IsRefresh: boolean, Cancel: boolean}) => void): void;
-    on(obj: Excel.Application, event: 'WorkbookNewChart', argNames: ['Wb', 'Ch'], handler: (this: Excel.Application, parameter: {readonly Wb: Excel.Workbook, readonly Ch: Excel.Chart}) => void): void;
-    on(obj: Excel.Application, event: 'WorkbookNewSheet', argNames: ['Wb', 'Sh'], handler: (this: Excel.Application, parameter: {readonly Wb: Excel.Workbook, readonly Sh: any}) => void): void;
+            this: Excel.Application, parameter: { readonly Wb: Excel.Workbook, readonly Map: Excel.XmlMap, readonly Url: string, readonly IsRefresh: boolean, Cancel: boolean }) => void): void;
+    on(obj: Excel.Application, event: 'WorkbookNewChart', argNames: ['Wb', 'Ch'], handler: (
+        this: Excel.Application, parameter: { readonly Wb: Excel.Workbook, readonly Ch: Excel.Chart }) => void): void;
+    on(obj: Excel.Application, event: 'WorkbookNewSheet', argNames: ['Wb', 'Sh'], handler: (this: Excel.Application, parameter: { readonly Wb: Excel.Workbook, readonly Sh: any }) => void): void;
     on(
         obj: Excel.Application, event: 'WorkbookPivotTableCloseConnection' | 'WorkbookPivotTableOpenConnection', argNames: ['Wb', 'Target'],
-        handler: (this: Excel.Application, parameter: {readonly Wb: Excel.Workbook, readonly Target: Excel.PivotTable}) => void): void;
+        handler: (this: Excel.Application, parameter: { readonly Wb: Excel.Workbook, readonly Target: Excel.PivotTable }) => void): void;
     on(
         obj: Excel.Application, event: 'WorkbookRowsetComplete', argNames: ['Wb', 'Description', 'Sheet', 'Success'], handler: (
-            this: Excel.Application, parameter: {readonly Wb: Excel.Workbook, readonly Description: string, readonly Sheet: string, readonly Success: boolean}) => void): void;
+            this: Excel.Application, parameter: { readonly Wb: Excel.Workbook, readonly Description: string, readonly Sheet: string, readonly Success: boolean }) => void): void;
     on(
         obj: Excel.Application, event: 'WorkbookSync', argNames: ['Wb', 'SyncEventType'], handler: (
-            this: Excel.Application, parameter: {readonly Wb: Excel.Workbook, readonly SyncEventType: Office.MsoSyncEventType}) => void): void;
+            this: Excel.Application, parameter: { readonly Wb: Excel.Workbook, readonly SyncEventType: Office.MsoSyncEventType }) => void): void;
     on(
         obj: Excel.Chart, event: 'BeforeDoubleClick', argNames: ['ElementID', 'Arg1', 'Arg2', 'Cancel'], handler: (
-            this: Excel.Chart, parameter: {readonly ElementID: number, readonly Arg1: number, readonly Arg2: number, Cancel: boolean}) => void): void;
-    on(obj: Excel.Chart, event: 'BeforeRightClick', argNames: ['Cancel'], handler: (this: Excel.Chart, parameter: {Cancel: boolean}) => void): void;
+            this: Excel.Chart, parameter: { readonly ElementID: number, readonly Arg1: number, readonly Arg2: number, Cancel: boolean }) => void): void;
+    on(obj: Excel.Chart, event: 'BeforeRightClick', argNames: ['Cancel'], handler: (this: Excel.Chart, parameter: { Cancel: boolean }) => void): void;
     on(
         obj: Excel.Chart, event: 'GetIDsOfNames', argNames: ['riid', 'rgszNames', 'cNames', 'lcid', 'rgdispid'], handler: (
-            this: Excel.Chart, parameter: {readonly riid: stdole.GUID, readonly rgszNames: number, readonly cNames: number, readonly lcid: number, rgdispid: number}) => void): void;
+            this: Excel.Chart, parameter: { readonly riid: stdole.GUID, readonly rgszNames: number, readonly cNames: number, readonly lcid: number, rgdispid: number }) => void): void;
     on(
         obj: Excel.Chart, event: 'GetTypeInfo', argNames: ['itinfo', 'lcid', 'pptinfo'], handler: (
-            this: Excel.Chart, parameter: {readonly itinfo: number, readonly lcid: number, pptinfo: undefined}) => void): void;
-    on(obj: Excel.Chart, event: 'GetTypeInfoCount', argNames: ['pctinfo'], handler: (this: Excel.Chart, parameter: {pctinfo: number}) => void): void;
+            this: Excel.Chart, parameter: { readonly itinfo: number, readonly lcid: number, pptinfo: undefined }) => void): void;
+    on(obj: Excel.Chart, event: 'GetTypeInfoCount', argNames: ['pctinfo'], handler: (this: Excel.Chart, parameter: { pctinfo: number }) => void): void;
     on(obj: Excel.Chart, event: 'Invoke', argNames: Excel.EventHelperTypes.Chart_Invoke_ArgNames, handler: (this: Excel.Chart, parameter: Excel.EventHelperTypes.Chart_Invoke_Parameter) => void): void;
     on(
         obj: Excel.Chart, event: 'MouseDown' | 'MouseMove' | 'MouseUp', argNames: ['Button', 'Shift', 'x', 'y'], handler: (
-            this: Excel.Chart, parameter: {readonly Button: number, readonly Shift: number, readonly x: number, readonly y: number}) => void): void;
-    on(obj: Excel.Chart, event: 'QueryInterface', argNames: ['riid', 'ppvObj'], handler: (this: Excel.Chart, parameter: {readonly riid: stdole.GUID, ppvObj: undefined}) => void): void;
+            this: Excel.Chart, parameter: { readonly Button: number, readonly Shift: number, readonly x: number, readonly y: number }) => void): void;
+    on(obj: Excel.Chart, event: 'QueryInterface', argNames: ['riid', 'ppvObj'], handler: (this: Excel.Chart, parameter: { readonly riid: stdole.GUID, ppvObj: undefined }) => void): void;
     on(
         obj: Excel.Chart, event: 'Select', argNames: ['ElementID', 'Arg1', 'Arg2'], handler: (
-            this: Excel.Chart, parameter: {readonly ElementID: number, readonly Arg1: number, readonly Arg2: number}) => void): void;
+            this: Excel.Chart, parameter: { readonly ElementID: number, readonly Arg1: number, readonly Arg2: number }) => void): void;
     on(
         obj: Excel.Chart, event: 'SeriesChange', argNames: ['SeriesIndex', 'PointIndex'], handler: (
-            this: Excel.Chart, parameter: {readonly SeriesIndex: number, readonly PointIndex: number}) => void): void;
+            this: Excel.Chart, parameter: { readonly SeriesIndex: number, readonly PointIndex: number }) => void): void;
     on(
         obj: Excel.OLEObject, event: 'GetIDsOfNames', argNames: ['riid', 'rgszNames', 'cNames', 'lcid', 'rgdispid'], handler: (
-            this: Excel.OLEObject, parameter: {readonly riid: stdole.GUID, readonly rgszNames: number, readonly cNames: number, readonly lcid: number, rgdispid: number}) => void): void;
+            this: Excel.OLEObject, parameter: { readonly riid: stdole.GUID, readonly rgszNames: number, readonly cNames: number, readonly lcid: number, rgdispid: number }) => void): void;
     on(
         obj: Excel.OLEObject, event: 'GetTypeInfo', argNames: ['itinfo', 'lcid', 'pptinfo'], handler: (
-            this: Excel.OLEObject, parameter: {readonly itinfo: number, readonly lcid: number, pptinfo: undefined}) => void): void;
-    on(obj: Excel.OLEObject, event: 'GetTypeInfoCount', argNames: ['pctinfo'], handler: (this: Excel.OLEObject, parameter: {pctinfo: number}) => void): void;
+            this: Excel.OLEObject, parameter: { readonly itinfo: number, readonly lcid: number, pptinfo: undefined }) => void): void;
+    on(obj: Excel.OLEObject, event: 'GetTypeInfoCount', argNames: ['pctinfo'], handler: (this: Excel.OLEObject, parameter: { pctinfo: number }) => void): void;
     on(
         obj: Excel.OLEObject, event: 'Invoke', argNames: Excel.EventHelperTypes.OLEObject_Invoke_ArgNames, handler: (
             this: Excel.OLEObject, parameter: Excel.EventHelperTypes.OLEObject_Invoke_Parameter) => void): void;
-    on(obj: Excel.OLEObject, event: 'QueryInterface', argNames: ['riid', 'ppvObj'], handler: (this: Excel.OLEObject, parameter: {readonly riid: stdole.GUID, ppvObj: undefined}) => void): void;
-    on(obj: Excel.QueryTable, event: 'AfterRefresh', argNames: ['Success'], handler: (this: Excel.QueryTable, parameter: {readonly Success: boolean}) => void): void;
-    on(obj: Excel.QueryTable, event: 'BeforeRefresh', argNames: ['Cancel'], handler: (this: Excel.QueryTable, parameter: {Cancel: boolean}) => void): void;
+    on(obj: Excel.OLEObject, event: 'QueryInterface', argNames: ['riid', 'ppvObj'], handler: (this: Excel.OLEObject, parameter: { readonly riid: stdole.GUID, ppvObj: undefined }) => void): void;
+    on(obj: Excel.QueryTable, event: 'AfterRefresh', argNames: ['Success'], handler: (this: Excel.QueryTable, parameter: { readonly Success: boolean }) => void): void;
+    on(obj: Excel.QueryTable, event: 'BeforeRefresh', argNames: ['Cancel'], handler: (this: Excel.QueryTable, parameter: { Cancel: boolean }) => void): void;
     on(
         obj: Excel.QueryTable, event: 'GetIDsOfNames', argNames: ['riid', 'rgszNames', 'cNames', 'lcid', 'rgdispid'], handler: (
-            this: Excel.QueryTable, parameter: {readonly riid: stdole.GUID, readonly rgszNames: number, readonly cNames: number, readonly lcid: number, rgdispid: number}) => void): void;
+            this: Excel.QueryTable, parameter: { readonly riid: stdole.GUID, readonly rgszNames: number, readonly cNames: number, readonly lcid: number, rgdispid: number }) => void): void;
     on(
         obj: Excel.QueryTable, event: 'GetTypeInfo', argNames: ['itinfo', 'lcid', 'pptinfo'], handler: (
-            this: Excel.QueryTable, parameter: {readonly itinfo: number, readonly lcid: number, pptinfo: undefined}) => void): void;
-    on(obj: Excel.QueryTable, event: 'GetTypeInfoCount', argNames: ['pctinfo'], handler: (this: Excel.QueryTable, parameter: {pctinfo: number}) => void): void;
+            this: Excel.QueryTable, parameter: { readonly itinfo: number, readonly lcid: number, pptinfo: undefined }) => void): void;
+    on(obj: Excel.QueryTable, event: 'GetTypeInfoCount', argNames: ['pctinfo'], handler: (this: Excel.QueryTable, parameter: { pctinfo: number }) => void): void;
     on(
         obj: Excel.QueryTable, event: 'Invoke', argNames: Excel.EventHelperTypes.QueryTable_Invoke_ArgNames, handler: (
             this: Excel.QueryTable, parameter: Excel.EventHelperTypes.QueryTable_Invoke_Parameter) => void): void;
-    on(obj: Excel.QueryTable, event: 'QueryInterface', argNames: ['riid', 'ppvObj'], handler: (this: Excel.QueryTable, parameter: {readonly riid: stdole.GUID, ppvObj: undefined}) => void): void;
-    on(obj: Excel.Workbook, event: 'AfterSave', argNames: ['Success'], handler: (this: Excel.Workbook, parameter: {readonly Success: boolean}) => void): void;
+    on(obj: Excel.QueryTable, event: 'QueryInterface', argNames: ['riid', 'ppvObj'], handler: (this: Excel.QueryTable, parameter: { readonly riid: stdole.GUID, ppvObj: undefined }) => void): void;
+    on(obj: Excel.Workbook, event: 'AfterSave', argNames: ['Success'], handler: (this: Excel.Workbook, parameter: { readonly Success: boolean }) => void): void;
     on(
         obj: Excel.Workbook, event: 'AfterXmlExport', argNames: ['Map', 'Url', 'Result'], handler: (
-            this: Excel.Workbook, parameter: {readonly Map: Excel.XmlMap, readonly Url: string, readonly Result: Excel.XlXmlExportResult}) => void): void;
+            this: Excel.Workbook, parameter: { readonly Map: Excel.XmlMap, readonly Url: string, readonly Result: Excel.XlXmlExportResult }) => void): void;
     on(
         obj: Excel.Workbook, event: 'AfterXmlImport', argNames: ['Map', 'IsRefresh', 'Result'], handler: (
-            this: Excel.Workbook, parameter: {readonly Map: Excel.XmlMap, readonly IsRefresh: boolean, readonly Result: Excel.XlXmlImportResult}) => void): void;
-    on(obj: Excel.Workbook, event: 'BeforeClose' | 'BeforePrint', argNames: ['Cancel'], handler: (this: Excel.Workbook, parameter: {Cancel: boolean}) => void): void;
-    on(obj: Excel.Workbook, event: 'BeforeSave', argNames: ['SaveAsUI', 'Cancel'], handler: (this: Excel.Workbook, parameter: {readonly SaveAsUI: boolean, Cancel: boolean}) => void): void;
+            this: Excel.Workbook, parameter: { readonly Map: Excel.XmlMap, readonly IsRefresh: boolean, readonly Result: Excel.XlXmlImportResult }) => void): void;
+    on(obj: Excel.Workbook, event: 'BeforeClose' | 'BeforePrint', argNames: ['Cancel'], handler: (this: Excel.Workbook, parameter: { Cancel: boolean }) => void): void;
+    on(obj: Excel.Workbook, event: 'BeforeSave', argNames: ['SaveAsUI', 'Cancel'], handler: (this: Excel.Workbook, parameter: { readonly SaveAsUI: boolean, Cancel: boolean }) => void): void;
     on(
         obj: Excel.Workbook, event: 'BeforeXmlExport', argNames: ['Map', 'Url', 'Cancel'], handler: (
-            this: Excel.Workbook, parameter: {readonly Map: Excel.XmlMap, readonly Url: string, Cancel: boolean}) => void): void;
+            this: Excel.Workbook, parameter: { readonly Map: Excel.XmlMap, readonly Url: string, Cancel: boolean }) => void): void;
     on(
         obj: Excel.Workbook, event: 'BeforeXmlImport', argNames: ['Map', 'Url', 'IsRefresh', 'Cancel'], handler: (
-            this: Excel.Workbook, parameter: {readonly Map: Excel.XmlMap, readonly Url: string, readonly IsRefresh: boolean, Cancel: boolean}) => void): void;
+            this: Excel.Workbook, parameter: { readonly Map: Excel.XmlMap, readonly Url: string, readonly IsRefresh: boolean, Cancel: boolean }) => void): void;
     on(
         obj: Excel.Workbook, event: 'GetIDsOfNames', argNames: ['riid', 'rgszNames', 'cNames', 'lcid', 'rgdispid'], handler: (
-            this: Excel.Workbook, parameter: {readonly riid: stdole.GUID, readonly rgszNames: number, readonly cNames: number, readonly lcid: number, rgdispid: number}) => void): void;
+            this: Excel.Workbook, parameter: { readonly riid: stdole.GUID, readonly rgszNames: number, readonly cNames: number, readonly lcid: number, rgdispid: number }) => void): void;
     on(
         obj: Excel.Workbook, event: 'GetTypeInfo', argNames: ['itinfo', 'lcid', 'pptinfo'], handler: (
-            this: Excel.Workbook, parameter: {readonly itinfo: number, readonly lcid: number, pptinfo: undefined}) => void): void;
-    on(obj: Excel.Workbook, event: 'GetTypeInfoCount', argNames: ['pctinfo'], handler: (this: Excel.Workbook, parameter: {pctinfo: number}) => void): void;
+            this: Excel.Workbook, parameter: { readonly itinfo: number, readonly lcid: number, pptinfo: undefined }) => void): void;
+    on(obj: Excel.Workbook, event: 'GetTypeInfoCount', argNames: ['pctinfo'], handler: (this: Excel.Workbook, parameter: { pctinfo: number }) => void): void;
     on(
         obj: Excel.Workbook, event: 'Invoke', argNames: Excel.EventHelperTypes.Workbook_Invoke_ArgNames, handler: (
             this: Excel.Workbook, parameter: Excel.EventHelperTypes.Workbook_Invoke_Parameter) => void): void;
-    on(obj: Excel.Workbook, event: 'NewChart', argNames: ['Ch'], handler: (this: Excel.Workbook, parameter: {readonly Ch: Excel.Chart}) => void): void;
-    on(obj: Excel.Workbook, event: 'NewSheet' | 'SheetActivate' | 'SheetCalculate' | 'SheetDeactivate', argNames: ['Sh'], handler: (this: Excel.Workbook, parameter: {readonly Sh: any}) => void): void;
+    on(obj: Excel.Workbook, event: 'NewChart', argNames: ['Ch'], handler: (this: Excel.Workbook, parameter: { readonly Ch: Excel.Chart }) => void): void;
+    on(obj: Excel.Workbook, event: 'NewSheet' | 'SheetActivate' | 'SheetCalculate' | 'SheetDeactivate', argNames: ['Sh'], handler: (
+        this: Excel.Workbook, parameter: { readonly Sh: any }) => void): void;
     on(
         obj: Excel.Workbook, event: 'PivotTableCloseConnection' | 'PivotTableOpenConnection', argNames: ['Target'], handler: (
-            this: Excel.Workbook, parameter: {readonly Target: Excel.PivotTable}) => void): void;
-    on(obj: Excel.Workbook, event: 'QueryInterface', argNames: ['riid', 'ppvObj'], handler: (this: Excel.Workbook, parameter: {readonly riid: stdole.GUID, ppvObj: undefined}) => void): void;
+            this: Excel.Workbook, parameter: { readonly Target: Excel.PivotTable }) => void): void;
+    on(obj: Excel.Workbook, event: 'QueryInterface', argNames: ['riid', 'ppvObj'], handler: (this: Excel.Workbook, parameter: { readonly riid: stdole.GUID, ppvObj: undefined }) => void): void;
     on(
         obj: Excel.Workbook, event: 'RowsetComplete', argNames: ['Description', 'Sheet', 'Success'], handler: (
-            this: Excel.Workbook, parameter: {readonly Description: string, readonly Sheet: string, readonly Success: boolean}) => void): void;
+            this: Excel.Workbook, parameter: { readonly Description: string, readonly Sheet: string, readonly Success: boolean }) => void): void;
     on(
         obj: Excel.Workbook, event: 'SheetBeforeDoubleClick' | 'SheetBeforeRightClick', argNames: ['Sh', 'Target', 'Cancel'], handler: (
-            this: Excel.Workbook, parameter: {readonly Sh: any, readonly Target: Excel.Range, Cancel: boolean}) => void): void;
+            this: Excel.Workbook, parameter: { readonly Sh: any, readonly Target: Excel.Range, Cancel: boolean }) => void): void;
     on(
         obj: Excel.Workbook, event: 'SheetChange' | 'SheetSelectionChange', argNames: ['Sh', 'Target'], handler: (
-            this: Excel.Workbook, parameter: {readonly Sh: any, readonly Target: Excel.Range}) => void): void;
-    on(obj: Excel.Workbook, event: 'SheetFollowHyperlink', argNames: ['Sh', 'Target'], handler: (this: Excel.Workbook, parameter: {readonly Sh: any, readonly Target: Excel.Hyperlink}) => void): void;
+            this: Excel.Workbook, parameter: { readonly Sh: any, readonly Target: Excel.Range }) => void): void;
+    on(obj: Excel.Workbook, event: 'SheetFollowHyperlink', argNames: ['Sh', 'Target'], handler: (
+        this: Excel.Workbook, parameter: { readonly Sh: any, readonly Target: Excel.Hyperlink }) => void): void;
     on(
         obj: Excel.Workbook, event: 'SheetPivotTableAfterValueChange', argNames: ['Sh', 'TargetPivotTable', 'TargetRange'], handler: (
-            this: Excel.Workbook, parameter: {readonly Sh: any, readonly TargetPivotTable: Excel.PivotTable, readonly TargetRange: Excel.Range}) => void): void;
+            this: Excel.Workbook, parameter: { readonly Sh: any, readonly TargetPivotTable: Excel.PivotTable, readonly TargetRange: Excel.Range }) => void): void;
     on(
         obj: Excel.Workbook, event: 'SheetPivotTableBeforeAllocateChanges' | 'SheetPivotTableBeforeCommitChanges',
         argNames: ['Sh', 'TargetPivotTable', 'ValueChangeStart', 'ValueChangeEnd', 'Cancel'], handler: (
             this: Excel.Workbook,
-            parameter: {readonly Sh: any, readonly TargetPivotTable: Excel.PivotTable, readonly ValueChangeStart: number, readonly ValueChangeEnd: number, Cancel: boolean}) => void): void;
+            parameter: { readonly Sh: any, readonly TargetPivotTable: Excel.PivotTable, readonly ValueChangeStart: number, readonly ValueChangeEnd: number, Cancel: boolean }) => void): void;
     on(
-        obj: Excel.Workbook, event: 'SheetPivotTableBeforeDiscardChanges', argNames: ['Sh', 'TargetPivotTable', 'ValueChangeStart', 'ValueChangeEnd'],
-        handler: (this: Excel.Workbook, parameter: {readonly Sh: any, readonly TargetPivotTable: Excel.PivotTable, readonly ValueChangeStart: number, readonly ValueChangeEnd: number}) => void): void;
+        obj: Excel.Workbook, event: 'SheetPivotTableBeforeDiscardChanges', argNames: ['Sh', 'TargetPivotTable', 'ValueChangeStart', 'ValueChangeEnd'], handler: (
+            this: Excel.Workbook, parameter: { readonly Sh: any, readonly TargetPivotTable: Excel.PivotTable, readonly ValueChangeStart: number, readonly ValueChangeEnd: number }) => void): void;
     on(
         obj: Excel.Workbook, event: 'SheetPivotTableChangeSync' | 'SheetPivotTableUpdate', argNames: ['Sh', 'Target'], handler: (
-            this: Excel.Workbook, parameter: {readonly Sh: any, readonly Target: Excel.PivotTable}) => void): void;
-    on(obj: Excel.Workbook, event: 'Sync', argNames: ['SyncEventType'], handler: (this: Excel.Workbook, parameter: {readonly SyncEventType: Office.MsoSyncEventType}) => void): void;
-    on(obj: Excel.Workbook, event: 'WindowActivate' | 'WindowDeactivate' | 'WindowResize', argNames: ['Wn'], handler: (this: Excel.Workbook, parameter: {readonly Wn: Excel.Window}) => void): void;
+            this: Excel.Workbook, parameter: { readonly Sh: any, readonly Target: Excel.PivotTable }) => void): void;
+    on(obj: Excel.Workbook, event: 'Sync', argNames: ['SyncEventType'], handler: (this: Excel.Workbook, parameter: { readonly SyncEventType: Office.MsoSyncEventType }) => void): void;
+    on(obj: Excel.Workbook, event: 'WindowActivate' | 'WindowDeactivate' | 'WindowResize', argNames: ['Wn'], handler: (this: Excel.Workbook, parameter: { readonly Wn: Excel.Window }) => void): void;
     on(
         obj: Excel.Worksheet, event: 'BeforeDoubleClick' | 'BeforeRightClick', argNames: ['Target', 'Cancel'], handler: (
-            this: Excel.Worksheet, parameter: {readonly Target: Excel.Range, Cancel: boolean}) => void): void;
-    on(obj: Excel.Worksheet, event: 'Change' | 'SelectionChange', argNames: ['Target'], handler: (this: Excel.Worksheet, parameter: {readonly Target: Excel.Range}) => void): void;
-    on(obj: Excel.Worksheet, event: 'FollowHyperlink', argNames: ['Target'], handler: (this: Excel.Worksheet, parameter: {readonly Target: Excel.Hyperlink}) => void): void;
+            this: Excel.Worksheet, parameter: { readonly Target: Excel.Range, Cancel: boolean }) => void): void;
+    on(obj: Excel.Worksheet, event: 'Change' | 'SelectionChange', argNames: ['Target'], handler: (this: Excel.Worksheet, parameter: { readonly Target: Excel.Range }) => void): void;
+    on(obj: Excel.Worksheet, event: 'FollowHyperlink', argNames: ['Target'], handler: (this: Excel.Worksheet, parameter: { readonly Target: Excel.Hyperlink }) => void): void;
     on(
         obj: Excel.Worksheet, event: 'GetIDsOfNames', argNames: ['riid', 'rgszNames', 'cNames', 'lcid', 'rgdispid'], handler: (
-            this: Excel.Worksheet, parameter: {readonly riid: stdole.GUID, readonly rgszNames: number, readonly cNames: number, readonly lcid: number, rgdispid: number}) => void): void;
+            this: Excel.Worksheet, parameter: { readonly riid: stdole.GUID, readonly rgszNames: number, readonly cNames: number, readonly lcid: number, rgdispid: number }) => void): void;
     on(
         obj: Excel.Worksheet, event: 'GetTypeInfo', argNames: ['itinfo', 'lcid', 'pptinfo'], handler: (
-            this: Excel.Worksheet, parameter: {readonly itinfo: number, readonly lcid: number, pptinfo: undefined}) => void): void;
-    on(obj: Excel.Worksheet, event: 'GetTypeInfoCount', argNames: ['pctinfo'], handler: (this: Excel.Worksheet, parameter: {pctinfo: number}) => void): void;
+            this: Excel.Worksheet, parameter: { readonly itinfo: number, readonly lcid: number, pptinfo: undefined }) => void): void;
+    on(obj: Excel.Worksheet, event: 'GetTypeInfoCount', argNames: ['pctinfo'], handler: (this: Excel.Worksheet, parameter: { pctinfo: number }) => void): void;
     on(
         obj: Excel.Worksheet, event: 'Invoke', argNames: Excel.EventHelperTypes.Worksheet_Invoke_ArgNames, handler: (
             this: Excel.Worksheet, parameter: Excel.EventHelperTypes.Worksheet_Invoke_Parameter) => void): void;
     on(
         obj: Excel.Worksheet, event: 'PivotTableAfterValueChange', argNames: ['TargetPivotTable', 'TargetRange'], handler: (
-            this: Excel.Worksheet, parameter: {readonly TargetPivotTable: Excel.PivotTable, readonly TargetRange: Excel.Range}) => void): void;
+            this: Excel.Worksheet, parameter: { readonly TargetPivotTable: Excel.PivotTable, readonly TargetRange: Excel.Range }) => void): void;
     on(
         obj: Excel.Worksheet, event: 'PivotTableBeforeAllocateChanges' | 'PivotTableBeforeCommitChanges',
         argNames: ['TargetPivotTable', 'ValueChangeStart', 'ValueChangeEnd', 'Cancel'], handler: (
-            this: Excel.Worksheet, parameter: {readonly TargetPivotTable: Excel.PivotTable, readonly ValueChangeStart: number, readonly ValueChangeEnd: number, Cancel: boolean}) => void): void;
+            this: Excel.Worksheet, parameter: { readonly TargetPivotTable: Excel.PivotTable, readonly ValueChangeStart: number, readonly ValueChangeEnd: number, Cancel: boolean }) => void): void;
     on(
         obj: Excel.Worksheet, event: 'PivotTableBeforeDiscardChanges', argNames: ['TargetPivotTable', 'ValueChangeStart', 'ValueChangeEnd'],
-        handler: (this: Excel.Worksheet, parameter: {readonly TargetPivotTable: Excel.PivotTable, readonly ValueChangeStart: number, readonly ValueChangeEnd: number}) => void): void;
-    on(obj: Excel.Worksheet, event: 'PivotTableChangeSync' | 'PivotTableUpdate', argNames: ['Target'], handler: (this: Excel.Worksheet, parameter: {readonly Target: Excel.PivotTable}) => void): void;
-    on(obj: Excel.Worksheet, event: 'QueryInterface', argNames: ['riid', 'ppvObj'], handler: (this: Excel.Worksheet, parameter: {readonly riid: stdole.GUID, ppvObj: undefined}) => void): void;
+        handler: (this: Excel.Worksheet, parameter: { readonly TargetPivotTable: Excel.PivotTable, readonly ValueChangeStart: number, readonly ValueChangeEnd: number }) => void): void;
+    on(obj: Excel.Worksheet, event: 'PivotTableChangeSync' | 'PivotTableUpdate', argNames: ['Target'], handler: (
+        this: Excel.Worksheet, parameter: { readonly Target: Excel.PivotTable }) => void): void;
+    on(obj: Excel.Worksheet, event: 'QueryInterface', argNames: ['riid', 'ppvObj'], handler: (this: Excel.Worksheet, parameter: { readonly riid: stdole.GUID, ppvObj: undefined }) => void): void;
     on(obj: Excel.Application, event: 'AddRef' | 'AfterCalculate' | 'Release', handler: (this: Excel.Application, parameter: {}) => void): void;
     on(obj: Excel.Chart, event: 'Activate' | 'AddRef' | 'Calculate' | 'Deactivate' | 'DragOver' | 'DragPlot' | 'Release' | 'Resize', handler: (this: Excel.Chart, parameter: {}) => void): void;
     on(obj: Excel.OLEObject, event: 'AddRef' | 'GotFocus' | 'LostFocus' | 'Release', handler: (this: Excel.OLEObject, parameter: {}) => void): void;
@@ -9464,7 +9723,7 @@ interface ActiveXObject {
     set(obj: Excel.Workbook, propertyName: 'Colors', parameterTypes: [any], newValue: any): void;
     set(obj: Excel.Range, propertyName: 'Value', parameterTypes: [Excel.XlRangeValueDataType], newValue: any): void;
     set(obj: Excel.Range, propertyName: 'Value', newValue: any): void; // because Value is defined on the type as a method, not a property
-    new<K extends keyof ActiveXObjectNameMap = any>(progid: K): ActiveXObjectNameMap[K];
+    new <K extends keyof ActiveXObjectNameMap = any>(progid: K): ActiveXObjectNameMap[K];
 }
 
 interface ActiveXObjectNameMap {
@@ -9474,26 +9733,8 @@ interface ActiveXObjectNameMap {
 }
 
 interface EnumeratorConstructor {
-    new(col: Excel.Actions): Enumerator<Excel.Action>;
-    new(col: Excel.AddIns | Excel.AddIns2): Enumerator<Excel.AddIn>;
-    new(col: Excel.AllowEditRanges): Enumerator<Excel.AllowEditRange>;
-    new(col: Excel.Areas | Excel.Ranges): Enumerator<Excel.Range>;
-    new(col: Excel.Borders): Enumerator<Excel.Border>;
-    new(col: Excel.CalculatedFields): Enumerator<Excel.PivotField>;
-    new(col: Excel.CalculatedItems | Excel.PivotItemList): Enumerator<Excel.PivotItem>;
-    new(col: Excel.CalculatedMembers): Enumerator<Excel.CalculatedMember>;
-    new(col: Excel.Comments): Enumerator<Excel.Comment>;
-    new(col: Excel.Connections): Enumerator<Excel.WorkbookConnection>;
-    new(col: Excel.CubeFields): Enumerator<Excel.CubeField>;
-    new(col: Excel.CustomProperties): Enumerator<Excel.CustomProperty>;
-    new(col: Excel.CustomViews): Enumerator<Excel.CustomView>;
-    new(col: Excel.DiagramNodeChildren | Excel.DiagramNodes): Enumerator<Excel.DiagramNode>;
-    new(col: Excel.Dialogs): Enumerator<Excel.Dialog>;
-    new(col: Excel.FileExportConverters): Enumerator<Excel.FileExportConverter>;
-    new(col: Excel.Filters): Enumerator<Excel.Filter>;
-    new(
-        col: Excel.FormatConditions | Excel.IconSets | Excel.MenuItems | Excel.Modules | Excel.Phonetics | Excel.PivotFields | Excel.Range | Excel.ServerViewableItems |
-            Excel.SheetViews | Excel.UsedObjects): Enumerator<any>; // tslint:disable-line:use-default-type-parameter
+    new(col: Excel.Range): Enumerator;
+
     new(col: Excel.GroupShapes | Excel.ShapeRange | Excel.Shapes): Enumerator<Excel.Shape>;
     new(col: Excel.HPageBreaks): Enumerator<Excel.HPageBreak>;
     new(col: Excel.Hyperlinks): Enumerator<Excel.Hyperlink>;
@@ -9544,7 +9785,3 @@ interface EnumeratorConstructor {
     new(col: Excel.XmlNamespaces): Enumerator<Excel.XmlNamespace>;
     new(col: Excel.XmlSchemas): Enumerator<Excel.XmlSchema>;
 }
-
-interface SafeArray<T = any> {
-    _brand: SafeArray<T>;
-}
diff --git a/types/activex-excel/tslint.json b/types/activex-excel/tslint.json
index 3224b40b8b..f93cf8562a 100644
--- a/types/activex-excel/tslint.json
+++ b/types/activex-excel/tslint.json
@@ -1,6 +1,3 @@
 {
-    "extends": "dtslint/dt.json",
-    "rules": {
-        "no-const-enum": false
-    }
+    "extends": "dtslint/dt.json"
 }
diff --git a/types/activex-faxcomexlib/activex-faxcomexlib-tests.ts b/types/activex-faxcomexlib/activex-faxcomexlib-tests.ts
index 9ae8c7641d..ef3e403998 100644
--- a/types/activex-faxcomexlib/activex-faxcomexlib-tests.ts
+++ b/types/activex-faxcomexlib/activex-faxcomexlib-tests.ts
@@ -27,7 +27,7 @@ const getServer = () => {
     return server;
 };
 
-(() => {
+{
     // https://msdn.microsoft.com/en-us/library/windows/desktop/ms693376(v=vs.85).aspx
     const server = new ActiveXObject('FaxComEx.FaxServer');
     const document = new ActiveXObject('FaxComEx.FaxDocument');
@@ -35,10 +35,10 @@ const getServer = () => {
     // https://msdn.microsoft.com/en-us/library/windows/desktop/ms692919(v=vs.85).aspx
     server.Connect('');
     server.Connect('computername');
-})();
+}
 
 // https://msdn.microsoft.com/en-us/library/windows/desktop/ms693502(v=vs.85).aspx
-(() => {
+{
     const getInitializedDevice = () => {
         const ret = getServer().GetDevices().ItemById(1);
         ret.ReceiveMode = FAXCOMEXLib.FAX_DEVICE_RECEIVE_MODE_ENUM.fdrmAUTO_ANSWER;
@@ -54,17 +54,17 @@ const getServer = () => {
     // abandoning changes to configuration, using the Refresh method
     device = getInitializedDevice();
     device.Refresh();
-})();
+}
 
 // https://msdn.microsoft.com/en-us/library/windows/desktop/ms693502(v=vs.85).aspx
-(() => {
+{
     const incomingJob = getServer().Folders.IncomingQueue.GetJobs().Item(1);
     incomingJob.Refresh();
     const currentPage = incomingJob.CurrentPage;
-})();
+}
 
 // https://msdn.microsoft.com/en-us/library/windows/desktop/ms692922(v=vs.85).aspx
-(() => {
+{
     const server = getServer();
 
     WScript.Echo(`Server information:
@@ -72,10 +72,10 @@ API Version: ${server.APIVersion}
 Debug: ${server.Debug}
 Build and version: ${server.MajorBuild}.${server.MinorBuild}.${server.MajorVersion}.${server.MinorVersion}
 Server name: ${server.ServerName}`);
-})();
+}
 
 // https://msdn.microsoft.com/en-us/library/windows/desktop/ms693455(v=vs.85).aspx
-(() => {
+{
     const activity = getServer().Activity;
     activity.Refresh();
 
@@ -84,10 +84,10 @@ ${activity.IncomingMessages} incoming messages
 ${activity.OutgoingMessages} outgoing messages
 ${activity.RoutingMessages} routing messages
 ${activity.QueuedMessages} queued messages`);
-})();
+}
 
 // https://msdn.microsoft.com/en-us/library/windows/desktop/ms693400(v=vs.85).aspx
-(() => {
+{
     const device = getServer().GetDevices().Item(1);
     device.CSID = 'Accounts payable';
     device.Description = 'Primary fax device';
@@ -96,10 +96,10 @@ ${activity.QueuedMessages} queued messages`);
     device.SendEnabled = true;
     device.TSID = 'Accounts payable';
     device.Save();
-})();
+}
 
 // https://msdn.microsoft.com/en-us/library/windows/desktop/ms692985(v=vs.85).aspx
-(() => {
+{
     const devices = getServer().GetDevices();
     WScript.Echo(`This server has ${devices.Count} fax devices`);
     for (let i = 1; i <= devices.Count; i++) {
@@ -124,10 +124,10 @@ Sending now: ${device.SendingNow}`);
         device.UseRoutingMethod(routingMethods[0], false);
         device.Save();
     });
-})();
+}
 
 // https://msdn.microsoft.com/en-us/library/windows/desktop/ms693486(v=vs.85).aspx
-(() => {
+{
     const outputRuleInfo = (rule: FAXCOMEXLib.FaxOutboundRoutingRule, index?: number) => {
         WScript.Echo(`
 Outbound routing rule number: ${index || 'unknown'}
@@ -193,13 +193,11 @@ Input 1, 2, 3, 4, or 0 to exit
             areaCode = parseInt(VB.InputBox('Enter the area code'), 10);
             rule = outboundRoutingRules.Add(countryCode, areaCode, true, '', id);
             break;
-        default:
-            return;
     }
-})();
+}
 
 // https://msdn.microsoft.com/en-us/library/windows/desktop/ms693408(v=vs.85).aspx
-(() => {
+{
     const server = getServer();
     const outboundRouting = server.OutboundRouting;
     const outboundRoutingGroups = outboundRouting.GetGroups();
@@ -233,13 +231,14 @@ Device status: ${routingGroup.Status}
     });
 
     // allow user to remove a routing group
-    if (VB.InputBox('Do you want to remove a routing group (Y/N)?') === 'N') { return; }
-    const itemNumber = VB.InputBox('Enter the item number for the group you want to remove');
-    outboundRoutingGroups.Remove(itemNumber);
-})();
+    if (VB.InputBox('Do you want to remove a routing group (Y/N)?') === 'Y') {
+        const itemNumber = VB.InputBox('Enter the item number for the group you want to remove');
+        outboundRoutingGroups.Remove(itemNumber);
+    }
+}
 
 // https://msdn.microsoft.com/en-us/library/windows/desktop/aa964960(v=vs.85).aspx
-(() => {
+{
     const accountSet = getServer().FaxAccountSet;
     const accounts = collectionToArray(accountSet.GetAccounts());
     WScript.Echo(`Number of accounts: ${accounts.length}`);
@@ -248,10 +247,10 @@ Device status: ${routingGroup.Status}
     const accountName = VB.InputBox('Enter an account name');
     accountSet.AddAccount(accountName);
     accountSet.RemoveAccount(accountName);
-})();
+}
 
 // https://msdn.microsoft.com/en-us/library/windows/desktop/ms692952(v=vs.85).aspx
-(() => {
+{
     const incomingJobs = collectionToArray(getServer().Folders.IncomingQueue.GetJobs());
     WScript.Echo(`There are ${incomingJobs.length} jobs in the incoming queue.`);
     const n = parseInt(VB.InputBox('Input the number of a job for which you want information'), 10);
@@ -284,10 +283,10 @@ TSID: ${job.TSID}
         job.CopyTiff(fileName);
         new ActiveXObject('WScript.Shell').Run(fileName);
     }
-})();
+}
 
 // https://msdn.microsoft.com/en-us/library/windows/desktop/ms692914(v=vs.85).aspx
-(() => {
+{
     const server = new ActiveXObject('FaxComEx.FaxServer');
     server.Connect('');
     const outgoingQueue = server.Folders.OutgoingQueue;
@@ -300,10 +299,10 @@ TSID: ${job.TSID}
     outgoingQueue.DiscountRateStart = new Date(0, 0, 0, 1).getVarDate();
     outgoingQueue.UseDeviceTSID = true;
     outgoingQueue.Save();
-})();
+}
 
 // https://msdn.microsoft.com/en-us/library/windows/desktop/ms693393(v=vs.85).aspx
-(() => {
+{
     const outgoingQueue = getServer().Folders.OutgoingQueue;
     outgoingQueue.Refresh();
     WScript.Echo(`There are ${outgoingQueue.GetJobs().Count} faxes in the outgoing queue`);
@@ -357,10 +356,10 @@ the job?
             job.Resume();
             break;
     }
-})();
+}
 
 // https://msdn.microsoft.com/en-us/library/windows/desktop/ms692936(v=vs.85).aspx
-(() => {
+{
     const document = new ActiveXObject('FaxComEx.FaxDocument');
     document.Body = 'C:\\docs\\body.txt';
     document.DocumentName = 'My First Fax';
@@ -401,10 +400,10 @@ the job?
     WScript.Echo(`The job ID is ${jobID}`);
 
     server.Disconnect();
-})();
+}
 
 // https://msdn.microsoft.com/en-us/library/windows/desktop/ms693479(v=vs.85).aspx
-(() => {
+{
     const document = new ActiveXObject('FaxComEx.FaxDocument');
     document.Body = 'C:\\docs\\body.txt';
     document.DocumentName = 'My First Fax';
@@ -428,10 +427,10 @@ the job?
     while (recipients.Count > 0) {
         recipients.Remove(1);
     }
-})();
+}
 
 // https://msdn.microsoft.com/en-us/library/windows/desktop/aa964962(v=vs.85).aspx
-(() => {
+{
     const server = getServer();
     const prefetchCount = parseInt(VB.InputBox('How many messages should be prefetched?'), 10);
     server.CurrentAccount.Folders.IncomingArchive.Refresh();
@@ -442,7 +441,7 @@ the job?
         const message = messageIterator.Message as FAXCOMEXLib.FaxIncomingMessage;
         if (messageIterator.AtEOF) {
             WScript.Echo(`End of file reached`);
-            return;
+            break;
         }
         if (!message.WasReAssigned) {
             if (VB.InputBox('Message not reassigned. Reassign (Y/N)?') === 'Y') {
@@ -455,10 +454,10 @@ the job?
         }
         messageIterator.MoveNext();
     }
-})();
+}
 
 // https://msdn.microsoft.com/en-us/library/windows/desktop/ms693402(v=vs.85).aspx
-(() => {
+{
     const server = getServer();
     const prefetchCount = parseInt(VB.InputBox('How many messages should be prefetched?'), 10);
     server.Folders.OutgoingArchive.Refresh();
@@ -468,7 +467,7 @@ the job?
         if (i > 1 && VB.InputBox('View next message? (Y/N)') !== 'Y') { break; }
         if (messageIterator.AtEOF) {
             WScript.Echo(`End of file reached`);
-            return;
+            break;
         }
         const message = messageIterator.Message as FAXCOMEXLib.FaxOutgoingMessage;
 
@@ -498,10 +497,10 @@ TSID: ${message.TSID}`);
             message.Delete();
         }
     }
-})();
+}
 
 // https://msdn.microsoft.com/en-us/library/windows/desktop/ms693472(v=vs.85).aspx
-(() => {
+{
     const server = getServer();
     const outgoingArchive = server.Folders.OutgoingArchive;
     WScript.Echo(`
@@ -526,12 +525,11 @@ Is archive used? ${outgoingArchive.UseArchive}`.trim()
         outgoingArchive.GetMessage(messageID).CopyTiff(fileName);
         new ActiveXObject('WScript.Shell').Run(fileName);
     }
-})();
+}
 
-(() => {
+{
     const server = getServer();
     const messageIterator = server.Folders.OutgoingArchive.GetMessages();
-    if (messageIterator.AtEOF) { return; }
     messageIterator.MoveFirst();
     while (!messageIterator.AtEOF) {
         const message = messageIterator.Message;
@@ -543,10 +541,10 @@ Transmission start: ${new Date(message.TransmissionStart)}
 `.trim());
         messageIterator.MoveNext();
     }
-})();
+}
 
 // https://msdn.microsoft.com/en-us/library/windows/desktop/ms692976(v=vs.85).aspx
-(() => {
+{
     const server = getServer();
     const prefetchCount = parseInt(VB.InputBox('How many messages should be prefetched?'), 10);
     server.Folders.IncomingArchive.Refresh();
@@ -557,7 +555,7 @@ Transmission start: ${new Date(message.TransmissionStart)}
         const message = messageIterator.Message as FAXCOMEXLib.FaxIncomingMessage;
         if (messageIterator.AtEOF) {
             WScript.Echo(`End of file reached`);
-            return;
+            break;
         }
         const fileName = VB.InputBox('Enter path to save TIFF file');
         message.CopyTiff(fileName);
@@ -565,10 +563,10 @@ Transmission start: ${new Date(message.TransmissionStart)}
 
         messageIterator.MoveNext();
     }
-})();
+}
 
 // https://msdn.microsoft.com/en-us/library/windows/desktop/ms693406(v=vs.85).aspx
-(() => {
+{
     const server = getServer();
     const incomingArchive = server.Folders.IncomingArchive;
     incomingArchive.Refresh();
@@ -587,9 +585,9 @@ Is archive used? ${incomingArchive.UseArchive}
     incomingArchive.Save();
 
     const messageID = VB.InputBox('Message ID to retrieve information? (Leave empty, or Cancel, to exit)');
-    if (messageID === '') { return; }
-    const message = incomingArchive.GetMessage(messageID);
-    WScript.Echo(`
+    if (messageID !== '') {
+        const message = incomingArchive.GetMessage(messageID);
+        WScript.Echo(`
 Caller ID: ${message.CallerId}
 CSID: ${message.CSID}
 Device name: ${message.DeviceName}
@@ -603,13 +601,14 @@ Transmission end: ${new Date(message.TransmissionEnd)}
 TSID: ${message.TSID}
 `.trim());
 
-    if (VB.InputBox('Delete this message from the archive (Y/N)?') === 'Y') {
-        message.Delete();
+        if (VB.InputBox('Delete this message from the archive (Y/N)?') === 'Y') {
+            message.Delete();
+        }
     }
-})();
+}
 
 // https://msdn.microsoft.com/en-us/library/windows/desktop/ms693401(v=vs.85).aspx
-(() => {
+{
     const server = getServer();
     const loggingOptions = server.LoggingOptions;
     const activityLogging = loggingOptions.ActivityLogging;
@@ -626,10 +625,10 @@ TSID: ${message.TSID}
     eventLogging.InitEventsLevel = FAXCOMEXLib.FAX_LOG_LEVEL_ENUM.fllMAX;
     eventLogging.OutboundEventsLevel = FAXCOMEXLib.FAX_LOG_LEVEL_ENUM.fllNONE;
     eventLogging.Save();
-})();
+}
 
 // https://msdn.microsoft.com/en-us/library/windows/desktop/ms693387(v=vs.85).aspx
-(() => {
+{
     const server = getServer();
     const receiptOptions = server.ReceiptOptions;
     receiptOptions.Refresh();
@@ -649,10 +648,10 @@ Use for inbound routing? ${receiptOptions.UseForInboundRouting}
     receiptOptions.SMTPServer = 'My SMTP Server';
     receiptOptions.UseForInboundRouting = true;
     receiptOptions.Save();
-})();
+}
 
 // https://msdn.microsoft.com/en-us/library/windows/desktop/ms693462(v=vs.85).aspx
-(() => {
+{
     const server = getServer();
     collectionToArray(server.GetDeviceProviders()).forEach((provider, index) => {
         WScript.Echo(`
@@ -668,29 +667,29 @@ Unique name: ${provider.UniqueName}
 
         new VBArray(provider.DeviceIds).toArray().forEach(id => WScript.Echo(id));
     });
-})();
+}
 
 // https://msdn.microsoft.com/en-us/library/windows/desktop/ms693437(v=vs.85).aspx -- for a fax device
-(() => {
+{
     const server = getServer();
     const device = server.GetDevices().Item(1);
     const deviceProperty = toSafeArray(1, 2, 3);
     const propertyName = '{B1F944B9-9A16-45d1-933A-4060A4871AB0}';
     device.SetExtensionProperty(propertyName, deviceProperty);
     new VBArray(device.GetExtensionProperty(propertyName)).toArray().forEach(x => WScript.Echo(x));
-})();
+}
 
 // https://msdn.microsoft.com/en-us/library/windows/desktop/ms693437(v=vs.85).aspx -- for a fax device
-(() => {
+{
     const server = getServer();
     const serverProperty = toSafeArray(4, 2, 3);
     const propertyName = `{AC7D0DEE-B6E5-4a44-AF45-835C58CB44D2}`;
     server.SetExtensionProperty(propertyName, serverProperty);
     new VBArray(server.GetExtensionProperty(propertyName)).toArray().forEach(x => WScript.Echo(x));
-})();
+}
 
 // https://msdn.microsoft.com/en-us/library/windows/desktop/ms693013(v=vs.85).aspx
-(() => {
+{
     const server = getServer();
 
     ActiveXObject.on(server, 'OnOutgoingJobAdded', ['pFaxServer', 'bstrJobId'], prm => WScript.Echo('New job added to queue'));
@@ -727,4 +726,4 @@ TSID: ${status.TSID}
         FAXCOMEXLib.FAX_SERVER_EVENTS_TYPE_ENUM.fsetFXSSVC_ENDED +
         FAXCOMEXLib.FAX_SERVER_EVENTS_TYPE_ENUM.fsetOUT_QUEUE
     );
-})();
+}
diff --git a/types/activex-faxcomexlib/index.d.ts b/types/activex-faxcomexlib/index.d.ts
index 237c841fda..d4078061f7 100644
--- a/types/activex-faxcomexlib/index.d.ts
+++ b/types/activex-faxcomexlib/index.d.ts
@@ -7,7 +7,7 @@
 /// <reference types="activex-stdole" />
 
 declare namespace FAXCOMEXLib {
-    // tslint:disable-next-line no-const-enum
+    // tslint:disable-next-line:no-const-enum
     const enum FAX_ACCESS_RIGHTS_ENUM {
         farMANAGE_CONFIG = 64,
         farMANAGE_IN_ARCHIVE = 256,
@@ -22,7 +22,7 @@ declare namespace FAXCOMEXLib {
         farSUBMIT_NORMAL = 2,
     }
 
-    // tslint:disable-next-line no-const-enum
+    // tslint:disable-next-line:no-const-enum
     const enum FAX_ACCESS_RIGHTS_ENUM_2 {
         far2MANAGE_ARCHIVES = 256,
         far2MANAGE_CONFIG = 64,
@@ -36,7 +36,7 @@ declare namespace FAXCOMEXLib {
         far2SUBMIT_NORMAL = 2,
     }
 
-    // tslint:disable-next-line no-const-enum
+    // tslint:disable-next-line:no-const-enum
     const enum FAX_ACCOUNT_EVENTS_TYPE_ENUM {
         faetFXSSVC_ENDED = 16,
         faetIN_ARCHIVE = 4,
@@ -46,21 +46,21 @@ declare namespace FAXCOMEXLib {
         faetOUT_QUEUE = 2,
     }
 
-    // tslint:disable-next-line no-const-enum
+    // tslint:disable-next-line:no-const-enum
     const enum FAX_COVERPAGE_TYPE_ENUM {
         fcptLOCAL = 1,
         fcptNONE = 0,
         fcptSERVER = 2,
     }
 
-    // tslint:disable-next-line no-const-enum
+    // tslint:disable-next-line:no-const-enum
     const enum FAX_DEVICE_RECEIVE_MODE_ENUM {
         fdrmAUTO_ANSWER = 1,
         fdrmMANUAL_ANSWER = 2,
         fdrmNO_ANSWER = 0,
     }
 
-    // tslint:disable-next-line no-const-enum
+    // tslint:disable-next-line:no-const-enum
     const enum FAX_GROUP_STATUS_ENUM {
         fgsALL_DEV_NOT_VALID = 2,
         fgsALL_DEV_VALID = 0,
@@ -68,7 +68,7 @@ declare namespace FAXCOMEXLib {
         fgsSOME_DEV_NOT_VALID = 3,
     }
 
-    // tslint:disable-next-line no-const-enum
+    // tslint:disable-next-line:no-const-enum
     const enum FAX_JOB_EXTENDED_STATUS_ENUM {
         fjesANSWERED = 5,
         fjesBAD_ADDRESS = 10,
@@ -93,7 +93,7 @@ declare namespace FAXCOMEXLib {
         fjesTRANSMITTING = 4,
     }
 
-    // tslint:disable-next-line no-const-enum
+    // tslint:disable-next-line:no-const-enum
     const enum FAX_JOB_OPERATIONS_ENUM {
         fjoDELETE = 16,
         fjoPAUSE = 2,
@@ -104,7 +104,7 @@ declare namespace FAXCOMEXLib {
         fjoVIEW = 1,
     }
 
-    // tslint:disable-next-line no-const-enum
+    // tslint:disable-next-line:no-const-enum
     const enum FAX_JOB_STATUS_ENUM {
         fjsCANCELED = 512,
         fjsCANCELING = 1024,
@@ -119,14 +119,14 @@ declare namespace FAXCOMEXLib {
         fjsROUTING = 2048,
     }
 
-    // tslint:disable-next-line no-const-enum
+    // tslint:disable-next-line:no-const-enum
     const enum FAX_JOB_TYPE_ENUM {
         fjtRECEIVE = 1,
         fjtROUTING = 2,
         fjtSEND = 0,
     }
 
-    // tslint:disable-next-line no-const-enum
+    // tslint:disable-next-line:no-const-enum
     const enum FAX_LOG_LEVEL_ENUM {
         fllMAX = 3,
         fllMED = 2,
@@ -134,14 +134,14 @@ declare namespace FAXCOMEXLib {
         fllNONE = 0,
     }
 
-    // tslint:disable-next-line no-const-enum
+    // tslint:disable-next-line:no-const-enum
     const enum FAX_PRIORITY_TYPE_ENUM {
         fptHIGH = 2,
         fptLOW = 0,
         fptNORMAL = 1,
     }
 
-    // tslint:disable-next-line no-const-enum
+    // tslint:disable-next-line:no-const-enum
     const enum FAX_PROVIDER_STATUS_ENUM {
         fpsBAD_GUID = 2,
         fpsBAD_VERSION = 3,
@@ -152,19 +152,19 @@ declare namespace FAXCOMEXLib {
         fpsSUCCESS = 0,
     }
 
-    // tslint:disable-next-line no-const-enum
+    // tslint:disable-next-line:no-const-enum
     const enum FAX_RECEIPT_TYPE_ENUM {
         frtMAIL = 1,
         frtMSGBOX = 4,
         frtNONE = 0,
     }
 
-    // tslint:disable-next-line no-const-enum
+    // tslint:disable-next-line:no-const-enum
     const enum FAX_ROUTING_RULE_CODE_ENUM {
         frrcANY_CODE = 0,
     }
 
-    // tslint:disable-next-line no-const-enum
+    // tslint:disable-next-line:no-const-enum
     const enum FAX_RULE_STATUS_ENUM {
         frsALL_GROUP_DEV_NOT_VALID = 2,
         frsBAD_DEVICE = 4,
@@ -173,14 +173,14 @@ declare namespace FAXCOMEXLib {
         frsVALID = 0,
     }
 
-    // tslint:disable-next-line no-const-enum
+    // tslint:disable-next-line:no-const-enum
     const enum FAX_SCHEDULE_TYPE_ENUM {
         fstDISCOUNT_PERIOD = 2,
         fstNOW = 0,
         fstSPECIFIC_TIME = 1,
     }
 
-    // tslint:disable-next-line no-const-enum
+    // tslint:disable-next-line:no-const-enum
     const enum FAX_SERVER_APIVERSION_ENUM {
         fsAPI_VERSION_0 = 0,
         fsAPI_VERSION_1 = 65536,
@@ -188,7 +188,7 @@ declare namespace FAXCOMEXLib {
         fsAPI_VERSION_3 = 196608,
     }
 
-    // tslint:disable-next-line no-const-enum
+    // tslint:disable-next-line:no-const-enum
     const enum FAX_SERVER_EVENTS_TYPE_ENUM {
         fsetACTIVITY = 8,
         fsetCONFIG = 4,
@@ -203,14 +203,14 @@ declare namespace FAXCOMEXLib {
         fsetQUEUE_STATE = 16,
     }
 
-    // tslint:disable-next-line no-const-enum
+    // tslint:disable-next-line:no-const-enum
     const enum FAX_SMTP_AUTHENTICATION_TYPE_ENUM {
         fsatANONYMOUS = 0,
         fsatBASIC = 1,
         fsatNTLM = 2,
     }
 
-    // tslint:disable-next-line no-const-enum
+    // tslint:disable-next-line:no-const-enum
     const enum FaxConstants {
         bstrGROUPNAME_ALLDEVICES = '<All Devices>',
         lDEFAULT_PREFETCH_SIZE = 100,
@@ -326,11 +326,10 @@ declare namespace FAXCOMEXLib {
     }
 
     /** FaxAccounts Class */
-    class FaxAccounts {
-        private 'FAXCOMEXLib.FaxAccounts_typekey': FaxAccounts;
-        private constructor();
+    interface FaxAccounts {
         readonly Count: number;
         Item(vIndex: any): FaxAccount;
+        (vIndex: any): FaxAccount;
     }
 
     /** FaxAccountSet Class */
@@ -535,10 +534,7 @@ declare namespace FAXCOMEXLib {
     }
 
     /** FaxDeviceIds Class */
-    class FaxDeviceIds {
-        private 'FAXCOMEXLib.FaxDeviceIds_typekey': FaxDeviceIds;
-        private constructor();
-
+    interface FaxDeviceIds {
         /** Add a device */
         Add(lDeviceId: number): void;
         readonly Count: number;
@@ -549,6 +545,7 @@ declare namespace FAXCOMEXLib {
 
         /** Set order of the device */
         SetOrder(lDeviceId: number, lNewOrder: number): void;
+        (lIndex: number): number;
     }
 
     /** FaxDeviceProvider Class */
@@ -594,22 +591,20 @@ declare namespace FAXCOMEXLib {
     }
 
     /** FaxDeviceProviders Class */
-    class FaxDeviceProviders {
-        private 'FAXCOMEXLib.FaxDeviceProviders_typekey': FaxDeviceProviders;
-        private constructor();
+    interface FaxDeviceProviders {
         readonly Count: number;
         Item(vIndex: any): FaxDeviceProvider;
+        (vIndex: any): FaxDeviceProvider;
     }
 
     /** FaxDevices Class */
-    class FaxDevices {
-        private 'FAXCOMEXLib.FaxDevices_typekey': FaxDevices;
-        private constructor();
+    interface FaxDevices {
         readonly Count: number;
         Item(vIndex: any): FaxDevice;
 
         /** Get device by its ID */
         ItemById(lId: number): FaxDevice;
+        (vIndex: any): FaxDevice;
     }
 
     /** FaxDocument Class */
@@ -630,10 +625,10 @@ declare namespace FAXCOMEXLib {
         CallHandle: number;
 
         /** Submit the fax document on the already connected server */
-        ConnectedSubmit(pFaxServer: IFaxServer): any;
+        ConnectedSubmit(pFaxServer: IFaxServer): SafeArray<string>;
 
         /** Submit the fax document on the already connected server */
-        ConnectedSubmit2(pFaxServer: IFaxServer, pvFaxOutgoingJobIDs: any): number;
+        ConnectedSubmit2(pFaxServer: IFaxServer, pvFaxOutgoingJobIDs: SafeArray<string>): number;
 
         /** Cover page file path */
         CoverPage: string;
@@ -765,7 +760,7 @@ declare namespace FAXCOMEXLib {
         readonly MajorVersion: number;
 
         /** Array of methods exposed by extension */
-        readonly Methods: any;
+        readonly Methods: SafeArray<string>;
 
         /** The minor part of extension's build number */
         readonly MinorBuild: number;
@@ -781,11 +776,10 @@ declare namespace FAXCOMEXLib {
     }
 
     /** FaxInboundRoutingExtensions Class */
-    class FaxInboundRoutingExtensions {
-        private 'FAXCOMEXLib.FaxInboundRoutingExtensions_typekey': FaxInboundRoutingExtensions;
-        private constructor();
+    interface FaxInboundRoutingExtensions {
         readonly Count: number;
         Item(vIndex: any): FaxInboundRoutingExtension;
+        (vIndex: any): FaxInboundRoutingExtension;
     }
 
     /** FaxInboundRoutingMethod Class */
@@ -819,11 +813,10 @@ declare namespace FAXCOMEXLib {
     }
 
     /** FaxInboundRoutingMethods Class */
-    class FaxInboundRoutingMethods {
-        private 'FAXCOMEXLib.FaxInboundRoutingMethods_typekey': FaxInboundRoutingMethods;
-        private constructor();
+    interface FaxInboundRoutingMethods {
         readonly Count: number;
         Item(vIndex: any): FaxInboundRoutingMethod;
+        (vIndex: any): FaxInboundRoutingMethod;
     }
 
     /** FaxIncomingArchive Class */
@@ -935,11 +928,10 @@ declare namespace FAXCOMEXLib {
     }
 
     /** FaxIncomingJobs Class */
-    class FaxIncomingJobs {
-        private 'FAXCOMEXLib.FaxIncomingJobs_typekey': FaxIncomingJobs;
-        private constructor();
+    interface FaxIncomingJobs {
         readonly Count: number;
         Item(vIndex: any): FaxIncomingJob;
+        (vIndex: any): FaxIncomingJob;
     }
 
     /** FaxIncomingMessage Class */
@@ -1117,10 +1109,7 @@ declare namespace FAXCOMEXLib {
     }
 
     /** FaxOutboundRoutingGroups Class */
-    class FaxOutboundRoutingGroups {
-        private 'FAXCOMEXLib.FaxOutboundRoutingGroups_typekey': FaxOutboundRoutingGroups;
-        private constructor();
-
+    interface FaxOutboundRoutingGroups {
         /** Add a group */
         Add(bstrName: string): FaxOutboundRoutingGroup;
         readonly Count: number;
@@ -1128,6 +1117,7 @@ declare namespace FAXCOMEXLib {
 
         /** Remove a group */
         Remove(vIndex: number | string): void;
+        (vIndex: number | string): FaxOutboundRoutingGroup;
     }
 
     /** FaxOutboundRoutingRule Class */
@@ -1161,10 +1151,7 @@ declare namespace FAXCOMEXLib {
     }
 
     /** FaxOutboundRoutingRules Class */
-    class FaxOutboundRoutingRules {
-        private 'FAXCOMEXLib.FaxOutboundRoutingRules_typekey': FaxOutboundRoutingRules;
-        private constructor();
-
+    interface FaxOutboundRoutingRules {
         /** Add a rule */
         Add(lCountryCode: number, lAreaCode: number, bUseDevice: boolean, bstrGroupName: string, lDeviceId: number): FaxOutboundRoutingRule;
         readonly Count: number;
@@ -1178,6 +1165,7 @@ declare namespace FAXCOMEXLib {
 
         /** Remove a rule by criteria */
         RemoveByCountryAndArea(lCountryCode: number, lAreaCode: number): void;
+        (lIndex: number): FaxOutboundRoutingRule;
     }
 
     /** FaxOutgoingArchive Class */
@@ -1334,11 +1322,10 @@ declare namespace FAXCOMEXLib {
     }
 
     /** FaxOutgoingJobs Class */
-    class FaxOutgoingJobs {
-        private 'FAXCOMEXLib.FaxOutgoingJobs_typekey': FaxOutgoingJobs;
-        private constructor();
+    interface FaxOutgoingJobs {
         readonly Count: number;
         Item(vIndex: any): IFaxOutgoingJob;
+        (vIndex: any): IFaxOutgoingJob;
     }
 
     /** FaxOutgoingMessage Class */
@@ -1486,10 +1473,7 @@ declare namespace FAXCOMEXLib {
     }
 
     /** FaxRecipients Class */
-    class FaxRecipients {
-        private 'FAXCOMEXLib.FaxRecipients_typekey': FaxRecipients;
-        private constructor();
-
+    interface FaxRecipients {
         /**
          * Add a recipient
          * @param string [bstrRecipientName='']
@@ -1500,6 +1484,7 @@ declare namespace FAXCOMEXLib {
 
         /** Remove a recipient */
         Remove(lIndex: number): void;
+        (lIndex: number): FaxRecipient;
     }
 
     /** FaxSecurity Class */
@@ -2033,21 +2018,3 @@ interface ActiveXObjectNameMap {
     'FaxComEx.FaxDocument': FAXCOMEXLib.FaxDocument;
     'FaxComEx.FaxServer': FAXCOMEXLib.FaxServer;
 }
-
-interface EnumeratorConstructor {
-    new(col: FAXCOMEXLib.FaxAccounts): Enumerator<FAXCOMEXLib.FaxAccount>;
-    new(col: FAXCOMEXLib.FaxDeviceIds): Enumerator<number>;
-    new(col: FAXCOMEXLib.FaxDeviceProviders): Enumerator<FAXCOMEXLib.FaxDeviceProvider>;
-    new(col: FAXCOMEXLib.FaxDevices): Enumerator<FAXCOMEXLib.FaxDevice>;
-    new(col: FAXCOMEXLib.FaxInboundRoutingExtensions): Enumerator<FAXCOMEXLib.FaxInboundRoutingExtension>;
-    new(col: FAXCOMEXLib.FaxInboundRoutingMethods): Enumerator<FAXCOMEXLib.FaxInboundRoutingMethod>;
-    new(col: FAXCOMEXLib.FaxIncomingJobs): Enumerator<FAXCOMEXLib.FaxIncomingJob>;
-    new(col: FAXCOMEXLib.FaxOutboundRoutingGroups): Enumerator<FAXCOMEXLib.FaxOutboundRoutingGroup>;
-    new(col: FAXCOMEXLib.FaxOutboundRoutingRules): Enumerator<FAXCOMEXLib.FaxOutboundRoutingRule>;
-    new(col: FAXCOMEXLib.FaxOutgoingJobs): Enumerator<FAXCOMEXLib.IFaxOutgoingJob>;
-    new(col: FAXCOMEXLib.FaxRecipients): Enumerator<FAXCOMEXLib.FaxRecipient>;
-}
-
-interface SafeArray<T = any> {
-    _brand: SafeArray<T>;
-}
diff --git a/types/activex-faxcomexlib/tsconfig.json b/types/activex-faxcomexlib/tsconfig.json
index 50b3ab1a0a..6509ab4701 100644
--- a/types/activex-faxcomexlib/tsconfig.json
+++ b/types/activex-faxcomexlib/tsconfig.json
@@ -1,8 +1,10 @@
-
 {
     "compilerOptions": {
         "module": "commonjs",
-        "lib": ["es5", "scripthost"],
+        "lib": [
+            "es5",
+            "scripthost"
+        ],
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
diff --git a/types/activex-iwshruntimelibrary/activex-iwshruntimelibrary-tests.ts b/types/activex-iwshruntimelibrary/activex-iwshruntimelibrary-tests.ts
index f39627cc1a..14a90f9a8a 100644
--- a/types/activex-iwshruntimelibrary/activex-iwshruntimelibrary-tests.ts
+++ b/types/activex-iwshruntimelibrary/activex-iwshruntimelibrary-tests.ts
@@ -4,11 +4,11 @@ const wshn = new ActiveXObject('WScript.Network');
 // https://msdn.microsoft.com/en-us/library/wck0hkd7(v=vs.84).aspx
 // https://msdn.microsoft.com/en-us/library/tte130y1(v=vs.84).aspx
 // https://msdn.microsoft.com/en-us/library/3fxhka75(v=vs.84).aspx
-(() => {
+{
     WScript.Echo('Domain = ' + wshn.UserDomain);
     WScript.Echo('Computer Name = ' + wshn.ComputerName);
     WScript.Echo('User Name = ' + wshn.UserName);
-})();
+}
 
 // https://msdn.microsoft.com/en-us/library/zsdh7hkb(v=vs.84).aspx
 wshn.AddWindowsPrinterConnection('\\\\printserv\\DefaultPrinter');
@@ -18,7 +18,7 @@ wshn.AddPrinterConnection("LPT1", "\\\\Server\\Print1");
 
 // https://msdn.microsoft.com/en-us/library/t9zt39at(v=vs.84).aspx
 // https://msdn.microsoft.com/en-us/library/zhds6k80(v=vs.84).aspx
-(() => {
+{
     const drives = wshn.EnumNetworkDrives();
     const printers = wshn.EnumPrinterConnections();
     WScript.Echo("Network drive mappings:");
@@ -30,7 +30,7 @@ wshn.AddPrinterConnection("LPT1", "\\\\Server\\Print1");
     for (let i = 0; i < printers.length; i += 2) {
         WScript.Echo(`Port ${printers.Item(i)} = ${printers.Item(i + 1)}`);
     }
-})();
+}
 
 // https://msdn.microsoft.com/en-us/library/8kst88h6(v=vs.84).aspx
 wshn.MapNetworkDrive('E:', '\\\\Server\\Public');
@@ -42,8 +42,8 @@ wshn.RemoveNetworkDrive('E:');
 wshn.RemovePrinterConnection('\\\\PRN-CORP1\\B41-4523-A', true, true);
 
 // https://msdn.microsoft.com/en-us/library/2ccwwdct(v=vs.84).aspx
-(() => {
+{
     const printerPath = "\\\\research\\library1";
     wshn.AddWindowsPrinterConnection(printerPath);
     wshn.SetDefaultPrinter(printerPath);
-})();
+}
diff --git a/types/activex-iwshruntimelibrary/index.d.ts b/types/activex-iwshruntimelibrary/index.d.ts
index c50c9670a2..d5b052eaae 100644
--- a/types/activex-iwshruntimelibrary/index.d.ts
+++ b/types/activex-iwshruntimelibrary/index.d.ts
@@ -5,6 +5,9 @@
 // TypeScript Version: 2.6
 
 declare namespace IWshRuntimeLibrary {
+    type WindowStyle = 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10;
+    type ShortcutWindowStyle = 1 | 3 | 7;
+
     // tslint:disable-next-line no-const-enum
     const enum ButtonType {
         OK,
@@ -16,6 +19,16 @@ declare namespace IWshRuntimeLibrary {
         CancelTryagainContinue
     }
 
+    // tslint:disable-next-line no-const-enum
+    const enum EventType {
+        AuditFailure = 5,
+        AuditSuccess = 4,
+        Error = 1,
+        Information = 3,
+        Success = 0,
+        Warning = 2
+    }
+
     // tslint:disable-next-line no-const-enum
     const enum IconType {
         Stop = 16,
@@ -85,22 +98,20 @@ declare namespace IWshRuntimeLibrary {
     }
 
     /** Generic Collection Object */
-    class WshCollection {
-        private 'IWshRuntimeLibrary.WshCollection_typekey': WshCollection;
-        private constructor();
+    interface WshCollection {
         Count(): number;
         Item(Index: any): any;
         readonly length: number;
+        (Index: any): any;
     }
 
     /** Environment Variables Collection Object */
-    class WshEnvironment {
-        private 'IWshRuntimeLibrary.WshEnvironment_typekey': WshEnvironment;
-        private constructor();
+    interface WshEnvironment {
         Count(): number;
         Item(Name: string): string;
         readonly length: number;
         Remove(Name: string): void;
+        (Name: string): string;
     }
 
     /** WSHExec object */
@@ -161,7 +172,7 @@ declare namespace IWshRuntimeLibrary {
          * @param Force [false] Remove the connections even if the resource is in use
          * @param UpdateProfile [false] Remove the mapping from the user's profile
          */
-        RemoveNetworkDrive(Name: string, Force?: any, UpdateProfile?: any): void;
+        RemoveNetworkDrive(Name: string, Force?: boolean, UpdateProfile?: boolean): void;
 
         /**
          * Removes a shared network printer connection from your computer system
@@ -173,7 +184,7 @@ declare namespace IWshRuntimeLibrary {
          * _Name_ must be the printer's local name. If the printer was connected using the **AddWindowsPrinterConnection** method or was added manually (using the Add Printer wizard),
          * then _Name_ must be the printer's UNC name.
          */
-        RemovePrinterConnection(Name: string, Force?: any, UpdateProfile?: any): void;
+        RemovePrinterConnection(Name: string, Force?: true, UpdateProfile?: true): void;
         SetDefaultPrinter(Name: string): void;
         readonly Site: string;
         readonly UserDomain: string;
@@ -185,21 +196,107 @@ declare namespace IWshRuntimeLibrary {
     class WshShell {
         private 'IWshRuntimeLibrary.WshShell_typekey': WshShell;
         private constructor();
-        AppActivate(App: any, Wait?: any): boolean;
-        CreateShortcut(PathLink: string): any;
+
+        /**
+         * Activates an application window
+         * @param App Title of application as it appears in the title bar, or the process ID
+         * @param Wait
+         *
+         * This method changes the focus to the named application or window. The window must be attached to the calling thread's message queue. It does not affect whether it is maximized or
+         * minimized. Focus moves from the activated application window when the user takes action to change the focus (or closes the window).
+         *
+         * In determining which application to activate, the specified title is compared to the title string of each running application. If no exact match exists, any application whose title
+         * string begins with title is activated. If an application still cannot be found, any application whose title string ends with title is activated. If more than one instance of the
+         * application named by title exists, one instance is arbitrarily activated.
+         *
+         * The method might return `false` under the following conditions:
+         *
+         * * The window is not brought to the foreground.
+         * * The window is brought to the foreground but is not given keyboard focus.
+         * * A Command Prompt window (`cmd.exe`) is brought to the foreground and is given keyboard focus.
+         */
+        AppActivate(App: string | number, Wait?: any): boolean;
+
+        /**
+         * Creates a shortcut
+         * @param PathLink Path where the shortcut should be created
+         *
+         * The shortcut object exists in memory until you save it to disk with the **Save** method.
+         */
+        CreateShortcut(PathLink: string): WshShortcut | WshURLShortcut;
         CurrentDirectory: string;
-        Environment(Type?: any): WshEnvironment;
+
+        /**
+         * Note that **Environment** doesn't actually return a callable object; the call is only usable in the context of the **Environment** property. The following:
+         *
+         *     let env = new ActiveXObject('WScript.Shell').Environment;
+         *     WScript.Echo(env('System'));
+         *
+         * will return an empty string, unless there is an environment variable named `System`
+         */
+        Environment: WshEnvironment & ((Type: 'System' | 'User' | 'Process' | 'Volatile') => WshEnvironment);
         Exec(Command: string): WshExec;
         ExpandEnvironmentStrings(Src: string): string;
 
-        /** @param string [Target=''] */
-        LogEvent(Type: any, Message: string, Target?: string): boolean;
-        Popup(Text: any, SecondsToWait?: number, Title?: string, Type?: ButtonType | IconType | PopupType): PopupSelection;
+        /** @param string [Target=''] Name of the computer system where the event should be logged; default is the local computer system */
+        LogEvent(Type: EventType, Message: string, Target?: string): boolean;
+        Popup(Text: string, SecondsToWait?: number, Title?: string, Type?: ButtonType | IconType | PopupType): PopupSelection;
         RegDelete(Name: string): void;
-        RegRead(Name: string): any;
-        RegWrite(Name: string, Value: any, Type?: any): void;
-        Run(Command: string, WindowStyle?: any, WaitOnReturn?: any): number;
-        SendKeys(Keys: string, Wait?: any): void;
+
+        /**
+         * Returns the value of a key or value-name from the registry
+         * @param Name Key (ends with a final `\`) or value-name (doesn't end with a final `\`)
+         *
+         * Returns one of the following, based on the registry value type:
+         *
+         * * **REG_SZ** -- a string
+         * * **REG_DWORD** -- a number
+         * * **REG_SBINARY** -- a binary value, as a COM SafeArray containing integers
+         * * **REG_EXPAND_SZ** -- an expandable string
+         * * **REG_MULTI_SZ** -- an array of srings, as a COM SafeArray
+         */
+        RegRead(Name: string): string | number | SafeArray<string> | SafeArray<number>;
+
+        /**
+         * Creates a new key, adds another value-name to an existing key and assigns it a value, or changes the value of an existing value-name
+         * @param Name Key (ends with a final `\`) or value-name (doesn't end with a final `\`)
+         * @param Value Will be coerced to `string` or `integer` based on the value-name type:
+         * `REG_SZ | REG_EXPAND_SZ` will be converted to `string`;
+         * `REG_DWORD | REG_BINARY` will be converted to `integer`
+         * @param Type
+         */
+        RegWrite(Name: string, Value: any, Type?: 'REG_SZ' | 'REG_DWORD' | 'REG_BINARY' | 'REG_EXPAND_SZ'): void;
+
+        /**
+         * Runs a program in a new process.
+         * @param Command Command-line, including any parameters you want to pass to the executable file.
+         * @param WindowStyle Appearance of the program window. Not all programs make use of this information.
+         * @param WaitOnReturn Block script until program finishes executing.
+         *
+         * If `false` is passed into **WaitOnReturn**, the **Run** method will return 0 immediately. If `true` is passed in, **Run** will return the program's error code, if any.
+         *
+         * Environment variables will be expanded within the command line.
+         *
+         * Passing a registered file type will automatically open the program registered to the file type.
+         *
+         * Possible values for **WindowStyle**:
+         *
+         * * **0** -- Hides the window and activates another window.
+         * * **1** -- Activates and displays a window. If the window is minimized or maximized, the system restores it to its original size and position. An application should specify this flag
+         * when displaying the window for the first time.
+         * * **2** -- Activates the window and displays it as a minimized window.
+         * * **3** -- Activates the window and displays it as a maximized window.
+         * * **4** -- Displays a window in its most recent size and position. The active window remains active.
+         * * **5** -- Activates the window and displays it in its current size and position.
+         * * **6** -- Minimizes the specified window and activates the next top-level window in the Z order.
+         * * **7** -- Displays the window as a minimized window. The active window remains active.
+         * * **8** -- Displays the window in its current state. The active window remains active.
+         * * **9** -- Activates and displays the window. If the window is minimized or maximized, the system restores it to its original size and position. An application should specify this flag
+         * when restoring a minimized window.
+         * * **10** -- Sets the show-state based on the state of the program that started the application.
+         */
+        Run(Command: string, WindowStyle?: WindowStyle, WaitOnReturn?: boolean): number;
+        SendKeys(Keys: string, Wait?: boolean): void;
         readonly SpecialFolders: WshCollection;
     }
 
@@ -216,7 +313,16 @@ declare namespace IWshRuntimeLibrary {
         readonly RelativePath: string;
         Save(): void;
         TargetPath: string;
-        WindowStyle: number;
+
+        /**
+         * Possible values:
+         *
+         * * **1** -- Activates and displays a window. If the window is minimized or maximized, the system restores it to its original size and position. An application should specify this flag
+         * when displaying the window for the first time.
+         * * **3** -- Activates the window and displays it as a maximized window.
+         * * **7** -- Displays the window as a minimized window. The active window remains active.
+         */
+        WindowStyle: ShortcutWindowStyle;
         WorkingDirectory: string;
     }
 
@@ -240,8 +346,3 @@ interface ActiveXObjectNameMap {
     'WScript.Network': IWshRuntimeLibrary.WshNetwork;
     'WScript.Shell': IWshRuntimeLibrary.WshShell;
 }
-
-interface EnumeratorConstructor {
-    new(col: IWshRuntimeLibrary.WshCollection): Enumerator;
-    new(col: IWshRuntimeLibrary.WshEnvironment): Enumerator<string>;
-}
diff --git a/types/activex-iwshruntimelibrary/tsconfig.json b/types/activex-iwshruntimelibrary/tsconfig.json
index d2d55bbe09..1fa5abc39b 100644
--- a/types/activex-iwshruntimelibrary/tsconfig.json
+++ b/types/activex-iwshruntimelibrary/tsconfig.json
@@ -1,8 +1,10 @@
-
 {
     "compilerOptions": {
         "module": "commonjs",
-        "lib": ["es5", "scripthost"],
+        "lib": [
+            "es5",
+            "scripthost"
+        ],
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
diff --git a/types/activex-scripting/activex-scripting-tests.ts b/types/activex-scripting/activex-scripting-tests.ts
index 2297548b81..313e480cb5 100644
--- a/types/activex-scripting/activex-scripting-tests.ts
+++ b/types/activex-scripting/activex-scripting-tests.ts
@@ -1,60 +1,324 @@
-// source -- https://msdn.microsoft.com/en-us/library/ebkhfaaz.aspx
+// Note -- running these tests under cscript requires some ES5 polyfills
 
-// Generates a string describing the drive type of a given Drive object.
-function showDriveType(drive: Scripting.Drive) {
-    switch (drive.DriveType) {
-        case Scripting.DriveTypeConst.Removable:
-            return 'Removeable';
-        case Scripting.DriveTypeConst.Fixed:
-            return 'Fixecd';
-        case Scripting.DriveTypeConst.Remote:
-            return 'Network';
-        case Scripting.DriveTypeConst.CDRom:
-            return 'CD-ROM';
-        case Scripting.DriveTypeConst.RamDisk:
-            return 'RAM Disk';
-        default:
-            return 'Unknown';
+const collectionToArray = <T>(col: { Item(key: any): T }): T[] => {
+    const results: T[] = [];
+    const enumerator = new Enumerator<T>(col);
+    enumerator.moveFirst();
+    while (!enumerator.atEnd()) {
+        results.push(enumerator.item());
+        enumerator.moveNext();
     }
-}
+    return results;
+};
 
-// Generates a string describing the attributes of a file or folder.
-function showFileAttributes(file: Scripting.File) {
-    const attr = file.Attributes;
-    if (attr === 0) {
-        return 'Normal';
+const fso = new ActiveXObject('Scripting.FileSystemObject');
+
+// https://msdn.microsoft.com/en-us/library/ebkhfaaz(v=vs.84).aspx
+{
+    /** Generates a string describing the drive type of a given Drive object. */
+    const driveTypeString = (drive: Scripting.Drive) => {
+        switch (drive.DriveType) {
+            case Scripting.DriveTypeConst.Removable:
+                return 'Removeable';
+            case Scripting.DriveTypeConst.Fixed:
+                return 'Fixecd';
+            case Scripting.DriveTypeConst.Remote:
+                return 'Network';
+            case Scripting.DriveTypeConst.CDRom:
+                return 'CD-ROM';
+            case Scripting.DriveTypeConst.RamDisk:
+                return 'RAM Disk';
+            default:
+                return 'Unknown';
+        }
+    };
+
+    /** Generates a string describing the attributes of a file or folder. */
+    const attributesString = (f: Scripting.File | Scripting.Folder) => {
+        const attr = f.Attributes;
+        if (attr === 0) {
+            return 'Normal';
+        }
+        const attributeStrings: string[] = [];
+        if (attr & Scripting.FileAttribute.Directory) { attributeStrings.push('Directory'); }
+        if (attr & Scripting.FileAttribute.ReadOnly) { attributeStrings.push('Read-only'); }
+        if (attr & Scripting.FileAttribute.Hidden) { attributeStrings.push('Hidden'); }
+        if (attr & Scripting.FileAttribute.System) { attributeStrings.push('System'); }
+        if (attr & Scripting.FileAttribute.Volume) { attributeStrings.push('Volume'); }
+        if (attr & Scripting.FileAttribute.Archive) { attributeStrings.push('Archive'); }
+        if (attr & Scripting.FileAttribute.Alias) { attributeStrings.push('Alias'); }
+        if (attr & Scripting.FileAttribute.Compressed) { attributeStrings.push('Compressed'); }
+        return attributeStrings.join(',');
+    };
+
+    const drivesInfoReport = () => {
+        const driveLine = (d: Scripting.Drive) => {
+            let parts: Array<string | number> = [
+                d.DriveLetter,
+                d.Path,
+                driveTypeString(d),
+                d.IsReady ? 'true' : 'false'
+            ];
+            if (d.IsReady) {
+                parts = parts.concat([
+                    d.DriveType === Scripting.DriveTypeConst.Remote ? d.ShareName : d.VolumeName,
+                    d.FileSystem,
+                    d.TotalSize,
+                    d.FreeSpace,
+                    d.AvailableSpace,
+                    d.SerialNumber.toString(16)
+                ]);
+            }
+            return parts.join('    ');
+        };
+
+        const ret = `
+Number of drives:    ${fso.Drives.Count}
+
+        Drive        File    Total   Free    Available    Serial
+Letter    Path    Type    Ready?    Name    System    Space    Space     Space    Number
+${new Array(106).join('-')}
+${collectionToArray(fso.Drives).map(driveLine).join('\n')}`
+            .trim().replace('    ', '\t');
+    };
+
+    type fiileFolderKey = keyof Scripting.File & keyof Scripting.Folder;
+    type keys = fiileFolderKey | 'Attribs' | 'Created' | 'Accessed' | 'Modified';
+    const detailBuilder = (f: Scripting.File | Scripting.Folder, x: fiileFolderKey | 'Attribs' | 'Created' | 'Accessed' | 'Modified') => {
+        if (x === 'Attribs') { return attributesString(f); }
+        const label = x;
+        switch (x) {
+            case 'Created':
+                x = 'DateCreated';
+                break;
+            case 'Accessed':
+                x = 'DateLastAccessed';
+                break;
+            case 'Modified':
+                x = 'DateLastModified';
+                break;
+        }
+        return `${label}\t${f[x]}\n`;
+    };
+
+    const fileDetailsString = (f: Scripting.File) => {
+        const keys: keys[] = ['Path', 'Name', 'Type', 'Attribs', 'Created', 'Accessed', 'Modified', 'Size'];
+        return keys.map(x => detailBuilder(f, x)).join('');
+    };
+
+    const folderDetailsString = (f: Scripting.Folder) => {
+        const keys: keys[] = ['Path', 'Name', 'Attribs', 'Created', 'Accessed', 'Modified', 'Size'];
+        return keys.map(x => detailBuilder(f, x)).join('');
+    };
+
+    const folderContentsString = (f: Scripting.Folder): string => {
+        const files = collectionToArray(f.Files);
+        const subfolders = collectionToArray(f.SubFolders);
+        return `
+Folder:    ${f.Path}
+
+There ${files.length === 1 ? 'is 1 file' : `are ${files.length} files`}
+${files.map(fileDetailsString).join('')}
+
+There ${subfolders.length === 1 ? 'is 1 subfolder' : `are ${subfolders.length} subfolders`}
+${subfolders.map(folderDetailsString).join('')}
+${subfolders.map(folderContentsString).join('')}`
+            .trim().replace('    ', '\t');
+    };
+
+    const testDrive = 'C:\\';
+    const testPath = 'C:\\test';
+    const testfolderInfo = () => {
+        if (!fso.DriveExists(testDrive) || !fso.FolderExists(testPath)) { return ''; }
+        return folderContentsString(fso.GetFolder(testPath));
+    };
+
+    const deleteTestFolder = () => {
+        // two ways to delete a file:
+        const filepathToDelete = `${testPath}\\LoremIpsum\\Paragraph1.txt`;
+        fso.DeleteFile(filepathToDelete);
+        // fso.GetFile(filepathToDelete).Delete();
+
+        // two ways to delete a folder:
+        fso.DeleteFolder(`${testPath}\\LoremIpsum`);
+        fso.GetFolder(testPath).Delete();
+    };
+
+    const createLyrics = (folder: Scripting.Folder) => {
+        let stream = folder.CreateTextFile('Paragraph1.txt');
+        stream.Write('Lorem Ipsum - Paragraph 1');
+        stream.WriteBlankLines(1);
+        stream.WriteLine('Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Maecenas sem.');
+        stream.WriteLine('Donec ante. Nulla facilisi. Phasellus interdum nulla a nunc. Morbi laoreet nunc.');
+        stream.WriteBlankLines(2);
+        stream.Close();
+
+        stream = folder.CreateTextFile('Paragraph2.txt');
+        stream.WriteLine('Lorem Ipsum - Paragraph 2');
+        stream.WriteBlankLines(1);
+        stream.WriteLine('Nullam nulla quam, sollicitudin ut, lobortis ornare, tristique a, augue.');
+        stream.WriteLine('Vestibulum sem felis, fermentum eu, volutpat eu, vulputate eget, elit. ');
+        stream.WriteBlankLines(2);
+        stream.Close();
+    };
+
+    const getLyrics = () => {
+        const folderPath = `${testPath}\\LoremIpsum`;
+        let lyrics = '';
+
+        // One way to read from a file
+        let stream = fso.OpenTextFile(fso.BuildPath(folderPath, 'Paragraph1.txt'));
+        lyrics = stream.ReadAll() + '\n\n';
+        stream.Close();
+
+        // Another way to read from a file
+        stream = fso.GetFile(fso.BuildPath(folderPath, 'Paragraph2.txt')).OpenAsTextStream();
+        while (!stream.AtEndOfStream) {
+            lyrics += stream.ReadLine() + '\n';
+        }
+        stream.Close();
+
+        return lyrics;
+    };
+
+    const buildTestFolder = () => {
+        // Bail out if the drive doesn't exists ...
+        if (!fso.DriveExists(testDrive)) { return false; }
+        // or the directory already exists
+        if (fso.FolderExists(testPath)) { return false; }
+
+        const testFolder = fso.CreateFolder(testPath);
+
+        const stream = fso.CreateTextFile(fso.BuildPath(testPath, 'readme.txt'));
+        stream.WriteLine('My sample text collection');
+        stream.Close();
+
+        const subfolder = testFolder.SubFolders.Add('LoremIpsum');
+        createLyrics(subfolder);
+        return true;
+    };
+
+    const echoLines = (linecount = 1) => new Array(linecount).forEach(() => WScript.Echo(''));
+
+    if (!buildTestFolder()) {
+        WScript.Echo('Test directory already exists or cannot be created. Cannot continue.');
+    } else {
+        drivesInfoReport();
+        echoLines(2);
+        WScript.Echo(testfolderInfo());
+        echoLines(2);
+        WScript.Echo(getLyrics());
+        echoLines(2);
+        deleteTestFolder();
     }
-    const attributeStrings: string[] = [];
-    if (attr & Scripting.FileAttribute.Directory) { attributeStrings.push('Directory'); }
-    if (attr & Scripting.FileAttribute.ReadOnly) { attributeStrings.push('Read-only'); }
-    if (attr & Scripting.FileAttribute.Hidden) { attributeStrings.push('Hidden'); }
-    if (attr & Scripting.FileAttribute.System) { attributeStrings.push('System'); }
-    if (attr & Scripting.FileAttribute.Volume) { attributeStrings.push('Volume'); }
-    if (attr & Scripting.FileAttribute.Archive) { attributeStrings.push('Archive'); }
-    if (attr & Scripting.FileAttribute.Alias) { attributeStrings.push('Alias'); }
-    if (attr & Scripting.FileAttribute.Compressed) { attributeStrings.push('Compressed'); }
-    return attributeStrings.join(',');
 }
 
 // source --https://msdn.microsoft.com/en-us/library/ts2t8ybh(v=vs.84).aspx
-function showFreeSpace(drvPath: string) {
-    const fso = new ActiveXObject('Scripting.FileSystemObject');
-    const d = fso.GetDrive(fso.GetDriveName(drvPath));
-    let s = `Drive ${drvPath} - `;
-    s += d.VolumeName + '<br>';
-    s += `Free Space: ${d.FreeSpace / 1024} Kbytes`;
-    return (s);
+{
+    const showFreeSpace = (drvPath: string) => {
+        const d = fso.GetDrive(fso.GetDriveName(drvPath));
+        let s = `Drive ${drvPath} - `;
+        s += d.VolumeName + '<br>';
+        s += `Free Space: ${d.FreeSpace / 1024} Kbytes`;
+        return (s);
+    };
 }
 
 // source -- https://msdn.microsoft.com/en-us/library/kaf6yaft(v=vs.84).aspx
-function getALine(filespec: string) {
-    const fso = new ActiveXObject('Scripting.FileSystemObject');
-    const file = fso.OpenTextFile(filespec, Scripting.IOMode.ForReading, false);
+{
+    const getALine = (filespec: string) => {
+        const file = fso.OpenTextFile(filespec, Scripting.IOMode.ForReading, false);
 
-    let s = '';
-    while (!file.AtEndOfLine) {
-        s += file.Read(1);
-    }
-    file.Close();
-    return (s);
+        let s = '';
+        while (!file.AtEndOfLine) {
+            s += file.Read(1);
+        }
+        file.Close();
+        return (s);
+    };
+}
+
+// https://msdn.microsoft.com/en-us/library/ch28h2s7(v=vs.84).aspx
+{
+    const showDriveInfo = (path: string) => {
+        const bytesPerGB = 1024 * 1024 * 1024;
+        const drv = fso.GetDrive(fso.GetDriveName(path));
+        const ret =
+            drv.IsReady ?
+            `${drv.Path} - ${drv.FreeSpace / bytesPerGB} GB free of ${drv.TotalSize / bytesPerGB} GB` :
+            'Not ready';
+        WScript.Echo(ret);
+    };
+
+    const showFolderInfo = () => {
+        const fldr = fso.GetFolder("c:\\");
+        let ret = `
+Folder: ${fldr.Path}
+Drive: ${fldr.Drive}
+${fldr.IsRootFolder ? 'Is root folder' : `Parent folder: ${fldr.ParentFolder}`}
+        `.trim();
+
+        // Create and delete a folder.
+        const newFolderName = 'C:\\TempFolder1';
+        fso.CreateFolder(newFolderName);
+        ret += `Base Name of Added Folder: ${fso.GetBaseName(newFolderName)}`;
+        fso.DeleteFolder(newFolderName);
+
+        WScript.Echo(ret);
+    };
+}
+
+// https://msdn.microsoft.com/en-us/library/czxefwt8(v=vs.84).aspx
+{
+    const readFiles = () => {
+        const file = fso.CreateTextFile("c:\\testfile.txt", true);
+
+        // Write a line.
+        WScript.Echo('Writing file');
+        file.WriteLine("Hello World");
+        file.WriteBlankLines(1);
+        file.Close();
+
+        // Read the contents of the file.
+        WScript.Echo('Reading file');
+        const textStream = fso.OpenTextFile("c:\\testfile.txt", Scripting.IOMode.ForReading);
+        WScript.Echo(`File contents = "${textStream.ReadLine()}"`);
+        textStream.Close();
+    };
+
+    const manipulateFiles = () => {
+        const file = fso.CreateTextFile("c:\\testfile.txt", true);
+
+        WScript.Echo('Writing file');
+
+        // Write a line.
+        file.Write("This is a test.");
+
+        // Close the file to writing.
+        file.Close();
+
+        WScript.Echo('Moving file to c:\\tmp');
+
+        // Get a handle to the file in root of C:\.
+        let file2 = fso.GetFile("c:\\testfile.txt");
+
+        // Move the file to \tmp directory.
+        file2.Move("c:\\tmp\\testfile.txt");
+
+        WScript.Echo('Copying file to c:\\temp <br>');
+
+        // Copy the file to \temp.
+        file2.Copy('c:\\temp\\testfile.txt');
+
+        WScript.Echo('Deleting files <br>');
+
+        // Get handles to files' current location.
+        file2 = fso.GetFile('c:\\tmp\\testfile.txt');
+        const file3 = fso.GetFile('c:\\temp\\testfile.txt');
+
+        // Delete the files.
+        file2.Delete();
+        file3.Delete();
+        WScript.Echo('All done!');
+    };
 }
diff --git a/types/activex-scripting/index.d.ts b/types/activex-scripting/index.d.ts
index c4a64c54af..42e4f0c9e0 100644
--- a/types/activex-scripting/index.d.ts
+++ b/types/activex-scripting/index.d.ts
@@ -1,24 +1,28 @@
 // Type definitions for Microsoft Scripting Runtime 1.0
-// Project: https://msdn.microsoft.com/en-us/library/bstcxhf7.aspx
+// Project: https://msdn.microsoft.com/en-us/library/bstcxhf7(v=vs.84).aspx
 // Definitions by: Zev Spitz <https://github.com/zspitz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.6
 
 declare namespace Scripting {
+    // tslint:disable-next-line:no-const-enum
     const enum CompareMethod {
         BinaryCompare = 0,
         DatabaseCompare = 2,
-        TextCompare = 1
+        TextCompare = 1,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum DriveTypeConst {
         CDRom = 4,
         Fixed = 2,
         RamDisk = 5,
         Remote = 3,
         Removable = 1,
-        UnknownType = 0
+        UnknownType = 0,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum FileAttribute {
         Alias = 1024,
         Archive = 32,
@@ -28,38 +32,42 @@ declare namespace Scripting {
         Normal = 0,
         ReadOnly = 1,
         System = 4,
-        Volume = 8
+        Volume = 8,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum IOMode {
         ForAppending = 8,
         ForReading = 1,
-        ForWriting = 2
+        ForWriting = 2,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum SpecialFolderConst {
         SystemFolder = 1,
         TemporaryFolder = 2,
-        WindowsFolder = 0
+        WindowsFolder = 0,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum StandardStreamTypes {
         StdErr = 2,
         StdIn = 0,
-        StdOut = 1
+        StdOut = 1,
     }
 
+    // tslint:disable-next-line:no-const-enum
     const enum Tristate {
         TristateFalse = 0,
         TristateMixed = -2,
         TristateTrue = -1,
-        TristateUseDefault = -2
+        TristateUseDefault = -2,
     }
 
     /** Scripting.Dictionary */
-    interface Dictionary {
+    interface Dictionary<TKey = any, TItem = any> {
         /** Add a new key and item to the dictionary. */
-        Add(Key: any, Item: any): void;
+        Add(Key: TKey, Item: TItem): void;
 
         /** Set or get the string comparison method. */
         CompareMode: CompareMethod;
@@ -68,32 +76,38 @@ declare namespace Scripting {
         readonly Count: number;
 
         /** Determine if a given key is in the dictionary. */
-        Exists(Key: any): boolean;
-        HashVal(Key: any): any;
+        Exists(Key: TKey): boolean;
+        HashVal(Key: TKey): any;
 
         /** Set or get the item for a given key */
-        Item(Key: any): any;
+        Item(Key: TKey): TItem;
 
         /** Get an array containing all items in the dictionary. */
-        Items(): any;
+        Items(): SafeArray<TItem>;
 
         /** Change a key to a different key. */
-        Key(Key: any): any;
+        Key(Key: TKey): TKey;
 
         /** Get an array containing all keys in the dictionary. */
-        Keys(): any;
+        Keys(): SafeArray<TKey>;
 
         /** Remove a given key from the dictionary. */
-        Remove(Key: any): void;
+        Remove(Key: TKey): void;
 
         /** Remove all information from the dictionary. */
         RemoveAll(): void;
+
+        /** Set or get the item for a given key */
+        (Key: TKey): TItem;
     }
 
     /** Drive Object */
-    interface Drive {
+    class Drive {
+        private constructor();
+        private 'Scripting.Drive_typekey': Drive;
+
         /** Get available space */
-        readonly AvailableSpace: any;
+        readonly AvailableSpace: number;
 
         /** Drive letter */
         readonly DriveLetter: string;
@@ -105,7 +119,7 @@ declare namespace Scripting {
         readonly FileSystem: string;
 
         /** Get drive free space */
-        readonly FreeSpace: any;
+        readonly FreeSpace: number;
 
         /** Check if disk is available */
         readonly IsReady: boolean;
@@ -123,7 +137,7 @@ declare namespace Scripting {
         readonly ShareName: string;
 
         /** Get total drive size */
-        readonly TotalSize: any;
+        readonly TotalSize: number;
 
         /** Name of volume */
         VolumeName: string;
@@ -134,18 +148,27 @@ declare namespace Scripting {
         /** Number of drives */
         readonly Count: number;
 
-        /** Get drive */
-        Item(Key: any): Drive;
+        /** Get drive using the drive letter (`C`) or path (`C:\\`) */
+        Item(Key: string): Drive;
+
+        /** Get drive using the drive letter (`C`) or path (`C:\\`) */
+        (Key: string): Drive;
     }
 
     /** Script Encoder Object */
     interface Encoder {
         /** Call the Encoder determined by szExt, passing bstrStreamIn and optional arguments */
         EncodeScriptFile(szExt: string, bstrStreamIn: string, cFlags: number, bstrDefaultLang: string): string;
+
+        /** Call the Encoder determined by szExt, passing bstrStreamIn and optional arguments */
+        (szExt: string, bstrStreamIn: string, cFlags: number, bstrDefaultLang: string): string;
     }
 
     /** File object */
-    interface File {
+    class File {
+        private constructor();
+        private 'Scripting.File_typekey': File;
+
         /** File attributes */
         Attributes: FileAttribute;
 
@@ -166,7 +189,7 @@ declare namespace Scripting {
 
         /**
          * Delete this file
-         * @param boolean [Force=false]
+         * @param boolean [Force=false] Pass `true` to delete the file even if the read-only attribute is set
          */
         Delete(Force?: boolean): void;
 
@@ -199,7 +222,7 @@ declare namespace Scripting {
         readonly ShortPath: string;
 
         /** File size */
-        readonly Size: any;
+        readonly Size: number;
 
         /** Type description */
         readonly Type: string;
@@ -210,12 +233,18 @@ declare namespace Scripting {
         /** Number of folders */
         readonly Count: number;
 
+        /** Get file object using the name and extension of the file */
+        Item(Key: string): File;
+
         /** Get file */
-        Item(Key: any): File;
+        (Key: string): File;
     }
 
     /** FileSystem Object */
-    interface FileSystemObject {
+    class FileSystemObject {
+        private constructor();
+        private 'Scripting.FileSystemObject_typekey': FileSystemObject;
+
         /** Generate a path from an existing path and a name */
         BuildPath(Path: string, Name: string): string;
 
@@ -243,13 +272,13 @@ declare namespace Scripting {
 
         /**
          * Delete a file
-         * @param boolean [Force=false]
+         * @param boolean [Force=false] Pass `true` to also delete files with the read-only attribute set
          */
         DeleteFile(FileSpec: string, Force?: boolean): void;
 
         /**
          * Delete a folder
-         * @param boolean [Force=false]
+         * @param boolean [Force=false] Pass `true` to also delete folders with the read-only attribute set
          */
         DeleteFolder(FolderSpec: string, Force?: boolean): void;
 
@@ -317,13 +346,16 @@ declare namespace Scripting {
          * Open a file as a TextStream
          * @param Scripting.IOMode [IOMode=1]
          * @param boolean [Create=false]
-         * @param Scripting.Tristate [Format=0]
+         * @param Scripting.Tristate [Format=0] **TristateTrue** opens the file as Unicode; **TristateFalse** opens the file as ASCII;  **TristateUseDefault** opens the file with  the system default
          */
         OpenTextFile(FileName: string, IOMode?: IOMode, Create?: boolean, Format?: Tristate): TextStream;
     }
 
     /** Folder object */
-    interface Folder {
+    class Folder {
+        private constructor();
+        private 'Scripting.Folder_typekey': Folder;
+
         /** Folder attributes */
         Attributes: FileAttribute;
 
@@ -351,7 +383,7 @@ declare namespace Scripting {
 
         /**
          * Delete this folder
-         * @param boolean [Force=false]
+         * @param boolean [Force=false] Pass `true` to delete the folder even if the read-only attribute set
          */
         Delete(Force?: boolean): void;
 
@@ -383,7 +415,7 @@ declare namespace Scripting {
         readonly ShortPath: string;
 
         /** Sum of files and subfolders */
-        readonly Size: any;
+        readonly Size: number;
 
         /** Get folders collection */
         readonly SubFolders: Folders;
@@ -400,12 +432,18 @@ declare namespace Scripting {
         /** Number of folders */
         readonly Count: number;
 
-        /** Get folder */
-        Item(Key: any): Folder;
+        /** Get folder in collection using the folder's name */
+        Item(Key: string): Folder;
+
+        /** Get folder in collection using the folder's name */
+        (Key: string): Folder;
     }
 
     /** TextStream object */
-    interface TextStream {
+    class TextStream {
+        private constructor();
+        private 'Scripting.TextStream_typekey': TextStream;
+
         /** Is the current position at the end of a line? */
         readonly AtEndOfLine: boolean;
 
@@ -451,15 +489,12 @@ declare namespace Scripting {
 }
 
 interface ActiveXObject {
+    new <K extends keyof ActiveXObjectNameMap = any>(progid: K): ActiveXObjectNameMap[K];
     set(obj: Scripting.Dictionary, propertyName: 'Item', parameterTypes: [any], newValue: any): void;
-    new(progid: 'Scripting.Dictionary'): Scripting.Dictionary;
-    new(progid: 'Scripting.Encoder'): Scripting.Encoder;
-    new(progid: 'Scripting.FileSystemObject'): Scripting.FileSystemObject;
 }
 
-interface EnumeratorConstructor {
-    new(col: Scripting.Dictionary): any;
-    new(col: Scripting.Drives): Scripting.Drive;
-    new(col: Scripting.Files): Scripting.File;
-    new(col: Scripting.Folders): Scripting.Folder;
+interface ActiveXObjectNameMap {
+    'Scripting.Dictionary': Scripting.Dictionary;
+    'Scripting.Encoder': Scripting.Encoder;
+    'Scripting.FileSystemObject': Scripting.FileSystemObject;
 }
diff --git a/types/activex-scripting/tslint.json b/types/activex-scripting/tslint.json
index 3224b40b8b..f93cf8562a 100644
--- a/types/activex-scripting/tslint.json
+++ b/types/activex-scripting/tslint.json
@@ -1,6 +1,3 @@
 {
-    "extends": "dtslint/dt.json",
-    "rules": {
-        "no-const-enum": false
-    }
+    "extends": "dtslint/dt.json"
 }
diff --git a/types/activex-shdocvw/tsconfig.json b/types/activex-shdocvw/tsconfig.json
index 1759b6965f..1907cb1ef6 100644
--- a/types/activex-shdocvw/tsconfig.json
+++ b/types/activex-shdocvw/tsconfig.json
@@ -1,8 +1,10 @@
-
 {
     "compilerOptions": {
         "module": "commonjs",
-        "lib": ["es5", "scripthost"],
+        "lib": [
+            "es5",
+            "scripthost"
+        ],
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
diff --git a/types/activex-shell/activex-shell-tests.ts b/types/activex-shell/activex-shell-tests.ts
index 1a7e08754c..f236f6e592 100644
--- a/types/activex-shell/activex-shell-tests.ts
+++ b/types/activex-shell/activex-shell-tests.ts
@@ -59,7 +59,7 @@ shell.ShowBrowserBar(Shell32.ExplorerBarCLSID.Favorites, true);
 
 // https://msdn.microsoft.com/en-us/library/windows/desktop/bb774107(v=vs.85).aspx
 const wshShell = new ActiveXObject('WScript.Shell');
-wshShell.Popup(shell.Windows().Count);
+wshShell.Popup(shell.Windows().Count.toString());
 
 // https://msdn.microsoft.com/en-us/library/windows/desktop/bb787866(v=vs.85).aspx
 shell.NameSpace(`c:\\windows`)!.CopyHere('c:\\autoexec.bat');
diff --git a/types/activex-shell/tsconfig.json b/types/activex-shell/tsconfig.json
index 97b3ee81cb..f4b549f649 100644
--- a/types/activex-shell/tsconfig.json
+++ b/types/activex-shell/tsconfig.json
@@ -1,8 +1,10 @@
-
 {
     "compilerOptions": {
         "module": "commonjs",
-        "lib": ["es5", "scripthost"],
+        "lib": [
+            "es5",
+            "scripthost"
+        ],
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
diff --git a/types/add-zero/tsconfig.json b/types/add-zero/tsconfig.json
index e71d235cdf..d7645a2e3c 100644
--- a/types/add-zero/tsconfig.json
+++ b/types/add-zero/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "add-zero-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/adone/glosses/collections.d.ts b/types/adone/glosses/collections.d.ts
deleted file mode 100644
index 178921136d..0000000000
--- a/types/adone/glosses/collections.d.ts
+++ /dev/null
@@ -1,1965 +0,0 @@
-declare namespace adone {
-    namespace collection {
-        namespace I.LinkedList {
-            /**
-             * Represents the node of a linked list
-             */
-            interface Node<T> {
-                /**
-                 * The next node
-                 */
-                next?: Node<T>;
-
-                /**
-                 * The previous node
-                 */
-                prev?: Node<T>;
-
-                /**
-                 * The value this node contains
-                 */
-                value: T;
-            }
-        }
-
-        /**
-         * Represents a linked list
-         */
-        class LinkedList<T = any> {
-            /**
-             * The maximum length of the list
-             */
-            readonly maxLength: number;
-
-            /**
-             * Current length of the list
-             */
-            readonly length: number;
-
-            /**
-             * Whether the list is autoresizable
-             */
-            readonly autoresize: boolean;
-
-            /**
-             * @param maxLength Maximum length of the linked list
-             */
-            constructor(maxLength?: number);
-
-            /**
-             * Whether the list is full
-             */
-            readonly full: boolean;
-
-            /**
-             * Whether the list is empty
-             */
-            readonly empty: boolean;
-
-            /**
-             * Resizes the list
-             */
-            resize(newLength: number): this;
-
-            /**
-             * Adds a new node to the end
-             *
-             * @returns Added node
-             */
-            push(value: T): I.LinkedList.Node<T>;
-
-            /**
-             * Removes the last node, returns undefined if the list is empty
-             */
-            pop(): T | undefined;
-
-            /**
-             * Removes the first node, returns undefined if the list is empty
-             */
-            shift(): T | undefined;
-
-            /**
-             * Inserts a new node at the beginning of the list
-             *
-             * @returns Added node
-             */
-            unshift(value: T): I.LinkedList.Node<T>;
-
-            /**
-             * Moves the given node to the end of the list
-             */
-            pushNode(node: I.LinkedList.Node<T>): void;
-
-            /**
-             * Moved the given node to the beginning of the list
-             */
-            unshiftNode(node: I.LinkedList.Node<T>): void;
-
-            /**
-             * Removes the given node from the list
-             */
-            removeNode(node: I.LinkedList.Node<T>): void;
-
-            /**
-             * Clears the list
-             *
-             * @param strong Whether to reset all the node's values
-             */
-            clear(strong?: boolean): void;
-
-            /**
-             * Convers the list to an array
-             */
-            toArray(): T[];
-
-            /**
-             * The first element of the list
-             */
-            readonly front: T;
-
-            /**
-             * The last element of the list
-             */
-            readonly back: T;
-
-            /**
-             * Returns an iterator over the list elements
-             */
-            [Symbol.iterator](): IterableIterator<T>;
-
-            /**
-             * Returns the next node for the given node
-             */
-            nextNode(node: I.LinkedList.Node<T>): I.LinkedList.Node<T>;
-
-            /**
-             * Maps this linked list to a new one using the given function
-             */
-            map<R>(fn: (value: T, index: number) => R): LinkedList<R>;
-
-            /**
-             * Invokes the given callback for each value from the beginning to the end (much faster than for-of).
-             * If the given function returns false it stops iterating.
-             */
-            forEach(callback: (value: T, index: number) => void | boolean): void;
-
-            /**
-             * Default length of a new created linked list
-             */
-            static DEFAULT_LENGTH: number;
-        }
-
-        namespace I {
-            type Long = math.Long;
-
-            type Longable = math.I.Longable;
-
-            namespace ByteArray {
-                interface Varint32 {
-                    value: number;
-                    length: number;
-                }
-
-                interface Varint64 {
-                    value: Long;
-                    length: number;
-                }
-
-                interface String {
-                    string: string;
-                    length: number;
-                }
-
-                type Wrappable = string | ByteArray | Buffer | Uint8Array | ArrayBuffer;
-
-                type Metrics = "b" | "c";
-            }
-        }
-
-        /**
-         * Represents an array of bytes, enhanced Node.js Buffer
-         */
-        class ByteArray {
-            /**
-             * Constructs a new ByteArray
-             *
-             * @param capacity Initial capacity. Defaults to ByteArray.DEFAULT_CAPACITY(64)
-             * @param noAssert Whether to skip assertions of offsets and values. Defaults to ByteArray.DEFAULT_NOASSERT(false)
-             */
-            constructor(capacity?: number, noAssert?: boolean);
-
-            /**
-             * Reads a BitSet as an array of booleans.
-             *
-             * @param offset Offset to read from. Will use and increase offset by length if omitted.
-             */
-            readBitSet(offset?: number): boolean[];
-
-            /**
-             * Reads the specified number of bytes.
-             *
-             * @param length Number of bytes to read
-             * @param offset Offset to read from. Will use and increase offset by length if omitted.
-             */
-            read(length: number, offset?: number): ByteArray;
-
-            /**
-             * Reads an 8bit signed integer
-             *
-             * @param offset Offset to read from
-             */
-            readInt8(offset?: number): number;
-
-            /**
-             * Reads an 8bit unsigned integer
-             *
-             * @param offset Offset to read from
-             */
-            readUInt8(offset?: number): number;
-
-            /**
-             * Reads a 16bit signed le integer
-             *
-             * @param offset Offset to read from
-             */
-            readInt16LE(offset?: number): number;
-
-            /**
-             * Reads a 16bit unsigned le integer
-             *
-             * @param offset Offset to read from
-             */
-            readUInt16LE(offset?: number): number;
-
-            /**
-             * Reads a 16bit signed be integer
-             *
-             * @param offset Offset to read from
-             */
-            readInt16BE(offset?: number): number;
-
-            /**
-             * Reads a 16bit unsigned be integer
-             *
-             * @param offset Offset to read from
-             */
-            readUInt16BE(offset?: number): number;
-
-            /**
-             * Reads a 32bit signed le integer
-             *
-             * @param offset Offset to read from
-             */
-            readInt32LE(offset?: number): number;
-
-            /**
-             * Reads a 32bit unsigned le integer
-             *
-             * @param offset Offset to read from
-             */
-            readUInt32LE(offset?: number): number;
-
-            /**
-             * Reads a 32bit signed be integer
-             *
-             * @param offset Offset to read from
-             */
-            readInt32BE(offset?: number): number;
-
-            /**
-             * Reads a 32bit unsigned be integer
-             *
-             * @param offset Offset to read from
-             */
-            readUInt32BE(offset?: number): number;
-
-            /**
-             * Reads a 64bit signed le integer as math.Long
-             *
-             * @param offset Offset to read from
-             */
-            readInt64LE(offset?: number): math.Long;
-
-            /**
-             * Reads a 64bit unsigned le integer as math.Long
-             *
-             * @param offset Offset to read from
-             */
-            readUInt64LE(offset?: number): math.Long;
-
-            /**
-             * Reads a 64bit signed be integer as math.Long
-             *
-             * @param offset Offset to read from
-             */
-            readInt64BE(offset?: number): math.Long;
-
-            /**
-             * Reads a 64bit unsigned be integer as math.Long
-             *
-             * @param offset Offset to read from
-             */
-            readUInt64BE(offset?: number): math.Long;
-
-            /**
-             * Reads a 32bit le float
-             *
-             * @param offset Offset to read from
-             */
-            readFloatLE(offset?: number): number;
-
-            /**
-             * Reads a 32bit be float
-             *
-             * @param offset Offset to read from
-             */
-            readFloatBE(offset?: number): number;
-
-            /**
-             * Reads a 64bit le float
-             *
-             * @param offset Offset to read from
-             */
-            readDoubleLE(offset?: number): number;
-
-            /**
-             * Reads a 64bit be float
-             *
-             * @param offset Offset to read from
-             */
-            readDoubleBE(offset?: number): number;
-
-            /**
-             * Appends some data to this ByteArray.
-             * This will overwrite any contents behind the specified offset up to the appended data's length.
-             *
-             * @param source The source write from
-             * @param offset Offset to write to
-             * @param length length to read from the source
-             * @param encoding encoding to use for wrapping the source in bytearray
-             */
-            write(source: I.ByteArray.Wrappable, offset?: number, length?: number, encoding?: string): this;
-
-            /**
-             * Writes the array as a bitset.
-             * @param value Array of booleans to write
-             */
-            writeBitSet(value: number[]): this;
-
-            /**
-             * Writes the array as a bitset.
-             * @param value Array of booleans to write
-             * @param offset Offset to write to
-             */
-            writeBitSet(value: number[], offset: number): number;
-
-            /**
-             * Writes an 8bit signed integer
-             *
-             * @param offset Offset to write to
-             */
-            writeInt8(value: number, offset?: number): this;
-
-            /**
-             * Writes an 8bit unsigned integer
-             *
-             * @param offset Offset to write to
-             */
-            writeUInt8(value: number, offset?: number): this;
-
-            /**
-             * Writes a 16bit signed le integer
-             *
-             * @param offset Offset to write to
-             */
-            writeInt16LE(value: number, offset?: number): this;
-
-            /**
-             * Writes a 16bit signed be integer
-             *
-             * @param offset Offset to write to
-             */
-            writeInt16BE(value: number, offset?: number): this;
-
-            /**
-             * Writes a 16bit unsigned le integer
-             *
-             * @param offset Offset to write to
-             */
-            writeUInt16LE(value: number, offset?: number): this;
-
-            /**
-             * Writes a 16bit unsigned be integer
-             *
-             * @param offset Offset to write to
-             */
-            writeUInt16BE(value: number, offset?: number): this;
-
-            /**
-             * Writes a 32bit signed le integer
-             *
-             * @param offset Offset to write to
-             */
-            writeInt32LE(value: number, offset?: number): this;
-
-            /**
-             * Writes a 32bit signed be integer
-             *
-             * @param offset Offset to write to
-             */
-            writeInt32BE(value: number, offset?: number): this;
-
-            /**
-             * Writes a 32bit unsigned le integer
-             *
-             * @param offset Offset to write to
-             */
-            writeUInt32LE(value: number, offset?: number): this;
-
-            /**
-             * Writes a 32bit unsigned be integer
-             *
-             * @param offset Offset to write to
-             */
-            writeUInt32BE(value: number, offset?: number): this;
-
-            /**
-             * Writes a 64bit signed le long integer
-             *
-             * @param offset Offset to write to
-             */
-            writeInt64LE(value: math.Long | string | number, offset?: number): this;
-
-            /**
-             * Writes a 64bit signed be long integer
-             *
-             * @param offset Offset to write to
-             */
-            writeInt64BE(value: math.Long | string | number, offset?: number): this;
-
-            /**
-             * Writes a 64bit unsigned le long integer
-             *
-             * @param offset Offset to write to
-             */
-            writeUInt64LE(value: math.Long | string | number, offset?: number): this;
-
-            /**
-             * Writes a 64bit unsigned be long integer
-             *
-             * @param offset Offset to write to
-             */
-            writeUInt64BE(value: math.Long | string | number, offset?: number): this;
-
-            /**
-             * Writes a 32bit le float
-             *
-             * @param offset Offset to write to
-             */
-            writeFloatLE(value: number, offset?: number): this;
-
-            /**
-             * Writes a 32bit be float
-             *
-             * @param offset Offset to write to
-             */
-            writeFloatBE(value: number, offset?: number): this;
-
-            /**
-             * Writes a 64bit le float
-             *
-             * @param offset Offset to write to
-             */
-            writeDoubleLE(value: number, offset?: number): this;
-
-            /**
-             * Writes a 64bit be float
-             *
-             * @param offset Offset to write to
-             */
-            writeDoubleBE(value: number, offset?: number): this;
-
-            /**
-             * Writes a 32bit base 128 variable-length integer
-             */
-            writeVarint32(value: number): this;
-
-            /**
-             * Writes a 32bit base 128 variable-length integer
-             *
-             * @param offset Offset to write to
-             */
-            writeVarint32(value: number, offset: number): number;
-
-            /**
-             * Writes a zig-zag encoded 32bit base 128 variable-length integer
-             */
-            writeVarint32ZigZag(value: number): this;
-
-            /**
-             * Writes a zig-zag encoded 32bit base 128 variable-length integer
-             *
-             * @param offset Offset to write to
-             */
-            writeVarint32ZigZag(value: number, offset: number): number;
-
-            /**
-             * Reads a 32bit base 128 variable-length integer
-             */
-            readVarint32(): number;
-
-            /**
-             * Reads a 32bit base 128 variable-length integer
-             *
-             * @param offset Offset to read from
-             */
-            readVarint32(offset: number): I.ByteArray.Varint32;
-
-            /**
-             * Reads a zig-zag encoded 32bit base 128 variable-length integer
-             */
-            readVarint32ZigZag(): number;
-
-            /**
-             * Reads a zig-zag encoded 32bit base 128 variable-length integer
-             *
-             * @param offset Offset to read from
-             */
-            readVarint32ZigZag(offset: number): I.ByteArray.Varint32;
-
-            /**
-             * Writes a 64bit base 128 variable-length integer
-             */
-            writeVarint64(value: math.Long | string | number): this;
-
-            /**
-             * Writes a 64bit base 128 variable-length integer
-             *
-             * @param offset Offset to write to
-             */
-            writeVarint64(value: math.Long | string | number, offset: number): number;
-
-            /**
-             * Writes a zig-zag encoded 64bit base 128 variable-length integer
-             */
-            writeVarint64ZigZag(value: math.Long | string | number): this;
-
-            /**
-             * Writes a zig-zag encoded 64bit base 128 variable-length integer
-             *
-             * @param offset Offset to write to
-             */
-            writeVarint64ZigZag(value: math.Long | string | number, offset: number): number;
-
-            /**
-             * Reads a 64bit base 128 variable-length integer
-             */
-            readVarint64(): I.Long;
-
-            /**
-             * Reads a 64bit base 128 variable-length integer
-             *
-             * @param offset Offset to read from
-             */
-            readVarint64(offset: number): I.ByteArray.Varint64;
-
-            /**
-             * Reads a zig-zag encoded 64bit base 128 variable-length integer
-             */
-            readVarint64ZigZag(): math.Long;
-
-            /**
-             * Reads a zig-zag encoded 64bit base 128 variable-length integer
-             *
-             * @param offset Offset to read from
-             */
-            readVarint64ZigZag(offset: number): I.ByteArray.Varint64;
-
-            /**
-             * Writes a NULL-terminated UTF8 encoded string.
-             * For this to work the specified string must not contain any NULL characters itself
-             */
-            writeCString(str: string): this;
-
-            /**
-             * Writes a NULL-terminated UTF8 encoded string.
-             * For this to work the specified string must not contain any NULL characters itself
-             *
-             * @param offset Offset to write to
-             */
-            writeCString(str: string, offset: number): number;
-
-            /**
-             * Reads a NULL-terminated UTF8 encoded string.
-             * For this to work the string read must not contain any NULL characters itself
-             */
-            readCString(): string;
-
-            /**
-             * Reads a NULL-terminated UTF8 encoded string.
-             * For this to work the string read must not contain any NULL characters itself
-             *
-             * @param offset Offset to read from
-             */
-            readCString(offset: number): I.ByteArray.String;
-
-            /**
-             * Writes an UTF8 encoded string
-             */
-            writeString(str: string): this;
-
-            /**
-             * Writes an UTF8 encoded string
-             *
-             * @param offset Offset to write to
-             */
-            writeString(str: string, offset: number): number;
-
-            /**
-             * Reads an UTF8 encoded string
-             *
-             * @param length Number of characters or bytes to read
-             * @param metrics Metrics specifying what n is meant to count. Defaults to ByteArray.METRICS_CHARS("c")
-             */
-            readString(length: number, metrics?: I.ByteArray.Metrics): string;
-
-            /**
-             * Reads an UTF8 encoded string
-             *
-             * @param length Number of characters or bytes to read
-             * @param metrics Metrics specifying what n is meant to count. Defaults to ByteArray.METRICS_CHARS("c")
-             * @param offset Offset to read from
-             */
-            readString(length: number, metrics: I.ByteArray.Metrics, offset: number): I.ByteArray.String;
-
-            /**
-             * Reads an UTF8 encoded string
-             *
-             * @param length Number of characters or bytes to read
-             * @param offset Offset to read from
-             */
-            readString(length: number, offset: number): I.ByteArray.String;
-
-            /**
-             * Writes a length as varint32 prefixed UTF8 encoded string
-             */
-            writeVString(str: string): this;
-
-            /**
-             * Writes a length as varint32 prefixed UTF8 encoded string
-             *
-             * @param offset Offset to read from
-             */
-            writeVString(str: string, offset: number): number;
-
-            /**
-             * Reads a length as varint32 prefixed UTF8 encoded string
-             */
-            readVString(): string;
-
-            /**
-             * Reads a length as varint32 prefixed UTF8 encoded string
-             *
-             * @param offset Offset to read from
-             */
-            readVString(offset: number): I.ByteArray.String;
-
-            /**
-             * Appends this ByteArray's contents to another ByteArray.
-             * This will overwrite any contents behind the specified offset up to the length of this ByteArray's data
-             *
-             * @param offset Offset to append to
-             */
-            appendTo(target: ByteArray, offset?: number): this;
-
-            /**
-             * Enables or disables assertions of argument types and offsets.
-             * Assertions are enabled by default but you can opt to disable them if your code already makes sure that everything is valid
-             */
-            assert(assert?: boolean): this;
-
-            /**
-             * Gets the capacity of this ByteArray's backing buffer
-             */
-            capacity(): number;
-
-            /**
-             * Clears this ByteArray's offsets by setting offset to 0 and limit to the backing buffer's capacity
-             */
-            clear(): this;
-
-            /**
-             * Creates a cloned instance of this ByteArray,
-             * preset with this ByteArray's values for offset, markedOffset and limit
-             *
-             * @param copy Whether to copy the backing buffer or to return another view on the same, false by default
-             */
-            clone(copy?: boolean): ByteArray;
-
-            /**
-             * Compacts this ByteArray to be backed by a buffer of its contents' length.
-             * Will set offset = 0 and limit = capacity and adapt markedOffset to the same relative position if set
-             *
-             * @param begin Offset to start at, buffer offset by default
-             * @param end Offset to end at, buffer limit by default
-             */
-            compact(begin?: number, end?: number): this;
-
-            /**
-             * Creates a copy of this ByteArray's contents.
-             *
-             * @param begin Begin offset, buffer offset by default
-             * @param end End offset, buffer limit by default
-             */
-            copy(begin?: number, end?: number): ByteArray;
-
-            /**
-             * Copies this ByteArray's contents to another ByteArray.
-             *
-             * @param targetOffset Offset to copy to. Will use and increase the target's offset by the number of bytes copied if omitted
-             * @param sourceOffset Offset to start copying from. Will use and increase offset by the number of bytes copied if omitted
-             * @param sourceLimit Offset to end copying from, defaults to the buffer limit
-             */
-            copyTo(target: ByteArray, targetOffset?: number, souceOffset?: number, sourceLimit?: number): this | ByteArray;
-
-            /**
-             * Makes sure that this ByteArray is backed by a ByteArray#buffer of at least the specified capacity.
-             * If the current capacity is exceeded, it will be doubled.
-             * If double the current capacity is less than the required capacity, the required capacity will be used instead
-             */
-            ensureCapacity(capacity: number): this;
-
-            /**
-             * Overwrites this ByteArray's contents with the specified value.
-             *
-             * @param value Byte value to fill with. If given as a string, the first character is used
-             * @param begin Begin offset. Will use and increase offset by the number of bytes written if omitted. defaults to offset
-             * @param end End offset, defaults to limit.
-             */
-            fill(value: string | number, begin?: number, end?: number): this;
-
-            /**
-             * Makes this ByteArray ready for a new sequence of write or relative read operations.
-             * Sets limit = offset and offset = 0.
-             * Make sure always to flip a ByteArray when all relative read or write operations are complete
-             */
-            flip(): this;
-
-            /**
-             * Marks an offset on this ByteArray to be used later
-             *
-             * @param offset Offset to mark. Defaults to offset.
-             */
-            mark(offset?: number): this;
-
-            /**
-             * Prepends some data to this ByteArray.
-             * This will overwrite any contents before the specified offset up to the prepended data's length.
-             * If there is not enough space available before the specified offset,
-             * the backing buffer will be resized and its contents moved accordingly
-             *
-             * @param source Data to prepend
-             * @param offset Offset to prepend at. Will use and decrease offset by the number of bytes prepended if omitted.
-             */
-            prepend(source: I.ByteArray.Wrappable, offset: number): this;
-
-            /**
-             * Prepends some data to this ByteArray.
-             * This will overwrite any contents before the specified offset up to the prepended data's length.
-             * If there is not enough space available before the specified offset,
-             * the backing buffer will be resized and its contents moved accordingly
-             *
-             * @param source Data to prepend
-             * @param encoding Encoding if data is a string
-             * @param offset Offset to prepend at. Will use and decrease offset by the number of bytes prepended if omitted.
-             */
-            prepend(source: I.ByteArray.Wrappable, encoding?: string, offset?: number): this;
-
-            /**
-             * Prepends this ByteArray to another ByteArray.
-             * This will overwrite any contents before the specified offset up to the prepended data's length.
-             * If there is not enough space available before the specified offset,
-             * the backing buffer will be resized and its contents moved accordingly
-             *
-             * @param offset Offset to prepend at
-             */
-            prependTo(target: ByteArray, offset?: number): this;
-
-            /**
-             * Gets the number of remaining readable bytes
-             */
-            remaining(): number;
-
-            /**
-             * Resets this ByteArray's offset.
-             * If an offset has been marked through mark before, offset will be set to markedOffset, which will then be discarded.
-             * If no offset has been marked, sets offset = 0
-             */
-            reset(): this;
-
-            /**
-             * Resizes this ByteArray to be backed by a buffer of at least the given capacity.
-             * Will do nothing if already that large or larger.
-             *
-             * @param capacity	Capacity required
-             */
-            resize(capacity: number): this;
-
-            /**
-             * Reverses this ByteArray's contents.
-             *
-             * @param begin Offset to start at, defaults to offset
-             * @param end Offset to end at, defaults to limit
-             */
-            reverse(begin?: number, end?: number): this;
-
-            /**
-             * Skips the next length bytes. This will just advance
-             */
-            skip(length: number): this;
-
-            /**
-             * Slices this ByteArray by creating a cloned instance with offset = begin and limit = end
-             *
-             * @param begin Begin offset, defaults to offset
-             * @param end End offset, defaults to limit
-             */
-            slice(begin?: number, end?: number): ByteArray;
-
-            /**
-             * Returns a copy of the backing buffer that contains this ByteArray's contents.
-             *
-             * @param forceCopy If true returns a copy, otherwise returns a view referencing the same memory if possible, false by default
-             * @param begin Begin offset, offset by default
-             * @param end End offset, limit by default
-             */
-            toBuffer(forceCopy?: boolean, begin?: number, end?: number): Buffer;
-
-            /**
-             * Returns a raw buffer compacted to contain this ByteArray's contents
-             */
-            toArrayBuffer(): ArrayBuffer;
-
-            /**
-             * Converts the ByteArray's contents to a string
-             *
-             * @param encoding Output encoding
-             * @param begin Begin offset, offset by default
-             * @param end End offset, limit by default
-             */
-            toString(encoding?: string, begin?: number, end?: number): string;
-
-            /**
-             * Encodes this ByteArray's contents to a base64 encoded string
-             *
-             * @param begin Begin offset, offset by default
-             * @param end End offset, limit by default
-             */
-            toBase64(begin?: number, end?: number): string;
-
-            /**
-             * Encodes this ByteArray to a binary encoded string, that is using only characters 0x00-0xFF as bytes
-             *
-             * @param begin Begin offset, offset by default
-             * @param end End offset, limit by default
-             */
-            toBinary(begin?: number, end?: number): string;
-
-            /**
-             * Encodes this ByteArray to a hex encoded string with marked offsets
-             *
-             * @param columns If true returns two columns hex + ascii, defaults to false
-             */
-            toDebug(columns?: boolean): string;
-
-            /**
-             * Encodes this ByteArray's contents to a hex encoded string
-             *
-             * @param begin Begin offset, offset by default
-             * @param end End offset, limit by default
-             */
-            toHex(begin?: number, end?: number): string;
-
-            /**
-             * Encodes this ByteArray's contents to an UTF8 encoded string
-             *
-             * @param begin Begin offset, offset by default
-             * @param end End offset, limit by default
-             */
-            toUTF8(begin?: number, end?: number): string;
-
-            static accessor(): typeof Buffer;
-
-            /**
-             * Allocates a new ByteArray backed by a buffer of the specified capacity.
-             *
-             * @param capacity Initial capacity. Defaults to ByteArray.DEFAULT_CAPACITY(64)
-             * @param noAssert Whether to skip assertions of offsets and values. Defaults to ByteArray.DEFAULT_NOASSERT(false)
-             */
-            static allocate(capacity?: number, noAssert?: boolean): ByteArray;
-
-            /**
-             * Concatenates multiple ByteArrays into one
-             *
-             * @param encoding Encoding for strings
-             * @param noAssert Whether to skip assertions of offsets and values. Defaults to ByteArray.DEFAULT_NOASSERT(false)
-             */
-            static concat(buffers: I.ByteArray.Wrappable[], encoding?: string, noAssert?: boolean): ByteArray;
-
-            static type(): typeof Buffer;
-
-            /**
-             * Wraps a buffer or a string.
-             * Sets the allocated ByteArray's offset to 0 and its limit to the length of the wrapped data
-             *
-             * @param encoding Encoding for strings
-             * @param noAssert Whether to skip assertions of offsets and values. Defaults to ByteArray.DEFAULT_NOASSERT(false)
-             */
-            static wrap(buffer: I.ByteArray.Wrappable, encoding?: string, noAssert?: boolean): ByteArray;
-
-            /**
-             * Calculates the actual number of bytes required to store a 32bit base 128 variable-length integer
-             */
-            static calculateVarint32(value: number): number;
-
-            /**
-             * Zigzag encodes a signed 32bit integer so that it can be effectively used with varint encoding
-             */
-            static zigZagEncode32(n: number): number;
-
-            /**
-             * Decodes a zigzag encoded signed 32bit integer
-             */
-            static zigZagDecode32(n: number): number;
-
-            /**
-             * Calculates the actual number of bytes required to store a 64bit base 128 variable-length integer
-             */
-            static calculateVarint64(value: number | string): number;
-
-            /**
-             * Zigzag encodes a signed 64bit integer so that it can be effectively used with varint encoding
-             */
-            static zigZagEncode64(value: number | string | I.Long): I.Long;
-
-            /**
-             * Decodes a zigzag encoded signed 64bit integer.
-             */
-            static zigZagDecode64(value: number | string | I.Long): I.Long;
-
-            /**
-             * Calculates the number of UTF8 characters of a string.
-             * JavaScript itself uses UTF-16,
-             * so that a string's length property does not reflect its actual UTF8 size if it contains code points larger than 0xFFFF
-             */
-            static calculateUTF8Chars(str: string): number;
-
-            /**
-             *  Calculates the number of UTF8 bytes of a string.
-             */
-            static calculateString(str: string): number;
-
-            /**
-             * Decodes a base64 encoded string to a ByteArray
-             */
-            static fromBase64(str: string): ByteArray;
-
-            /**
-             * Encodes a binary string to base64 like window.btoa does
-             */
-            static btoa(str: string): string;
-
-            /**
-             * Decodes a base64 encoded string to binary like window.atob does
-             */
-            static atob(b64: string): string;
-
-            /**
-             * Decodes a binary encoded string, that is using only characters 0x00-0xFF as bytes, to a ByteArray
-             */
-            static fromBinary(str: string): ByteArray;
-
-            /**
-             * Decodes a hex encoded string with marked offsets to a ByteArray
-             */
-            static fromDebug(str: string, noAssert?: boolean): ByteArray;
-
-            /**
-             * Decodes a hex encoded string to a ByteArray
-             */
-            static fromHex(str: string, noAssert?: boolean): ByteArray;
-
-            /**
-             * Decodes an UTF8 encoded string to a ByteArray
-             */
-            static fromUTF8(str: string, noAssert?: boolean): ByteArray;
-
-            /**
-             * Default initial capacity
-             */
-            static DEFAULT_CAPACITY: number;
-
-            /**
-             * Default no assertions flag
-             */
-            static DEFAULT_NOASSERT: boolean;
-
-            /**
-             * Maximum number of bytes required to store a 32bit base 128 variable-length integer
-             */
-            static MAX_VARINT32_BYTES: number;
-
-            /**
-             * Maximum number of bytes required to store a 64bit base 128 variable-length integer
-             */
-            static MAX_VARINT64_BYTES: number;
-
-            /**
-             * Metrics representing number of UTF8 characters. Evaluates to `c`.
-             */
-            static METRICS_CHARS: string;
-
-            /**
-             * Metrics representing number of bytes. Evaluates to `b`.
-             */
-            static METRICS_BYTES: string;
-        }
-
-        /**
-         * Represents a queue
-         */
-        class Queue<S = any, T = S> {
-            /**
-             * Whether the queue is full
-             */
-            readonly full: boolean;
-
-            /**
-             * The length of the queue
-             */
-            readonly length: number;
-
-            /**
-             * Whether the queue is empty
-             */
-            readonly empty: boolean;
-
-            /**
-             * Inserts a new element at the end
-             */
-            push(x: S): this;
-
-            /**
-             * Removes and returns an element from the beginning
-             */
-            pop(): T | undefined;
-        }
-
-        /**
-         * Represents an asynchronous queue, each pop is a promise
-         * that is resolved with an existing element or an element that will be pushed in the future
-         */
-        class AsyncQueue<T = any> extends Queue<T, Promise<T>> {
-            /**
-             * Returns a promise that will be resolved with an existing element or an element that will be pushed in the future
-             */
-            pop(): Promise<T>;
-        }
-
-        namespace I.PriorityQueue {
-            interface ConstructorOptions<T> {
-                /**
-                 * Function that compares objects.
-                 *
-                 * Must return a positive value if a > b, a negative if a < b, and zero for equal objects
-                 */
-                compare?(a: T, b: T): number;
-
-                /**
-                 * Function that evaluates the priority value by the given objects,
-                 * if the returned value > 0, then the first argument has higher priority,
-                 * = 0 same priority, < 0 lower priority.
-                 * By default the top element is an element that has the highest priority,
-                 * the default priority function is equal to the compare function
-                 */
-                priority?(a: T, b: T): number;
-            }
-        }
-
-        /**
-         * Represents a priority queue
-         */
-        class PriorityQueue<T = any> {
-            /**
-             * Whether the queue is empty
-             */
-            readonly empty: boolean;
-
-            /**
-             * The length of the queue
-             */
-            readonly length: number;
-
-            constructor(options?: I.PriorityQueue.ConstructorOptions<T>);
-
-            /**
-             * Clones the queue
-             */
-            clone(): PriorityQueue<T>;
-
-            /**
-             * Inserts a new element
-             */
-            push(x: T): this;
-
-            /**
-             * Removes the top element (that has the highest priority)
-             */
-            pop(): T | undefined;
-
-            /**
-             * Deletes the given element from the queue
-             */
-            delete(x: T): this;
-
-            /**
-             * Replaces the top element (pop + push)
-             */
-            replace(x: T): T;
-
-            /**
-             * Faster push + pop
-             */
-            pushpop(x: T): T;
-
-            /**
-             * Converts the queue to an array, it works with a clone of the queue, so the original queue is untouched
-             */
-            toArray(): T[];
-
-            /**
-             * Creates a queue object from the given iterable
-             */
-            static from<T>(iterable: Iterable<T>, options?: I.PriorityQueue.ConstructorOptions<T>): PriorityQueue<T>;
-        }
-
-        /**
-         * Represents a faster LRU cache but with less functionality
-         */
-        class FastLRU<K = any, V = any> {
-            /**
-             * @param size Cache size, unlimited by default
-             */
-            constructor(size?: number, options?: {
-                /**
-                 * Function that is called when a value is deleted
-                 */
-                dispose?(key: K, value: V): void
-            });
-
-            /**
-             * The actual size of the cache
-             */
-            readonly size: number;
-
-            /**
-             * Gets the value by the given key
-             */
-            get(key: K): V | undefined;
-
-            /**
-             * Sets a new value for the given key
-             */
-            set(key: K, value: V): void;
-
-            /**
-             * Deletes the given key from the cache
-             */
-            delete(key: K): boolean;
-
-            /**
-             * Checks whether the cache has an element with the given key
-             */
-            has(key: K): boolean;
-
-            /**
-             * Returns the keys iterator
-             */
-            keys(): IterableIterator<K>;
-
-            /**
-             * Returns the values iterator
-             */
-            values(): IterableIterator<V>;
-
-            /**
-             * Returns the entries iterator
-             */
-            entries(): IterableIterator<[K, V]>;
-
-            /**
-             * Clears the cache
-             */
-            clear(): void;
-        }
-
-        /**
-         * Represents a stack
-         */
-        class Stack<T = any> {
-            /**
-             * Whether the stack is empty
-             */
-            readonly empty: boolean;
-
-            /**
-             * The top element of the stack
-             */
-            readonly top: T;
-
-            /**
-             * Inserts a new element
-             */
-            push(x: T): this;
-
-            /**
-             * Removes the top element
-             */
-            pop(): T | undefined;
-
-            /**
-             * Returns an iterator over the values
-             */
-            [Symbol.iterator](): IterableIterator<T>;
-
-            /**
-             * Creates a stack and pushed all the values from the given iterable object
-             */
-            static from<T>(iterable: Iterable<T>): Stack<T>;
-        }
-
-        namespace I.BinarySearchTree {
-            interface ConstructorOptions<K, V, Tree> {
-                /**
-                 * The parent tree
-                 */
-                parent?: Tree;
-
-                /**
-                 * Value to keep in this node
-                 */
-                value?: V;
-
-                /**
-                 * WHether the values must be unique, false by default.
-                 * If false you can store many values for same keys, otherwise only one
-                 */
-                unique?: boolean;
-
-                /**
-                 * Custom keys comparator, by default if a > b => -1, a < b -1, a === b => 0
-                 */
-                compareKeys?(a: K, b: K): number;
-
-                /**
-                 * Function that defines whether 2 values are the same, by default a === b
-                 */
-                checkValueEquality?(a: V, b: V): boolean;
-            }
-
-            interface Query<K> {
-                $lt?: K;
-                $lte?: K;
-                $gt?: K;
-                $gte?: K;
-            }
-        }
-
-        /**
-         * Represents a binary search tree
-         */
-        class BinarySearchTree<K = any, V = any> {
-            constructor(options?: I.BinarySearchTree.ConstructorOptions<K, V, BinarySearchTree<K, V>>);
-
-            /**
-             * Returns the max descendant tree
-             */
-            getMaxKeyDescendant(): BinarySearchTree<K, V>;
-
-            /**
-             * Returns the maximum key
-             */
-            getMaxKey(): K;
-
-            /**
-             * Returns the min descendant tree
-             */
-            getMinKeyDescendant(): BinarySearchTree<K, V>;
-
-            /**
-             * Returns the minumum key
-             */
-            getMinKey(): K;
-
-            /**
-             * Traverses the tree and calls the given function for each node
-             */
-            checkAllNodesFullfillCondition(test: (key: K, value: V) => void): void;
-
-            /**
-             * Checks whether the tree is a binary search tree
-             */
-            checkIsBST(): void;
-
-            /**
-             * Returns the of keys in the tree
-             */
-            getNumberOfKeys(): number;
-
-            /**
-             * Inserts a new key/value
-             */
-            insert(key: K, value: V): void;
-
-            /**
-             * Searches the given key in the tree
-             */
-            search(key: K): V[];
-
-            /**
-             * Returns all the values from the given key bounds
-             */
-            betweenBounds(query: I.BinarySearchTree.Query<K>): V[];
-
-            /**
-             * Deletes the given key/value from the tree
-             */
-            delete(key: K, value?: V): void;
-
-            /**
-             * Executed the given callback for each node from left to right
-             */
-            executeOnEveryNode(fn: (tree: BinarySearchTree<K, V>) => void): void;
-
-            /**
-             * Prints the tree
-             */
-            prettyPrint(printData?: boolean, spacing?: string): void;
-        }
-
-        /**
-         * Represents an AVL tree, a self-balancing binary search tree
-         */
-        class AVLTree<K = any, V = any> {
-            constructor(options?: I.BinarySearchTree.ConstructorOptions<K, V, AVLTree<K, V>>);
-
-            /**
-             * Checks whether the tree is an avl tree
-             */
-            checkIsAVLT(): void;
-
-            /**
-             * Inserts a new key/value
-             */
-            insert(key: K, value: V): void;
-
-            /**
-             * Deletes the given key/value from the tree
-             */
-            delete(key: K, value?: V): void;
-
-            /**
-             * Returns the of keys in the tree
-             */
-            getNumberOFKeys(): number;
-
-            /**
-             * Searches the given key in the tree
-             */
-            search(key: K): V[];
-
-            /**
-             * Returns all the values from the given key bounds
-             */
-            betweenBounds(query: I.BinarySearchTree.Query<K>): V[];
-
-            /**
-             * Executed the given callback for each node from left to right
-             */
-            executeOnEveryNode(fn: (tree: AVLTree<K, V>) => void): void;
-
-            /**
-             * Prints the tree
-             */
-            prettyPrint(printDate?: boolean, spacing?: string): void;
-        }
-
-        namespace I.RedBlackTree {
-            interface Node<K, V> {
-                /**
-                 * The key associated to the node
-                 */
-                key: K;
-
-                /**
-                 * The value associated to the node
-                 */
-                value: V;
-
-                /**
-                 * The left subtree of the node
-                 */
-                left?: Node<K, V>;
-
-                /**
-                 * The right subtree of the node
-                 */
-                right?: Node<K, V>;
-            }
-
-            interface Iterator<K, V> {
-                /**
-                 * Checks if the iterator is valid
-                 */
-                readonly valid: boolean;
-
-                /**
-                 * The value of the node at the iterator's current position, null if invalid
-                 */
-                readonly node: Node<K, V> | null;
-
-                /**
-                 * The key of the item referenced by the iterator, undefined if invalid
-                 */
-                readonly key?: K;
-
-                /**
-                 * The value of the item referenced by the iterator, undefined if invalid
-                 */
-                readonly value?: V;
-
-                /**
-                 * Returns the position of this iterator in the sequence
-                 */
-                readonly index: number;
-
-                /**
-                 * If true, then the iterator is not at the end of the sequence
-                 */
-                readonly hasNext: boolean;
-
-                /**
-                 * If true, then the iterator is not at the beginning of the sequence
-                 */
-                readonly hasPrev: boolean;
-
-                /**
-                 * The tree associated to the iterator
-                 */
-                tree: RedBlackTree<K, V>;
-
-                /**
-                 * Makes a copy of the iterator
-                 */
-                clone(): Iterator<K, V>;
-
-                /**
-                 * Removes the item at the position of the iterator and returns a new rb-tree
-                 */
-                remove(): RedBlackTree<K, V>;
-
-                /**
-                 * Advances the iterator to the next position
-                 */
-                next(): void;
-
-                /**
-                 * Updates the value of the node in the tree at this iterator and returns a new rb-tree
-                 */
-                update(value: V): RedBlackTree<K, V>;
-
-                /**
-                 * Moves the iterator backward one element
-                 */
-                prev(): void;
-            }
-        }
-
-        /**
-         * Represents a fully persistent red-black tree
-         */
-        class RedBlackTree<K = any, V = any> {
-            /**
-             * The root node of the tree
-             */
-            root: I.RedBlackTree.Node<K, V>;
-
-            constructor(compare?: (a: K, b: K) => number, root?: RedBlackTree<K, V>);
-
-            /**
-             * A sorted array of all the keys in the tree
-             */
-            readonly keys: K[];
-
-            /**
-             * An array of all the values in the tree
-             */
-            readonly values: V[];
-
-            /**
-             * The number of items in the tree
-             */
-            readonly length: number;
-
-            /**
-             * An iterator pointing to the first element in the tree
-             */
-            readonly begin: I.RedBlackTree.Iterator<K, V>;
-
-            /**
-             * An iterator pointing to the last element in the tree
-             */
-            readonly end: I.RedBlackTree.Iterator<K, V>;
-
-            /**
-             * Creates a new tree with the new pair inserted
-             */
-            insert(key: K, value: V): RedBlackTree<K, V>;
-
-            /**
-             * Walks a visitor function over the nodes of the tree in order
-             *
-             * @param visit A callback that gets executed on each node.
-             *              If a truthy value is returned from the visitor, then iteration is stopped.
-             * @param lo An optional start of the range to visit (inclusive)
-             * @param hi An optional end of the range to visit (non-inclusive)
-             */
-            forEach<T>(visit: (key: K, value: V) => T, lo?: K, hi?: K): T;
-
-            /**
-             * Finds an iterator starting at the given element
-             */
-            at(idx: number): I.RedBlackTree.Iterator<K, V>;
-
-            /**
-             * Finds the first item in the tree whose key is >= key
-             */
-            ge(key: K): I.RedBlackTree.Iterator<K, V>;
-
-            /**
-             * Finds the first item in the tree whose key is > key
-             */
-            gt(key: K): I.RedBlackTree.Iterator<K, V>;
-
-            /**
-             * Finds the first item in the tree whose key is < key
-             */
-            lt(key: K): I.RedBlackTree.Iterator<K, V>;
-
-            /**
-             * Finds the first item in the tree whose key is <= key
-             */
-            le(key: K): I.RedBlackTree.Iterator<K, V>;
-
-            /**
-             * Returns an iterator pointing to the first item in the tree with key, otherwise null
-             */
-            find(key: K): I.RedBlackTree.Iterator<K, V> | null;
-
-            /**
-             * Removes the first item with key in the tree
-             */
-            remove(key: K): RedBlackTree<K, V>;
-
-            /**
-             * Retrieves the value associated to the given key
-             */
-            get(key: K): V | undefined;
-        }
-
-        /**
-         * Respresetns a data structure which is a combination of an array and a set.
-         * Adding a new member is O(1), testing for membership is O(1),
-         * and finding the index of an element is O(1).
-         */
-        class ArraySet<T = any> {
-            /**
-             * The number of unique items in this ArraySet.
-             * If duplicates have been added, than those do not count towards the size.
-             */
-            readonly length: number;
-
-            /**
-             * Adds the given value to this set.
-             *
-             * @param allowDuplicates Whether to allow duplicates in the set, false by default
-             */
-            add(value: T, allowDuplicates?: boolean): this;
-
-            /**
-             * Checks whether the given value is a member of the set
-             */
-            has(value: T): boolean;
-
-            /**
-             * Returns the index of the given element.
-             * If the value is not present it will return -1
-             */
-            indexOf(value: T): number;
-
-            /**
-             * Converts the set to an array
-             */
-            toArray(): T[];
-
-            /**
-             * Creates an ArraySet from the given iterable object
-             *
-             * @param allowDuplicates Whether to allow duplicates in the set, false by default
-             */
-            static from<T>(iterable: Iterable<T>, allowDuplicates?: boolean): ArraySet<T>;
-        }
-
-        namespace I.BufferList {
-            type Appendable = Buffer | BufferList | string | number | Array<Buffer | BufferList | string | number>;
-        }
-
-        /**
-         * Represents a Node.js Buffer list collector, reader and streamer with callback/promise interface support
-         */
-        class BufferList extends std.stream.Duplex implements PromiseLike<Buffer> {
-            /**
-             * Creates a new buffer list
-             */
-            constructor();
-
-            /**
-             * Creates a new buffer list and initiates with the given value
-             */
-            constructor(buffer: I.BufferList.Appendable);
-
-            /**
-             * Creates a new buffer list and subscribes the given callback on the end/error event
-             */
-            constructor(callback: (err: any, data: Buffer) => void);
-
-            /**
-             * Adds an additional buffer or BufferList to the internal list
-             */
-            append(buf: I.BufferList.Appendable): this;
-
-            /**
-             * Ends the stream
-             */
-            end(chunk?: Buffer): void;
-            end(chunk?: () => void): void;
-
-            /**
-             * Returns the byte at the specified index
-             */
-            get(idx: number): number;
-
-            /**
-             * Returns a new Buffer object containing the bytes within the range specified.
-             */
-            slice(start?: number, end?: number): Buffer;
-
-            /**
-             * Copies the content of the list in the dest buffer
-             * starting from destStart and containing the bytes within the range specified with srcStart to srcEnd
-             *
-             * @param dstStart writes from this position
-             * @param srcStart reads bytes from this position
-             * @param srcEnd  read bytes to this position
-             */
-            copy<T extends Buffer = Buffer>(dst: T, dstStart?: number, srcStart?: number, srcEnd?: number): T;
-
-            /**
-             * Returns a new BufferList object containing the bytes within the range specified.
-             * No copies will be performed. All buffers in the result share memory with the original list.
-             *
-             * @param start slice from
-             * @param end slice to
-             */
-            shallowSlice(start?: number, end?: number): BufferList;
-
-            /**
-             * Return a string representation of the buffer
-             */
-            toString(encoding?: fs.I.Encoding, start?: number, end?: number): string;
-
-            /**
-             * Shifts bytes off the start of the list
-             */
-            consume(bytes: number): this;
-
-            /**
-             * Performs a shallow-copy of the list.
-             */
-            duplicate(): BufferList;
-
-            /**
-             * Destroys the stream
-             */
-            destroy(): void;
-
-            then<T1 = Buffer, T2 = never>(
-                onfulfilled?: ((value: Buffer) => T1 | PromiseLike<T1>) | null,
-                onrejected?: ((reason: any) => T2 | PromiseLike<T2>) | null
-            ): PromiseLike<T1 | T2>;
-
-            catch<T>(onrejected?: ((reason: any) => T | PromiseLike<T>) | null): PromiseLike<T | Buffer>;
-        }
-
-        /**
-         * Represents a Map that has a default values factory object or function.
-         * Each get of non-existent key goes through the factory
-         */
-        class DefaultMap<K = string, V = any> extends Map<K, V> {
-            constructor(factory?: ((key: K) => V) | { [key: string]: V }, iterable?: Iterable<[K, V]>);
-        }
-
-        namespace I.LRU {
-            type LengthCalculator<K, V> = (value: V, key: K) => number;
-            interface ConstructorOptions<K, V> {
-                /**
-                 * The maximum size of the cache, checked by applying the length function to all values in the cache.
-                 * Default is Infinity
-                 */
-                max?: number;
-
-                /**
-                 * Maximum age in ms. Items are not pro-actively pruned out as they age,
-                 * but if you try to get an item that is too old,
-                 * it'll drop it and return undefined instead of giving it to you
-                 */
-                maxAge?: number;
-
-                /**
-                 * Function that is used to calculate the length of stored items
-                 */
-                length?: LengthCalculator<K, V>;
-
-                /**
-                 * Function that is called on items when they are dropped from the cache
-                 */
-                dispose?(key: K, value: V): void;
-
-                /**
-                 * Whether to return the stale value before deleting it
-                 */
-                stale?: boolean;
-
-                /**
-                 * Dispose will only be called when a key falls out of the cache, not when it is overwritten
-                 */
-                noDisposeOnSet?: boolean;
-            }
-
-            interface SerializedEntry<K, V> {
-                /**
-                 * key
-                 */
-                key: K;
-
-                /**
-                 * value
-                 */
-                value: V;
-
-                /**
-                 * when it becomes expired
-                 */
-                e: number;
-            }
-
-            interface Entry<K, V> {
-                /**
-                 * key
-                 */
-                key: K;
-
-                /**
-                 * value
-                 */
-                value: V;
-
-                /**
-                 * entry length
-                 */
-                length: number;
-
-                /**
-                 * Timestamp when the entry was created
-                 */
-                now: number;
-
-                /**
-                 * Maximum live time
-                 */
-                maxAge: number;
-            }
-        }
-
-        /**
-         * Represent an LRU cache
-         */
-        class LRU<K = any, V = any> {
-            /**
-             * Creates an LRU cache of the given size
-             */
-            constructor(max: number);
-
-            /**
-             * Creates an LRU cache with the given options
-             */
-            constructor(options?: I.LRU.ConstructorOptions<K, V>);
-
-            /**
-             * The length of the cache, setter resizes the cache
-             */
-            max: number;
-
-            /**
-             * stale setting
-             */
-            allowStale: boolean;
-
-            /**
-             * maxAge setting
-             */
-            maxAge: number;
-
-            /**
-             * length setting
-             */
-            lengthCalculator: I.LRU.LengthCalculator<K, V>;
-
-            /**
-             * Total length of objects in cache taking into account length options function
-             */
-            readonly length: number;
-
-            /**
-             * Total quantity of objects currently in cache.
-             * Note, that stale items are returned as part of this item count.
-             */
-            readonly itemCount: number;
-
-            /**
-             * Iterates over all the keys in the cache, in reverse recent-ness order. (ie, less recently used items are iterated over first.)
-             */
-            rforEach<T = any>(fn: (this: T, value: V, key: K, cache: LRU<K, V>) => void, thisp?: T): void;
-
-            /**
-             * Iterates over all the keys in the cache, in order of recent-ness
-             */
-            forEach<T = any>(fn: (this: T, value: V, key: K, cache: LRU<K, V>) => void, thisp?: T): void;
-
-            /**
-             * Returns an array of the keys in the cache
-             */
-            keys(): K[];
-
-            /**
-             * Returns an array of the values in the cache
-             */
-            values(): V[];
-
-            /**
-             * Clears the cache entirely, throwing away all values
-             */
-            reset(): void;
-
-            /**
-             * Return an array of the cache entries ready for serialization and usage with 'destinationCache.load(arr)`
-             */
-            dump(): Array<I.LRU.SerializedEntry<K, V>>;
-
-            /**
-             * Returns an internal lru list of entries
-             */
-            dumpLru(): LinkedList<I.LRU.Entry<K, V>>;
-
-            /**
-             * @param opts std.util.inspect options
-             */
-            inspect(opts?: object): string;
-
-            /**
-             * Sets a new value for the given key. Updates the "recently used"-ness of the key
-             *
-             * @param maxAge maxAge option specific for this key
-             * @returns Whether the key was set
-             */
-            set(key: K, value: V, maxAge?: number): boolean;
-
-            /**
-             * Check if a key is in the cache, without updating the recent-ness or deleting it for being stale
-             */
-            has(key: K): boolean;
-
-            /**
-             * Gets the value of the given key. Updates the "recently used"-ness of the key
-             */
-            get(key: K): V | undefined;
-
-            /**
-             * Returns the key value without updating the "recently used"-ness of the key
-             */
-            peek(key: K): V | undefined;
-
-            /**
-             * Deletes the less recently used element
-             */
-            pop(): I.LRU.Entry<K, V>;
-
-            /**
-             * Deletes a key out of the cache
-             */
-            del(key: K): void;
-
-            /**
-             * Loads another cache entries array, obtained with sourceCache.dump(), into the cache.
-             * The destination cache is reset before loading new entries
-             */
-            load(arr: Array<I.LRU.SerializedEntry<K, V>>): void;
-
-            /**
-             * Manually iterates over the entire cache proactively pruning old entries
-             */
-            prune(): void;
-        }
-
-        /**
-         * Represents a Map that keeps keys only for a specified interval of time
-         */
-        class TimedoutMap<K = any, V = any> extends Map<K, V> {
-            /**
-             * @param timeout maximum age of the keys, 1000 by default
-             * @param callback callback that is called with each key when the timeout is passed
-             */
-            constructor(timeout?: number, callback?: (key: K) => void);
-
-            /**
-             * Gets the timeout
-             */
-            getTimeout(): number;
-
-            /**
-             * Sets the timeout
-             */
-            setTimeout(ms: number): void;
-
-            /**
-             * Iterates over the map and calls the callback for each element
-             */
-            forEach<T = any>(callback: (this: T, value: V, key: K, cache: this) => void, thisArg?: T): this;
-
-            /**
-             * Deletes the given key
-             */
-            delete(key: K): boolean;
-        }
-    }
-}
diff --git a/types/adone/glosses/collections/array_set.d.ts b/types/adone/glosses/collections/array_set.d.ts
new file mode 100644
index 0000000000..c13d8769f1
--- /dev/null
+++ b/types/adone/glosses/collections/array_set.d.ts
@@ -0,0 +1,44 @@
+declare namespace adone.collection {
+    /**
+     * Respresetns a data structure which is a combination of an array and a set.
+     * Adding a new member is O(1), testing for membership is O(1),
+     * and finding the index of an element is O(1).
+     */
+    class ArraySet<T = any> {
+        /**
+         * The number of unique items in this ArraySet.
+         * If duplicates have been added, than those do not count towards the size.
+         */
+        readonly length: number;
+
+        /**
+         * Adds the given value to this set.
+         *
+         * @param allowDuplicates Whether to allow duplicates in the set, false by default
+         */
+        add(value: T, allowDuplicates?: boolean): this;
+
+        /**
+         * Checks whether the given value is a member of the set
+         */
+        has(value: T): boolean;
+
+        /**
+         * Returns the index of the given element.
+         * If the value is not present it will return -1
+         */
+        indexOf(value: T): number;
+
+        /**
+         * Converts the set to an array
+         */
+        toArray(): T[];
+
+        /**
+         * Creates an ArraySet from the given iterable object
+         *
+         * @param allowDuplicates Whether to allow duplicates in the set, false by default
+         */
+        static from<T>(iterable: Iterable<T>, allowDuplicates?: boolean): ArraySet<T>;
+    }
+}
diff --git a/types/adone/glosses/collections/async_queue.d.ts b/types/adone/glosses/collections/async_queue.d.ts
new file mode 100644
index 0000000000..9a575a33be
--- /dev/null
+++ b/types/adone/glosses/collections/async_queue.d.ts
@@ -0,0 +1,12 @@
+declare namespace adone.collection {
+    /**
+     * Represents an asynchronous queue, each pop is a promise
+     * that is resolved with an existing element or an element that will be pushed in the future
+     */
+    class AsyncQueue<T = any> extends Queue<T, Promise<T>> {
+        /**
+         * Returns a promise that will be resolved with an existing element or an element that will be pushed in the future
+         */
+        pop(): Promise<T>;
+    }
+}
diff --git a/types/adone/glosses/collections/avl_tree.d.ts b/types/adone/glosses/collections/avl_tree.d.ts
new file mode 100644
index 0000000000..2b5dc132b6
--- /dev/null
+++ b/types/adone/glosses/collections/avl_tree.d.ts
@@ -0,0 +1,48 @@
+declare namespace adone.collection {
+    /**
+     * Represents an AVL tree, a self-balancing binary search tree
+     */
+    class AVLTree<K = any, V = any> {
+        constructor(options?: I.BinarySearchTree.ConstructorOptions<K, V, AVLTree<K, V>>);
+
+        /**
+         * Checks whether the tree is an avl tree
+         */
+        checkIsAVLT(): void;
+
+        /**
+         * Inserts a new key/value
+         */
+        insert(key: K, value: V): void;
+
+        /**
+         * Deletes the given key/value from the tree
+         */
+        delete(key: K, value?: V): void;
+
+        /**
+         * Returns the of keys in the tree
+         */
+        getNumberOFKeys(): number;
+
+        /**
+         * Searches the given key in the tree
+         */
+        search(key: K): V[];
+
+        /**
+         * Returns all the values from the given key bounds
+         */
+        betweenBounds(query: I.BinarySearchTree.Query<K>): V[];
+
+        /**
+         * Executed the given callback for each node from left to right
+         */
+        executeOnEveryNode(fn: (tree: AVLTree<K, V>) => void): void;
+
+        /**
+         * Prints the tree
+         */
+        prettyPrint(printDate?: boolean, spacing?: string): void;
+    }
+}
diff --git a/types/adone/glosses/collections/binary_search_tree.d.ts b/types/adone/glosses/collections/binary_search_tree.d.ts
new file mode 100644
index 0000000000..878bd7e6a4
--- /dev/null
+++ b/types/adone/glosses/collections/binary_search_tree.d.ts
@@ -0,0 +1,110 @@
+declare namespace adone.collection {
+    namespace I.BinarySearchTree {
+        interface ConstructorOptions<K, V, Tree> {
+            /**
+             * The parent tree
+             */
+            parent?: Tree;
+
+            /**
+             * Value to keep in this node
+             */
+            value?: V;
+
+            /**
+             * WHether the values must be unique, false by default.
+             * If false you can store many values for same keys, otherwise only one
+             */
+            unique?: boolean;
+
+            /**
+             * Custom keys comparator, by default if a > b => -1, a < b -1, a === b => 0
+             */
+            compareKeys?(a: K, b: K): number;
+
+            /**
+             * Function that defines whether 2 values are the same, by default a === b
+             */
+            checkValueEquality?(a: V, b: V): boolean;
+        }
+
+        interface Query<K> {
+            $lt?: K;
+            $lte?: K;
+            $gt?: K;
+            $gte?: K;
+        }
+    }
+
+    /**
+     * Represents a binary search tree
+     */
+    class BinarySearchTree<K = any, V = any> {
+        constructor(options?: I.BinarySearchTree.ConstructorOptions<K, V, BinarySearchTree<K, V>>);
+
+        /**
+         * Returns the max descendant tree
+         */
+        getMaxKeyDescendant(): BinarySearchTree<K, V>;
+
+        /**
+         * Returns the maximum key
+         */
+        getMaxKey(): K;
+
+        /**
+         * Returns the min descendant tree
+         */
+        getMinKeyDescendant(): BinarySearchTree<K, V>;
+
+        /**
+         * Returns the minumum key
+         */
+        getMinKey(): K;
+
+        /**
+         * Traverses the tree and calls the given function for each node
+         */
+        checkAllNodesFullfillCondition(test: (key: K, value: V) => void): void;
+
+        /**
+         * Checks whether the tree is a binary search tree
+         */
+        checkIsBST(): void;
+
+        /**
+         * Returns the of keys in the tree
+         */
+        getNumberOfKeys(): number;
+
+        /**
+         * Inserts a new key/value
+         */
+        insert(key: K, value: V): void;
+
+        /**
+         * Searches the given key in the tree
+         */
+        search(key: K): V[];
+
+        /**
+         * Returns all the values from the given key bounds
+         */
+        betweenBounds(query: I.BinarySearchTree.Query<K>): V[];
+
+        /**
+         * Deletes the given key/value from the tree
+         */
+        delete(key: K, value?: V): void;
+
+        /**
+         * Executed the given callback for each node from left to right
+         */
+        executeOnEveryNode(fn: (tree: BinarySearchTree<K, V>) => void): void;
+
+        /**
+         * Prints the tree
+         */
+        prettyPrint(printData?: boolean, spacing?: string): void;
+    }
+}
diff --git a/types/adone/glosses/collections/buffer_list.d.ts b/types/adone/glosses/collections/buffer_list.d.ts
new file mode 100644
index 0000000000..b2a4157385
--- /dev/null
+++ b/types/adone/glosses/collections/buffer_list.d.ts
@@ -0,0 +1,92 @@
+declare namespace adone.collection {
+    namespace I.BufferList {
+        type Appendable = Buffer | BufferList | string | number | Array<Buffer | BufferList | string | number>;
+    }
+
+    /**
+     * Represents a Node.js Buffer list collector, reader and streamer with callback/promise interface support
+     */
+    class BufferList extends std.stream.Duplex implements PromiseLike<Buffer> {
+        /**
+         * Creates a new buffer list
+         */
+        constructor();
+
+        /**
+         * Creates a new buffer list and initiates with the given value
+         */
+        constructor(buffer: I.BufferList.Appendable);
+
+        /**
+         * Creates a new buffer list and subscribes the given callback on the end/error event
+         */
+        constructor(callback: (err: any, data: Buffer) => void);
+
+        /**
+         * Adds an additional buffer or BufferList to the internal list
+         */
+        append(buf: I.BufferList.Appendable): this;
+
+        /**
+         * Ends the stream
+         */
+        end(chunk?: Buffer): void;
+        end(chunk?: () => void): void;
+
+        /**
+         * Returns the byte at the specified index
+         */
+        get(idx: number): number;
+
+        /**
+         * Returns a new Buffer object containing the bytes within the range specified.
+         */
+        slice(start?: number, end?: number): Buffer;
+
+        /**
+         * Copies the content of the list in the dest buffer
+         * starting from destStart and containing the bytes within the range specified with srcStart to srcEnd
+         *
+         * @param dstStart writes from this position
+         * @param srcStart reads bytes from this position
+         * @param srcEnd  read bytes to this position
+         */
+        copy<T extends Buffer = Buffer>(dst: T, dstStart?: number, srcStart?: number, srcEnd?: number): T;
+
+        /**
+         * Returns a new BufferList object containing the bytes within the range specified.
+         * No copies will be performed. All buffers in the result share memory with the original list.
+         *
+         * @param start slice from
+         * @param end slice to
+         */
+        shallowSlice(start?: number, end?: number): BufferList;
+
+        /**
+         * Return a string representation of the buffer
+         */
+        toString(encoding?: fs.I.Encoding, start?: number, end?: number): string;
+
+        /**
+         * Shifts bytes off the start of the list
+         */
+        consume(bytes: number): this;
+
+        /**
+         * Performs a shallow-copy of the list.
+         */
+        duplicate(): BufferList;
+
+        /**
+         * Destroys the stream
+         */
+        destroy(): void;
+
+        then<T1 = Buffer, T2 = never>(
+            onfulfilled?: ((value: Buffer) => T1 | PromiseLike<T1>) | null,
+            onrejected?: ((reason: any) => T2 | PromiseLike<T2>) | null
+        ): PromiseLike<T1 | T2>;
+
+        catch<T>(onrejected?: ((reason: any) => T | PromiseLike<T>) | null): PromiseLike<T | Buffer>;
+    }
+}
diff --git a/types/adone/glosses/collections/byte_array.d.ts b/types/adone/glosses/collections/byte_array.d.ts
new file mode 100644
index 0000000000..1dc3080fb3
--- /dev/null
+++ b/types/adone/glosses/collections/byte_array.d.ts
@@ -0,0 +1,892 @@
+declare namespace adone.collection {
+    namespace I {
+        type Long = math.Long;
+
+        type Longable = math.I.Longable;
+
+        namespace ByteArray {
+            interface Varint32 {
+                value: number;
+                length: number;
+            }
+
+            interface Varint64 {
+                value: Long;
+                length: number;
+            }
+
+            interface String {
+                string: string;
+                length: number;
+            }
+
+            type Wrappable = string | ByteArray | Buffer | Uint8Array | ArrayBuffer;
+
+            type Metrics = "b" | "c";
+        }
+    }
+
+    /**
+     * Represents an array of bytes, enhanced Node.js Buffer
+     */
+    class ByteArray {
+        readonly woffset: number;
+
+        readonly roffset: number;
+
+        readonly buffer: Buffer;
+
+        readonly noAssert: boolean;
+
+        /**
+         * Constructs a new ByteArray
+         *
+         * @param capacity Initial capacity. Defaults to ByteArray.DEFAULT_CAPACITY(64)
+         * @param noAssert Whether to skip assertions of offsets and values. Defaults to ByteArray.DEFAULT_NOASSERT(false)
+         */
+        constructor(capacity?: number, noAssert?: boolean);
+
+        /**
+         * Reads a BitSet as an array of booleans.
+         *
+         * @param offset Offset to read from. Will use and increase offset by length if omitted.
+         */
+        readBitSet(offset?: number): boolean[];
+
+        /**
+         * Reads the specified number of bytes.
+         *
+         * @param length Number of bytes to read
+         * @param offset Offset to read from. Will use and increase offset by length if omitted.
+         */
+        read(length: number, offset?: number): ByteArray;
+
+        /**
+         * Reads an 8bit signed integer
+         *
+         * @param offset Offset to read from
+         */
+        readInt8(offset?: number): number;
+
+        /**
+         * Reads an 8bit unsigned integer
+         *
+         * @param offset Offset to read from
+         */
+        readUInt8(offset?: number): number;
+
+        /**
+         * Reads a 16bit signed le integer
+         *
+         * @param offset Offset to read from
+         */
+        readInt16LE(offset?: number): number;
+
+        /**
+         * Reads a 16bit unsigned le integer
+         *
+         * @param offset Offset to read from
+         */
+        readUInt16LE(offset?: number): number;
+
+        /**
+         * Reads a 16bit signed be integer
+         *
+         * @param offset Offset to read from
+         */
+        readInt16BE(offset?: number): number;
+
+        /**
+         * Reads a 16bit unsigned be integer
+         *
+         * @param offset Offset to read from
+         */
+        readUInt16BE(offset?: number): number;
+
+        /**
+         * Reads a 32bit signed le integer
+         *
+         * @param offset Offset to read from
+         */
+        readInt32LE(offset?: number): number;
+
+        /**
+         * Reads a 32bit unsigned le integer
+         *
+         * @param offset Offset to read from
+         */
+        readUInt32LE(offset?: number): number;
+
+        /**
+         * Reads a 32bit signed be integer
+         *
+         * @param offset Offset to read from
+         */
+        readInt32BE(offset?: number): number;
+
+        /**
+         * Reads a 32bit unsigned be integer
+         *
+         * @param offset Offset to read from
+         */
+        readUInt32BE(offset?: number): number;
+
+        /**
+         * Reads a 64bit signed le integer as math.Long
+         *
+         * @param offset Offset to read from
+         */
+        readInt64LE(offset?: number): math.Long;
+
+        /**
+         * Reads a 64bit unsigned le integer as math.Long
+         *
+         * @param offset Offset to read from
+         */
+        readUInt64LE(offset?: number): math.Long;
+
+        /**
+         * Reads a 64bit signed be integer as math.Long
+         *
+         * @param offset Offset to read from
+         */
+        readInt64BE(offset?: number): math.Long;
+
+        /**
+         * Reads a 64bit unsigned be integer as math.Long
+         *
+         * @param offset Offset to read from
+         */
+        readUInt64BE(offset?: number): math.Long;
+
+        /**
+         * Reads a 32bit le float
+         *
+         * @param offset Offset to read from
+         */
+        readFloatLE(offset?: number): number;
+
+        /**
+         * Reads a 32bit be float
+         *
+         * @param offset Offset to read from
+         */
+        readFloatBE(offset?: number): number;
+
+        /**
+         * Reads a 64bit le float
+         *
+         * @param offset Offset to read from
+         */
+        readDoubleLE(offset?: number): number;
+
+        /**
+         * Reads a 64bit be float
+         *
+         * @param offset Offset to read from
+         */
+        readDoubleBE(offset?: number): number;
+
+        /**
+         * Appends some data to this ByteArray.
+         * This will overwrite any contents behind the specified offset up to the appended data's length.
+         *
+         * @param source The source write from
+         * @param offset Offset to write at
+         * @param length length to read from the source
+         * @param encoding encoding to use for wrapping the source in bytearray
+         */
+        write(source: I.ByteArray.Wrappable, offset?: number, length?: number, encoding?: string): this;
+
+        /**
+         * Writes the array as a bitset.
+         * @param value Array of booleans to write
+         */
+        writeBitSet(value: number[]): this;
+
+        /**
+         * Writes the array as a bitset.
+         * @param value Array of booleans to write
+         * @param offset Offset to write at
+         */
+        writeBitSet(value: number[], offset: number): number;
+
+        /**
+         * Writes a buffer at the given offset
+         * @param buf Buffer to write
+         * @param offset Offset to write at
+         */
+        writeBuffer(buf: Buffer, offset?: number): this;
+
+        /**
+         * Writes an 8bit signed integer
+         *
+         * @param offset Offset to write at
+         */
+        writeInt8(value: number, offset?: number): this;
+
+        /**
+         * Writes an 8bit unsigned integer
+         *
+         * @param offset Offset to write at
+         */
+        writeUInt8(value: number, offset?: number): this;
+
+        /**
+         * Writes a 16bit signed le integer
+         *
+         * @param offset Offset to write at
+         */
+        writeInt16LE(value: number, offset?: number): this;
+
+        /**
+         * Writes a 16bit signed be integer
+         *
+         * @param offset Offset to write at
+         */
+        writeInt16BE(value: number, offset?: number): this;
+
+        /**
+         * Writes a 16bit unsigned le integer
+         *
+         * @param offset Offset to write at
+         */
+        writeUInt16LE(value: number, offset?: number): this;
+
+        /**
+         * Writes a 16bit unsigned be integer
+         *
+         * @param offset Offset to write at
+         */
+        writeUInt16BE(value: number, offset?: number): this;
+
+        /**
+         * Writes a 32bit signed le integer
+         *
+         * @param offset Offset to write at
+         */
+        writeInt32LE(value: number, offset?: number): this;
+
+        /**
+         * Writes a 32bit signed be integer
+         *
+         * @param offset Offset to write at
+         */
+        writeInt32BE(value: number, offset?: number): this;
+
+        /**
+         * Writes a 32bit unsigned le integer
+         *
+         * @param offset Offset to write at
+         */
+        writeUInt32LE(value: number, offset?: number): this;
+
+        /**
+         * Writes a 32bit unsigned be integer
+         *
+         * @param offset Offset to write at
+         */
+        writeUInt32BE(value: number, offset?: number): this;
+
+        /**
+         * Writes a 64bit signed le long integer
+         *
+         * @param offset Offset to write at
+         */
+        writeInt64LE(value: math.Long | string | number, offset?: number): this;
+
+        /**
+         * Writes a 64bit signed be long integer
+         *
+         * @param offset Offset to write at
+         */
+        writeInt64BE(value: math.Long | string | number, offset?: number): this;
+
+        /**
+         * Writes a 64bit unsigned le long integer
+         *
+         * @param offset Offset to write at
+         */
+        writeUInt64LE(value: math.Long | string | number, offset?: number): this;
+
+        /**
+         * Writes a 64bit unsigned be long integer
+         *
+         * @param offset Offset to write at
+         */
+        writeUInt64BE(value: math.Long | string | number, offset?: number): this;
+
+        /**
+         * Writes a 32bit le float
+         *
+         * @param offset Offset to write at
+         */
+        writeFloatLE(value: number, offset?: number): this;
+
+        /**
+         * Writes a 32bit be float
+         *
+         * @param offset Offset to write at
+         */
+        writeFloatBE(value: number, offset?: number): this;
+
+        /**
+         * Writes a 64bit le float
+         *
+         * @param offset Offset to write at
+         */
+        writeDoubleLE(value: number, offset?: number): this;
+
+        /**
+         * Writes a 64bit be float
+         *
+         * @param offset Offset to write at
+         */
+        writeDoubleBE(value: number, offset?: number): this;
+
+        /**
+         * Writes a 32bit base 128 variable-length integer
+         */
+        writeVarint32(value: number): this;
+
+        /**
+         * Writes a 32bit base 128 variable-length integer
+         *
+         * @param offset Offset to write at
+         */
+        writeVarint32(value: number, offset: number): number;
+
+        /**
+         * Writes a zig-zag encoded 32bit base 128 variable-length integer
+         */
+        writeVarint32ZigZag(value: number): this;
+
+        /**
+         * Writes a zig-zag encoded 32bit base 128 variable-length integer
+         *
+         * @param offset Offset to write at
+         */
+        writeVarint32ZigZag(value: number, offset: number): number;
+
+        /**
+         * Reads a 32bit base 128 variable-length integer
+         */
+        readVarint32(): number;
+
+        /**
+         * Reads a 32bit base 128 variable-length integer
+         *
+         * @param offset Offset to read from
+         */
+        readVarint32(offset: number): I.ByteArray.Varint32;
+
+        /**
+         * Reads a zig-zag encoded 32bit base 128 variable-length integer
+         */
+        readVarint32ZigZag(): number;
+
+        /**
+         * Reads a zig-zag encoded 32bit base 128 variable-length integer
+         *
+         * @param offset Offset to read from
+         */
+        readVarint32ZigZag(offset: number): I.ByteArray.Varint32;
+
+        /**
+         * Writes a 64bit base 128 variable-length integer
+         */
+        writeVarint64(value: math.Long | string | number): this;
+
+        /**
+         * Writes a 64bit base 128 variable-length integer
+         *
+         * @param offset Offset to write at
+         */
+        writeVarint64(value: math.Long | string | number, offset: number): number;
+
+        /**
+         * Writes a zig-zag encoded 64bit base 128 variable-length integer
+         */
+        writeVarint64ZigZag(value: math.Long | string | number): this;
+
+        /**
+         * Writes a zig-zag encoded 64bit base 128 variable-length integer
+         *
+         * @param offset Offset to write at
+         */
+        writeVarint64ZigZag(value: math.Long | string | number, offset: number): number;
+
+        /**
+         * Reads a 64bit base 128 variable-length integer
+         */
+        readVarint64(): I.Long;
+
+        /**
+         * Reads a 64bit base 128 variable-length integer
+         *
+         * @param offset Offset to read from
+         */
+        readVarint64(offset: number): I.ByteArray.Varint64;
+
+        /**
+         * Reads a zig-zag encoded 64bit base 128 variable-length integer
+         */
+        readVarint64ZigZag(): math.Long;
+
+        /**
+         * Reads a zig-zag encoded 64bit base 128 variable-length integer
+         *
+         * @param offset Offset to read from
+         */
+        readVarint64ZigZag(offset: number): I.ByteArray.Varint64;
+
+        /**
+         * Writes a NULL-terminated UTF8 encoded string.
+         * For this to work the specified string must not contain any NULL characters itself
+         */
+        writeCString(str: string): this;
+
+        /**
+         * Writes a NULL-terminated UTF8 encoded string.
+         * For this to work the specified string must not contain any NULL characters itself
+         *
+         * @param offset Offset to write at
+         */
+        writeCString(str: string, offset: number): number;
+
+        /**
+         * Reads a NULL-terminated UTF8 encoded string.
+         * For this to work the string read must not contain any NULL characters itself
+         */
+        readCString(): string;
+
+        /**
+         * Reads a NULL-terminated UTF8 encoded string.
+         * For this to work the string read must not contain any NULL characters itself
+         *
+         * @param offset Offset to read from
+         */
+        readCString(offset: number): I.ByteArray.String;
+
+        /**
+         * Writes an UTF8 encoded string
+         */
+        writeString(str: string): this;
+
+        /**
+         * Writes an UTF8 encoded string
+         *
+         * @param offset Offset to write at
+         */
+        writeString(str: string, offset: number): number;
+
+        /**
+         * Reads an UTF8 encoded string
+         *
+         * @param length Number of characters or bytes to read
+         * @param metrics Metrics specifying what n is meant to count. Defaults to ByteArray.METRICS_CHARS("c")
+         */
+        readString(length: number, metrics?: I.ByteArray.Metrics): string;
+
+        /**
+         * Reads an UTF8 encoded string
+         *
+         * @param length Number of characters or bytes to read
+         * @param metrics Metrics specifying what n is meant to count. Defaults to ByteArray.METRICS_CHARS("c")
+         * @param offset Offset to read from
+         */
+        readString(length: number, metrics: I.ByteArray.Metrics, offset: number): I.ByteArray.String;
+
+        /**
+         * Reads an UTF8 encoded string
+         *
+         * @param length Number of characters or bytes to read
+         * @param offset Offset to read from
+         */
+        readString(length: number, offset: number): I.ByteArray.String;
+
+        /**
+         * Writes a length as varint32 prefixed UTF8 encoded string
+         */
+        writeVString(str: string): this;
+
+        /**
+         * Writes a length as varint32 prefixed UTF8 encoded string
+         *
+         * @param offset Offset to read from
+         */
+        writeVString(str: string, offset: number): number;
+
+        /**
+         * Reads a length as varint32 prefixed UTF8 encoded string
+         */
+        readVString(): string;
+
+        /**
+         * Reads a length as varint32 prefixed UTF8 encoded string
+         *
+         * @param offset Offset to read from
+         */
+        readVString(offset: number): I.ByteArray.String;
+
+        /**
+         * Appends this ByteArray's contents to another ByteArray.
+         * This will overwrite any contents behind the specified offset up to the length of this ByteArray's data
+         *
+         * @param offset Offset to append to
+         */
+        appendTo(target: ByteArray, offset?: number): this;
+
+        /**
+         * Enables or disables assertions of argument types and offsets.
+         * Assertions are enabled by default but you can opt to disable them if your code already makes sure that everything is valid
+         */
+        assert(assert?: boolean): this;
+
+        /**
+         * Gets the capacity of this ByteArray's backing buffer
+         */
+        capacity(): number;
+
+        /**
+         * Clears this ByteArray's offsets by setting offset to 0 and limit to the backing buffer's capacity
+         */
+        clear(): this;
+
+        /**
+         * Creates a cloned instance of this ByteArray,
+         * preset with this ByteArray's values for offset, markedOffset and limit
+         *
+         * @param copy Whether to copy the backing buffer or to return another view on the same, false by default
+         */
+        clone(copy?: boolean): ByteArray;
+
+        /**
+         * Compacts this ByteArray to be backed by a buffer of its contents' length.
+         * Will set offset = 0 and limit = capacity and adapt markedOffset to the same relative position if set
+         *
+         * @param begin Offset to start at, buffer offset by default
+         * @param end Offset to end at, buffer limit by default
+         */
+        compact(begin?: number, end?: number): this;
+
+        /**
+         * Creates a copy of this ByteArray's contents.
+         *
+         * @param begin Begin offset, buffer offset by default
+         * @param end End offset, buffer limit by default
+         */
+        copy(begin?: number, end?: number): ByteArray;
+
+        /**
+         * Copies this ByteArray's contents to another ByteArray.
+         *
+         * @param targetOffset Offset to copy to. Will use and increase the target's offset by the number of bytes copied if omitted
+         * @param sourceOffset Offset to start copying from. Will use and increase offset by the number of bytes copied if omitted
+         * @param sourceLimit Offset to end copying from, defaults to the buffer limit
+         */
+        copyTo(target: ByteArray, targetOffset?: number, souceOffset?: number, sourceLimit?: number): this | ByteArray;
+
+        /**
+         * Makes sure that this ByteArray is backed by a ByteArray#buffer of at least the specified capacity.
+         * If the current capacity is exceeded, it will be doubled.
+         * If double the current capacity is less than the required capacity, the required capacity will be used instead
+         */
+        ensureCapacity(capacity: number): this;
+
+        /**
+         * Overwrites this ByteArray's contents with the specified value.
+         *
+         * @param value Byte value to fill with. If given as a string, the first character is used
+         * @param begin Begin offset. Will use and increase offset by the number of bytes written if omitted. defaults to offset
+         * @param end End offset, defaults to limit.
+         */
+        fill(value: string | number, begin?: number, end?: number): this;
+
+        /**
+         * Makes this ByteArray ready for a new sequence of write or relative read operations.
+         * Sets limit = offset and offset = 0.
+         * Make sure always to flip a ByteArray when all relative read or write operations are complete
+         */
+        flip(): this;
+
+        /**
+         * Marks an offset on this ByteArray to be used later
+         *
+         * @param offset Offset to mark. Defaults to offset.
+         */
+        mark(offset?: number): this;
+
+        /**
+         * Prepends some data to this ByteArray.
+         * This will overwrite any contents before the specified offset up to the prepended data's length.
+         * If there is not enough space available before the specified offset,
+         * the backing buffer will be resized and its contents moved accordingly
+         *
+         * @param source Data to prepend
+         * @param offset Offset to prepend at. Will use and decrease offset by the number of bytes prepended if omitted.
+         */
+        prepend(source: I.ByteArray.Wrappable, offset: number): this;
+
+        /**
+         * Prepends some data to this ByteArray.
+         * This will overwrite any contents before the specified offset up to the prepended data's length.
+         * If there is not enough space available before the specified offset,
+         * the backing buffer will be resized and its contents moved accordingly
+         *
+         * @param source Data to prepend
+         * @param encoding Encoding if data is a string
+         * @param offset Offset to prepend at. Will use and decrease offset by the number of bytes prepended if omitted.
+         */
+        prepend(source: I.ByteArray.Wrappable, encoding?: string, offset?: number): this;
+
+        /**
+         * Prepends this ByteArray to another ByteArray.
+         * This will overwrite any contents before the specified offset up to the prepended data's length.
+         * If there is not enough space available before the specified offset,
+         * the backing buffer will be resized and its contents moved accordingly
+         *
+         * @param offset Offset to prepend at
+         */
+        prependTo(target: ByteArray, offset?: number): this;
+
+        /**
+         * Gets the number of remaining readable bytes
+         */
+        remaining(): number;
+
+        /**
+         * Resets this ByteArray's offset.
+         * If an offset has been marked through mark before, offset will be set to markedOffset, which will then be discarded.
+         * If no offset has been marked, sets offset = 0
+         */
+        reset(): this;
+
+        /**
+         * Resizes this ByteArray to be backed by a buffer of at least the given capacity.
+         * Will do nothing if already that large or larger.
+         *
+         * @param capacity	Capacity required
+         */
+        resize(capacity: number): this;
+
+        /**
+         * Reverses this ByteArray's contents.
+         *
+         * @param begin Offset to start at, defaults to offset
+         * @param end Offset to end at, defaults to limit
+         */
+        reverse(begin?: number, end?: number): this;
+
+        /**
+         * Skips the next length bytes. This will just advance
+         */
+        skip(length: number): this;
+
+        /**
+         * Slices this ByteArray by creating a cloned instance with offset = begin and limit = end
+         *
+         * @param begin Begin offset, defaults to offset
+         * @param end End offset, defaults to limit
+         */
+        slice(begin?: number, end?: number): ByteArray;
+
+        /**
+         * Returns a copy of the backing buffer that contains this ByteArray's contents.
+         *
+         * @param forceCopy If true returns a copy, otherwise returns a view referencing the same memory if possible, false by default
+         * @param begin Begin offset, offset by default
+         * @param end End offset, limit by default
+         */
+        toBuffer(forceCopy?: boolean, begin?: number, end?: number): Buffer;
+
+        /**
+         * Returns a raw buffer compacted to contain this ByteArray's contents
+         */
+        toArrayBuffer(): ArrayBuffer;
+
+        /**
+         * Converts the ByteArray's contents to a string
+         *
+         * @param encoding Output encoding
+         * @param begin Begin offset, offset by default
+         * @param end End offset, limit by default
+         */
+        toString(encoding?: string, begin?: number, end?: number): string;
+
+        /**
+         * Encodes this ByteArray's contents to a base64 encoded string
+         *
+         * @param begin Begin offset, offset by default
+         * @param end End offset, limit by default
+         */
+        toBase64(begin?: number, end?: number): string;
+
+        /**
+         * Encodes this ByteArray to a binary encoded string, that is using only characters 0x00-0xFF as bytes
+         *
+         * @param begin Begin offset, offset by default
+         * @param end End offset, limit by default
+         */
+        toBinary(begin?: number, end?: number): string;
+
+        /**
+         * Encodes this ByteArray to a hex encoded string with marked offsets
+         *
+         * @param columns If true returns two columns hex + ascii, defaults to false
+         */
+        toDebug(columns?: boolean): string;
+
+        /**
+         * Encodes this ByteArray's contents to a hex encoded string
+         *
+         * @param begin Begin offset, offset by default
+         * @param end End offset, limit by default
+         */
+        toHex(begin?: number, end?: number): string;
+
+        /**
+         * Encodes this ByteArray's contents to an UTF8 encoded string
+         *
+         * @param begin Begin offset, offset by default
+         * @param end End offset, limit by default
+         */
+        toUTF8(begin?: number, end?: number): string;
+
+        static accessor(): typeof Buffer;
+
+        /**
+         * Allocates a new ByteArray backed by a buffer of the specified capacity.
+         *
+         * @param capacity Initial capacity. Defaults to ByteArray.DEFAULT_CAPACITY(64)
+         * @param noAssert Whether to skip assertions of offsets and values. Defaults to ByteArray.DEFAULT_NOASSERT(false)
+         */
+        static allocate(capacity?: number, noAssert?: boolean): ByteArray;
+
+        /**
+         * Concatenates multiple ByteArrays into one
+         *
+         * @param encoding Encoding for strings
+         * @param noAssert Whether to skip assertions of offsets and values. Defaults to ByteArray.DEFAULT_NOASSERT(false)
+         */
+        static concat(buffers: I.ByteArray.Wrappable[], encoding?: string, noAssert?: boolean): ByteArray;
+
+        static type(): typeof Buffer;
+
+        /**
+         * Wraps a buffer or a string.
+         * Sets the allocated ByteArray's offset to 0 and its limit to the length of the wrapped data
+         *
+         * @param encoding Encoding for strings
+         * @param noAssert Whether to skip assertions of offsets and values. Defaults to ByteArray.DEFAULT_NOASSERT(false)
+         */
+        static wrap(buffer: I.ByteArray.Wrappable, encoding?: string, noAssert?: boolean): ByteArray;
+
+        /**
+         * Calculates the actual number of bytes required to store a 32bit base 128 variable-length integer
+         */
+        static calculateVarint32(value: number): number;
+
+        /**
+         * Zigzag encodes a signed 32bit integer so that it can be effectively used with varint encoding
+         */
+        static zigZagEncode32(n: number): number;
+
+        /**
+         * Decodes a zigzag encoded signed 32bit integer
+         */
+        static zigZagDecode32(n: number): number;
+
+        /**
+         * Calculates the actual number of bytes required to store a 64bit base 128 variable-length integer
+         */
+        static calculateVarint64(value: number | string): number;
+
+        /**
+         * Zigzag encodes a signed 64bit integer so that it can be effectively used with varint encoding
+         */
+        static zigZagEncode64(value: number | string | I.Long): I.Long;
+
+        /**
+         * Decodes a zigzag encoded signed 64bit integer.
+         */
+        static zigZagDecode64(value: number | string | I.Long): I.Long;
+
+        /**
+         * Calculates the number of UTF8 characters of a string.
+         * JavaScript itself uses UTF-16,
+         * so that a string's length property does not reflect its actual UTF8 size if it contains code points larger than 0xFFFF
+         */
+        static calculateUTF8Chars(str: string): number;
+
+        /**
+         *  Calculates the number of UTF8 bytes of a string.
+         */
+        static calculateString(str: string): number;
+
+        /**
+         * Decodes a base64 encoded string to a ByteArray
+         */
+        static fromBase64(str: string): ByteArray;
+
+        /**
+         * Encodes a binary string to base64 like window.btoa does
+         */
+        static btoa(str: string): string;
+
+        /**
+         * Decodes a base64 encoded string to binary like window.atob does
+         */
+        static atob(b64: string): string;
+
+        /**
+         * Decodes a binary encoded string, that is using only characters 0x00-0xFF as bytes, to a ByteArray
+         */
+        static fromBinary(str: string): ByteArray;
+
+        /**
+         * Decodes a hex encoded string with marked offsets to a ByteArray
+         */
+        static fromDebug(str: string, noAssert?: boolean): ByteArray;
+
+        /**
+         * Decodes a hex encoded string to a ByteArray
+         */
+        static fromHex(str: string, noAssert?: boolean): ByteArray;
+
+        /**
+         * Decodes an UTF8 encoded string to a ByteArray
+         */
+        static fromUTF8(str: string, noAssert?: boolean): ByteArray;
+
+        /**
+         * Default initial capacity
+         */
+        static DEFAULT_CAPACITY: number;
+
+        /**
+         * Default no assertions flag
+         */
+        static DEFAULT_NOASSERT: boolean;
+
+        /**
+         * Maximum number of bytes required to store a 32bit base 128 variable-length integer
+         */
+        static MAX_VARINT32_BYTES: number;
+
+        /**
+         * Maximum number of bytes required to store a 64bit base 128 variable-length integer
+         */
+        static MAX_VARINT64_BYTES: number;
+
+        /**
+         * Metrics representing number of UTF8 characters. Evaluates to `c`.
+         */
+        static METRICS_CHARS: string;
+
+        /**
+         * Metrics representing number of bytes. Evaluates to `b`.
+         */
+        static METRICS_BYTES: string;
+    }
+}
diff --git a/types/adone/glosses/collections/default_map.d.ts b/types/adone/glosses/collections/default_map.d.ts
new file mode 100644
index 0000000000..46b8ccebfe
--- /dev/null
+++ b/types/adone/glosses/collections/default_map.d.ts
@@ -0,0 +1,9 @@
+declare namespace adone.collection {
+    /**
+     * Represents a Map that has a default values factory object or function.
+     * Each get of non-existent key goes through the factory
+     */
+    class DefaultMap<K = string, V = any> extends Map<K, V> {
+        constructor(factory?: ((key: K) => V) | { [key: string]: V }, iterable?: Iterable<[K, V]>);
+    }
+}
diff --git a/types/adone/glosses/collections/fast_lru.d.ts b/types/adone/glosses/collections/fast_lru.d.ts
new file mode 100644
index 0000000000..e991322bc0
--- /dev/null
+++ b/types/adone/glosses/collections/fast_lru.d.ts
@@ -0,0 +1,61 @@
+declare namespace adone.collection {
+    /**
+     * Represents a faster LRU cache but with less functionality
+     */
+    class FastLRU<K = any, V = any> {
+        /**
+         * @param size Cache size, unlimited by default
+         */
+        constructor(size?: number, options?: {
+            /**
+             * Function that is called when a value is deleted
+             */
+            dispose?(key: K, value: V): void
+        });
+
+        /**
+         * The actual size of the cache
+         */
+        readonly size: number;
+
+        /**
+         * Gets the value by the given key
+         */
+        get(key: K): V | undefined;
+
+        /**
+         * Sets a new value for the given key
+         */
+        set(key: K, value: V): void;
+
+        /**
+         * Deletes the given key from the cache
+         */
+        delete(key: K): boolean;
+
+        /**
+         * Checks whether the cache has an element with the given key
+         */
+        has(key: K): boolean;
+
+        /**
+         * Returns the keys iterator
+         */
+        keys(): IterableIterator<K>;
+
+        /**
+         * Returns the values iterator
+         */
+        values(): IterableIterator<V>;
+
+        /**
+         * Returns the entries iterator
+         */
+        entries(): IterableIterator<[K, V]>;
+
+        /**
+         * Clears the cache
+         */
+        clear(): void;
+    }
+}
diff --git a/types/adone/glosses/collections/index.d.ts b/types/adone/glosses/collections/index.d.ts
new file mode 100644
index 0000000000..234ffe85f4
--- /dev/null
+++ b/types/adone/glosses/collections/index.d.ts
@@ -0,0 +1,28 @@
+/// <reference path="./array_set.d.ts" />
+/// <reference path="./async_queue.d.ts" />
+/// <reference path="./avl_tree.d.ts" />
+/// <reference path="./binary_search_tree.d.ts" />
+/// <reference path="./buffer_list.d.ts" />
+/// <reference path="./byte_array.d.ts" />
+/// <reference path="./default_map.d.ts" />
+/// <reference path="./fast_lru.d.ts" />
+/// <reference path="./linked_list.d.ts" />
+/// <reference path="./lru.d.ts" />
+/// <reference path="./map_cache.d.ts" />
+/// <reference path="./ns_cache.d.ts" />
+/// <reference path="./priority_queue.d.ts" />
+/// <reference path="./queue.d.ts" />
+/// <reference path="./rb_tree.d.ts" />
+/// <reference path="./refcounted_cache.d.ts" />
+/// <reference path="./set.d.ts" />
+/// <reference path="./stack.d.ts" />
+/// <reference path="./timedout_map.d.ts" />
+
+declare namespace adone {
+    /**
+     * Data structures
+     */
+    namespace collection {
+        //
+    }
+}
diff --git a/types/adone/glosses/collections/linked_list.d.ts b/types/adone/glosses/collections/linked_list.d.ts
new file mode 100644
index 0000000000..69ffa4da4b
--- /dev/null
+++ b/types/adone/glosses/collections/linked_list.d.ts
@@ -0,0 +1,150 @@
+declare namespace adone.collection {
+    namespace I.LinkedList {
+        /**
+         * Represents the node of a linked list
+         */
+        interface Node<T> {
+            /**
+             * The next node
+             */
+            next?: Node<T>;
+
+            /**
+             * The previous node
+             */
+            prev?: Node<T>;
+
+            /**
+             * The value this node contains
+             */
+            value: T;
+        }
+    }
+
+    /**
+     * Represents a linked list
+     */
+    class LinkedList<T = any> {
+        /**
+         * The maximum length of the list
+         */
+        readonly maxLength: number;
+
+        /**
+         * Current length of the list
+         */
+        readonly length: number;
+
+        /**
+         * Whether the list is autoresizable
+         */
+        readonly autoresize: boolean;
+
+        /**
+         * @param maxLength Maximum length of the linked list
+         */
+        constructor(maxLength?: number);
+
+        /**
+         * Whether the list is full
+         */
+        readonly full: boolean;
+
+        /**
+         * Whether the list is empty
+         */
+        readonly empty: boolean;
+
+        /**
+         * Resizes the list
+         */
+        resize(newLength: number): this;
+
+        /**
+         * Adds a new node to the end
+         *
+         * @returns Added node
+         */
+        push(value: T): I.LinkedList.Node<T>;
+
+        /**
+         * Removes the last node, returns undefined if the list is empty
+         */
+        pop(): T | undefined;
+
+        /**
+         * Removes the first node, returns undefined if the list is empty
+         */
+        shift(): T | undefined;
+
+        /**
+         * Inserts a new node at the beginning of the list
+         *
+         * @returns Added node
+         */
+        unshift(value: T): I.LinkedList.Node<T>;
+
+        /**
+         * Moves the given node to the end of the list
+         */
+        pushNode(node: I.LinkedList.Node<T>): void;
+
+        /**
+         * Moved the given node to the beginning of the list
+         */
+        unshiftNode(node: I.LinkedList.Node<T>): void;
+
+        /**
+         * Removes the given node from the list
+         */
+        removeNode(node: I.LinkedList.Node<T>): void;
+
+        /**
+         * Clears the list
+         *
+         * @param strong Whether to reset all the node's values
+         */
+        clear(strong?: boolean): void;
+
+        /**
+         * Convers the list to an array
+         */
+        toArray(): T[];
+
+        /**
+         * The first element of the list
+         */
+        readonly front: T;
+
+        /**
+         * The last element of the list
+         */
+        readonly back: T;
+
+        /**
+         * Returns an iterator over the list elements
+         */
+        [Symbol.iterator](): IterableIterator<T>;
+
+        /**
+         * Returns the next node for the given node
+         */
+        nextNode(node: I.LinkedList.Node<T>): I.LinkedList.Node<T>;
+
+        /**
+         * Maps this linked list to a new one using the given function
+         */
+        map<R>(fn: (value: T, index: number) => R): LinkedList<R>;
+
+        /**
+         * Invokes the given callback for each value from the beginning to the end (much faster than for-of).
+         * If the given function returns false it stops iterating.
+         */
+        forEach(callback: (value: T, index: number) => void | boolean): void;
+
+        /**
+         * Default length of a new created linked list
+         */
+        static DEFAULT_LENGTH: number;
+    }
+}
diff --git a/types/adone/glosses/collections/lru.d.ts b/types/adone/glosses/collections/lru.d.ts
new file mode 100644
index 0000000000..7d41e32cd5
--- /dev/null
+++ b/types/adone/glosses/collections/lru.d.ts
@@ -0,0 +1,213 @@
+declare namespace adone.collection {
+    namespace I.LRU {
+        type LengthCalculator<K, V> = (value: V, key: K) => number;
+        interface ConstructorOptions<K, V> {
+            /**
+             * The maximum size of the cache, checked by applying the length function to all values in the cache.
+             * Default is Infinity
+             */
+            max?: number;
+
+            /**
+             * Maximum age in ms. Items are not pro-actively pruned out as they age,
+             * but if you try to get an item that is too old,
+             * it'll drop it and return undefined instead of giving it to you
+             */
+            maxAge?: number;
+
+            /**
+             * Function that is used to calculate the length of stored items
+             */
+            length?: LengthCalculator<K, V>;
+
+            /**
+             * Function that is called on items when they are dropped from the cache
+             */
+            dispose?(key: K, value: V): void;
+
+            /**
+             * Whether to return the stale value before deleting it
+             */
+            stale?: boolean;
+
+            /**
+             * Dispose will only be called when a key falls out of the cache, not when it is overwritten
+             */
+            noDisposeOnSet?: boolean;
+        }
+
+        interface SerializedEntry<K, V> {
+            /**
+             * key
+             */
+            key: K;
+
+            /**
+             * value
+             */
+            value: V;
+
+            /**
+             * when it becomes expired
+             */
+            e: number;
+        }
+
+        interface Entry<K, V> {
+            /**
+             * key
+             */
+            key: K;
+
+            /**
+             * value
+             */
+            value: V;
+
+            /**
+             * entry length
+             */
+            length: number;
+
+            /**
+             * Timestamp when the entry was created
+             */
+            now: number;
+
+            /**
+             * Maximum live time
+             */
+            maxAge: number;
+        }
+    }
+
+    /**
+     * Represent an LRU cache
+     */
+    class LRU<K = any, V = any> {
+        /**
+         * Creates an LRU cache of the given size
+         */
+        constructor(max: number);
+
+        /**
+         * Creates an LRU cache with the given options
+         */
+        constructor(options?: I.LRU.ConstructorOptions<K, V>);
+
+        /**
+         * The length of the cache, setter resizes the cache
+         */
+        max: number;
+
+        /**
+         * stale setting
+         */
+        allowStale: boolean;
+
+        /**
+         * maxAge setting
+         */
+        maxAge: number;
+
+        /**
+         * length setting
+         */
+        lengthCalculator: I.LRU.LengthCalculator<K, V>;
+
+        /**
+         * Total length of objects in cache taking into account length options function
+         */
+        readonly length: number;
+
+        /**
+         * Total quantity of objects currently in cache.
+         * Note, that stale items are returned as part of this item count.
+         */
+        readonly itemCount: number;
+
+        /**
+         * Iterates over all the keys in the cache, in reverse recent-ness order. (ie, less recently used items are iterated over first.)
+         */
+        rforEach<T = any>(fn: (this: T, value: V, key: K, cache: LRU<K, V>) => void, thisp?: T): void;
+
+        /**
+         * Iterates over all the keys in the cache, in order of recent-ness
+         */
+        forEach<T = any>(fn: (this: T, value: V, key: K, cache: LRU<K, V>) => void, thisp?: T): void;
+
+        /**
+         * Returns an array of the keys in the cache
+         */
+        keys(): K[];
+
+        /**
+         * Returns an array of the values in the cache
+         */
+        values(): V[];
+
+        /**
+         * Clears the cache entirely, throwing away all values
+         */
+        reset(): void;
+
+        /**
+         * Return an array of the cache entries ready for serialization and usage with 'destinationCache.load(arr)`
+         */
+        dump(): Array<I.LRU.SerializedEntry<K, V>>;
+
+        /**
+         * Returns an internal lru list of entries
+         */
+        dumpLru(): LinkedList<I.LRU.Entry<K, V>>;
+
+        /**
+         * @param opts std.util.inspect options
+         */
+        inspect(opts?: object): string;
+
+        /**
+         * Sets a new value for the given key. Updates the "recently used"-ness of the key
+         *
+         * @param maxAge maxAge option specific for this key
+         * @returns Whether the key was set
+         */
+        set(key: K, value: V, maxAge?: number): boolean;
+
+        /**
+         * Check if a key is in the cache, without updating the recent-ness or deleting it for being stale
+         */
+        has(key: K): boolean;
+
+        /**
+         * Gets the value of the given key. Updates the "recently used"-ness of the key
+         */
+        get(key: K): V | undefined;
+
+        /**
+         * Returns the key value without updating the "recently used"-ness of the key
+         */
+        peek(key: K): V | undefined;
+
+        /**
+         * Deletes the less recently used element
+         */
+        pop(): I.LRU.Entry<K, V>;
+
+        /**
+         * Deletes a key out of the cache
+         */
+        del(key: K): void;
+
+        /**
+         * Loads another cache entries array, obtained with sourceCache.dump(), into the cache.
+         * The destination cache is reset before loading new entries
+         */
+        load(arr: Array<I.LRU.SerializedEntry<K, V>>): void;
+
+        /**
+         * Manually iterates over the entire cache proactively pruning old entries
+         */
+        prune(): void;
+    }
+}
diff --git a/types/adone/glosses/collections/map_cache.d.ts b/types/adone/glosses/collections/map_cache.d.ts
new file mode 100644
index 0000000000..55bbb6e05f
--- /dev/null
+++ b/types/adone/glosses/collections/map_cache.d.ts
@@ -0,0 +1,13 @@
+declare namespace adone.collection {
+    class MapCache<T = any> {
+        has(key: string): boolean;
+
+        get(key: string): T;
+
+        set(key: string, value: T): void;
+
+        delete(key: string): void;
+
+        clear(): void;
+    }
+}
diff --git a/types/adone/glosses/collections/ns_cache.d.ts b/types/adone/glosses/collections/ns_cache.d.ts
new file mode 100644
index 0000000000..5630c295d3
--- /dev/null
+++ b/types/adone/glosses/collections/ns_cache.d.ts
@@ -0,0 +1,17 @@
+declare namespace adone.collection {
+    class NSCache<T = any> {
+        constructor(size: number, namespaces: string[]);
+
+        resize(newSize: number): void;
+
+        set(ns: string, key: string, value: T): void;
+
+        get(ns: string, key: string): T;
+
+        has(ns: string, key: string): boolean;
+
+        delete(ns: string, key: string): void;
+
+        clear(): void;
+    }
+}
diff --git a/types/adone/glosses/collections/priority_queue.d.ts b/types/adone/glosses/collections/priority_queue.d.ts
new file mode 100644
index 0000000000..0fb1e92814
--- /dev/null
+++ b/types/adone/glosses/collections/priority_queue.d.ts
@@ -0,0 +1,78 @@
+declare namespace adone.collection {
+    namespace I.PriorityQueue {
+        interface ConstructorOptions<T> {
+            /**
+             * Function that compares objects.
+             *
+             * Must return a positive value if a > b, a negative if a < b, and zero for equal objects
+             */
+            compare?(a: T, b: T): number;
+
+            /**
+             * Function that evaluates the priority value by the given objects,
+             * if the returned value > 0, then the first argument has higher priority,
+             * = 0 same priority, < 0 lower priority.
+             * By default the top element is an element that has the highest priority,
+             * the default priority function is equal to the compare function
+             */
+            priority?(a: T, b: T): number;
+        }
+    }
+
+    /**
+     * Represents a priority queue
+     */
+    class PriorityQueue<T = any> {
+        /**
+         * Whether the queue is empty
+         */
+        readonly empty: boolean;
+
+        /**
+         * The length of the queue
+         */
+        readonly length: number;
+
+        constructor(options?: I.PriorityQueue.ConstructorOptions<T>);
+
+        /**
+         * Clones the queue
+         */
+        clone(): PriorityQueue<T>;
+
+        /**
+         * Inserts a new element
+         */
+        push(x: T): this;
+
+        /**
+         * Removes the top element (that has the highest priority)
+         */
+        pop(): T | undefined;
+
+        /**
+         * Deletes the given element from the queue
+         */
+        delete(x: T): this;
+
+        /**
+         * Replaces the top element (pop + push)
+         */
+        replace(x: T): T;
+
+        /**
+         * Faster push + pop
+         */
+        pushpop(x: T): T;
+
+        /**
+         * Converts the queue to an array, it works with a clone of the queue, so the original queue is untouched
+         */
+        toArray(): T[];
+
+        /**
+         * Creates a queue object from the given iterable
+         */
+        static from<T>(iterable: Iterable<T>, options?: I.PriorityQueue.ConstructorOptions<T>): PriorityQueue<T>;
+    }
+}
diff --git a/types/adone/glosses/collections/queue.d.ts b/types/adone/glosses/collections/queue.d.ts
new file mode 100644
index 0000000000..e67eb8fda9
--- /dev/null
+++ b/types/adone/glosses/collections/queue.d.ts
@@ -0,0 +1,31 @@
+declare namespace adone.collection {
+    /**
+     * Represents a queue
+     */
+    class Queue<S = any, T = S> {
+        /**
+         * Whether the queue is full
+         */
+        readonly full: boolean;
+
+        /**
+         * The length of the queue
+         */
+        readonly length: number;
+
+        /**
+         * Whether the queue is empty
+         */
+        readonly empty: boolean;
+
+        /**
+         * Inserts a new element at the end
+         */
+        push(x: S): this;
+
+        /**
+         * Removes and returns an element from the beginning
+         */
+        pop(): T | undefined;
+    }
+}
diff --git a/types/adone/glosses/collections/rb_tree.d.ts b/types/adone/glosses/collections/rb_tree.d.ts
new file mode 100644
index 0000000000..2ed7a81323
--- /dev/null
+++ b/types/adone/glosses/collections/rb_tree.d.ts
@@ -0,0 +1,184 @@
+declare namespace adone.collection {
+    namespace I.RedBlackTree {
+        interface Node<K, V> {
+            /**
+             * The key associated to the node
+             */
+            key: K;
+
+            /**
+             * The value associated to the node
+             */
+            value: V;
+
+            /**
+             * The left subtree of the node
+             */
+            left?: Node<K, V>;
+
+            /**
+             * The right subtree of the node
+             */
+            right?: Node<K, V>;
+        }
+
+        interface Iterator<K, V> {
+            /**
+             * Checks if the iterator is valid
+             */
+            readonly valid: boolean;
+
+            /**
+             * The value of the node at the iterator's current position, null if invalid
+             */
+            readonly node: Node<K, V> | null;
+
+            /**
+             * The key of the item referenced by the iterator, undefined if invalid
+             */
+            readonly key?: K;
+
+            /**
+             * The value of the item referenced by the iterator, undefined if invalid
+             */
+            readonly value?: V;
+
+            /**
+             * Returns the position of this iterator in the sequence
+             */
+            readonly index: number;
+
+            /**
+             * If true, then the iterator is not at the end of the sequence
+             */
+            readonly hasNext: boolean;
+
+            /**
+             * If true, then the iterator is not at the beginning of the sequence
+             */
+            readonly hasPrev: boolean;
+
+            /**
+             * The tree associated to the iterator
+             */
+            tree: RedBlackTree<K, V>;
+
+            /**
+             * Makes a copy of the iterator
+             */
+            clone(): Iterator<K, V>;
+
+            /**
+             * Removes the item at the position of the iterator and returns a new rb-tree
+             */
+            remove(): RedBlackTree<K, V>;
+
+            /**
+             * Advances the iterator to the next position
+             */
+            next(): void;
+
+            /**
+             * Updates the value of the node in the tree at this iterator and returns a new rb-tree
+             */
+            update(value: V): RedBlackTree<K, V>;
+
+            /**
+             * Moves the iterator backward one element
+             */
+            prev(): void;
+        }
+    }
+
+    /**
+     * Represents a fully persistent red-black tree
+     */
+    class RedBlackTree<K = any, V = any> {
+        /**
+         * The root node of the tree
+         */
+        root: I.RedBlackTree.Node<K, V>;
+
+        constructor(compare?: (a: K, b: K) => number, root?: RedBlackTree<K, V>);
+
+        /**
+         * A sorted array of all the keys in the tree
+         */
+        readonly keys: K[];
+
+        /**
+         * An array of all the values in the tree
+         */
+        readonly values: V[];
+
+        /**
+         * The number of items in the tree
+         */
+        readonly length: number;
+
+        /**
+         * An iterator pointing to the first element in the tree
+         */
+        readonly begin: I.RedBlackTree.Iterator<K, V>;
+
+        /**
+         * An iterator pointing to the last element in the tree
+         */
+        readonly end: I.RedBlackTree.Iterator<K, V>;
+
+        /**
+         * Creates a new tree with the new pair inserted
+         */
+        insert(key: K, value: V): RedBlackTree<K, V>;
+
+        /**
+         * Walks a visitor function over the nodes of the tree in order
+         *
+         * @param visit A callback that gets executed on each node.
+         *              If a truthy value is returned from the visitor, then iteration is stopped.
+         * @param lo An optional start of the range to visit (inclusive)
+         * @param hi An optional end of the range to visit (non-inclusive)
+         */
+        forEach<T>(visit: (key: K, value: V) => T, lo?: K, hi?: K): T;
+
+        /**
+         * Finds an iterator starting at the given element
+         */
+        at(idx: number): I.RedBlackTree.Iterator<K, V>;
+
+        /**
+         * Finds the first item in the tree whose key is >= key
+         */
+        ge(key: K): I.RedBlackTree.Iterator<K, V>;
+
+        /**
+         * Finds the first item in the tree whose key is > key
+         */
+        gt(key: K): I.RedBlackTree.Iterator<K, V>;
+
+        /**
+         * Finds the first item in the tree whose key is < key
+         */
+        lt(key: K): I.RedBlackTree.Iterator<K, V>;
+
+        /**
+         * Finds the first item in the tree whose key is <= key
+         */
+        le(key: K): I.RedBlackTree.Iterator<K, V>;
+
+        /**
+         * Returns an iterator pointing to the first item in the tree with key, otherwise null
+         */
+        find(key: K): I.RedBlackTree.Iterator<K, V> | null;
+
+        /**
+         * Removes the first item with key in the tree
+         */
+        remove(key: K): RedBlackTree<K, V>;
+
+        /**
+         * Retrieves the value associated to the given key
+         */
+        get(key: K): V | undefined;
+    }
+}
diff --git a/types/adone/glosses/collections/refcounted_cache.d.ts b/types/adone/glosses/collections/refcounted_cache.d.ts
new file mode 100644
index 0000000000..79410423a4
--- /dev/null
+++ b/types/adone/glosses/collections/refcounted_cache.d.ts
@@ -0,0 +1,9 @@
+declare namespace adone.collection {
+    class RefcountedCache<T = any> extends MapCache<T> {
+        ref(key: string): void;
+
+        unref(key: string): void;
+
+        references(key: string): number;
+    }
+}
diff --git a/types/adone/glosses/collections/set.d.ts b/types/adone/glosses/collections/set.d.ts
new file mode 100644
index 0000000000..f1a6bae96d
--- /dev/null
+++ b/types/adone/glosses/collections/set.d.ts
@@ -0,0 +1,17 @@
+declare namespace adone.collection {
+    class Set<T = any> {
+        constructor(key?: (x: T) => any);
+
+        has(value: T): boolean;
+
+        add(value: T): void;
+
+        delete(value: T): void;
+
+        get(value: T): T; // ???
+
+        readonly size: number;
+
+        only(): T;
+    }
+}
diff --git a/types/adone/glosses/collections/stack.d.ts b/types/adone/glosses/collections/stack.d.ts
new file mode 100644
index 0000000000..90fe35b99b
--- /dev/null
+++ b/types/adone/glosses/collections/stack.d.ts
@@ -0,0 +1,36 @@
+declare namespace adone.collection {
+    /**
+     * Represents a stack
+     */
+    class Stack<T = any> {
+        /**
+         * Whether the stack is empty
+         */
+        readonly empty: boolean;
+
+        /**
+         * The top element of the stack
+         */
+        readonly top: T;
+
+        /**
+         * Inserts a new element
+         */
+        push(x: T): this;
+
+        /**
+         * Removes the top element
+         */
+        pop(): T | undefined;
+
+        /**
+         * Returns an iterator over the values
+         */
+        [Symbol.iterator](): IterableIterator<T>;
+
+        /**
+         * Creates a stack and pushed all the values from the given iterable object
+         */
+        static from<T>(iterable: Iterable<T>): Stack<T>;
+    }
+}
diff --git a/types/adone/glosses/collections/timedout_map.d.ts b/types/adone/glosses/collections/timedout_map.d.ts
new file mode 100644
index 0000000000..fedcf79fa2
--- /dev/null
+++ b/types/adone/glosses/collections/timedout_map.d.ts
@@ -0,0 +1,32 @@
+declare namespace adone.collection {
+    /**
+     * Represents a Map that keeps keys only for a specified interval of time
+     */
+    class TimedoutMap<K = any, V = any> extends Map<K, V> {
+        /**
+         * @param timeout maximum age of the keys, 1000 by default
+         * @param callback callback that is called with each key when the timeout is passed
+         */
+        constructor(timeout?: number, callback?: (key: K) => void);
+
+        /**
+         * Gets the timeout
+         */
+        getTimeout(): number;
+
+        /**
+         * Sets the timeout
+         */
+        setTimeout(ms: number): void;
+
+        /**
+         * Iterates over the map and calls the callback for each element
+         */
+        forEach<T = any>(callback: (this: T, value: V, key: K, cache: this) => void, thisArg?: T): this;
+
+        /**
+         * Deletes the given key
+         */
+        delete(key: K): boolean;
+    }
+}
diff --git a/types/adone/glosses/crypto/asn1.d.ts b/types/adone/glosses/crypto/asn1.d.ts
new file mode 100644
index 0000000000..2c4f2134a0
--- /dev/null
+++ b/types/adone/glosses/crypto/asn1.d.ts
@@ -0,0 +1,597 @@
+declare namespace adone.crypto {
+    namespace asn1 {
+        namespace I {
+            interface LocalBaseBlockParams {
+                blockLength?: number;
+                error?: string;
+                warnings?: string[];
+                valueBeforeDecode?: ArrayBuffer;
+            }
+
+            interface JsonLocalBaseBlock {
+                blockName: string;
+                blockLength: number;
+                error: string;
+                warnings: string[];
+                valueBeforeDecode: ArrayBuffer;
+            }
+
+            class LocalBaseBlock {
+                blockLength: number;
+                error: string;
+                warnings: string[];
+                valueBeforeDecode: ArrayBuffer;
+
+                constructor(params?: LocalBaseBlockParams);
+                /**
+                 * Aux function, need to get a block name. Need to have it here for inhiritence
+                 */
+                static blockName(): string;
+                /**
+                 * Convertion for the block to JSON object
+                 */
+                toJSON(): JsonLocalBaseBlock;
+            }
+
+            interface LocalHexBlockParams extends LocalBaseBlockParams {
+                isHexOnly?: boolean;
+                valueHex?: ArrayBuffer;
+            }
+
+            class LocalHexBlock {
+                isHexOnly: boolean;
+
+                valueHex: ArrayBuffer;
+
+                constructor(params: any);
+
+                /**
+                 * Aux function, need to get a block name. Need to have it here for inhiritence
+                 */
+                static blockName(): string;
+
+                /**
+                 * Base function for converting block from BER encoded array of bytes
+                 *
+                 * @param inputBuffer ASN.1 BER encoded array
+                 * @param inputOffset Offset in ASN.1 BER encoded array where decoding should be started
+                 * @param inputLength Maximum length of array of bytes which can be using in this function
+                 */
+                fromBER(inputBuffer: ArrayBuffer, inputOffset: number, inputLength: number): number;
+
+                /**
+                 * Encoding of current ASN.1 block into ASN.1 encoded array (BER rules)
+                 *
+                 * @param sizeOnly Flag that we need only a size of encoding, not a real array of bytes
+                 */
+                toBER(sizeOnly?: boolean): ArrayBuffer;
+
+                /**
+                 * Convertion for the block to JSON object
+                 */
+                toJSON(): any;
+            }
+
+            interface LocalIdentificationBlockParams {
+                idBlock?: LocalHexBlockParams & {
+                    isConstructed?: boolean;
+                    tagClass?: number;
+                    tagNumber?: number;
+                };
+            }
+
+            class LocalIdentificationBlock extends LocalBaseBlock {
+                isConstructed: boolean;
+
+                tagClass: number;
+
+                tagNumber: number;
+
+                constructor(params?: LocalIdentificationBlockParams);
+
+                // ILocalHexBlock implementation
+                isHexOnly: boolean;
+                valueHex: ArrayBuffer;
+                fromBER(inputBuffer: ArrayBuffer, inputOffset: number, inputLength: number): number;
+                toBER(sizeOnly?: boolean): ArrayBuffer;
+            }
+
+            interface LocalLengthBlockParams {
+                lenBlock?: {
+                    isIndefiniteForm?: boolean;
+                    longFormUsed?: boolean;
+                    length: number;
+                };
+            }
+
+            class LocalLengthBlock extends LocalBaseBlock {
+                isIndefiniteForm: boolean;
+                longFormUsed: boolean;
+                length: number;
+                constructor(params?: LocalLengthBlockParams);
+                fromBER(inputBuffer: ArrayBuffer, inputOffset: number, inputLength: number): void;
+                toBER(sizeOnly?: boolean): ArrayBuffer;
+            }
+
+            class LocalValueBlock extends LocalBaseBlock {
+                fromBER(inputBuffer: ArrayBuffer, inputOffset: number, inputLength: number): void;
+                toBER(sizeOnly?: boolean): ArrayBuffer;
+            }
+
+            interface BaseBlockParams extends LocalBaseBlockParams {
+                name?: string;
+                optional?: boolean;
+                primitiveSchema?: object;
+            }
+
+            interface LocalPrimitiveValueBlockParams extends LocalBaseBlockParams {
+                valueHex?: ArrayBuffer;
+                isHexOnly?: boolean;
+            }
+
+            class LocalPrimitiveValueBlock extends LocalValueBlock {
+                valueHex: ArrayBuffer;
+                isHexOnly: boolean;
+                fromBER(inputBuffer: ArrayBuffer, inputOffset: number, inputLength: number): number;
+                toBER(sizeOnly?: boolean): ArrayBuffer;
+            }
+
+            interface LocalConstructedValueBlockParams extends LocalBaseBlockParams {
+                value?: LocalValueBlock;
+                isIndefiniteForm?: boolean;
+            }
+
+            class LocalConstructedValueBlock extends LocalValueBlock {
+                value: LocalValueBlock[];
+                isIndefiniteForm: boolean;
+                fromBER(inputBuffer: ArrayBuffer, inputOffset: number, inputLength: number): number;
+                toBER(sizeOnly?: boolean): ArrayBuffer;
+            }
+
+            class LocalEndOfContentValueBlock extends LocalValueBlock {
+                constructor(params?: LocalBaseBlockParams);
+                fromBER(inputBuffer: ArrayBuffer, inputOffset: number, inputLength: number): number;
+                toBER(sizeOnly?: boolean): ArrayBuffer;
+            }
+
+            interface LocalBooleanValueBlockParams extends LocalBaseBlockParams {
+                value?: boolean;
+                isHexOnly?: boolean;
+                valueHex?: ArrayBuffer;
+            }
+
+            class LocalBooleanValueBlock extends LocalValueBlock {
+                value: boolean;
+                isHexOnly: boolean;
+                valueHex: ArrayBuffer;
+                fromBER(inputBuffer: ArrayBuffer, inputOffset: number, inputLength: number): number;
+                toBER(sizeOnly?: boolean): ArrayBuffer;
+            }
+
+            interface LocalOctetStringValueBlockParams extends LocalConstructedValueBlockParams, LocalHexBlockParams {
+                isConstructed?: boolean;
+            }
+
+            class LocalOctetStringValueBlock extends LocalConstructedValueBlock {
+                isConstructed: boolean;
+                isHexOnly: boolean;
+                valueHex: ArrayBuffer;
+
+                constructor(params?: LocalOctetStringValueBlockParams);
+            }
+
+            interface LocalBitStringValueBlockParams extends LocalConstructedValueBlockParams, LocalHexBlockParams {
+                unusedBits?: number;
+                isConstructed?: boolean;
+                blockLength?: number;
+            }
+
+            class LocalBitStringValueBlock extends LocalConstructedValueBlock implements LocalHexBlock {
+                unusedBits: number;
+                isConstructed: boolean;
+                blockLength: number;
+                isHexOnly: boolean;
+                valueHex: ArrayBuffer;
+                constructor(params?: LocalBitStringValueBlockParams);
+            }
+
+            interface LocalIntegerValueBlockParams extends LocalBaseBlockParams, LocalHexBlockParams {
+            }
+
+            class LocalIntegerValueBlock extends LocalValueBlock implements LocalHexBlock {
+                valueDec: number;
+                isHexOnly: boolean;
+                valueHex: ArrayBuffer;
+                constructor(params?: LocalIntegerValueBlockParams);
+                fromBER(inputBuffer: ArrayBuffer, inputOffset: number, inputLength: number): number;
+                toBER(sizeOnly?: boolean): ArrayBuffer;
+                /**
+                 * Base function for converting block from DER encoded array of bytes
+                 *
+                 * @param inputBuffer ASN.1 DER encoded array
+                 * @param inputOffset Offset in ASN.1 DER encoded array where decoding should be started
+                 * @param inputLength Maximum length of array of bytes which can be using in this function
+                 * @param expectedLength Expected length of converted "valueHex" buffer
+                 */
+                fromDER(inputBuffer: ArrayBuffer, inputOffset: number, inputLength: number, expectedLength?: number): number;
+                /**
+                 * Encoding of current ASN.1 block into ASN.1 encoded array (DER rules)
+                 *
+                 * @param sizeOnly Flag that we need only a size of encoding, not a real array of bytes
+                 */
+                toDER(sizeOnly?: boolean): ArrayBuffer;
+            }
+
+            interface IntegerParams {
+                value?: number;
+            }
+
+            interface LocalSidValueBlockParams extends LocalBaseBlockParams, LocalHexBlockParams {
+                valueDec?: number;
+                isFirstSid?: boolean;
+            }
+
+            class LocalSidValueBlock extends LocalBaseBlock implements LocalHexBlock {
+                valueDec: number;
+                isFirstSid: boolean;
+                isHexOnly: boolean;
+                valueHex: ArrayBuffer;
+                constructor(params?: LocalSidValueBlockParams);
+                fromBER(inputBuffer: ArrayBuffer, inputOffset: number, inputLength: number): number;
+                toBER(sizeOnly?: boolean): ArrayBuffer;
+                toString(): string;
+            }
+
+            interface LocalObjectIdentifierValueBlockParams extends LocalBaseBlockParams {
+                value?: string;
+            }
+
+            class LocalObjectIdentifierValueBlock extends LocalValueBlock {
+                constructor(params?: LocalObjectIdentifierValueBlockParams);
+
+                /**
+                 * Create "LocalObjectIdentifierValueBlock" class from string
+                 *
+                 * @param string Input string to convert from
+                 */
+                fromString(data: string): boolean;
+                /**
+                 * Converts "LocalObjectIdentifierValueBlock" class to string
+                 */
+                toString(): string;
+            }
+
+            interface LocalUtf8StringValueBlockParams extends LocalBaseBlockParams, LocalHexBlock {
+            }
+
+            class LocalUtf8StringValueBlock extends LocalBaseBlock implements LocalHexBlock {
+                isHexOnly: boolean;
+                valueHex: ArrayBuffer;
+                constructor(params?: LocalSidValueBlockParams);
+                fromBER(inputBuffer: ArrayBuffer, inputOffset: number, inputLength: number): number;
+                toBER(sizeOnly?: boolean): ArrayBuffer;
+                toString(): string;
+            }
+
+            interface Utf8StringParams {
+                value?: string;
+            }
+
+            interface LocalBmpStringValueBlockParams extends LocalHexBlockParams, LocalBaseBlockParams {
+            }
+
+            class LocalBmpStringValueBlock extends LocalBaseBlock implements LocalHexBlock {
+                value: string;
+                isHexOnly: boolean;
+                valueHex: ArrayBuffer;
+
+                constructor(params?: LocalBmpStringValueBlockParams);
+
+                fromBER(inputBuffer: ArrayBuffer, inputOffset: number, inputLength: number): number;
+                toBER(sizeOnly?: boolean): ArrayBuffer;
+            }
+
+            interface LocalUniversalStringValueParams extends LocalHexBlockParams, LocalBaseBlockParams {
+            }
+
+            class LocalUniversalStringValueBlock extends LocalBaseBlock implements LocalHexBlock {
+                value: string;
+                isHexOnly: boolean;
+                valueHex: ArrayBuffer;
+
+                constructor(params?: LocalUniversalStringValueParams);
+
+                fromBER(inputBuffer: ArrayBuffer, inputOffset: number, inputLength: number): number;
+                toBER(sizeOnly?: boolean): ArrayBuffer;
+            }
+
+            interface LocalSimpleLocalSimpleStringValueBlockParams extends LocalHexBlockParams, LocalBaseBlockParams {
+            }
+
+            class LocalSimpleLocalSimpleStringValueBlock extends LocalBaseBlock implements LocalHexBlock {
+                value: string;
+                isHexOnly: boolean;
+                valueHex: ArrayBuffer;
+
+                constructor(params?: LocalSimpleLocalSimpleStringValueBlockParams);
+
+                fromBER(inputBuffer: ArrayBuffer, inputOffset: number, inputLength: number): number;
+                toBER(sizeOnly?: boolean): ArrayBuffer;
+            }
+
+            interface LocalSimpleStringBlockParams {
+                value?: string;
+            }
+
+            class LocalSimpleStringBlock extends BaseBlock<LocalSimpleLocalSimpleStringValueBlock> {
+                constructor(params?: LocalSimpleStringBlockParams);
+                /**
+                 * Function converting ArrayBuffer into ASN.1 internal string
+                 *
+                 * @param inputBuffer ASN.1 BER encoded array
+                 */
+                fromBuffer(inputBuffer: ArrayBuffer): void;
+                /**
+                 * Function converting JavaScript string into ASN.1 internal class
+                 *
+                 * @param inputString ASN.1 BER encoded array
+                 */
+                fromString(inputString: string): void;
+            }
+
+            interface BmpStringParams {
+                value?: string;
+            }
+
+            interface UniversalStringParams {
+                value?: string;
+            }
+
+            interface UTCTimeParams extends LocalSimpleLocalSimpleStringValueBlockParams {
+                value?: string;
+                valueDate?: Date;
+            }
+
+            interface ChoiceParams {
+                value?: LocalValueBlock[];
+                optional?: boolean;
+            }
+
+            interface AnyParams {
+                name?: string;
+                optional?: boolean;
+            }
+
+            interface RepeatedParams {
+                name?: string;
+                optional?: boolean;
+                value?: Any;
+                local?: boolean;
+            }
+
+            interface RawDataParams {
+                data?: ArrayBuffer;
+            }
+        }
+
+        class BaseBlock<T extends I.LocalValueBlock> extends I.LocalBaseBlock {
+            constructor(parameters?: I.BaseBlockParams, valueBlockType?: typeof I.LocalValueBlock);
+            idBlock: I.LocalIdentificationBlock;
+            lenBlock: I.LocalLengthBlock;
+            valueBlock: T;
+            fromBER(inputBuffer: ArrayBuffer, inputOffset: number, inputLength: number): number;
+            toBER(sizeOnly?: boolean): ArrayBuffer;
+        }
+
+        class Primitive extends BaseBlock<I.LocalPrimitiveValueBlock> {
+        }
+
+        class Constructed extends BaseBlock<I.LocalConstructedValueBlock> { }
+
+        class EndOfContent extends BaseBlock<I.LocalEndOfContentValueBlock> { }
+
+        class Boolean extends BaseBlock<I.LocalBooleanValueBlock> { }
+
+        class Sequence extends Constructed { }
+
+        class Set extends Constructed { }
+
+        class Null extends BaseBlock<I.LocalValueBlock> { }
+
+        class OctetString extends BaseBlock<I.LocalOctetStringValueBlock> {
+            constructor(params?: I.LocalOctetStringValueBlockParams);
+            /**
+             * Checking that two OCTETSTRINGs are equal
+             */
+            isEqual(octetString: OctetString): boolean;
+        }
+
+        class BitString extends BaseBlock<I.LocalBitStringValueBlock> {
+            constructor(params?: I.LocalBitStringValueBlockParams);
+            /**
+             * Checking that two BITSTRINGs are equal
+             * @param bitString
+             */
+            isEqual(bitString: BitString): boolean;
+        }
+
+        class Integer extends BaseBlock<I.LocalIntegerValueBlock> {
+            constructor(params?: I.IntegerParams)
+            /**
+             * Compare two Integer object, or Integer and ArrayBuffer objects
+             */
+            isEqual(otherValue: Integer | ArrayBuffer): boolean;
+            /**
+             * Convert current Integer value from BER into DER format
+             */
+            convertToDER(): Integer;
+            /**
+             * Convert current Integer value from DER to BER format
+             */
+            convertFromDER(): Integer;
+        }
+
+        class Enumerated extends Integer { }
+
+        class ObjectIdentifier extends BaseBlock<I.LocalObjectIdentifierValueBlock> {
+            constructor(params?: I.LocalObjectIdentifierValueBlockParams);
+        }
+
+        class Utf8String extends BaseBlock<I.LocalUtf8StringValueBlock> {
+            constructor(params?: I.Utf8StringParams);
+            /**
+             * Function converting ArrayBuffer into ASN.1 internal string
+             *
+             * @param inputBuffer ASN.1 BER encoded array
+             */
+            fromBuffer(inputBuffer: ArrayBuffer): void;
+            /**
+             * Function converting JavaScript string into ASN.1 internal class
+             *
+             * @param inputString ASN.1 BER encoded array
+             */
+            fromString(inputString: string): void;
+        }
+
+        class BmpString extends BaseBlock<I.LocalBmpStringValueBlock> {
+            constructor(params?: I.BmpStringParams);
+            /**
+             * Function converting ArrayBuffer into ASN.1 internal string
+             *
+             * @param inputBuffer ASN.1 BER encoded array
+             */
+            fromBuffer(inputBuffer: ArrayBuffer): void;
+            /**
+             * Function converting JavaScript string into ASN.1 internal class
+             *
+             * @param inputString ASN.1 BER encoded array
+             */
+            fromString(inputString: string): void;
+        }
+
+        class UniversalString extends BaseBlock<I.LocalUniversalStringValueBlock> {
+            constructor(params?: I.UniversalStringParams);
+            /**
+             * Function converting ArrayBuffer into ASN.1 internal string
+             *
+             * @param inputBuffer ASN.1 BER encoded array
+             */
+            fromBuffer(inputBuffer: ArrayBuffer): void;
+            /**
+             * Function converting JavaScript string into ASN.1 internal class
+             *
+             * @param inputString ASN.1 BER encoded array
+             */
+            fromString(inputString: string): void;
+        }
+
+        class NumericString extends I.LocalSimpleStringBlock { }
+
+        class PrintableString extends I.LocalSimpleStringBlock { }
+
+        class TeletexString extends I.LocalSimpleStringBlock { }
+
+        class VideotexString extends I.LocalSimpleStringBlock { }
+
+        class IA5String extends I.LocalSimpleStringBlock { }
+
+        class GraphicString extends I.LocalSimpleStringBlock { }
+
+        class VisibleString extends I.LocalSimpleStringBlock { }
+
+        class GeneralString extends I.LocalSimpleStringBlock { }
+
+        class CharacterString extends I.LocalSimpleStringBlock { }
+
+        class UTCTime extends VisibleString {
+            year: number;
+            month: number;
+            day: number;
+            hour: number;
+            minute: number;
+            second: number;
+            constructor(params?: I.UTCTimeParams);
+            /**
+             * Function converting ASN.1 internal string into ArrayBuffer
+             */
+            toBuffer(): ArrayBuffer;
+            /**
+             * Function converting "Date" object into ASN.1 internal string
+             *
+             * @param inputDate JavaScript "Date" object
+             */
+            fromDate(inputDate: Date): void;
+            /**
+             * Function converting ASN.1 internal string into "Date" object
+             */
+            toDate(): Date;
+        }
+
+        class GeneralizedTime extends UTCTime {
+            millisecond: number;
+        }
+
+        class DATE extends Utf8String { }
+
+        class TimeOfDay extends Utf8String { }
+
+        class DateTime extends Utf8String { }
+
+        class Duration extends Utf8String { }
+
+        class TIME extends Utf8String { }
+
+        class Choice {
+            value: I.LocalValueBlock[];
+            optional: boolean;
+            constructor(params?: I.ChoiceParams);
+        }
+
+        class Any {
+            name: string;
+            optional: boolean;
+            constructor(params?: I.AnyParams);
+        }
+
+        class Repeated {
+            name: string;
+            optional: boolean;
+            value: Any;
+            local: boolean;
+            constructor(params?: I.RepeatedParams);
+        }
+
+        class RawData {
+            data: ArrayBuffer;
+
+            constructor(params?: I.RawDataParams);
+
+            fromBER(inputBuffer: ArrayBuffer, inputOffset: number, inputLength: number): number;
+            toBER(sizeOnly?: boolean): ArrayBuffer;
+        }
+
+        /**
+         * Major function for decoding ASN.1 BER array into internal library structuries
+         *
+         * @param inputBuffer ASN.1 BER encoded array of bytes
+         */
+        function fromBER(inputBuffer: ArrayBuffer): { offset: number; result: I.LocalBaseBlock };
+
+        /**
+         * Compare of two ASN.1 object trees
+         *
+         * @param root Root of input ASN.1 object tree
+         * @param inputData Input ASN.1 object tree
+         * @param inputSchema Input ASN.1 schema to compare with
+         */
+        function compareSchema(root: any, inputData: any, inputSchema: any): { verified: boolean, result?: any };
+
+        /**
+         * ASN.1 schema verification for ArrayBuffer data
+         *
+         * @param inputBuffer Input BER-encoded ASN.1 data
+         * @param inputSchema Input ASN.1 schema to verify against to
+         */
+        function verifySchema(inputBuffer: ArrayBuffer, inputSchema: any): { verified: boolean, result?: any };
+    }
+}
diff --git a/types/adone/glosses/crypto/ed25519.d.ts b/types/adone/glosses/crypto/ed25519.d.ts
new file mode 100644
index 0000000000..7e4f6e2f33
--- /dev/null
+++ b/types/adone/glosses/crypto/ed25519.d.ts
@@ -0,0 +1,20 @@
+declare namespace adone.crypto {
+    namespace ed25519 {
+        const publicKeyLength: number;
+
+        const privateKeyLength: number;
+
+        namespace I {
+            interface KeyPair {
+                publicKey: Buffer;
+                privateKey: Buffer;
+            }
+        }
+
+        function generateKeyPair(seed: Buffer): I.KeyPair;
+
+        function sign(message: Buffer, seed: Buffer | I.KeyPair): Buffer;
+
+        function verify(message: Buffer, signature: Buffer, publicKey: Buffer): boolean;
+    }
+}
diff --git a/types/adone/glosses/crypto/index.d.ts b/types/adone/glosses/crypto/index.d.ts
new file mode 100644
index 0000000000..ea4b76967f
--- /dev/null
+++ b/types/adone/glosses/crypto/index.d.ts
@@ -0,0 +1,9 @@
+/// <reference path="./asn1.d.ts" />
+/// <reference path="./ed25519.d.ts" />
+/// <reference path="./secp256k1.d.ts" />
+
+declare namespace adone {
+    namespace crypto {
+        //
+    }
+}
diff --git a/types/adone/glosses/crypto/secp256k1.d.ts b/types/adone/glosses/crypto/secp256k1.d.ts
new file mode 100644
index 0000000000..87167cc441
--- /dev/null
+++ b/types/adone/glosses/crypto/secp256k1.d.ts
@@ -0,0 +1,127 @@
+declare namespace adone.crypto {
+    namespace secp256k1 {
+        /**
+         * Verifies an ECDSA privateKey
+         */
+        function privateKeyVerify(privateKey: Buffer): boolean;
+
+        /**
+         * Exports a privateKey in DER format
+         */
+        function privateKeyExport(privateKey: Buffer, compressed?: boolean): Buffer;
+
+        /**
+         * Imports a privateKey in DER format
+         */
+        function privateKeyImport(privateKey: Buffer): Buffer;
+
+        /**
+         * Negates a privateKey by subtracting it from the order of the curve's base point
+         */
+        function privateKeyNegate(privateKey: Buffer): Buffer;
+
+        /**
+         * Computes the inverse of a privateKey (modulo the order of the curve's base point)
+         */
+        function privateKeyModInverse(privateKey: Buffer): Buffer;
+
+        /**
+         * Tweaks a privateKey by adding tweak to it
+         */
+        function privateKeyTweakAdd(privateKey: Buffer, tweak: Buffer): Buffer;
+
+        /**
+         * Tweaks a privateKey by multiplying it by a tweak
+         */
+        function privateKeyTweakMul(privateKey: Buffer, tweak: Buffer): Buffer;
+
+        /**
+         * Computes the public key for a privateKey
+         */
+        function publicKeyCreate(privateKey: Buffer, compressed?: boolean): Buffer;
+
+        /**
+         * Converts a publicKey to compressed or uncompressed form
+         */
+        function publicKeyConvert(publicKey: Buffer, compressed?: boolean): Buffer;
+
+        /**
+         * Verifies an ECDSA publicKey
+         */
+        function publicKeyVerify(publicKey: Buffer): boolean;
+
+        /**
+         * Tweaks a publicKey by adding tweak times the generator to it
+         */
+        function publicKeyTweakAdd(publicKey: Buffer, tweak: Buffer, compressed?: boolean): Buffer;
+
+        /**
+         * Tweaks a publicKey by multiplying it by a tweak value
+         */
+        function publicKeyTweakMul(publicKey: Buffer, tweak: Buffer, compressed?: boolean): Buffer;
+
+        /**
+         * Adds a given publicKeys together
+         */
+        function publicKeyCombine(publicKeys: Buffer[], compressed?: boolean): Buffer;
+
+        /**
+         * Converts a signature to a normalized lower-S form
+         */
+        function signatureNormalize(signature: Buffer): Buffer;
+
+        /**
+         * Serializes an ECDSA signature in DER format
+         */
+        function signatureExport(signature: Buffer): Buffer;
+
+        /**
+         * Parse a DER ECDSA signature (follow by BIP66)
+         */
+        function signatureImport(signature: Buffer): Buffer;
+
+        /**
+         * Same as signatureImport but not follow by BIP66
+         */
+        function signatureImportLax(signature: Buffer): Buffer;
+
+        namespace I {
+            interface SignOptions {
+                noncefn?: (message: Buffer, privateKey: Buffer, algo: Buffer, data: Buffer, attempt: number) => Buffer;
+                data?: Buffer | null;
+            }
+
+            interface SignResult {
+                signature: Buffer;
+                recovery: number;
+            }
+        }
+
+        /**
+         * Creates an ECDSA signature. Always return low-S signature.
+         */
+        function sign(message: Buffer, privateKey: Buffer, options?: I.SignOptions): I.SignResult;
+
+        /**
+         * Verifies an ECDSA signature
+         *
+         * Note: return false for high signatures!
+         */
+        function verify(message: Buffer, signature: Buffer, publicKey: Buffer): boolean;
+
+        /**
+         * Recovers an ECDSA public key from a signature
+         */
+        function recover(message: Buffer, signature: Buffer, recovery: number, compressed?: boolean): Buffer;
+
+        /**
+         * Computes an EC Diffie-Hellman secret and applied sha256 to compressed public key
+         */
+        function ecdh(publicKey: Buffer, privateKey: Buffer): Buffer;
+
+        /**
+         * Computes an EC Diffie-Hellman secret and return public key as result
+         */
+        function ecdhUnsafe(publicKey: Buffer, privateKey: Buffer, compressed?: boolean): Buffer;
+    }
+}
diff --git a/types/adone/glosses/data.d.ts b/types/adone/glosses/data.d.ts
index a22ba10750..4d3dae7b2b 100644
--- a/types/adone/glosses/data.d.ts
+++ b/types/adone/glosses/data.d.ts
@@ -1050,5 +1050,183 @@ declare namespace adone {
              */
             function decode(buf: Buffer, options?: I.DeserializeOptions): any;
         }
+
+        namespace protobuf {
+            namespace schema {
+                namespace I {
+                    interface Field {
+                        name: string | null;
+                        type: string | null;
+                        tag: number;
+                        map: {
+                            from: string;
+                            to: string;
+                        } | null;
+                        oneof: string | null;
+                        required: boolean;
+                        repeated: boolean;
+                        options: object;
+                    }
+
+                    interface Enum {
+                        name: string;
+                        values: object;
+                        options: object;
+                    }
+
+                    interface Extend {
+                        name: string;
+                        message: Message;
+                    }
+
+                    interface Message {
+                        name: string;
+                        enums: Enum[];
+                        extends: Extend[];
+                        messages: Message[];
+                        fields: Field[];
+                        extensions: {
+                            from: number,
+                            to: number
+                        } | null;
+                    }
+
+                    interface RPCMethod {
+                        name: string;
+                        input_type: string | null;
+                        output_type: string | null;
+                        client_streaming: boolean;
+                        server_streaming: boolean;
+                        options: object;
+                    }
+
+                    interface Service {
+                        name: string;
+                        methods: RPCMethod[];
+                        options: object;
+                    }
+
+                    interface Schema {
+                        syntax: any; // ??
+                        package: string | null;
+                        imports: string[];
+                        enums: Enum[];
+                        messages: Message[];
+                        options: object;
+                        extends: Extend[];
+                        services?: Service[];
+                    }
+                }
+
+                function parse(buf: Buffer | string): I.Schema;
+
+                function stringify(schema: object): string;
+            }
+
+            function create(proto: Buffer | string | object, opts?: object): object;
+        }
+
+        namespace base32 {
+            function charmap<T = object>(alphabet: string, mappings?: T): T;
+
+            namespace I {
+                interface Spec {
+                    alphabet: string;
+                    charmap: {
+                        [c: string]: number;
+                    };
+                }
+            }
+
+            const rfc4648: I.Spec;
+
+            const crockford: I.Spec;
+
+            const base32hex: I.Spec;
+
+            namespace I {
+                interface DecoderOptions {
+                    type: "rfc4648" | "crockford" | "base32hex";
+                    charmap?: object;
+                }
+
+                interface EncoderOptions {
+                    type: "rfc4648" | "crockford" | "base32hex";
+                    alphabet?: string;
+                }
+            }
+
+            class Decoder {
+                constructor(options?: I.DecoderOptions);
+
+                write(str: string): this;
+
+                finalize(str?: string): Buffer;
+            }
+
+            class Encoder {
+                constructor(options?: I.EncoderOptions);
+
+                write(buf: Buffer): this;
+
+                finalize(buf?: Buffer): string;
+            }
+
+            function encode(buf: Buffer, options?: I.EncoderOptions): string;
+
+            function decode(str: string, options?: I.DecoderOptions): Buffer;
+        }
+
+        namespace I {
+            interface BaseX {
+                encode(buf: Buffer): string;
+
+                decode(str: string): Buffer;
+
+                decodeUnsafe(str: string): Buffer;
+            }
+        }
+
+        function basex(alphabet: string): I.BaseX;
+
+        const base58: I.BaseX;
+
+        namespace base64url {
+            function unescape(str: string): string;
+
+            function escape(str: string): string;
+
+            namespace I {
+                interface EncodeOptions {
+                    encoding?: string;
+                }
+
+                interface DecodeOptions {
+                    encoding?: string;
+                    buffer?: boolean;
+                }
+            }
+
+            function encode(str: Buffer | string, options?: I.EncodeOptions): string;
+
+            function decode(str: string, options: I.DecodeOptions & { buffer: true }): Buffer;
+            function decode(str: string, options?: I.DecodeOptions): string;
+        }
+
+        namespace varint {
+            function encode<T = any>(num: number, out?: T[], offset?: number): T[];
+
+            function decode(buf: Buffer, offset?: number): number;
+
+            function encodingLength(value: number): number;
+        }
+
+        namespace varintSigned {
+            function encode<T = any>(num: number, out?: T[], offset?: number): T[];
+
+            function decode(buf: Buffer, offset?: number): number;
+
+            function encodingLength(value: number): number;
+        }
     }
 }
diff --git a/types/adone/glosses/fake.d.ts b/types/adone/glosses/fake.d.ts
new file mode 100644
index 0000000000..0c403747e4
--- /dev/null
+++ b/types/adone/glosses/fake.d.ts
@@ -0,0 +1,337 @@
+declare namespace adone {
+    namespace fake {
+        namespace I {
+            interface Card {
+                name: string;
+                username: string;
+                email: string;
+                address: FullAddress;
+                phone: string;
+                website: string;
+                company: Company;
+                posts: Post[];
+                accountHistory: string[];
+            }
+
+            interface FullAddress {
+                streetA: string;
+                streetB: string;
+                streetC: string;
+                streetD: string;
+                city: string;
+                state: string;
+                county: string;
+                zipcode: string;
+                geo: Geo;
+            }
+
+            interface Geo {
+                lat: string;
+                lng: string;
+            }
+
+            interface Company {
+                name: string;
+                catchPhrase: string;
+                bs: string;
+            }
+
+            interface Post {
+                words: string;
+                sentence: string;
+                sentences: string;
+                paragraph: string;
+            }
+
+            interface ContextualCard {
+                name: string;
+                username: string;
+                email: string;
+                dob: Date;
+                phone: string;
+                address: Address;
+                website: string;
+                company: Company;
+            }
+
+            interface Address {
+                street: string;
+                suite: string;
+                city: string;
+                state: string;
+                zipcode: string;
+                geo: Geo;
+            }
+
+            interface UserCard {
+                name: string;
+                username: string;
+                email: string;
+                address: Address;
+                phone: string;
+                website: string;
+                company: Company;
+            }
+
+            interface Transaction {
+                amount: string;
+                date: Date;
+                business: string;
+                name: string;
+                type: string;
+                account: string;
+            }
+        }
+
+        namespace address {
+            function zipCode(format?: string): string;
+            function city(format?: number): string;
+            function cityPrefix(): string;
+            function citySuffix(): string;
+            function streetName(): string;
+            function streetAddress(useFullAddress?: boolean): string;
+            function streetSuffix(): string;
+            function streetPrefix(): string;
+            function secondaryAddress(): string;
+            function county(): string;
+            function country(): string;
+            function countryCode(): string;
+            function state(useAbbr?: boolean): string;
+            function stateAbbr(): string;
+            function latitude(): string;
+            function longitude(): string;
+        }
+
+        namespace commerce {
+            function color(): string;
+            function department(): string;
+            function productName(): string;
+            function price(min?: number, max?: number, dec?: number, symbol?: string): string;
+            function productAdjective(): string;
+            function productMaterial(): string;
+            function product(): string;
+        }
+
+        namespace company {
+            function suffixes(): string[];
+            function companyName(format?: number): string;
+            function companySuffix(): string;
+            function catchPhrase(): string;
+            function bs(): string;
+            function catchPhraseAdjective(): string;
+            function catchPhraseDescriptor(): string;
+            function catchPhraseNoun(): string;
+            function bsAdjective(): string;
+            function bsBuzz(): string;
+            function bsNoun(): string;
+        }
+
+        namespace database {
+            function column(): string;
+            function type(): string;
+            function collation(): string;
+            function engine(): string;
+        }
+
+        namespace date {
+            function past(years?: number, refDate?: string|Date): Date;
+            function future(years?: number, refDate?: string|Date): Date;
+            function between(from: string|number|Date, to: string|Date): Date;
+            function recent(days?: number): Date;
+            function soon(days?: number): Date;
+            function month(options?: { abbr?: boolean, context?: boolean }): string;
+            function weekday(options?: { abbr?: boolean, context?: boolean }): string;
+        }
+
+        function fake(str: string): string;
+
+        namespace finance {
+            function account(length?: number): string;
+            function accountName(): string;
+            function mask(length?: number, parens?: boolean, elipsis?: boolean): string;
+            function amount(min?: number, max?: number, dec?: number, symbol?: string): string;
+            function transactionType(): string;
+            function currencyCode(): string;
+            function currencyName(): string;
+            function currencySymbol(): string;
+            function bitcoinAddress(): string;
+            function ethereumAddress(): string;
+            function iban(formatted?: boolean): string;
+            function bic(): string;
+        }
+
+        namespace hacker {
+            function abbreviation(): string;
+            function adjective(): string;
+            function noun(): string;
+            function verb(): string;
+            function ingverb(): string;
+            function phrase(): string;
+        }
+
+        namespace helpers {
+            function randomize<T>(array: T[]): T;
+            function randomize(): string;
+            function slugify(string?: string): string;
+            function replaceSymbolWithNumber(string?: string, symbol?: string): string;
+            function replaceSymbols(string?: string): string;
+            function shuffle<T>(o: T[]): T[];
+            function shuffle(): string[];
+            function mustache(str: string, data: { [key: string]: string|((substring: string, ...args: any[]) => string) }): string;
+            function createCard(): I.Card;
+            function contextualCard(): I.ContextualCard;
+            function userCard(): I.UserCard;
+            function createTransaction(): I.Transaction;
+        }
+
+        namespace image {
+            function image(): string;
+            function avatar(): string;
+            function imageUrl(width?: number, height?: number, category?: string): string;
+            function abstract(width?: number, height?: number): string;
+            function animals(width?: number, height?: number): string;
+            function business(width?: number, height?: number): string;
+            function cats(width?: number, height?: number): string;
+            function city(width?: number, height?: number): string;
+            function food(width?: number, height?: number): string;
+            function nightlife(width?: number, height?: number): string;
+            function fashion(width?: number, height?: number): string;
+            function people(width?: number, height?: number): string;
+            function nature(width?: number, height?: number): string;
+            function sports(width?: number, height?: number): string;
+            function technics(width?: number, height?: number): string;
+            function transport(width?: number, height?: number): string;
+            function dataUri(width?: number, height?: number): string;
+        }
+
+        namespace internet {
+            function avatar(): string;
+            function email(firstName?: string, lastName?: string, provider?: string): string;
+            function exampleEmail(firstName?: string, lastName?: string): string;
+            function userName(firstName?: string, lastName?: string): string;
+            function protocol(): string;
+            function url(): string;
+            function domainName(): string;
+            function domainSuffix(): string;
+            function domainWord(): string;
+            function ip(): string;
+            function ipv6(): string;
+            function userAgent(): string;
+            function color(baseRed255?: number, baseGreen255?: number, baseBlue255?: number): string;
+            function mac(): string;
+            function password(len?: number, memorable?: boolean, pattern?: string|RegExp, prefix?: string): string;
+        }
+
+        namespace lorem {
+            function word(): string;
+            function words(num?: number): string;
+            function sentence(wordCount?: number, range?: number): string;
+            function slug(wordCount?: number): string;
+            function sentences(sentenceCount?: number): string;
+            function paragraph(sentenceCount?: number): string;
+            function paragraphs(paragraphCount?: number, separator?: string): string;
+            function text(times?: number): string;
+            function lines(lineCount?: number): string;
+        }
+
+        namespace name {
+            function firstName(gender?: number): string;
+            function lastName(gender?: number): string;
+            function findName(firstName?: string, lastName?: string, gender?: number): string;
+            function jobTitle(): string;
+            function prefix(): string;
+            function suffix(): string;
+            function title(): string;
+            function jobDescriptor(): string;
+            function jobArea(): string;
+            function jobType(): string;
+        }
+
+        namespace phone {
+            function phoneNumber(format?: string): string;
+            function phoneNumberFormat(phoneFormatsArrayIndex?: number): string;
+            function phoneFormats(): string;
+        }
+
+        namespace random {
+            function number(max: number): number;
+            function number(options?: { min?: number, max?: number, precision?: number }): number;
+            function arrayElement(): string;
+            function arrayElement<T>(array: T[]): T;
+            function objectElement(object?: { [key: string]: any }, field?: "key"): string;
+            function objectElement<T>(object?: { [key: string]: T }, field?: any): T;
+            function uuid(): string;
+            function boolean(): boolean;
+            function word(type?: string): string;
+            function words(count?: number): string;
+            function image(): string;
+            function locale(): string;
+            function alphaNumeric(count?: number): string;
+            function hexaDecimal(count?: number): string;
+        }
+
+        namespace system {
+            function fileName(ext: string, type: string): string;
+            function commonFileName(ext: string, type: string): string;
+            function mimeType(): string;
+            function commonFileType(): string;
+            function commonFileExt(): string;
+            function fileType(): string;
+            function fileExt(mimeType: string): string;
+            function directoryPath(): string;
+            function filePath(): string;
+            function semver(): string;
+        }
+
+        function seed(value: number): void;
+
+        namespace I {
+            type Locale =
+                | "az"
+                | "cz"
+                | "de"
+                | "de_AT"
+                | "de_CH"
+                | "el"
+                | "en"
+                | "en_AU"
+                | "en_BORK"
+                | "en_CA"
+                | "en_GB"
+                | "en_IE"
+                | "en_IND"
+                | "en_US"
+                | "en_au_ocker"
+                | "es"
+                | "es_MX"
+                | "fa"
+                | "fr"
+                | "fr_CA"
+                | "ge"
+                | "id_ID"
+                | "it"
+                | "ja"
+                | "ko"
+                | "lv"
+                | "nb_NO"
+                | "nep"
+                | "nl"
+                | "nl_BE"
+                | "pl"
+                | "pt_BR"
+                | "ro"
+                | "ru"
+                | "sk"
+                | "sv"
+                | "tr"
+                | "uk"
+                | "vi"
+                | "zh_CN"
+                | "zh_TW";
+        }
+
+        function getLocale(): I.Locale;
+
+        function setLocale(locale: I.Locale): void;
+    }
+}
diff --git a/types/adone/glosses/is.d.ts b/types/adone/glosses/is.d.ts
index 7df9559524..20d898ca7b 100644
--- a/types/adone/glosses/is.d.ts
+++ b/types/adone/glosses/is.d.ts
@@ -99,12 +99,12 @@ declare namespace adone {
         /**
          * Checks whether the given object is not a primitive, i.e. neither `undefined` nor `null` nor number nor string nor boolean nor symbol)
          */
-        export function object(obj: any): boolean;
+        export function object(obj: any): obj is object;
 
         /**
          * Checks whether the given object is a plain object, i.e. created by Object
          */
-        export function plainObject(obj: any): boolean;
+        export function plainObject(obj: any): obj is object;
 
         /**
          * Checks whether the given object is an adone namespace
@@ -120,7 +120,7 @@ declare namespace adone {
         /**
          * Checks whether the given object is empty, i.e. it is an object(not a primitive), and Object.keys returns an empty array
          */
-        export function emptyObject(obj: any): boolean;
+        export function emptyObject(obj: any): obj is object;
 
         /**
          * Checks whether the given object has the given owned property
@@ -140,7 +140,7 @@ declare namespace adone {
         /**
          * Checks whether the given object is like an array, i.e. it is not a primitive, not a function and has length
          */
-        export function arrayLikeObject(obj: any): boolean;
+        export function arrayLikeObject(obj: any): obj is ArrayLike<any>;
 
         /**
          * Checks whether the given array has the given value
@@ -227,13 +227,13 @@ declare namespace adone {
         /**
          * Checks whether the given object is a function
          */
-        function _function(obj: any): boolean;
+        function _function(obj: any): obj is (...args: any[]) => any;
         export { _function as function };
 
         /**
          * Checks whether the given object is an async function
          */
-        export function asyncFunction(obj: any): boolean;
+        export function asyncFunction(obj: any): obj is (...args: any[]) => Promise<any>;
 
         /**
          * Checks whether the given object is a promise
@@ -258,7 +258,7 @@ declare namespace adone {
         /**
          * Checks whether the given object is a generator function
          */
-        export function generator(obj: any): boolean;
+        export function generator(obj: any): obj is GeneratorFunction;
 
         /**
          * Checks whether the given object is NaN
@@ -320,12 +320,12 @@ declare namespace adone {
         /**
          * Checks whether the given object is an adone subsystem
          */
-        export function subsystem(obj: any): boolean;
+        export function subsystem(obj: any): obj is adone.application.Subsystem;
 
         /**
          * Checks whether the given object is an adone application
          */
-        export function application(obj: any): boolean;
+        export function application(obj: any): obj is adone.application.Application;
 
         /**
          * Checks whether the given object is an adone logger
@@ -335,22 +335,22 @@ declare namespace adone {
         /**
          * Checks whether the given object is a core stream
          */
-        export function coreStream(obj: any): boolean;
+        export function coreStream(obj: any): obj is adone.stream.core.Stream;
 
         /**
          * Checks whether the given object is a fast local map stream
          */
-        export function fastLocalMapStream(obj: any): boolean;
+        export function fastLocalMapStream(obj: any): obj is adone.fast.I.LocalMapStream<any>;
 
         /**
          * Checks whether the given object is a fast local stream
          */
-        export function fastLocalStream(obj: any): boolean;
+        export function fastLocalStream(obj: any): obj is adone.fast.I.LocalStream<any>;
 
         /**
          * Checks whether the given object is a fast stream
          */
-        export function fastStream(obj: any): boolean;
+        export function fastStream(obj: any): obj is adone.fast.I.Stream<any>;
 
         /**
          * Checks whether the given object is a genesis netron
@@ -430,7 +430,7 @@ declare namespace adone {
         /**
          * Checks whether the given object is iterable, has defined Symbol.iterator property
          */
-        export function iterable(obj: any): boolean;
+        export function iterable(obj: any): obj is Iterable<any>;
 
         /**
          * true if the OS is Windows
@@ -672,5 +672,9 @@ declare namespace adone {
          * Checks whether the given object is a valid UUID identifier (v1, v2, v3, v4 or v5)
          */
         export function uuid(obj: any, version?: "all"): obj is string;
+
+        export function emitter(obj: any): obj is event.Emitter;
+
+        export function asyncEmitter(obj: any): obj is event.AsyncEmitter;
     }
 }
diff --git a/types/adone/glosses/net/http/client.d.ts b/types/adone/glosses/net/http/client.d.ts
new file mode 100644
index 0000000000..33bccc95ac
--- /dev/null
+++ b/types/adone/glosses/net/http/client.d.ts
@@ -0,0 +1,275 @@
+declare namespace adone.net.http {
+    namespace client {
+        namespace I {
+            interface RequestHeaders {
+                "Accept"?: string;
+                "Accept-Charset"?: string;
+                "Accept-Encoding"?: string;
+                "Accept-Language"?: string;
+                "Accept-Datetime"?: string;
+                "Access-Control-Request-Method"?: string;
+                "Access-Control-Request-Headers"?: string;
+                "Authorization"?: string;
+                "Cache-Control"?: string;
+                "Connection"?: string;
+                "Cookie"?: string;
+                "Content-Length"?: string;
+                "Content-MD5"?: string;
+                "Content-Type"?: string;
+                "Date"?: string;
+                "Expect"?: string;
+                "Forwarded"?: string;
+                "From"?: string;
+                "Host"?: string;
+                "If-Match"?: string;
+                "If-Modified-Since"?: string;
+                "If-None-Match"?: string;
+                "If-Range"?: string;
+                "If-Unmodified-Since"?: string;
+                "Max-Forwards"?: string;
+                "Origin"?: string;
+                "Pragma"?: string;
+                "Proxy-Authorization"?: string;
+                "Range"?: string;
+                "Referer"?: string;
+                "TE"?: string;
+                "User-Agent"?: string;
+                "Upgrade"?: string;
+                "Via"?: string;
+                "Warning"?: string;
+                "X-Requested-With"?: string;
+                "DNT"?: string;
+                "X-Forwarded-For"?: string;
+                "X-Forwarded-Host"?: string;
+                "X-Forwarded-Proto"?: string;
+                "Front-End-Https"?: string;
+                "X-Http-Method-Override"?: string;
+                "X-ATT-DeviceId"?: string;
+                "X-Wap-Profile"?: string;
+                "Proxy-Connection"?: string;
+                "X-UIDH"?: string;
+                "X-Csrf-Token"?: string;
+                "X-Request-ID"?: string;
+                "X-Correlation-ID"?: string;
+
+                [name: string]: string | undefined;
+            }
+
+            interface ResponseHeaders {
+                "accept-patch": string | undefined;
+                "accept-ranges": string | undefined;
+                "access-control-allow-credentials": string | undefined;
+                "access-control-allow-headers": string | undefined;
+                "access-control-allow-methods": string | undefined;
+                "access-control-allow-origin": string | undefined;
+                "access-control-expose-headers": string | undefined;
+                "access-control-max-age": string | undefined;
+                "age": string | undefined;
+                "allow": string | undefined;
+                "alt-svc": string | undefined;
+                "cache-control": string | undefined;
+                "connection": string| undefined;
+                "content-disposition": string | undefined;
+                "content-encoding": string| undefined;
+                "content-language": string | undefined;
+                "content-length": string| undefined;
+                "content-location": string| undefined;
+                "content-md5": string| undefined;
+                "content-range": string| undefined;
+                "content-security-policy": string | undefined;
+                "content-type": string| undefined;
+                "date": string| undefined;
+                "etag": string| undefined;
+                "expires": string| undefined;
+                "keep-alive": string | undefined;
+                "last-modified": string | undefined;
+                "link": string| undefined;
+                "location": string| undefined;
+                "p3p": string| undefined;
+                "pragma": string| undefined;
+                "proxy-authenticate": string | undefined;
+                "public-key-pins": string| undefined;
+                "referer-policy": string | undefined;
+                "refresh": string | undefined;
+                "retry-after": string | undefined;
+                "server": string | undefined;
+                "set-cookie": string | undefined;
+                "status": string | undefined;
+                "strict-transport-security": string| undefined;
+                "timing-allow-origin": string | undefined;
+                "tk": string| undefined;
+                "transfer-encoding": string | undefined;
+                "upgrade-insecure-requests": string | undefined;
+                "upgrade": string| undefined;
+                "vary": string | undefined;
+                "via": string| undefined;
+                "warning": string| undefined;
+                "www-authenticate": string | undefined;
+                "x-content-duration": string | undefined;
+                "x-content-security-policy": string | undefined;
+                "x-content-type-options": string | undefined;
+                "x-correlation-id": string | undefined;
+                "x-frame-options": string| undefined;
+                "x-powered-by": string | undefined;
+                "x-request-id": string | undefined;
+                "x-ua-compatible": string | undefined;
+                "x-webkit-csp": string | undefined;
+                "x-xss-protection": string | undefined;
+
+                [header: string]: string | undefined;
+            }
+
+            interface Response<T> {
+                status: number;
+                statusText: string;
+                headers: ResponseHeaders;
+                data: T;
+            }
+
+            type Transformer = (data: Data, headers: object, config: I.Options) => Data;
+
+            interface FormValueOptions {
+                header?: string | { [key: string]: string };
+                knownLength?: number;
+                filename?: string;
+                filepath?: string;
+                contentType?: string;
+            }
+
+            type FormValue = string | Buffer | nodestd.stream.Readable | {
+                value: string | Buffer | nodestd.stream.Readable;
+                options: FormValueOptions
+            };
+
+            interface UploadProgressEvent {
+                lengthComputable: boolean;
+                loaded: number;
+                total: number;
+            }
+
+            interface ProxyObject {
+                protocol?: string;
+                host?: string;
+                port?: number;
+                auth?: {
+                    username?: string;
+                    password?: string;
+                };
+            }
+
+            interface Config {
+                adapter<T>(config: I.Config): Promise<Response<T>>;
+                transformRequest: Transformer[];
+                transformResponse: Transformer[];
+                timeout: number;
+                xsrfCookieName: string;
+                xsrfHeaderName: string;
+                maxContentLength: number;
+                validateStatus: (status: number) => boolean;
+                responseType: "buffer" | "string" | "stream" | "json";
+                responseEncoding: adone.util.iconv.I.SupportedEncoding;
+                method: "GET" | "POST" | "PUT" | "PATCH" | "DELETE" | "OPTIONS";
+                headers: RequestHeaders;
+                data: Data;
+                formData: {
+                    [formKey: string]: FormValue | FormValue[];
+                };
+                auth: {
+                    username?: string;
+                    password?: string;
+                };
+                httpsAgent: object;
+                httpAgent: object;
+                params: object;
+                rejectUnauthorized: boolean;
+                proxy: string | ProxyObject | false;
+                transport: object;
+                maxRedirects: number;
+                cancelToken: CancelToken;
+                onUploadProgress(event: UploadProgressEvent): void;
+                baseURL: string;
+                paramsSerializer(params: object): string;
+            }
+
+            type Options = Partial<Config>;
+
+            type Data = string | Buffer | ArrayBuffer | nodestd.stream.Readable | ArrayBufferView | object | undefined;
+
+            interface Request extends Client {
+                (config: I.Options, ...args: any[]): Promise<object>;
+            }
+        }
+
+        class Client {
+            constructor(options?: I.Options);
+
+            request(config: I.Options & { responseType: "json" }, ...args: any[]): Promise<I.Response<object | string>>;
+            request(config: I.Options & { responseType: "string" }, ...args: any[]): Promise<I.Response<string>>;
+            request(config: I.Options & { responseType: "buffer" }, ...args: any[]): Promise<I.Response<Buffer>>;
+            request(config: I.Options & { responseType: "stream" }, ...args: any[]): Promise<I.Response<nodestd.stream.Readable>>;
+            request(config: I.Options, ...args: any[]): Promise<I.Response<object | string>>;
+
+            get(url: string, options: I.Options & { responseType: "string" }): Promise<I.Response<string>>;
+            get(url: string, options: I.Options & { responseType: "buffer" }): Promise<I.Response<Buffer>>;
+            get(url: string, options: I.Options & { responseType: "stream" }): Promise<I.Response<nodestd.stream.Readable>>;
+            get(url: string, options?: I.Options): Promise<I.Response<object | string>>;
+
+            post(url: string, data: I.Data, options: I.Options & { responseType: "string" }): Promise<I.Response<string>>;
+            post(url: string, data: I.Data, options: I.Options & { responseType: "buffer" }): Promise<I.Response<Buffer>>;
+            post(url: string, data: I.Data, options: I.Options & { responseType: "stream" }): Promise<I.Response<nodestd.stream.Readable>>;
+            post(url: string, data?: I.Data, options?: I.Options): Promise<I.Response<object | string>>;
+
+            put(url: string, data: I.Data, options: I.Options & { responseType: "string" }): Promise<I.Response<string>>;
+            put(url: string, data: I.Data, options: I.Options & { responseType: "buffer" }): Promise<I.Response<Buffer>>;
+            put(url: string, data: I.Data, options: I.Options & { responseType: "stream" }): Promise<I.Response<nodestd.stream.Readable>>;
+            put(url: string, data?: I.Data, options?: I.Options): Promise<I.Response<object | string>>;
+
+            patch(url: string, data: I.Data, options: I.Options & { responseType: "string" }): Promise<I.Response<string>>;
+            patch(url: string, data: I.Data, options: I.Options & { responseType: "buffer" }): Promise<I.Response<Buffer>>;
+            patch(url: string, data: I.Data, options: I.Options & { responseType: "stream" }): Promise<I.Response<nodestd.stream.Readable>>;
+            patch(url: string, data?: I.Data, options?: I.Options): Promise<I.Response<object | string>>;
+
+            delete(url: string, options: I.Options & { responseType: "string" }): Promise<I.Response<string>>;
+            delete(url: string, options: I.Options & { responseType: "buffer" }): Promise<I.Response<Buffer>>;
+            delete(url: string, options: I.Options & { responseType: "stream" }): Promise<I.Response<nodestd.stream.Readable>>;
+            delete(url: string, options?: I.Options): Promise<I.Response<object | string>>;
+
+            options(url: string, options: I.Options & { responseType: "string" }): Promise<I.Response<string>>;
+            options(url: string, options: I.Options & { responseType: "buffer" }): Promise<I.Response<Buffer>>;
+            options(url: string, options: I.Options & { responseType: "stream" }): Promise<I.Response<nodestd.stream.Readable>>;
+            options(url: string, options?: I.Options): Promise<I.Response<object | string>>;
+        }
+
+        class Cancel {
+            message: string;
+
+            constructor(message: string);
+        }
+
+        namespace I {
+            type Canceller = (message?: string) => void;
+
+            interface CancelTokenSource {
+                token: CancelToken;
+                cancel: Canceller;
+            }
+        }
+
+        class CancelToken {
+            promise: Promise<Cancel>;
+            reason?: Cancel;
+
+            constructor(executor: I.Canceller);
+
+            throwIfRequested(): void;
+
+            static source(): I.CancelTokenSource;
+        }
+
+        const request: I.Request;
+
+        function create(options?: I.Options): I.Request;
+
+        function isCancel(obj: any): obj is Cancel;
+    }
+}
diff --git a/types/adone/glosses/net/http/index.d.ts b/types/adone/glosses/net/http/index.d.ts
new file mode 100644
index 0000000000..a4fbe478d8
--- /dev/null
+++ b/types/adone/glosses/net/http/index.d.ts
@@ -0,0 +1,7 @@
+/// <reference path="./client.d.ts" />
+
+declare namespace adone.net {
+    namespace http {
+        //
+    }
+}
diff --git a/types/adone/glosses/net/index.d.ts b/types/adone/glosses/net/index.d.ts
new file mode 100644
index 0000000000..5e773e4601
--- /dev/null
+++ b/types/adone/glosses/net/index.d.ts
@@ -0,0 +1,7 @@
+/// <reference path="./http/index.d.ts" />
+
+declare namespace adone {
+    namespace net {
+        //
+    }
+}
diff --git a/types/adone/glosses/regex.d.ts b/types/adone/glosses/regex.d.ts
new file mode 100644
index 0000000000..e5c3be642a
--- /dev/null
+++ b/types/adone/glosses/regex.d.ts
@@ -0,0 +1,25 @@
+declare namespace adone {
+    namespace regex {
+        function filename(): RegExp;
+
+        function ip4(): RegExp;
+
+        function ip6(): RegExp;
+
+        function protocol(): RegExp;
+
+        function idn(): RegExp;
+
+        function punycode(): RegExp;
+
+        function uri(): RegExp;
+
+        function uuid4(): RegExp;
+
+        function uuid5(): RegExp;
+
+        function ansi(): RegExp;
+
+        function shebang(): RegExp;
+    }
+}
diff --git a/types/adone/glosses/semver.d.ts b/types/adone/glosses/semver.d.ts
new file mode 100644
index 0000000000..6c78695600
--- /dev/null
+++ b/types/adone/glosses/semver.d.ts
@@ -0,0 +1,237 @@
+declare namespace adone {
+    namespace semver {
+        const SEMVER_SPEC_VERSION: "2.0.0";
+
+        namespace I {
+            type ReleaseType = "major"
+                | "premajor"
+                | "minor"
+                | "preminor"
+                | "patch"
+                | "prepatch"
+                | "prerelease";
+
+            type Operator = '==='
+                | "!=="
+                | ""
+                | "="
+                | "=="
+                | "!="
+                | ">"
+                | ">="
+                | "<"
+                | "<=";
+        }
+
+        /**
+         * Returns the parsed version as a SemVer object, or null if it's not valid.
+         */
+        function parse(v: string | SemVer, loose?: boolean): SemVer | null;
+
+        /**
+         * Returns the parsed version, or null if it's not valid.
+         */
+        function valid(v: string | SemVer, loose?: boolean): string | null;
+
+        /**
+         * Returns cleaned (removed leading/trailing whitespace, remove '=v' prefix) and parsed version, or null if version is invalid.
+         */
+        function clean(version: string, loose?: boolean): string | null;
+
+        /**
+         * Returns the version incremented by the release type (major, minor, patch, or prerelease), or null if it's not valid.
+         */
+        function inc(v: string | SemVer, release: I.ReleaseType, loose?: boolean, identifier?: string): string | null;
+
+        /**
+         * Returns the major version number.
+         */
+        function major(v: string | SemVer, loose?: boolean): number;
+
+        /**
+         * Returns the minor version number.
+         */
+        function minor(v: string | SemVer, loose?: boolean): number;
+
+        /**
+         * Returns the patch version number.
+         */
+        function patch(v: string | SemVer, loose?: boolean): number;
+
+        /**
+         * Returns an array of prerelease components, or null if none exist.
+         */
+        function prerelease(v: string | SemVer, loose?: boolean): string[] | null;
+
+        // Comparison
+
+        /**
+         * v1 > v2
+         */
+        function gt(v1: string | SemVer, v2: string | SemVer, loose?: boolean): boolean;
+
+        /**
+         * v1 >= v2
+         */
+        function gte(v1: string | SemVer, v2: string | SemVer, loose?: boolean): boolean;
+
+        /**
+         * v1 < v2
+         */
+        function lt(v1: string | SemVer, v2: string | SemVer, loose?: boolean): boolean;
+
+        /**
+         * v1 <= v2
+         */
+        function lte(v1: string | SemVer, v2: string | SemVer, loose?: boolean): boolean;
+
+        /**
+         * v1 == v2 This is true if they're logically equivalent, even if they're not the exact same string. You already know how to compare strings.
+         */
+        function eq(v1: string | SemVer, v2: string | SemVer, loose?: boolean): boolean;
+
+        /**
+         * v1 != v2 The opposite of eq.
+         */
+        function neq(v1: string | SemVer, v2: string | SemVer, loose?: boolean): boolean;
+
+        /**
+         * Pass in a comparison string, and it'll call the corresponding semver comparison function.
+         * "===" and "!==" do simple string comparison, but are included for completeness.
+         * Throws if an invalid comparison string is provided.
+         */
+        function cmp(v1: string | SemVer, operator: I.Operator, v2: string | SemVer, loose?: boolean): boolean;
+
+        /**
+         * Returns 0 if v1 == v2, or 1 if v1 is greater, or -1 if v2 is greater. Sorts in ascending order if passed to Array.sort().
+         */
+        function compare(v1: string | SemVer, v2: string | SemVer, loose?: boolean): 1 | 0 | -1;
+
+        /**
+         * The reverse of compare. Sorts an array of versions in descending order when passed to Array.sort().
+         */
+        function rcompare(v1: string | SemVer, v2: string | SemVer, loose?: boolean): 1 | 0 | -1;
+
+        /**
+         * Compares two identifiers, must be numeric strings or truthy/falsy values. Sorts in ascending order if passed to Array.sort().
+         */
+        function compareIdentifiers(a: string | null, b: string | null): 1 | 0 | -1;
+
+        /**
+         * The reverse of compareIdentifiers. Sorts in descending order when passed to Array.sort().
+         */
+        function rcompareIdentifiers(a: string | null, b: string | null): 1 | 0 | -1;
+
+        /**
+         * Sorts an array of semver entries in ascending order.
+         */
+        function sort(list: Array<string | SemVer>, loose?: boolean): Array<string | SemVer>;
+
+        /**
+         * Sorts an array of semver entries in descending order.
+         */
+        function rsort(list: Array<string | SemVer>, loose?: boolean): Array<string | SemVer>;
+
+        /**
+         * Returns difference between two versions by the release type (major, premajor, minor, preminor, patch, prepatch, or prerelease), or null if the versions are the same.
+         */
+        function diff(v1: string, v2: string, loose?: boolean): I.ReleaseType | null;
+
+        // Ranges
+
+        /**
+         * Returns the valid range or null if it's not valid
+         */
+        function validRange(range: string | Range, loose?: boolean): string;
+
+        /**
+         * Returns true if the version satisfies the range.
+         */
+        function satisfies(version: string | SemVer, range: string | Range, loose?: boolean): boolean;
+
+        /**
+         * Returns the highest version in the list that satisfies the range, or null if none of them do.
+         */
+        function maxSatisfying(versions: Array<string | SemVer>, range: string | Range, loose?: boolean): string;
+
+        /**
+         * Returns the lowest version in the list that satisfies the range, or null if none of them do.
+         */
+        function minSatisfying(versions: Array<string | SemVer>, range: string, loose?: boolean): string;
+
+        /**
+         * Returns true if version is greater than all the versions possible in the range.
+         */
+        function gtr(version: string | SemVer, range: string | Range, loose?: boolean): boolean;
+
+        /**
+         * Returns true if version is less than all the versions possible in the range.
+         */
+        function ltr(version: string | SemVer, range: string | Range, loose?: boolean): boolean;
+
+        /**
+         * Returns true if the version is outside the bounds of the range in either the high or low direction.
+         * The hilo argument must be either the string '>' or '<'. (This is the function called by gtr and ltr.)
+         */
+        function outside(version: string | SemVer, range: string | Range, hilo: '>' | '<', loose?: boolean): boolean;
+
+        /**
+         * Returns true if any of the ranges comparators intersect
+         */
+        function intersects(range1: string | Range, range2: string | Range, loose?: boolean): boolean;
+
+        // Coercion
+
+        /**
+         * Coerces a string to semver if possible
+         */
+        function coerce(version: string | SemVer): SemVer | null;
+
+        class SemVer {
+            constructor(version: string | SemVer, loose?: boolean);
+
+            raw: string;
+            loose: boolean;
+            format(): string;
+            inspect(): string;
+
+            major: number;
+            minor: number;
+            patch: number;
+            version: string;
+            build: string[];
+            prerelease: string[];
+
+            compare(other: string | SemVer): 1 | 0 | -1;
+            compareMain(other: string | SemVer): 1 | 0 | -1;
+            comparePre(other: string | SemVer): 1 | 0 | -1;
+            inc(release: I.ReleaseType, identifier?: string): SemVer;
+        }
+
+        class Comparator {
+            constructor(comp: string | Comparator, loose?: boolean);
+
+            semver: SemVer;
+            operator: string;
+            value: boolean;
+            parse(comp: string): void;
+            test(version: string | SemVer): boolean;
+            intersects(comp: Comparator, loose?: boolean): boolean;
+        }
+
+        class Range {
+            constructor(range: string | Range, loose?: boolean);
+
+            range: string;
+            raw: string;
+            loose: boolean;
+            format(): string;
+            inspect(): string;
+
+            set: Comparator[][];
+            parseRange(range: string): Comparator[];
+            test(version: string | SemVer): boolean;
+            intersects(range: Range, loose?: boolean): boolean;
+        }
+    }
+}
diff --git a/types/adone/glosses/std.d.ts b/types/adone/glosses/std.d.ts
index ec4bc4c37a..376b814d3e 100644
--- a/types/adone/glosses/std.d.ts
+++ b/types/adone/glosses/std.d.ts
@@ -1,34 +1,37 @@
-import * as assert from "assert";
-import * as fs from "fs";
-import * as path from "path";
-import * as util from "util";
-import * as events from "events";
-import * as stream from "stream";
-import * as url from "url";
-import * as net from "net";
-import * as http from "http";
-import * as https from "https";
-import * as child_process from "child_process";
-import * as os from "os";
-import * as cluster from "cluster";
-import * as repl from "repl";
-import * as punycode from "punycode";
-import * as readline from "readline";
-import * as string_decoder from "string_decoder";
-import * as querystring from "querystring";
-import * as crypto from "crypto";
-import * as vm from "vm";
-import * as v8 from "v8";
-import * as domain from "domain";
-import * as tty from "tty";
-import * as buffer from "buffer";
-import * as constants from "constants";
-import * as zlib from "zlib";
-import * as tls from "tls";
-import * as console from "console";
-import * as dns from "dns";
-import * as timers from "timers";
-import * as dgram from "dgram";
+import assert = require("assert");
+import fs = require("fs");
+import path = require("path");
+import util = require("util");
+import events = require("events");
+import stream = require("stream");
+import url = require("url");
+import net = require("net");
+import http = require("http");
+import http2 = require("http2");
+import https = require("https");
+import child_process = require("child_process");
+import os = require("os");
+import cluster = require("cluster");
+import repl = require("repl");
+import punycode = require("punycode");
+import readline = require("readline");
+import string_decoder = require("string_decoder");
+import querystring = require("querystring");
+import crypto = require("crypto");
+import vm = require("vm");
+import v8 = require("v8");
+import domain = require("domain");
+import module = require("module");
+import tty = require("tty");
+import buffer = require("buffer");
+import constants = require("constants");
+import zlib = require("zlib");
+import tls = require("tls");
+import console = require("console");
+import dns = require("dns");
+import timers = require("timers");
+import dgram = require("dgram");
+import perf_hooks = require("perf_hooks");
 
 export {
     assert,
@@ -40,6 +43,7 @@ export {
     url,
     net,
     http,
+    http2,
     https,
     child_process,
     os,
@@ -53,6 +57,7 @@ export {
     vm,
     v8,
     domain,
+    module,
     tty,
     buffer,
     constants,
@@ -62,6 +67,7 @@ export {
     dns,
     timers,
     dgram,
+    perf_hooks
 };
 
 export as namespace nodestd;
diff --git a/types/adone/glosses/system/env.d.ts b/types/adone/glosses/system/env.d.ts
new file mode 100644
index 0000000000..3ad18ab041
--- /dev/null
+++ b/types/adone/glosses/system/env.d.ts
@@ -0,0 +1,19 @@
+declare namespace adone.system {
+    namespace env {
+        function user(): string;
+
+        function prompt(): string;
+
+        function hostname(): string;
+
+        function tmpdir(): string;
+
+        function home(): string;
+
+        function path(): string;
+
+        function editor(): string;
+
+        function shell(): string;
+    }
+}
diff --git a/types/adone/glosses/system/index.d.ts b/types/adone/glosses/system/index.d.ts
new file mode 100644
index 0000000000..7a3ceced9d
--- /dev/null
+++ b/types/adone/glosses/system/index.d.ts
@@ -0,0 +1,9 @@
+/// <reference path="./env.d.ts" />
+/// <reference path="./process.d.ts" />
+/// <reference path="./user.d.ts" />
+
+declare namespace adone {
+    namespace system {
+        //
+    }
+}
diff --git a/types/adone/glosses/system/process.d.ts b/types/adone/glosses/system/process.d.ts
new file mode 100644
index 0000000000..51d0c45ddc
--- /dev/null
+++ b/types/adone/glosses/system/process.d.ts
@@ -0,0 +1,241 @@
+declare namespace adone.system.process {
+    function errname(code: number): string;
+
+    function errnameFallback(uv: object, code: number): string;
+
+    function stdio(opts: object): any[];
+
+    namespace I {
+        type StdIOOption = "pipe" | "ipc" | "ignore" | nodestd.stream.Stream | number | null | undefined;
+
+        interface ExecCommonOptions {
+            /**
+             * Current working directory of the child process.
+             * @default `process.cwd()`
+             */
+            cwd?: string;
+
+            /**
+             * Environment key-value pairs.
+             * Extends automatically from `process.env`.
+             * Set `extendEnv` to `false` if you don"t want this.
+             * @default `process.env`
+             */
+            env?: NodeJS.ProcessEnv;
+
+            /**
+             * Set to `false` if you don't want to extend the environment variables when providing the `env` property.
+             * @default `true`
+             */
+            extendEnv?: boolean;
+
+            /**
+             * Explicitly set the value of `argv[0]` sent to the child process.
+             * This will be set to `command` or `file` if not specified.
+             */
+            argv0?: string;
+
+            /**
+             * The `stdio` option is used to configure the pipes that are established between the parent and child process.
+             * By default, the child's stdin, stdout, and stderr are redirected to corresponding `subprocess.stdin`, `subprocess.stdout`, and `subprocess.stderr` streams on the `ChildProcess` object.
+             * @default `'pipe'`
+             *
+             * @see https://nodejs.org/api/child_process.html#child_process_options_stdio
+             */
+            stdio?: "pipe" | "ignore" | "inherit" | StdIOOption[];
+
+            /**
+             * Prepare child to run independently of its parent process.
+             * Specific behavior depends on the platform.
+             * @see https://nodejs.org/api/child_process.html#child_process_options_detached
+             */
+            detached?: boolean;
+
+            /**
+             * Sets the user identity of the process.
+             */
+            uid?: number;
+
+            /**
+             * Sets the group identity of the process.
+             */
+            gid?: number;
+
+            /**
+             * If `true`, runs `command` inside of a shell.
+             * Uses `/bin/sh` on UNIX and `cmd.exe` on Windows.
+             * A different shell can be specified as a string.
+             * The shell should understand the `-c` switch on UNIX or `/d /s /c` on Windows.
+             * @default `false`
+             */
+            shell?: boolean | string;
+
+            /**
+             * If `true`, no quoting or escaping of arguments is done on Windows.
+             * Ignored on other platforms.
+             * This is set to `true` automatically when `shell` is specified.
+             * @default `false`
+             */
+            windowsVerbatimArguments?: boolean;
+
+            /**
+             * Strip EOF (last newline) from the output.
+             * @default `true`
+             * @see https://github.com/sindresorhus/strip-eof
+             */
+            stripEof?: boolean;
+
+            /**
+             * Prefer locally installed binaries when looking for a binary to execute.
+             * If you `$ npm install foo`, you can then `execa('foo')`.
+             * @default `true`
+             */
+            preferLocal?: boolean;
+
+            /**
+             * Preferred path to find locally installed binaries in (use with `preferLocal`).
+             * @default `process.cwd()`
+             */
+            localDir?: string;
+
+            /**
+             * Setting this to `false` resolves the promise with the error instead of rejecting it.
+             * @default `true`
+             */
+            reject?: boolean;
+
+            /**
+             * Keep track of the spawned process and `kill` it when the parent process exits.
+             * @default `true`
+             */
+            cleanup?: boolean;
+
+            /**
+             * Specify the character encoding used to decode the `stdout` and `stderr` output.
+             * @default `utf8`
+             */
+            encoding?: string;
+
+            /**
+             * If `timeout` is greater than `0`, the parent will send the signal identified by the `killSignal` property
+             * (the default is `SIGTERM`) if the child runs longer than `timeout` milliseconds.
+             *
+             * @default `0`
+             */
+            timeout?: number;
+
+            /**
+             * Largest amount of data in bytes allowed on `stdout` or `stderr`.
+             * @default `10000000` (10MB)
+             */
+            maxBuffer?: number;
+
+            /**
+             * Signal value to be used when the spawned process will be killed.
+             * @default `SIGTERM`
+             */
+            killSignal?: string | number;
+
+            /**
+             * Used to configure the stdin pipe that is established between the parent and child process.
+             * @default `'pipe'`
+             * @see https://nodejs.org/api/child_process.html#child_process_options_stdio
+             */
+            stdin?: StdIOOption;
+
+            /**
+             * Used to configure the stdout pipe that is established between the parent and child process.
+             * @default `'pipe'`
+             * @see https://nodejs.org/api/child_process.html#child_process_options_stdio
+             */
+            stdout?: StdIOOption;
+
+            /**
+             * Used to configure the stderr pipe that is established between the parent and child process.
+             * @default `'pipe'`
+             * @see https://nodejs.org/api/child_process.html#child_process_options_stdio
+             */
+            stderr?: StdIOOption;
+        }
+
+        interface ExecOptions extends ExecCommonOptions {
+            /**
+             * Write some input to the `stdin` of your binary.
+             */
+            input?: string | Buffer | nodestd.stream.Stream;
+        }
+
+        interface ExecSyncOptions extends ExecCommonOptions {
+            /**
+             * Write some input to the `stdin` of your binary.
+             * Streams are not allowed when using the synchronous methods.
+             */
+            input?: string | Buffer;
+        }
+
+        interface ExecReturns {
+            /**
+             * The command that was run.
+             */
+            cmd: string;
+
+            /**
+             * The exit code of the process that was run.
+             */
+            code: number;
+
+            /**
+             * Whether the process failed to run.
+             */
+            failed: boolean;
+
+            /**
+             * Whether the process was killed.
+             */
+            killed: boolean;
+
+            /**
+             * The signal that was used to terminate the process.
+             */
+            signal: string | null;
+
+            /**
+             * The output of the process on stderr.
+             */
+            stderr: string;
+
+            /**
+             * The output of the process on stdout.
+             */
+            stdout: string;
+
+            /**
+             * Whether the process timed out.
+             */
+            timedOut: boolean;
+        }
+
+        type ExecError = Error & ExecReturns;
+
+        interface ExecChildPromise {
+            catch<TResult = never>(onrejected?: ((reason: ExecError) => TResult | PromiseLike<TResult>) | null): Promise<ExecReturns | TResult>;
+        }
+
+        type ExecChildProcess = nodestd.child_process.ChildProcess & ExecChildPromise & Promise<ExecReturns>;
+    }
+
+    function exec(cmd: string, args?: string[], opts?: I.ExecOptions): I.ExecChildProcess;
+    function exec(cmd: string, opts?: I.ExecOptions): I.ExecChildProcess;
+
+    function execStdout(cmd: string, args?: string[], opts?: I.ExecOptions): Promise<string>;
+    function execStdout(cmd: string, opts?: I.ExecOptions): Promise<string>;
+
+    function execStderr(cmd: string, args?: string[], opts?: I.ExecOptions): Promise<string>;
+    function execStderr(cmd: string, opts?: I.ExecOptions): Promise<string>;
+
+    function shell(cmd: string, opts?: I.ExecOptions): I.ExecChildProcess;
+
+    function execSync(cmd: string, args?: string[], opts?: I.ExecSyncOptions): I.ExecReturns;
+
+    function shellSync(cmd: string, opts?: I.ExecSyncOptions): I.ExecReturns;
+}
diff --git a/types/adone/glosses/system/user.d.ts b/types/adone/glosses/system/user.d.ts
new file mode 100644
index 0000000000..508f67e894
--- /dev/null
+++ b/types/adone/glosses/system/user.d.ts
@@ -0,0 +1,31 @@
+declare namespace adone.system {
+    /**
+     * Utils for uid/gid
+     */
+    namespace user {
+        /**
+         * Returns uid by the given username
+         */
+        function uid(username: string): { uid: number, gid: number };
+
+        /**
+         * Returns gid by the given groupname
+         */
+        function gid(groupname: string): number;
+
+        /**
+         * Returns gids the given user belongs
+         */
+        function gids(username: string): number[];
+
+        /**
+         * Returns username by the given uid
+         */
+        function username(uid: number): string;
+
+        /**
+         * Returns groupname by the given gid
+         */
+        function groupname(gid: number): string;
+    }
+}
diff --git a/types/adone/glosses/templating/dot.d.ts b/types/adone/glosses/templating/dot.d.ts
new file mode 100644
index 0000000000..500efe8d35
--- /dev/null
+++ b/types/adone/glosses/templating/dot.d.ts
@@ -0,0 +1,41 @@
+declare namespace adone.templating {
+    namespace dot {
+        namespace I {
+            type RenderFunction = (...args: any[]) => string;
+
+            interface TemplateSettings {
+                evaluate: RegExp;
+                interpolate: RegExp;
+                encode: RegExp;
+                use: RegExp;
+                useParams: RegExp;
+                define: RegExp;
+                defineParams: RegExp;
+                conditional: RegExp;
+                iterate: RegExp;
+                varname: string;
+                strip: boolean;
+                append: boolean;
+                selfcontained: boolean;
+            }
+        }
+        const version: string;
+
+        let templateSettings: I.TemplateSettings;
+
+        function template(tmpl: string, c?: I.TemplateSettings, def?: {}): I.RenderFunction;
+
+        function compile(tmpl: string, def?: object): I.RenderFunction;
+
+        namespace I {
+            interface ProcessOptions {
+                path?: string;
+                destination?: string;
+                global?: string;
+                templateSettings?: Partial<I.TemplateSettings>;
+            }
+        }
+
+        function process(options?: I.ProcessOptions): { [path: string]: I.RenderFunction };
+    }
+}
diff --git a/types/adone/glosses/templating/index.d.ts b/types/adone/glosses/templating/index.d.ts
new file mode 100644
index 0000000000..81f9964335
--- /dev/null
+++ b/types/adone/glosses/templating/index.d.ts
@@ -0,0 +1,8 @@
+/// <reference path="./dot.d.ts" />
+/// <reference path="./nunjucks.d.ts" />
+
+declare namespace adone {
+    namespace templating {
+        //
+    }
+}
diff --git a/types/adone/glosses/templating/nunjucks.d.ts b/types/adone/glosses/templating/nunjucks.d.ts
new file mode 100644
index 0000000000..d0aed211cc
--- /dev/null
+++ b/types/adone/glosses/templating/nunjucks.d.ts
@@ -0,0 +1,121 @@
+declare namespace adone.templating {
+    namespace nunjucks {
+        namespace I {
+            interface EnvironmentOptions {
+                dev?: boolean;
+                autoescape?: boolean;
+                throOnUndefined?: boolean;
+                trimBlocks?: boolean;
+                lstripBlocks?: boolean;
+            }
+
+            interface FileSystemLoaderOptions {
+                watch?: boolean;
+                noCache?: boolean;
+            }
+
+            type ConfigureOptions = EnvironmentOptions & FileSystemLoaderOptions & {
+                tags?: {
+                    blockStart?: string,
+                    blockEnd?: string,
+                    variableStart?: string,
+                    variableEnd?: string,
+                    commentStart?: string,
+                    commentEnd?: string
+                };
+            };
+
+            interface PrecompileOptions {
+                name?: string;
+                asFunction?: boolean;
+                force?: boolean;
+                env?: Environment;
+                include?: string[];
+                exclude?: string[];
+                wrapper?(templates: { name: string, template: string }, opts: PrecompileOptions): string;
+            }
+
+            interface Extension {
+                tags: string[];
+                parse(parser: any, nodes: any, lexer: any): any;
+            }
+
+            interface LoaderSource {
+                src: string;
+                path: string;
+                noCache: boolean;
+            }
+
+            interface Loader {
+                async?: boolean;
+                getSource(name: string): LoaderSource;
+                extend?(extender: Loader): Loader;
+            }
+        }
+
+        class Environment {
+            options: {
+                autoescape: boolean;
+            };
+
+            constructor(loader?: I.Loader | I.Loader[] | null, opts?: I.EnvironmentOptions);
+            render(name: string, context?: object): string;
+            render(name: string, context?: object, callback?: (err: any, res: string) => any): void;
+
+            renderString(name: string, context?: object): string;
+            renderString(name: string, context?: object, callback?: (err: any, res: string) => any): void;
+
+            addFilter(name: string, func: (...args: any[]) => any, async?: boolean): void;
+            getFilter(name: string): (...args: any[]) => any;
+
+            addExtension(name: string, ext: I.Extension): void;
+            removeExtension(name: string): void;
+            getExtension(name: string): I.Extension;
+            hasExtension(name: string): boolean;
+
+            addGlobal(name: string, value: any): this;
+
+            getTemplate(name: string, eagerCompile?: boolean): Template;
+            getTemplate(name: string, eagerCompile?: boolean, callback?: (err: any, templ: Template) => Template): void;
+
+            express(app: object): void;
+        }
+
+        class Template {
+            constructor(src: string, env?: Environment, eagerCompile?: boolean);
+            render(context?: object): string;
+            render(context?: object, callback?: (err: any, res: string) => any): void;
+        }
+
+        class Loader {
+            on(name: string, func: (...args: any[]) => any): void;
+            emit(name: string, ...args: any[]): void;
+            resolve(from: string, to: string): string;
+            isRelative(filename: string): boolean;
+            extend(toExtend: I.Loader): I.Loader;
+        }
+
+        class FileSystemLoader extends Loader implements I.Loader {
+            constructor(searchPaths?: string | string[], opts?: I.FileSystemLoaderOptions);
+
+            getSource(name: string): I.LoaderSource;
+        }
+
+        class PrecompiledLoader extends Loader implements I.Loader {
+            getSource(name: string): I.LoaderSource;
+        }
+
+        function renderSync(name: string, context?: object): string;
+        function render(name: string, context?: object): Promise<string>;
+
+        function renderString(src: string, context?: object): Promise<string>;
+        function renderStringSync(src: string, context?: object): string;
+
+        function compile(src: string, env?: Environment, path?: string, eagerCompile?: boolean): Template;
+
+        function configure(options?: I.ConfigureOptions): Environment;
+        function configure(path: string | string[], options?: I.ConfigureOptions): Environment;
+
+        function installJinjaCompat(): void;
+    }
+}
diff --git a/types/adone/glosses/text/index.d.ts b/types/adone/glosses/text/index.d.ts
new file mode 100644
index 0000000000..a640789765
--- /dev/null
+++ b/types/adone/glosses/text/index.d.ts
@@ -0,0 +1,77 @@
+/// <reference path="./pretties.d.ts" />
+/// <reference path="./spinners.d.ts" />
+/// <reference path="./table.d.ts" />
+/// <reference path="./unicode.d.ts" />
+
+declare namespace adone {
+    namespace text {
+        namespace escape {
+            function regExpPattern(str: string): string;
+
+            function regExpReplacement(str: string): string;
+
+            function format(str: string): string;
+
+            function shellArg(str: string): string;
+
+            function control(str: string): string;
+
+            function htmlSpecialChars(str: string): string;
+        }
+
+        namespace regexp {
+            function array2alternatives(array: string[]): string;
+        }
+
+        function escapeStringRegexp(str: string): string;
+
+        function toCamelCase(str: string): string;
+
+        function camelCaseToDashed(str: string): string;
+
+        const endLineRegExp: RegExp;
+
+        function splitLines(str: string): string[];
+
+        function regExpIndexOf(str: string, regex: RegExp, index?: number): string;
+
+        function stripAnsi(str: string): string;
+
+        function hasAnsi(str: string): boolean;
+
+        function random(len: number): string;
+
+        function detectNewLine(str: string): "\r\n" | "\n";
+
+        namespace I {
+            interface WordWrapOptions {
+                join?: boolean;
+                mode?: "soft" | "hard";
+                countAnsiEscapeCodes?: boolean;
+            }
+        }
+
+        function wordwrap(str: string, stop: number, options: I.WordWrapOptions & { join: false}): string[];
+        function wordwrap(str: string, stop: number, options?: I.WordWrapOptions): string;
+
+        function stringDistance(strA: string, strB: string, memo?: number[][]): number;
+
+        function stringDistanceCapped(strA: string, strB: string, cap: number): number;
+
+        function capitalize(str: string): string;
+
+        function capitalizeWords(str: string): string;
+
+        function width(str: string): number;
+
+        function indent(string: string, spaces: number): string;
+
+        function stripEof(str: string): string;
+
+        function stripLastCRLF(str: string): string;
+
+        function stripBOM(str: string): string;
+
+        function toUTF8Array(str: string): number[];
+    }
+}
diff --git a/types/adone/glosses/text/pretties.d.ts b/types/adone/glosses/text/pretties.d.ts
new file mode 100644
index 0000000000..886901b268
--- /dev/null
+++ b/types/adone/glosses/text/pretties.d.ts
@@ -0,0 +1,55 @@
+declare namespace adone.text {
+    namespace pretty {
+        namespace I {
+            interface JSONOptions {
+                emptyArrayMsg?: string;
+                keysColor?: string;
+                dashColor?: string;
+                numberColor?: string;
+                stringColor?: string;
+                defaultIndentation?: number;
+                noColor?: boolean;
+                noAlign?: boolean;
+            }
+        }
+
+        function json(data: any, options?: I.JSONOptions, indentation?: number): string;
+
+        namespace I {
+            interface TableColumn {
+                id: string;
+                header?: string;
+                align?: "right" | "center" | "left";
+                width?: string | number;
+                maxWidth?: number | string;
+                wordwrap?: "soft" | "hard" | adone.text.I.WordWrapOptions;
+                handle?: (item: object) => string;
+                format?: string | ((val: any, item: object) => string);
+                style?: string | ((val: any, str: string) => string);
+            }
+
+            type TableModel = TableColumn[];
+
+            interface TableStyle {
+                "padding-left"?: number;
+                "padding-right"?: number;
+                head?: string[];
+                broder?: string[];
+                compact?: boolean;
+            }
+
+            interface TableOptions {
+                model: TableModel;
+                noHeader?: boolean;
+                borderless?: boolean;
+                style?: TableStyle;
+                width?: number | string;
+                countAnsiEscapeCodes?: boolean;
+            }
+
+            type TableData = Array<{ [id: string]: any }>;
+        }
+
+        function table(data: I.TableData, options: I.TableOptions): string;
+    }
+}
diff --git a/types/adone/glosses/text/spinners.d.ts b/types/adone/glosses/text/spinners.d.ts
new file mode 100644
index 0000000000..962a6aebab
--- /dev/null
+++ b/types/adone/glosses/text/spinners.d.ts
@@ -0,0 +1,468 @@
+declare namespace adone.text {
+    namespace spinner {
+        const dots: {
+            interval: 80,
+            frames: [
+                "⠋",
+                "⠙",
+                "⠹",
+                "⠸",
+                "⠼",
+                "⠴",
+                "⠦",
+                "⠧",
+                "⠇",
+                "⠏"
+            ]
+        };
+        const dots2: {
+            interval: 80,
+            frames: [
+                "⣾",
+                "⣽",
+                "⣻",
+                "⢿",
+                "⡿",
+                "⣟",
+                "⣯",
+                "⣷"
+            ]
+        };
+        const dots3: {
+            interval: 80,
+            frames: [
+                "⠋",
+                "⠙",
+                "⠚",
+                "⠞",
+                "⠖",
+                "⠦",
+                "⠴",
+                "⠲",
+                "⠳",
+                "⠓"
+            ]
+        };
+        const dots4: {
+            interval: 80,
+            frames: [
+                "⠄",
+                "⠆",
+                "⠇",
+                "⠋",
+                "⠙",
+                "⠸",
+                "⠰",
+                "⠠",
+                "⠰",
+                "⠸",
+                "⠙",
+                "⠋",
+                "⠇",
+                "⠆"
+            ]
+        };
+        const dots5: {
+            interval: 80,
+            frames: [
+                "⠋",
+                "⠙",
+                "⠚",
+                "⠒",
+                "⠂",
+                "⠂",
+                "⠒",
+                "⠲",
+                "⠴",
+                "⠦",
+                "⠖",
+                "⠒",
+                "⠐",
+                "⠐",
+                "⠒",
+                "⠓",
+                "⠋"
+            ]
+        };
+        const dots6: {
+            interval: 80,
+            frames: [
+                "⠁",
+                "⠉",
+                "⠙",
+                "⠚",
+                "⠒",
+                "⠂",
+                "⠂",
+                "⠒",
+                "⠲",
+                "⠴",
+                "⠤",
+                "⠄",
+                "⠄",
+                "⠤",
+                "⠴",
+                "⠲",
+                "⠒",
+                "⠂",
+                "⠂",
+                "⠒",
+                "⠚",
+                "⠙",
+                "⠉",
+                "⠁"
+            ]
+        };
+        const dots7: {
+            interval: 80,
+            frames: [
+                "⠈",
+                "⠉",
+                "⠋",
+                "⠓",
+                "⠒",
+                "⠐",
+                "⠐",
+                "⠒",
+                "⠖",
+                "⠦",
+                "⠤",
+                "⠠",
+                "⠠",
+                "⠤",
+                "⠦",
+                "⠖",
+                "⠒",
+                "⠐",
+                "⠐",
+                "⠒",
+                "⠓",
+                "⠋",
+                "⠉",
+                "⠈"
+            ]
+        };
+        const dots8: {
+            interval: 80,
+            frames: [
+                "⠁",
+                "⠁",
+                "⠉",
+                "⠙",
+                "⠚",
+                "⠒",
+                "⠂",
+                "⠂",
+                "⠒",
+                "⠲",
+                "⠴",
+                "⠤",
+                "⠄",
+                "⠄",
+                "⠤",
+                "⠠",
+                "⠠",
+                "⠤",
+                "⠦",
+                "⠖",
+                "⠒",
+                "⠐",
+                "⠐",
+                "⠒",
+                "⠓",
+                "⠋",
+                "⠉",
+                "⠈",
+                "⠈"
+            ]
+        };
+        const dots9: {
+            interval: 80,
+            frames: [
+                "⢹",
+                "⢺",
+                "⢼",
+                "⣸",
+                "⣇",
+                "⡧",
+                "⡗",
+                "⡏"
+            ]
+        };
+        const dots10: {
+            interval: 80,
+            frames: [
+                "⢄",
+                "⢂",
+                "⢁",
+                "⡁",
+                "⡈",
+                "⡐",
+                "⡠"
+            ]
+        };
+        const dots11: {
+            interval: 100,
+            frames: [
+                "⠁",
+                "⠂",
+                "⠄",
+                "⡀",
+                "⢀",
+                "⠠",
+                "⠐",
+                "⠈"
+            ]
+        };
+        const dots12: {
+            interval: 80,
+            frames: [
+                "⢀⠀",
+                "⡀⠀",
+                "⠄⠀",
+                "⢂⠀",
+                "⡂⠀",
+                "⠅⠀",
+                "⢃⠀",
+                "⡃⠀",
+                "⠍⠀",
+                "⢋⠀",
+                "⡋⠀",
+                "⠍⠁",
+                "⢋⠁",
+                "⡋⠁",
+                "⠍⠉",
+                "⠋⠉",
+                "⠋⠉",
+                "⠉⠙",
+                "⠉⠙",
+                "⠉⠩",
+                "⠈⢙",
+                "⠈⡙",
+                "⢈⠩",
+                "⡀⢙",
+                "⠄⡙",
+                "⢂⠩",
+                "⡂⢘",
+                "⠅⡘",
+                "⢃⠨",
+                "⡃⢐",
+                "⠍⡐",
+                "⢋⠠",
+                "⡋⢀",
+                "⠍⡁",
+                "⢋⠁",
+                "⡋⠁",
+                "⠍⠉",
+                "⠋⠉",
+                "⠋⠉",
+                "⠉⠙",
+                "⠉⠙",
+                "⠉⠩",
+                "⠈⢙",
+                "⠈⡙",
+                "⠈⠩",
+                "⠀⢙",
+                "⠀⡙",
+                "⠀⠩",
+                "⠀⢘",
+                "⠀⡘",
+                "⠀⠨",
+                "⠀⢐",
+                "⠀⡐",
+                "⠀⠠",
+                "⠀⢀",
+                "⠀⡀"
+            ]
+        };
+        const line: {
+            interval: 130,
+            frames: [
+                "-",
+                "\\",
+                "|",
+                "/"
+            ]
+        };
+        const pipe: {
+            interval: 100,
+            frames: [
+                "┤",
+                "┘",
+                "┴",
+                "└",
+                "├",
+                "┌",
+                "┬",
+                "┐"
+            ]
+        };
+        const simpleDots: {
+            interval: 200,
+            frames: [
+                ".  ",
+                ".. ",
+                "...",
+                " ..",
+                "  .",
+                "   "
+            ]
+        };
+        const flip: {
+            interval: 70,
+            frames: [
+                "_",
+                "_",
+                "_",
+                "-",
+                "`",
+                "`",
+                "'",
+                "´",
+                "-",
+                "_",
+                "_",
+                "_"
+            ]
+        };
+        const growVertical: {
+            interval: 120,
+            frames: [
+                "▁",
+                "▃",
+                "▄",
+                "▅",
+                "▆",
+                "▇",
+                "▆",
+                "▅",
+                "▄",
+                "▃"
+            ]
+        };
+        const growHorizontal: {
+            interval: 120,
+            frames: [
+                "▏",
+                "▎",
+                "▍",
+                "▌",
+                "▋",
+                "▊",
+                "▉",
+                "▊",
+                "▋",
+                "▌",
+                "▍",
+                "▎"
+            ]
+        };
+        const boxBounce: {
+            interval: 120,
+            frames: [
+                "▖",
+                "▘",
+                "▝",
+                "▗"
+            ]
+        };
+        const boxBounce2: {
+            interval: 100,
+            frames: [
+                "▌",
+                "▀",
+                "▐",
+                "▄"
+            ]
+        };
+        const triangle: {
+            interval: 50,
+            frames: [
+                "◢",
+                "◣",
+                "◤",
+                "◥"
+            ]
+        };
+        const squareCorners: {
+            interval: 180,
+            frames: [
+                "◰",
+                "◳",
+                "◲",
+                "◱"
+            ]
+        };
+        const circleQuarters: {
+            interval: 120,
+            frames: [
+                "◴",
+                "◷",
+                "◶",
+                "◵"
+            ]
+        };
+        const circleHalves: {
+            interval: 80,
+            frames: [
+                "◐",
+                "◓",
+                "◑",
+                "◒"
+            ]
+        };
+        const arrow: {
+            interval: 80,
+            frames: [
+                "⬆️ ",
+                "↗️ ",
+                "➡️ ",
+                "↘️ ",
+                "⬇️ ",
+                "↙️ ",
+                "⬅️ ",
+                "↖️ "
+            ]
+        };
+        const arrow3: {
+            interval: 120,
+            frames: [
+                "▹▹▹▹▹",
+                "▸▹▹▹▹",
+                "▹▸▹▹▹",
+                "▹▹▸▹▹",
+                "▹▹▹▸▹",
+                "▹▹▹▹▸"
+            ]
+        };
+        const bouncingBar: {
+            interval: 80,
+            frames: [
+                "[    ]",
+                "[   =]",
+                "[  ==]",
+                "[ ===]",
+                "[====]",
+                "[=== ]",
+                "[==  ]",
+                "[=   ]"
+            ]
+        };
+        const clock: {
+            interval: 100,
+            frames: [
+                "🕐 ",
+                "🕑 ",
+                "🕒 ",
+                "🕓 ",
+                "🕔 ",
+                "🕕 ",
+                "🕖 ",
+                "🕗 ",
+                "🕘 ",
+                "🕙 ",
+                "🕚 "
+            ]
+        };
+    }
+}
diff --git a/types/adone/glosses/text/table.d.ts b/types/adone/glosses/text/table.d.ts
new file mode 100644
index 0000000000..2bfaaa07fd
--- /dev/null
+++ b/types/adone/glosses/text/table.d.ts
@@ -0,0 +1,73 @@
+declare namespace adone.text {
+    namespace table {
+        namespace I {
+            interface CharsOptions {
+                top: string;
+                "top-mid": string;
+                "top-left": string;
+                "top-right": string;
+                bottom: string;
+                "bottom-mid": string;
+                "bottom-left": string;
+                "bottom-right": string;
+                left: string;
+                "left-mid": string;
+                mid: string;
+                "mid-mid": string;
+                right: string;
+                "right-mid": string;
+                middle: string;
+            }
+
+            interface StyleOptions {
+                "padding-left": number;
+                "padding-right": number;
+                head: string[];
+                border: string[];
+                compact: boolean;
+            }
+
+            interface CommonOptions {
+                truncate: string;
+                colWidths: number[];
+                rowHeights: number[];
+                colAligns: Array<"left" | "center" | "right">;
+                rowAligns: Array<"top" | "center" | "bottom">;
+                head: string[];
+            }
+
+            interface Options extends CommonOptions {
+                style: StyleOptions;
+                chars: CharsOptions;
+            }
+
+            interface ConstructorOptions extends Partial<CommonOptions> {
+                style?: Partial<StyleOptions>;
+                chars?: Partial<CharsOptions>;
+            }
+        }
+
+        class Table extends Array {
+            constructor(options?: I.ConstructorOptions);
+
+            toString(): string;
+
+            readonly width: number;
+
+            static readonly defaultOptions: I.Options;
+        }
+
+        namespace I {
+            interface BorderlessConstructorOptions {
+                colWidths?: number[];
+                head?: string[];
+                colAligns?: Array<"left" | "center" | "right">;
+                style?: Partial<StyleOptions>;
+            }
+        }
+
+        class BorderlessTable extends Table {
+            constructor(options?: I.BorderlessConstructorOptions);
+        }
+    }
+}
diff --git a/types/adone/glosses/text/unicode.d.ts b/types/adone/glosses/text/unicode.d.ts
new file mode 100644
index 0000000000..98b449b9a3
--- /dev/null
+++ b/types/adone/glosses/text/unicode.d.ts
@@ -0,0 +1,137 @@
+declare namespace adone.text {
+    namespace unicode {
+        const symbol: {
+            tick: "✔",
+            cross: "✖",
+            star: "★",
+            square: "▇",
+            squareSmall: "◻",
+            squareSmallFilled: "◼",
+            play: "▶",
+            circle: "◯",
+            circleFilled: "◉",
+            circleDotted: "◌",
+            circleDouble: "◎",
+            circleCircle: "ⓞ",
+            circleCross: "ⓧ",
+            circlePipe: "Ⓘ",
+            circleQuestionMark: "?⃝",
+            bullet: "●",
+            dot: "․",
+            line: "─",
+            ellipsis: "…",
+            pointer: "❯",
+            pointerSmall: "›",
+            info: "ℹ",
+            warning: "⚠",
+            hamburger: "☰",
+            smiley: "㋡",
+            mustache: "෴",
+            heart: "♥",
+            arrowUp: "↑",
+            arrowDown: "↓",
+            arrowLeft: "←",
+            arrowRight: "→",
+            radioOn: "◉",
+            radioOff: "◯",
+            checkboxOn: "☒",
+            checkboxOff: "☐",
+            checkboxCircleOn: "ⓧ",
+            checkboxCircleOff: "Ⓘ",
+            questionMarkPrefix: "?" | "?⃝",
+            oneHalf: "½",
+            oneThird: "⅓",
+            oneQuarter: "¼",
+            oneFifth: "⅕",
+            oneSixth: "⅙",
+            oneSeventh: "⅐",
+            oneEighth: "⅛",
+            oneNinth: "⅑",
+            oneTenth: "⅒",
+            twoThirds: "⅔",
+            twoFifths: "⅖",
+            threeQuarters: "¾",
+            threeFifths: "⅗",
+            threeEighths: "⅜",
+            fourFifths: "⅘",
+            fiveSixths: "⅚",
+            fiveEighths: "⅝",
+            sevenEighths: "⅞",
+            minus: "−"
+        };
+
+        const symbolFallback: {
+            tick: "√",
+            cross: "×",
+            star: "*",
+            square: "█",
+            squareSmall: "[ ]",
+            squareSmallFilled: "[█]",
+            play: "►",
+            circle: "( )",
+            circleFilled: "(*)",
+            circleDotted: "( )",
+            circleDouble: "( )",
+            circleCircle: "(○)",
+            circleCross: "(×)",
+            circlePipe: "(│)",
+            circleQuestionMark: "(?)",
+            bullet: "*",
+            dot: ".",
+            line: "─",
+            ellipsis: "...",
+            pointer: ">",
+            pointerSmall: "»",
+            info: "i",
+            warning: "‼",
+            hamburger: "≡",
+            smiley: "☺",
+            mustache: "┌─┐",
+            heart: "♥",
+            arrowUp: "↑",
+            arrowDown: "↓",
+            arrowLeft: "←",
+            arrowRight: "→",
+            radioOn: "(*)",
+            radioOff: "( )",
+            checkboxOn: "[×]",
+            checkboxOff: "[ ]",
+            checkboxCircleOn: "(×)",
+            checkboxCircleOff: "( )",
+            questionMarkPrefix: "？",
+            oneHalf: "1/2",
+            oneThird: "1/3",
+            oneQuarter: "1/4",
+            oneFifth: "1/5",
+            oneSixth: "1/6",
+            oneSeventh: "1/7",
+            oneEighth: "1/8",
+            oneNinth: "1/9",
+            oneTenth: "1/10",
+            twoThirds: "2/3",
+            twoFifths: "2/5",
+            threeQuarters: "3/4",
+            threeFifths: "3/5",
+            threeEighths: "3/8",
+            fourFifths: "4/5",
+            fiveSixths: "5/6",
+            fiveEighths: "5/8",
+            sevenEighths: "7/8",
+            minus: "-"
+        };
+
+        function approx(str: string): string;
+
+        function length(str: string): number;
+
+        function toArray(str: string): string[];
+
+        function surrogatePair(char: string): number;
+
+        function isFullWidthCodePoint(code: number): boolean;
+
+        function isFullWidth(char: string): boolean;
+
+        function toFullWidth(str: string): string;
+    }
+}
diff --git a/types/adone/glosses/utils.d.ts b/types/adone/glosses/utils.d.ts
index 480c2354ce..d84dce79c9 100644
--- a/types/adone/glosses/utils.d.ts
+++ b/types/adone/glosses/utils.d.ts
@@ -252,7 +252,225 @@ declare namespace adone {
         function delegate(object: object, property: string): I.Delegator;
 
         namespace iconv {
-            // TODO: need to normalize source code
+            namespace I {
+                namespace encoding {
+                    type Native = "UTF-8"
+                        | "UCS-2"
+                        | "UTF-16LE"
+                        | "ASCII"
+                        | "Binary"
+                        | "Base64"
+                        | "Hex";
+
+                    type Unicode = "UTF-16BE" | "UTF-16";
+
+                    type Windows = "874"
+                        | "1250"
+                        | "1251"
+                        | "1252"
+                        | "1253"
+                        | "1254"
+                        | "1255"
+                        | "1256"
+                        | "1257"
+                        | "1258"
+                        | "CP874"
+                        | "CP1251"
+                        | "CP1252"
+                        | "CP1253"
+                        | "CP1254"
+                        | "CP1255"
+                        | "CP1256"
+                        | "CP1257"
+                        | "CP1258"
+                        | "Win-1251"
+                        | "Win-1252"
+                        | "Win-1253"
+                        | "Win-1254"
+                        | "Win-1255"
+                        | "Win-1256"
+                        | "Win-1257"
+                        | "Win-1258"
+                        | "Windows-1251"
+                        | "Windows-1252"
+                        | "Windows-1253"
+                        | "Windows-1254"
+                        | "Windows-1255"
+                        | "Windows-1256"
+                        | "Windows-1257"
+                        | "Windows-1258";
+
+                    type ISO = "ISO-8829-1"
+                        | "ISO-8859-2"
+                        | "ISO-8859-3"
+                        | "ISO-8859-4"
+                        | "ISO-8859-5"
+                        | "ISO-8859-6"
+                        | "ISO-8859-7"
+                        | "ISO-8859-8"
+                        | "ISO-8859-9"
+                        | "ISO-8859-10"
+                        | "ISO-8859-11"
+                        | "ISO-8859-12"
+                        | "ISO-8859-13"
+                        | "ISO-8859-14"
+                        | "ISO-8859-15"
+                        | "ISO-8859-16";
+
+                    type IBM = "437"
+                        | "737"
+                        | "775"
+                        | "808"
+                        | "850"
+                        | "852"
+                        | "855"
+                        | "856"
+                        | "857"
+                        | "858"
+                        | "860"
+                        | "861"
+                        | "862"
+                        | "863"
+                        | "864"
+                        | "865"
+                        | "866"
+                        | "869"
+                        | "922"
+                        | "1046"
+                        | "1124"
+                        | "1125"
+                        | "1129"
+                        | "1133"
+                        | "1161"
+                        | "1163"
+                        | "CP437"
+                        | "CP737"
+                        | "CP775"
+                        | "CP808"
+                        | "CP850"
+                        | "CP852"
+                        | "CP855"
+                        | "CP856"
+                        | "CP857"
+                        | "CP858"
+                        | "CP860"
+                        | "CP861"
+                        | "CP862"
+                        | "CP863"
+                        | "CP864"
+                        | "CP865"
+                        | "CP866"
+                        | "CP869"
+                        | "CP922"
+                        | "CP1046"
+                        | "CP1124"
+                        | "CP1125"
+                        | "CP1129"
+                        | "CP1133"
+                        | "CP1161"
+                        | "CP1163"
+                        | "IBM437"
+                        | "IBM737"
+                        | "IBM775"
+                        | "IBM808"
+                        | "IBM850"
+                        | "IBM852"
+                        | "IBM855"
+                        | "IBM856"
+                        | "IBM857"
+                        | "IBM858"
+                        | "IBM860"
+                        | "IBM861"
+                        | "IBM862"
+                        | "IBM863"
+                        | "IBM864"
+                        | "IBM865"
+                        | "IBM866"
+                        | "IBM869"
+                        | "IBM922"
+                        | "IBM1046"
+                        | "IBM1124"
+                        | "IBM1125"
+                        | "IBM1129"
+                        | "IBM1133"
+                        | "IBM1161"
+                        | "IBM1163";
+
+                    type Mac = "MacCroatian"
+                        | "MacCyrillic"
+                        | "MacGreek"
+                        | "MacIceland"
+                        | "MacRoman"
+                        | "MacThai"
+                        | "MacTurkish"
+                        | "MacUkraine"
+                        | "MacCentEuro"
+                        | "Macintosh";
+
+                    type KOI8 = "KOI8-R"
+                        | "KOI8-U"
+                        | "KOI8-RU"
+                        | "KOI8-T";
+
+                    type Misc = "ArmSCII8"
+                        | "RK1048"
+                        | "TCVN"
+                        | "GEORGIAN-ACADEMY"
+                        | "GEORGIAN-PS"
+                        | "PT154"
+                        | "VISCII"
+                        | "ISO-646-CN"
+                        | "ISO-646-JP"
+                        | "HP Roman-8"
+                        | "TIS-620";
+
+                    type Singlebyte = Windows
+                        | ISO
+                        | IBM
+                        | Mac
+                        | KOI8
+                        | Misc;
+
+                    type Japanese = "Shift_JIS"
+                        | "Windows-31J"
+                        | "windows-932"
+                        | "EUC-JP";
+
+                    type Chinese = "GB2312"
+                        | "GBK"
+                        | "GB18030"
+                        | "Windows-936"
+                        | "EUC-CN";
+
+                    type Korean = "KS_C_5601"
+                        | "Windows-949"
+                        | "EUC-KR";
+
+                    type TaiwanHongKong = "Big5"
+                        | "Big5-HKSCS"
+                        | "Windows-950";
+
+                    type Multibyte = Japanese
+                        | Chinese
+                        | Korean
+                        | TaiwanHongKong;
+                }
+
+                type SupportedEncoding = encoding.Native
+                    | encoding.Unicode
+                    | encoding.Singlebyte
+                    | encoding.Multibyte;
+            }
+
+            const defaultCharUnicode: "�";
+
+            const defaultCharSingleByte: "?";
+
+            function encodingExists(encoding: string): boolean;
+
+            function encode(buffer: string, encoding: I.SupportedEncoding, options?: object): Buffer;
+
+            function decode(buffer: Buffer, encoding: I.SupportedEncoding, options?: object): string;
         }
 
         namespace sqlstring {
@@ -337,7 +555,31 @@ declare namespace adone {
                     drop?: boolean;
                     dropLast?: boolean;
                 }
+
+                interface CreateFunction {
+                    <R>(fn: () => Promise<R>): Promise<R>;
+                    <R>(fn: () => R): Promise<R>;
+
+                    <T1, R>(fn: (a: T1) => Promise<R>, a: T1): Promise<R>;
+                    <T1, R>(fn: (a: T1) => R, a: T1): Promise<R>;
+
+                    <T1, T2, R>(fn: (a: T1, b: T2) => Promise<R>, a: T1, b: T2): Promise<R>;
+                    <T1, T2, R>(fn: (a: T1, b: T2) => R, a: T1, b: T2): Promise<R>;
+
+                    <T1, T2, T3, R>(fn: (a: T1, b: T2, c: T3) => Promise<R>, a: T1, b: T2, c: T3): Promise<R>;
+                    <T1, T2, T3, R>(fn: (a: T1, b: T2, c: T3) => R, a: T1, b: T2, c: T3): Promise<R>;
+
+                    <T1, T2, T3, T4, R>(fn: (a: T1, b: T2, c: T3, d: T4) => Promise<R>, a: T1, b: T2, c: T3, d: T4): Promise<R>;
+                    <T1, T2, T3, T4, R>(fn: (a: T1, b: T2, c: T3, d: T4) => R, a: T1, b: T2, c: T3, d: T4): Promise<R>;
+
+                    <T1, T2, T3, T4, T5, R>(fn: (a: T1, b: T2, c: T3, d: T4, e: T5) => Promise<R>, a: T1, b: T2, c: T3, d: T4, e: T5): Promise<R>;
+                    <T1, T2, T3, T4, T5, R>(fn: (a: T1, b: T2, c: T3, d: T4, e: T5) => R, a: T1, b: T2, c: T3, d: T4, e: T5): Promise<R>;
+
+                    <R>(fn: (...args: any[]) => Promise<R>, ...args: any[]): Promise<R>;
+                    <R>(fn: (...args: any[]) => R, ...args: any[]): Promise<R>;
+                }
             }
+            function create(options?: I.Options): I.CreateFunction;
             function create<R>(fn: () => R, options?: I.Options): () => Promise<R>;
             function create<T1, R>(fn: (a: T1) => R, options?: I.Options): (a: T1) => Promise<R>;
             function create<T1, T2, R>(fn: (a: T1, b: T2) => R, options?: I.Options): (a: T1, b: T2) => Promise<R>;
diff --git a/types/adone/index.d.ts b/types/adone/index.d.ts
index ad0645f04d..abcf5165c2 100644
--- a/types/adone/index.d.ts
+++ b/types/adone/index.d.ts
@@ -8,22 +8,30 @@
 /// <reference path="./glosses/application.d.ts" />
 /// <reference path="./glosses/archives.d.ts" />
 /// <reference path="./glosses/assertion.d.ts" />
-/// <reference path="./glosses/collections.d.ts" />
+/// <reference path="./glosses/collections/index.d.ts" />
 /// <reference path="./glosses/compressors.d.ts" />
+/// <reference path="./glosses/crypto/index.d.ts" />
 /// <reference path="./glosses/data.d.ts" />
 /// <reference path="./glosses/datetime.d.ts" />
 /// <reference path="./glosses/events.d.ts" />
 /// <reference path="./glosses/exceptions.d.ts" />
+/// <reference path="./glosses/fake.d.ts" />
 /// <reference path="./glosses/fast.d.ts" />
 /// <reference path="./glosses/fs.d.ts" />
 /// <reference path="./glosses/is.d.ts" />
 /// <reference path="./glosses/math/index.d.ts" />
 /// <reference path="./glosses/meta.d.ts" />
+/// <reference path="./glosses/net/index.d.ts" />
 /// <reference path="./glosses/promise.d.ts" />
-/// <reference path="./glosses/shani.d.ts" />
+/// <reference path="./glosses/regex.d.ts" />
+/// <reference path="./glosses/semver.d.ts" />
 /// <reference path="./glosses/shani-global.d.ts" />
+/// <reference path="./glosses/shani.d.ts" />
 /// <reference path="./glosses/std.d.ts" />
 /// <reference path="./glosses/streams.d.ts" />
+/// <reference path="./glosses/system/index.d.ts" />
+/// <reference path="./glosses/templating/index.d.ts" />
+/// <reference path="./glosses/text/index.d.ts" />
 /// <reference path="./glosses/utils.d.ts" />
 
 declare const _adone: typeof adone;
diff --git a/types/adone/test/glosses/collections.ts b/types/adone/test/glosses/collections.ts
deleted file mode 100644
index ec227d4440..0000000000
--- a/types/adone/test/glosses/collections.ts
+++ /dev/null
@@ -1,1003 +0,0 @@
-namespace collectionTests {
-    const { collection } = adone;
-
-    namespace linkedListTests {
-        const { LinkedList } = collection;
-
-        namespace creation {
-            new LinkedList();
-            new LinkedList(10);
-        }
-
-        namespace properties {
-            { const a: boolean = new LinkedList().full; }
-            { const a: boolean = new LinkedList().empty; }
-            { const a: number = new LinkedList().maxLength; }
-            { const a: number = new LinkedList().length; }
-            { const a: boolean = new LinkedList().autoresize; }
-        }
-
-        namespace resize {
-            { const a: boolean = new LinkedList().resize(100).full; }
-        }
-
-        namespace push {
-            const a = new LinkedList<number>().push(10);
-            a.next;
-            a.prev;
-            const b: number = a.value;
-        }
-
-        namespace pop {
-            const a: number | undefined = new LinkedList<number>().pop();
-        }
-
-        namespace shift {
-            const a: number | undefined = new LinkedList<number>().shift();
-        }
-
-        namespace unshift {
-            const a = new LinkedList<string>().unshift("hello");
-            a.next;
-            a.prev;
-            const b: string = a.value;
-        }
-
-        namespace pushNode {
-            const a = new LinkedList<string>();
-            const node = a.push("1230");
-            a.pushNode(node);
-        }
-
-        namespace unshiftNode {
-            const a = new LinkedList();
-            const node = a.push(10);
-            a.unshiftNode(node);
-        }
-
-        namespace removeNode {
-            const a = new LinkedList<string>();
-            const node = a.unshift("10");
-            a.removeNode(node);
-        }
-
-        namespace clear {
-            new LinkedList().clear();
-            new LinkedList().clear(true);
-        }
-
-        namespace toArray {
-            const a = new LinkedList<number>();
-            const b: number[] = a.toArray();
-        }
-
-        namespace front {
-            const a = new LinkedList<number>();
-            const b: number = a.front;
-        }
-
-        namespace back {
-            const a = new LinkedList<number>();
-            const b: number = a.back;
-        }
-
-        namespace iterating {
-            const a = new LinkedList<string>();
-            for (const b of a) {
-                const i: string = b;
-            }
-            const c = new LinkedList<number>();
-            for (const b of c) {
-                const i: number = b;
-            }
-        }
-
-        namespace nextNode {
-            const a = new LinkedList<string>();
-            const n1 = a.push("h");
-            const n2 = a.nextNode(n1);
-            n1.next;
-            n1.prev;
-            const t: string = n1.value;
-        }
-
-        namespace map {
-            const a = new LinkedList<number>();
-            const f = (a: number, idx: number) => `${a}${idx}`;
-            const b = a.map(f);
-            const c: string = b.front;
-        }
-
-        namespace forEach {
-            const a = new LinkedList<number>();
-
-            a.forEach((a: number, b: number) => {
-                const c = a + b;
-            });
-        }
-
-        namespace static {
-            const a: number = LinkedList.DEFAULT_LENGTH;
-        }
-    }
-
-    namespace ByteArrayTests {
-        const { ByteArray } = collection;
-
-        new ByteArray();
-        new ByteArray(10);
-        new ByteArray(10, true);
-
-        const buffer = new ByteArray();
-
-        namespace readBitSet {
-            const a: boolean[] = buffer.readBitSet();
-            const b: boolean[] = buffer.readBitSet(10);
-        }
-
-        namespace read {
-            const a: adone.collection.ByteArray = buffer.read(1);
-            const b: adone.collection.ByteArray = buffer.read(1, 10);
-        }
-
-        namespace readInt8 {
-            const a: number = buffer.readInt8();
-            const b: number = buffer.readInt8(10);
-        }
-
-        namespace readUInt8 {
-            const a: number = buffer.readUInt8();
-            const b: number = buffer.readUInt8(10);
-        }
-
-        namespace readInt16LE {
-            const a: number = buffer.readInt16LE();
-            const b: number = buffer.readInt16LE(10);
-        }
-
-        namespace readUInt16LE {
-            const a: number = buffer.readUInt16LE();
-            const b: number = buffer.readUInt16LE(10);
-        }
-
-        namespace readInt16BE {
-            const a: number = buffer.readInt16BE();
-            const b: number = buffer.readInt16BE(10);
-        }
-
-        namespace readUInt16BE {
-            const a: number = buffer.readUInt16BE();
-            const b: number = buffer.readUInt16BE(10);
-        }
-
-        namespace readInt32LE {
-            const a: number = buffer.readInt32LE();
-            const b: number = buffer.readInt32LE(10);
-        }
-
-        namespace readUInt32LE {
-            const a: number = buffer.readUInt32LE();
-            const b: number = buffer.readUInt32LE(10);
-        }
-
-        namespace readInt32BE {
-            const a: number = buffer.readInt32BE();
-            const b: number = buffer.readInt32BE(10);
-        }
-
-        namespace readUInt32BE {
-            const a: number = buffer.readUInt32BE();
-            const b: number = buffer.readUInt32BE(10);
-        }
-
-        namespace readInt64LE {
-            const a: adone.math.Long = buffer.readInt64LE();
-            const b: adone.math.Long = buffer.readInt64LE(10);
-        }
-
-        namespace readUInt64LE {
-            const a: adone.math.Long = buffer.readUInt64LE();
-            const b: adone.math.Long = buffer.readUInt64LE(10);
-        }
-
-        namespace readInt64BE {
-            const a: adone.math.Long = buffer.readInt64BE();
-            const b: adone.math.Long = buffer.readInt64BE(10);
-        }
-
-        namespace readUInt64BE {
-            const a: adone.math.Long = buffer.readUInt64BE();
-            const b: adone.math.Long = buffer.readUInt64BE(10);
-        }
-
-        namespace readFloatLE {
-            const a: number = buffer.readFloatLE();
-            const b: number = buffer.readFloatLE(10);
-        }
-
-        namespace readFloatBE {
-            const a: number = buffer.readFloatBE();
-            const b: number = buffer.readFloatBE(10);
-        }
-
-        namespace readDoubleLE {
-            const a: number = buffer.readDoubleLE();
-            const b: number = buffer.readDoubleLE(10);
-        }
-
-        namespace readDoubleBE {
-            const a: number = buffer.readDoubleBE();
-            const b: number = buffer.readDoubleBE(10);
-        }
-
-        namespace write {
-            const a: adone.collection.ByteArray = buffer.write("1");
-            const b: adone.collection.ByteArray = buffer.write(new ByteArray());
-            const c: adone.collection.ByteArray = buffer.write(Buffer.alloc(10));
-            const d: adone.collection.ByteArray = buffer.write(new Uint8Array([1, 2, 3]));
-            const e: adone.collection.ByteArray = buffer.write(new ArrayBuffer(10));
-            const f: adone.collection.ByteArray = buffer.write("1", 10);
-            const g: adone.collection.ByteArray = buffer.write("1", 10, 10);
-            const h: adone.collection.ByteArray = buffer.write("1", 10, 10, "utf8");
-        }
-
-        namespace writeBitSet {
-            const a: adone.collection.ByteArray = buffer.writeBitSet([1, 2, 3]);
-            const b: number = buffer.writeBitSet([1, 2, 3], 10);
-        }
-
-        namespace writeInt8 {
-            const a: adone.collection.ByteArray = buffer.writeInt8(10);
-            const b: adone.collection.ByteArray = buffer.writeInt8(10, 10);
-        }
-
-        namespace writeUInt8 {
-            const a: adone.collection.ByteArray = buffer.writeUInt8(10);
-            const b: adone.collection.ByteArray = buffer.writeUInt8(10, 10);
-        }
-
-        namespace writeInt16LE {
-            const a: adone.collection.ByteArray = buffer.writeInt16LE(10);
-            const b: adone.collection.ByteArray = buffer.writeInt16LE(10, 10);
-        }
-
-        namespace writeInt16BE {
-            const a: adone.collection.ByteArray = buffer.writeInt16BE(10);
-            const b: adone.collection.ByteArray = buffer.writeInt16BE(10, 10);
-        }
-
-        namespace writeUInt16LE {
-            const a: adone.collection.ByteArray = buffer.writeUInt16LE(10);
-            const b: adone.collection.ByteArray = buffer.writeUInt16LE(10, 10);
-        }
-
-        namespace writeUInt16BE {
-            const a: adone.collection.ByteArray = buffer.writeUInt16BE(10);
-            const b: adone.collection.ByteArray = buffer.writeUInt16BE(10, 10);
-        }
-
-        namespace writeInt32LE {
-            const a: adone.collection.ByteArray = buffer.writeInt32LE(10);
-            const b: adone.collection.ByteArray = buffer.writeInt32LE(10, 10);
-        }
-
-        namespace writeInt32BE {
-            const a: adone.collection.ByteArray = buffer.writeInt32BE(10);
-            const b: adone.collection.ByteArray = buffer.writeInt32BE(10, 10);
-        }
-
-        namespace writeUInt32LE {
-            const a: adone.collection.ByteArray = buffer.writeUInt32LE(10);
-            const b: adone.collection.ByteArray = buffer.writeUInt32LE(10, 10);
-        }
-
-        namespace writeUInt32BE {
-            const a: adone.collection.ByteArray = buffer.writeUInt32BE(10);
-            const b: adone.collection.ByteArray = buffer.writeUInt32BE(10, 10);
-        }
-
-        namespace writeInt64LE {
-            const a: adone.collection.ByteArray = buffer.writeInt64LE(10);
-            const b: adone.collection.ByteArray = buffer.writeInt64LE(10, 10);
-        }
-
-        namespace writeInt64BE {
-            const a: adone.collection.ByteArray = buffer.writeInt64BE(10);
-            const b: adone.collection.ByteArray = buffer.writeInt64BE(10, 10);
-        }
-
-        namespace writeUInt64LE {
-            const a: adone.collection.ByteArray = buffer.writeUInt64LE(10);
-            const b: adone.collection.ByteArray = buffer.writeUInt64LE(10, 10);
-        }
-
-        namespace writeUInt64BE {
-            const a: adone.collection.ByteArray = buffer.writeUInt64BE(10);
-            const b: adone.collection.ByteArray = buffer.writeUInt64BE(10, 10);
-        }
-
-        namespace writeFloatLE {
-            const a: adone.collection.ByteArray = buffer.writeFloatLE(10);
-            const b: adone.collection.ByteArray = buffer.writeFloatLE(10, 10);
-        }
-
-        namespace writeFloatBE {
-            const a: adone.collection.ByteArray = buffer.writeFloatBE(10);
-            const b: adone.collection.ByteArray = buffer.writeFloatBE(10, 10);
-        }
-
-        namespace writeDoubleLE {
-            const a: adone.collection.ByteArray = buffer.writeDoubleLE(10);
-            const b: adone.collection.ByteArray = buffer.writeDoubleLE(10, 10);
-        }
-
-        namespace writeDoubleBE {
-            const a: adone.collection.ByteArray = buffer.writeDoubleBE(10);
-            const b: adone.collection.ByteArray = buffer.writeDoubleBE(10, 10);
-        }
-
-        namespace writeVarInt32 {
-            const a: adone.collection.ByteArray = buffer.writeVarint32(10);
-            const b: number = buffer.writeVarint32(10, 10);
-        }
-
-        namespace writeVarInt32ZigZag {
-            const a: adone.collection.ByteArray = buffer.writeVarint32ZigZag(10);
-            const b: number = buffer.writeVarint32ZigZag(10, 10);
-        }
-
-        namespace readVarint32 {
-            const a: number = buffer.readVarint32();
-            const b: { value: number, length: number } = buffer.readVarint32(10);
-        }
-
-        namespace readVarint32ZigZag {
-            const a: number = buffer.readVarint32ZigZag();
-            const b: { value: number, length: number } = buffer.readVarint32ZigZag(10);
-        }
-
-        namespace writeVarint64 {
-            const a: adone.collection.ByteArray = buffer.writeVarint64(10);
-            const b: number = buffer.writeVarint64(10, 10);
-        }
-
-        namespace writeVarint64ZigZag {
-            const a: adone.collection.ByteArray = buffer.writeVarint64ZigZag(10);
-            const b: number = buffer.writeVarint64ZigZag(10, 10);
-        }
-
-        namespace readVarint64 {
-            const a: adone.math.Long = buffer.readVarint64();
-            const b: { value: adone.math.Long, length: number } = buffer.readVarint64(10);
-        }
-
-        namespace readVarint64ZigZag {
-            const a: adone.math.Long = buffer.readVarint64ZigZag();
-            const b: { value: adone.math.Long, length: number } = buffer.readVarint64ZigZag(10);
-        }
-
-        namespace writeCString {
-            const a: adone.collection.ByteArray = buffer.writeCString("asd");
-            const b: number = buffer.writeCString("123", 10);
-        }
-
-        namespace readCString {
-            const a: string = buffer.readCString();
-            const b: { string: string, length: number } = buffer.readCString(10);
-        }
-
-        namespace writeString {
-            const a: adone.collection.ByteArray = buffer.writeString("abc");
-            const b: number = buffer.writeString("abc", 10);
-        }
-
-        namespace readString {
-            const a: string = buffer.readString(10);
-            const b: string = buffer.readString(10, "b");
-            const c: string = buffer.readString(10, "c");
-            const d: { string: string, length: number } = buffer.readString(10, "c", 10);
-        }
-
-        namespace writeVString {
-            const a: adone.collection.ByteArray = buffer.writeVString("abc");
-            const b: number = buffer.writeVString("abc", 10);
-        }
-
-        namespace readVString {
-            const a: string = buffer.readVString();
-            const b: { string: string, length: number } = buffer.readVString(10);
-        }
-
-        namespace appendTo {
-            const a: adone.collection.ByteArray = buffer.appendTo(new ByteArray());
-            const b: adone.collection.ByteArray = buffer.appendTo(new ByteArray(), 10);
-        }
-
-        namespace assert {
-            const a: adone.collection.ByteArray = buffer.assert();
-            const b: adone.collection.ByteArray = buffer.assert(true);
-        }
-
-        namespace capacity {
-            const a: number = buffer.capacity();
-        }
-
-        namespace clear {
-            const a: adone.collection.ByteArray = buffer.clear();
-        }
-
-        namespace copy {
-            const a: adone.collection.ByteArray = buffer.clone();
-            const c: adone.collection.ByteArray = buffer.clone(true);
-        }
-
-        namespace compact {
-            const a: adone.collection.ByteArray = buffer.compact();
-            const b: adone.collection.ByteArray = buffer.compact(1);
-            const c: adone.collection.ByteArray = buffer.compact(1, 10);
-        }
-
-        namespace copyTo {
-            const a: adone.collection.ByteArray = buffer.copyTo(new ByteArray());
-            const b: adone.collection.ByteArray = buffer.copyTo(new ByteArray(), 0);
-            const c: adone.collection.ByteArray = buffer.copyTo(new ByteArray(), 0, 0);
-            const d: adone.collection.ByteArray = buffer.copyTo(new ByteArray(), 0, 0, 10);
-        }
-
-        namespace ensureCapacity {
-            const a: adone.collection.ByteArray = buffer.ensureCapacity(10);
-        }
-
-        namespace fill {
-            const a: adone.collection.ByteArray = buffer.fill("0");
-            const b: adone.collection.ByteArray = buffer.fill(0);
-            const c: adone.collection.ByteArray = buffer.fill(0, 0);
-            const d: adone.collection.ByteArray = buffer.fill(0, 0, 10);
-        }
-
-        namespace flip {
-            const a: adone.collection.ByteArray = buffer.flip();
-        }
-
-        namespace mark {
-            const a: adone.collection.ByteArray = buffer.mark();
-            const b: adone.collection.ByteArray = buffer.mark(10);
-        }
-
-        namespace prepend {
-            const a: adone.collection.ByteArray = buffer.prepend("");
-            const b: adone.collection.ByteArray = buffer.prepend(new ByteArray());
-            const c: adone.collection.ByteArray = buffer.prepend(Buffer.alloc(10));
-            const d: adone.collection.ByteArray = buffer.prepend(new Uint8Array([1, 2, 3]));
-            const e: adone.collection.ByteArray = buffer.prepend(new ArrayBuffer(10));
-            const f: adone.collection.ByteArray = buffer.prepend("", "utf8");
-            const g: adone.collection.ByteArray = buffer.prepend("", "utf8", 10);
-            const h: adone.collection.ByteArray = buffer.prepend("", 10);
-        }
-
-        namespace prependTo {
-            const a: adone.collection.ByteArray = buffer.prependTo(new ByteArray());
-            const b: adone.collection.ByteArray = buffer.prependTo(new ByteArray(), 10);
-        }
-
-        namespace remaining {
-            const a: number = buffer.remaining();
-        }
-
-        namespace reset {
-            const a: adone.collection.ByteArray = buffer.reset();
-        }
-
-        namespace resize {
-            const a: adone.collection.ByteArray = buffer.resize(10);
-        }
-
-        namespace reverse {
-            const a: adone.collection.ByteArray = buffer.reverse();
-            const b: adone.collection.ByteArray = buffer.reverse(1);
-            const c: adone.collection.ByteArray = buffer.reverse(1, 10);
-        }
-
-        namespace skip {
-            const a: adone.collection.ByteArray = buffer.skip(10);
-        }
-
-        namespace slice {
-            const a: adone.collection.ByteArray = buffer.slice();
-            const b: adone.collection.ByteArray = buffer.slice(1);
-            const c: adone.collection.ByteArray = buffer.slice(1, 10);
-        }
-
-        namespace toBuffer {
-            const a: Buffer = buffer.toBuffer();
-            const b: Buffer = buffer.toBuffer(true);
-            const c: Buffer = buffer.toBuffer(true, 0);
-            const d: Buffer = buffer.toBuffer(true, 0, 10);
-        }
-
-        namespace toArrayBuffer {
-            const a: ArrayBuffer = buffer.toArrayBuffer();
-        }
-
-        namespace toString {
-            const a: string = buffer.toString();
-            const b: string = buffer.toString("utf8");
-            const c: string = buffer.toString("utf8", 0);
-            const d: string = buffer.toString("utf8", 0, 10);
-        }
-
-        namespace toBase64 {
-            const a: string = buffer.toBase64();
-            const b: string = buffer.toBase64(0);
-            const c: string = buffer.toBase64(0, 10);
-        }
-
-        namespace toBinary {
-            const a: string = buffer.toBinary();
-            const b: string = buffer.toBinary(0);
-            const c: string = buffer.toBinary(0, 10);
-        }
-
-        namespace toDebug {
-            const a: string = buffer.toDebug();
-            const b: string = buffer.toDebug(true);
-        }
-
-        namespace toUTF8 {
-            const a: string = buffer.toUTF8();
-            const b: string = buffer.toUTF8(0);
-            const c: string = buffer.toUTF8(0, 10);
-        }
-
-        namespace static {
-            namespace accessor {
-                const a: typeof Buffer = ByteArray.accessor();
-            }
-
-            namespace allocate {
-                const a: adone.collection.ByteArray = ByteArray.allocate();
-                const b: adone.collection.ByteArray = ByteArray.allocate(10);
-                const c: adone.collection.ByteArray = ByteArray.allocate(10, true);
-            }
-
-            namespace concat {
-                const a: adone.collection.ByteArray = ByteArray.concat([
-                    new ByteArray(),
-                    Buffer.alloc(10),
-                    new Uint8Array([1, 2, 3]),
-                    new ArrayBuffer(10)
-                ]);
-                const b: adone.collection.ByteArray = ByteArray.concat([
-                    new ByteArray(),
-                    Buffer.alloc(10),
-                    new Uint8Array([1, 2, 3]),
-                    new ArrayBuffer(10)
-                ], "utf8");
-                const c: adone.collection.ByteArray = ByteArray.concat([
-                    new ByteArray(),
-                    Buffer.alloc(10),
-                    new Uint8Array([1, 2, 3]),
-                    new ArrayBuffer(10)
-                ], "utf8", true);
-            }
-
-            namespace type {
-                const a: typeof Buffer = ByteArray.type();
-            }
-
-            namespace wrap {
-                const a: adone.collection.ByteArray = ByteArray.wrap("");
-                const b: adone.collection.ByteArray = ByteArray.wrap(new ByteArray());
-                const c: adone.collection.ByteArray = ByteArray.wrap(Buffer.alloc(10));
-                const d: adone.collection.ByteArray = ByteArray.wrap(new Uint8Array([1, 2, 3]));
-                const e: adone.collection.ByteArray = ByteArray.wrap(new ArrayBuffer(10));
-                const f: adone.collection.ByteArray = ByteArray.wrap("", "utf8");
-                const g: adone.collection.ByteArray = ByteArray.wrap("", "utf8", true);
-            }
-
-            namespace calculateVarint32 {
-                const a: number = ByteArray.calculateVarint32(10);
-            }
-
-            namespace zigZagEncode32 {
-                const a: number = ByteArray.zigZagEncode32(10);
-            }
-
-            namespace zigZagDecode32 {
-                const a: number = ByteArray.zigZagDecode32(10);
-            }
-
-            namespace calculateVarint64 {
-                const a: number = ByteArray.calculateVarint64(10);
-                const b: number = ByteArray.calculateVarint64("10");
-            }
-
-            namespace zigZagEncode64 {
-                const a: adone.math.Long = ByteArray.zigZagEncode64(10);
-                const b: adone.math.Long = ByteArray.zigZagEncode64("10");
-                const c: adone.math.Long = ByteArray.zigZagEncode64(adone.math.Long.fromValue(10));
-            }
-
-            namespace zigZagDecode64 {
-                const a: adone.math.Long = ByteArray.zigZagDecode64(10);
-                const b: adone.math.Long = ByteArray.zigZagDecode64("10");
-                const c: adone.math.Long = ByteArray.zigZagDecode64(adone.math.Long.fromValue(10));
-            }
-
-            namespace calculateUTF8Chars {
-                const a: number = ByteArray.calculateUTF8Chars("123");
-            }
-
-            namespace calculateString {
-                const a: number = ByteArray.calculateString("123");
-            }
-
-            namespace fromBase64 {
-                const a: adone.collection.ByteArray = ByteArray.fromBase64("123");
-            }
-
-            namespace btoa {
-                const a: string = ByteArray.btoa("123");
-            }
-
-            namespace atob {
-                const a: string = ByteArray.atob("123");
-            }
-
-            namespace fromBinary {
-                const a: adone.collection.ByteArray = ByteArray.fromBinary("123");
-            }
-
-            namespace fromDebug {
-                const a: adone.collection.ByteArray = ByteArray.fromDebug("12");
-                const b: adone.collection.ByteArray = ByteArray.fromDebug("12", true);
-            }
-
-            namespace fromHex {
-                const a: adone.collection.ByteArray = ByteArray.fromHex("192");
-                const b: adone.collection.ByteArray = ByteArray.fromHex("192", true);
-            }
-
-            namespace fromUTF8 {
-                const a: adone.collection.ByteArray = ByteArray.fromUTF8("123");
-                const b: adone.collection.ByteArray = ByteArray.fromUTF8("123", true);
-            }
-
-            namespace constants {
-                const a: number = ByteArray.DEFAULT_CAPACITY;
-                const b: boolean = ByteArray.DEFAULT_NOASSERT;
-                const c: number = ByteArray.MAX_VARINT32_BYTES;
-                const d: number = ByteArray.MAX_VARINT64_BYTES;
-                const e: string = ByteArray.METRICS_CHARS;
-                const f: string = ByteArray.METRICS_BYTES;
-            }
-        }
-    }
-
-    namespace queueTests {
-        const { Queue } = collection;
-        type Queue = adone.collection.Queue;
-
-        new Queue();
-        { const a: Queue = new Queue().push(123).push(123); }
-        { const a: number | undefined = new Queue<number>().push(123).pop(); }
-        { const a: string | undefined = new Queue<number, string>().push(123).pop(); }
-        { const a: boolean = new Queue().full; }
-        { const a: number = new Queue().length; }
-        { const a: boolean = new Queue().empty; }
-    }
-
-    namespace asyncQueueTests {
-        const { AsyncQueue } = collection;
-        type AsyncQueue = adone.collection.AsyncQueue;
-
-        { const a: AsyncQueue = new AsyncQueue().push(123); }
-        { const a: Promise<number> = new AsyncQueue<number>().push(123).pop(); }
-    }
-
-    namespace priorityQueueTests {
-        const { PriorityQueue } = collection;
-        type PriorityQueue<T = any> = adone.collection.PriorityQueue<T>;
-
-        { const a: boolean = new PriorityQueue().empty; }
-        { const a: number = new PriorityQueue().length; }
-        new PriorityQueue();
-        new PriorityQueue({});
-        new PriorityQueue<number>({
-            compare(a: number, b: number) {
-                return a - b;
-            }
-        });
-        new PriorityQueue<string>({
-            priority(a: string, b: string) {
-                return a.length - b.length;
-            }
-        });
-        { const a: PriorityQueue<string> = new PriorityQueue<string>().clone(); }
-        { const a: PriorityQueue<string> = new PriorityQueue<string>().push("123"); }
-        { const a: string | undefined = new PriorityQueue<string>().pop(); }
-        { const a: PriorityQueue<string> = new PriorityQueue<string>().delete("123"); }
-        { const a: PriorityQueue<string> = new PriorityQueue<string>().delete("123"); }
-        { const a: string = new PriorityQueue<string>().replace("123"); }
-        { const a: string = new PriorityQueue<string>().pushpop("123"); }
-        { const a: string[] = new PriorityQueue<string>().toArray(); }
-        { const a: PriorityQueue<string> = PriorityQueue.from(["1"]); }
-        { const a: PriorityQueue<string> = PriorityQueue.from(["1"], {}); }
-        { const a: PriorityQueue<string> = PriorityQueue.from(["1"], { compare: (a: string, b: string) => a.length - b.length }); }
-        { const a: PriorityQueue<string> = PriorityQueue.from(["1"], { priority: (a: string, b: string) => a.length - b.length }); }
-    }
-
-    namespace fastlruTests {
-        const { FastLRU } = collection;
-
-        new FastLRU();
-        new FastLRU(100);
-        new FastLRU<string, number>(100, { dispose: (key: string, value: number) => null });
-        { const a: number = new FastLRU().size; }
-        { const a: number | undefined = new FastLRU<string, number>().get("key"); }
-        new FastLRU<string, number>().set("key", 123);
-        { const a: boolean = new FastLRU<string, number>().delete("key"); }
-        { const a: boolean = new FastLRU<string, number>().has("key"); }
-        { const a: string[] = [...new FastLRU<string, number>().keys()]; }
-        { const a: number[] = [...new FastLRU<string, number>().values()]; }
-        { const a: number[] = [...new FastLRU<string, number>().values()]; }
-        { const a: Array<[string, number]> = [...new FastLRU<string, number>().entries()]; }
-        new FastLRU<string, number>().clear();
-    }
-
-    namespace stackTests {
-        const { Stack } = collection;
-        type Stack<T = any> = adone.collection.Stack<T>;
-
-        { const a: boolean = new Stack().empty; }
-        { const a: number = new Stack<number>().top; }
-        { const a: Stack<number> = new Stack<number>().push(123); }
-        { const a: number | undefined = new Stack<number>().pop(); }
-        { const a: number[] = [...new Stack<number>()]; }
-        { const a: Stack<number> = Stack.from([1, 2, 3]); }
-    }
-
-    namespace binarySearchTreeTests {
-        const { BinarySearchTree } = collection;
-        type BinarySearchTree<K = any, V = any> = adone.collection.BinarySearchTree<K, V>;
-
-        new BinarySearchTree();
-        new BinarySearchTree({});
-        new BinarySearchTree<string, number>({ checkValueEquality: (a: number, b: number) => a === b });
-        new BinarySearchTree<string, number>({ compareKeys: (a: string, b: string) => a.length - b.length });
-        new BinarySearchTree<string, number>({ parent: new BinarySearchTree<string, number>() });
-        new BinarySearchTree<string, number>({ unique: true });
-        new BinarySearchTree<string, number>({ value: 123 });
-        { const a: BinarySearchTree<string, number> = new BinarySearchTree<string, number>().getMaxKeyDescendant(); }
-        { const a: string = new BinarySearchTree<string, number>().getMaxKey(); }
-        { const a: BinarySearchTree<string, number> = new BinarySearchTree<string, number>().getMinKeyDescendant(); }
-        { const a: string = new BinarySearchTree<string, number>().getMinKey(); }
-        new BinarySearchTree<string, number>().checkAllNodesFullfillCondition((key: string, value: number) => null);
-        new BinarySearchTree<string, number>().checkIsBST();
-        { const a: number = new BinarySearchTree<string, number>().getNumberOfKeys(); }
-        new BinarySearchTree<string, number>().insert("asd", 123);
-        { const a: number[] = new BinarySearchTree<string, number>().search("asd"); }
-        { const a: number[] = new BinarySearchTree<string, number>().betweenBounds({ $gt: "" }); }
-        { const a: number[] = new BinarySearchTree<string, number>().betweenBounds({ $lt: "" }); }
-        { const a: number[] = new BinarySearchTree<string, number>().betweenBounds({ $lte: "" }); }
-        { const a: number[] = new BinarySearchTree<string, number>().betweenBounds({ $gte: "" }); }
-        new BinarySearchTree<string, number>().delete("key");
-        new BinarySearchTree<string, number>().delete("key", 123);
-        new BinarySearchTree<string, number>().executeOnEveryNode((tree: BinarySearchTree<string, number>) => null);
-        new BinarySearchTree<string, number>().prettyPrint();
-        new BinarySearchTree<string, number>().prettyPrint(true);
-        new BinarySearchTree<string, number>().prettyPrint(true, " ");
-    }
-
-    namespace avlTreeTests {
-        const { AVLTree } = collection;
-        type AVLTree<K = any, V = any> = adone.collection.AVLTree<K, V>;
-
-        new AVLTree();
-        new AVLTree<string, number>({ checkValueEquality: (a: number, b: number) => a === b });
-        new AVLTree<string, number>({ compareKeys: (a: string, b: string) => a.length - b.length });
-        new AVLTree<string, number>({ parent: new AVLTree() });
-        new AVLTree<string, number>({ unique: false });
-        new AVLTree<string, number>({ value: 123 });
-        new AVLTree<string, number>().checkIsAVLT();
-        new AVLTree<string, number>().insert("123", 123);
-        new AVLTree<string, number>().delete("123");
-        new AVLTree<string, number>().delete("123", 123);
-        { const a: number = new AVLTree<string, number>().getNumberOFKeys(); }
-        { const a: number[] = new AVLTree<string, number>().search("key"); }
-        { const a: number[] = new AVLTree<string, number>().betweenBounds({}); }
-        { const a: number[] = new AVLTree<string, number>().betweenBounds({ $gt: "ads" }); }
-        { const a: number[] = new AVLTree<string, number>().betweenBounds({ $lt: "ads" }); }
-        { const a: number[] = new AVLTree<string, number>().betweenBounds({ $gte: "ads" }); }
-        { const a: number[] = new AVLTree<string, number>().betweenBounds({ $lte: "ads" }); }
-        new AVLTree<string, number>().executeOnEveryNode((tree: AVLTree<string, number>) => null);
-    }
-
-    namespace redBlackTreeTests {
-        const { RedBlackTree } = collection;
-        type RedBlackTree<K = any, V = any> = adone.collection.RedBlackTree<K, V>;
-        type RedBlackTreeIterator<K = any, V = any> = adone.collection.I.RedBlackTree.Iterator<K, V>;
-        type RedBlackTreeNode<K = any, V = any> = adone.collection.I.RedBlackTree.Node<K, V>;
-
-        new RedBlackTree();
-        new RedBlackTree<string, number>((a: string, b: string) => a.length - b.length);
-        new RedBlackTree<string, number>(undefined, new RedBlackTree());
-        { const a: string[] = new RedBlackTree<string, number>().keys; }
-        { const a: number[] = new RedBlackTree<string, number>().values; }
-        { const a: number = new RedBlackTree<string, number>().length; }
-        {
-            const a: RedBlackTreeIterator<string, number> = new RedBlackTree<string, number>().begin;
-            { const b: boolean = a.valid; }
-            { const b: RedBlackTreeNode<string, number> | null = a.node; }
-            { const b: string | undefined = a.key; }
-            { const b: number | undefined = a.value; }
-            { const b: number = a.index; }
-            { const b: boolean = a.hasNext; }
-            { const b: boolean = a.hasPrev; }
-            { const b: RedBlackTree<string, number> = a.tree; }
-            { const b: RedBlackTreeIterator<string, number> = a.clone(); }
-            { const b: RedBlackTree<string, number> = a.remove(); }
-            a.next();
-            { const b: RedBlackTree<string, number> = a.update(333); }
-            a.prev();
-        }
-        { const a: RedBlackTreeIterator<string, number> = new RedBlackTree<string, number>().end; }
-        { const a: RedBlackTree<string, number> = new RedBlackTree<string, number>().insert("123", 456); }
-        { const a: number = new RedBlackTree<string, number>().forEach((key: string, value: number) => value); }
-        { const a: number = new RedBlackTree<string, number>().forEach((key: string, value: number) => value, "1"); }
-        { const a: number = new RedBlackTree<string, number>().forEach((key: string, value: number) => value, "1", "2"); }
-        { const a: RedBlackTreeIterator<string, number> = new RedBlackTree<string, number>().at(1); }
-        { const a: RedBlackTreeIterator<string, number> = new RedBlackTree<string, number>().ge("1"); }
-        { const a: RedBlackTreeIterator<string, number> = new RedBlackTree<string, number>().gt("1"); }
-        { const a: RedBlackTreeIterator<string, number> = new RedBlackTree<string, number>().lt("1"); }
-        { const a: RedBlackTreeIterator<string, number> = new RedBlackTree<string, number>().le("1"); }
-        { const a: RedBlackTreeIterator<string, number> | null = new RedBlackTree<string, number>().find("1"); }
-        { const a: RedBlackTree<string, number> = new RedBlackTree<string, number>().remove("1"); }
-        { const a: RedBlackTree<string, number> = new RedBlackTree<string, number>().remove("1"); }
-        { const a: number | undefined = new RedBlackTree<string, number>().get("1"); }
-    }
-
-    namespace arraySetTests {
-        const { ArraySet } = collection;
-        type ArraySet<T = any> = adone.collection.ArraySet<T>;
-
-        new ArraySet();
-        { const a: number = new ArraySet().length; }
-        { const a: ArraySet = new ArraySet<string>().add("hello"); }
-        { const a: ArraySet = new ArraySet<string>().add("hello", true); }
-        { const a: boolean = new ArraySet<string>().has("string"); }
-        { const a: number = new ArraySet<string>().indexOf("hello"); }
-        { const a: string[] = new ArraySet<string>().toArray(); }
-        { const a: ArraySet<number> = ArraySet.from([1]); }
-        { const a: ArraySet<number> = ArraySet.from([1], true); }
-    }
-
-    namespace bufferListTests {
-        const { BufferList } = collection;
-        type BufferList = adone.collection.BufferList;
-
-        new BufferList();
-        new BufferList(Buffer.from("123"));
-        new BufferList("123");
-        new BufferList(123);
-        new BufferList([Buffer.from("123"), "123", 123]);
-        new BufferList((err: any, data: Buffer) => null);
-        new BufferList().append(Buffer.from("123"));
-        new BufferList().append("123");
-        new BufferList().append(123);
-        new BufferList().append([Buffer.from("123"), "123", 123]);
-        new BufferList().end(Buffer.from("123"));
-        new BufferList().end();
-        { const a: number = new BufferList().get(123); }
-        { const a: Buffer = new BufferList().slice(); }
-        { const a: Buffer = new BufferList().slice(1); }
-        { const a: Buffer = new BufferList().slice(1, 2); }
-        { const a: Buffer = new BufferList().copy(Buffer.alloc(100)); }
-        { const a: Buffer = new BufferList().copy(Buffer.alloc(100), 0); }
-        { const a: Buffer = new BufferList().copy(Buffer.alloc(100), 0, 1); }
-        { const a: Buffer = new BufferList().copy(Buffer.alloc(100), 0, 1, 2); }
-        { const a: BufferList = new BufferList().shallowSlice(); }
-        { const a: BufferList = new BufferList().shallowSlice(1); }
-        { const a: BufferList = new BufferList().shallowSlice(1, 2); }
-        { const a: string = new BufferList().toString(); }
-        { const a: string = new BufferList().toString("utf8"); }
-        { const a: string = new BufferList().toString("utf8", 1); }
-        { const a: string = new BufferList().toString("utf8", 1, 2); }
-        { const a: BufferList = new BufferList().consume(10); }
-        { const a: BufferList = new BufferList().duplicate(); }
-        new BufferList().destroy();
-        new BufferList().then((x: Buffer) => null);
-        new BufferList().catch((err: any) => null);
-    }
-
-    namespace defaultMapTests {
-        const { DefaultMap } = collection;
-        type DefaultMap<K = any, V = any> = adone.collection.DefaultMap<K, V>;
-
-        new DefaultMap();
-        { const a: DefaultMap<string, number> = new DefaultMap(undefined, [["1", 2]]); }
-        { const a: DefaultMap<string, number> = new DefaultMap((key: string) => 123); }
-        { const a: DefaultMap<string, number> = new DefaultMap({ a: 123 }); }
-    }
-
-    namespace lruTests {
-        const { LRU } = collection;
-        type LRU = adone.collection.LRU;
-
-        new LRU();
-        new LRU(100);
-        new LRU({});
-        new LRU({ max: 100 });
-        new LRU<string, number>({ dispose: (key: string, value: number) => null });
-        new LRU<string, number>({ maxAge: 100 });
-        new LRU<string, number>({ noDisposeOnSet: false });
-        new LRU<string, number>({ stale: true });
-        { const a: number = new LRU<string, number>().max; }
-        { new LRU<string, number>().max = 100; }
-        { const a: boolean = new LRU<string, number>().allowStale; }
-        { new LRU<string, number>().allowStale = false; }
-        { const a: number = new LRU<string, number>().maxAge; }
-        { new LRU<string, number>().maxAge = 100; }
-        { const a: (v: number, k: string) => number = new LRU<string, number>().lengthCalculator; }
-        { new LRU<string, number>().lengthCalculator = () => 123; }
-        { const a: number = new LRU<string, number>().length; }
-        { const a: number = new LRU<string, number>().itemCount; }
-        new LRU<string, number>().rforEach((value: number, key: string) => null);
-        new LRU<string, number>().rforEach(function (value: number, key: string) {
-            const b: number = this.a;
-        }, { a: 1 });
-        new LRU<string, number>().forEach((value: number, key: string) => null);
-        new LRU<string, number>().forEach(function (value: number, key: string) {
-            const b: number = this.a;
-        }, { a: 1 });
-        { const a: string[] = new LRU<string, number>().keys(); }
-        { const a: number[] = new LRU<string, number>().values(); }
-        new LRU<string, number>().reset();
-        {
-            const a: Array<adone.collection.I.LRU.SerializedEntry<string, number>> = new LRU<string, number>().dump();
-            const [b] = a;
-            { const c: number = b.e; }
-            { const c: string = b.key; }
-            { const c: number = b.value; }
-        }
-        {
-            const a: adone.collection.LinkedList<adone.collection.I.LRU.Entry<string, number>> = new LRU<string, number>().dumpLru();
-            const b = a.shift();
-            if (b !== undefined) {
-                { const a: string = b.key; }
-                { const a: number = b.value; }
-                { const a: number = b.now; }
-                { const a: number = b.maxAge; }
-            }
-        }
-        { const a: string = new LRU<string, number>().inspect(); }
-        { const a: string = new LRU<string, number>().inspect({}); }
-        { const a: boolean = new LRU<string, number>().set("asd", 13); }
-        { const a: boolean = new LRU<string, number>().set("asd", 13, 100500); }
-        { const a: boolean = new LRU<string, number>().has("asd"); }
-        { const a: number | undefined = new LRU<string, number>().get("asd"); }
-        { const a: number | undefined = new LRU<string, number>().peek("asd"); }
-        { const a: adone.collection.I.LRU.Entry<string, number> = new LRU<string, number>().pop(); }
-        new LRU<string, number>().del("asd");
-        new LRU<string, number>().load(new LRU<string, number>().dump());
-        new LRU<string, number>().prune();
-    }
-
-    namespace timedoutMapTests {
-        const { TimedoutMap } = collection;
-        type TimedoutMap<K = any, V = any> = adone.collection.TimedoutMap<K, V>;
-
-        new TimedoutMap();
-        new TimedoutMap(1000);
-        new TimedoutMap<string, number>(1000, (key: string) => null);
-        {
-            const a: TimedoutMap<string, number> = new TimedoutMap<string, number>().forEach((value: number, key: string) => null);
-        }
-        {
-            const a: TimedoutMap<string, number> = new TimedoutMap<string, number>().forEach(function (value: number, key: string) {
-                const a: number = this.a;
-            }, { a: 1 });
-        }
-        { const a: boolean = new TimedoutMap<string, number>().delete("123"); }
-    }
-}
diff --git a/types/adone/test/glosses/collections/array_set.ts b/types/adone/test/glosses/collections/array_set.ts
new file mode 100644
index 0000000000..49fd8582ce
--- /dev/null
+++ b/types/adone/test/glosses/collections/array_set.ts
@@ -0,0 +1,19 @@
+namespace adoneTests.collection.ArraySet {
+    const {
+        collection: {
+            ArraySet
+        }
+    } = adone;
+
+    type ArraySet<T = any> = adone.collection.ArraySet<T>;
+
+    new ArraySet();
+    { const a: number = new ArraySet().length; }
+    { const a: ArraySet = new ArraySet<string>().add("hello"); }
+    { const a: ArraySet = new ArraySet<string>().add("hello", true); }
+    { const a: boolean = new ArraySet<string>().has("string"); }
+    { const a: number = new ArraySet<string>().indexOf("hello"); }
+    { const a: string[] = new ArraySet<string>().toArray(); }
+    { const a: ArraySet<number> = ArraySet.from([1]); }
+    { const a: ArraySet<number> = ArraySet.from([1], true); }
+}
diff --git a/types/adone/test/glosses/collections/async_queue.ts b/types/adone/test/glosses/collections/async_queue.ts
new file mode 100644
index 0000000000..43374e6d3a
--- /dev/null
+++ b/types/adone/test/glosses/collections/async_queue.ts
@@ -0,0 +1,12 @@
+namespace adoneTests.collection.AsyncQueue {
+    const {
+        collection: {
+            AsyncQueue
+        }
+    } = adone;
+
+    type AsyncQueue = adone.collection.AsyncQueue;
+
+    { const a: AsyncQueue = new AsyncQueue().push(123); }
+    { const a: Promise<number> = new AsyncQueue<number>().push(123).pop(); }
+}
diff --git a/types/adone/test/glosses/collections/avl_tree.ts b/types/adone/test/glosses/collections/avl_tree.ts
new file mode 100644
index 0000000000..9c032deb2d
--- /dev/null
+++ b/types/adone/test/glosses/collections/avl_tree.ts
@@ -0,0 +1,28 @@
+namespace adoneTests.collection.AVLTree {
+    const {
+        collection: {
+            AVLTree
+        }
+    } = adone;
+
+    type AVLTree<K = any, V = any> = adone.collection.AVLTree<K, V>;
+
+    new AVLTree();
+    new AVLTree<string, number>({ checkValueEquality: (a: number, b: number) => a === b });
+    new AVLTree<string, number>({ compareKeys: (a: string, b: string) => a.length - b.length });
+    new AVLTree<string, number>({ parent: new AVLTree() });
+    new AVLTree<string, number>({ unique: false });
+    new AVLTree<string, number>({ value: 123 });
+    new AVLTree<string, number>().checkIsAVLT();
+    new AVLTree<string, number>().insert("123", 123);
+    new AVLTree<string, number>().delete("123");
+    new AVLTree<string, number>().delete("123", 123);
+    { const a: number = new AVLTree<string, number>().getNumberOFKeys(); }
+    { const a: number[] = new AVLTree<string, number>().search("key"); }
+    { const a: number[] = new AVLTree<string, number>().betweenBounds({}); }
+    { const a: number[] = new AVLTree<string, number>().betweenBounds({ $gt: "ads" }); }
+    { const a: number[] = new AVLTree<string, number>().betweenBounds({ $lt: "ads" }); }
+    { const a: number[] = new AVLTree<string, number>().betweenBounds({ $gte: "ads" }); }
+    { const a: number[] = new AVLTree<string, number>().betweenBounds({ $lte: "ads" }); }
+    new AVLTree<string, number>().executeOnEveryNode((tree: AVLTree<string, number>) => null);
+}
diff --git a/types/adone/test/glosses/collections/binary_search_tree.ts b/types/adone/test/glosses/collections/binary_search_tree.ts
new file mode 100644
index 0000000000..56f9a28e72
--- /dev/null
+++ b/types/adone/test/glosses/collections/binary_search_tree.ts
@@ -0,0 +1,36 @@
+namespace adoneTests.collection.BinarySearchTree {
+    const {
+        collection: {
+            BinarySearchTree
+        }
+    } = adone;
+
+    type BinarySearchTree<K = any, V = any> = adone.collection.BinarySearchTree<K, V>;
+
+    new BinarySearchTree();
+    new BinarySearchTree({});
+    new BinarySearchTree<string, number>({ checkValueEquality: (a: number, b: number) => a === b });
+    new BinarySearchTree<string, number>({ compareKeys: (a: string, b: string) => a.length - b.length });
+    new BinarySearchTree<string, number>({ parent: new BinarySearchTree<string, number>() });
+    new BinarySearchTree<string, number>({ unique: true });
+    new BinarySearchTree<string, number>({ value: 123 });
+    { const a: BinarySearchTree<string, number> = new BinarySearchTree<string, number>().getMaxKeyDescendant(); }
+    { const a: string = new BinarySearchTree<string, number>().getMaxKey(); }
+    { const a: BinarySearchTree<string, number> = new BinarySearchTree<string, number>().getMinKeyDescendant(); }
+    { const a: string = new BinarySearchTree<string, number>().getMinKey(); }
+    new BinarySearchTree<string, number>().checkAllNodesFullfillCondition((key: string, value: number) => null);
+    new BinarySearchTree<string, number>().checkIsBST();
+    { const a: number = new BinarySearchTree<string, number>().getNumberOfKeys(); }
+    new BinarySearchTree<string, number>().insert("asd", 123);
+    { const a: number[] = new BinarySearchTree<string, number>().search("asd"); }
+    { const a: number[] = new BinarySearchTree<string, number>().betweenBounds({ $gt: "" }); }
+    { const a: number[] = new BinarySearchTree<string, number>().betweenBounds({ $lt: "" }); }
+    { const a: number[] = new BinarySearchTree<string, number>().betweenBounds({ $lte: "" }); }
+    { const a: number[] = new BinarySearchTree<string, number>().betweenBounds({ $gte: "" }); }
+    new BinarySearchTree<string, number>().delete("key");
+    new BinarySearchTree<string, number>().delete("key", 123);
+    new BinarySearchTree<string, number>().executeOnEveryNode((tree: BinarySearchTree<string, number>) => null);
+    new BinarySearchTree<string, number>().prettyPrint();
+    new BinarySearchTree<string, number>().prettyPrint(true);
+    new BinarySearchTree<string, number>().prettyPrint(true, " ");
+}
diff --git a/types/adone/test/glosses/collections/buffer_list.ts b/types/adone/test/glosses/collections/buffer_list.ts
new file mode 100644
index 0000000000..265d54033f
--- /dev/null
+++ b/types/adone/test/glosses/collections/buffer_list.ts
@@ -0,0 +1,42 @@
+namespace adoneTests.collection.BufferList {
+    const {
+        collection: {
+            BufferList
+        }
+    } = adone;
+
+    type BufferList = adone.collection.BufferList;
+
+    new BufferList();
+    new BufferList(Buffer.from("123"));
+    new BufferList("123");
+    new BufferList(123);
+    new BufferList([Buffer.from("123"), "123", 123]);
+    new BufferList((err: any, data: Buffer) => null);
+    new BufferList().append(Buffer.from("123"));
+    new BufferList().append("123");
+    new BufferList().append(123);
+    new BufferList().append([Buffer.from("123"), "123", 123]);
+    new BufferList().end(Buffer.from("123"));
+    new BufferList().end();
+    { const a: number = new BufferList().get(123); }
+    { const a: Buffer = new BufferList().slice(); }
+    { const a: Buffer = new BufferList().slice(1); }
+    { const a: Buffer = new BufferList().slice(1, 2); }
+    { const a: Buffer = new BufferList().copy(Buffer.alloc(100)); }
+    { const a: Buffer = new BufferList().copy(Buffer.alloc(100), 0); }
+    { const a: Buffer = new BufferList().copy(Buffer.alloc(100), 0, 1); }
+    { const a: Buffer = new BufferList().copy(Buffer.alloc(100), 0, 1, 2); }
+    { const a: BufferList = new BufferList().shallowSlice(); }
+    { const a: BufferList = new BufferList().shallowSlice(1); }
+    { const a: BufferList = new BufferList().shallowSlice(1, 2); }
+    { const a: string = new BufferList().toString(); }
+    { const a: string = new BufferList().toString("utf8"); }
+    { const a: string = new BufferList().toString("utf8", 1); }
+    { const a: string = new BufferList().toString("utf8", 1, 2); }
+    { const a: BufferList = new BufferList().consume(10); }
+    { const a: BufferList = new BufferList().duplicate(); }
+    new BufferList().destroy();
+    new BufferList().then((x: Buffer) => null);
+    new BufferList().catch((err: any) => null);
+}
diff --git a/types/adone/test/glosses/collections/byte_array.ts b/types/adone/test/glosses/collections/byte_array.ts
new file mode 100644
index 0000000000..7254008322
--- /dev/null
+++ b/types/adone/test/glosses/collections/byte_array.ts
@@ -0,0 +1,561 @@
+namespace adoneTests.collection.ByteArray {
+    const {
+        collection: {
+            ByteArray
+        }
+    } = adone;
+
+    new ByteArray();
+    new ByteArray(10);
+    new ByteArray(10, true);
+
+    const buffer = new ByteArray();
+
+    buffer.woffset === 2;
+    buffer.roffset === 3;
+    buffer.noAssert === true;
+    buffer.buffer.writeUInt8(0, 0);
+
+    namespace readBitSet {
+        const a: boolean[] = buffer.readBitSet();
+        const b: boolean[] = buffer.readBitSet(10);
+    }
+
+    namespace read {
+        const a: adone.collection.ByteArray = buffer.read(1);
+        const b: adone.collection.ByteArray = buffer.read(1, 10);
+    }
+
+    namespace readInt8 {
+        const a: number = buffer.readInt8();
+        const b: number = buffer.readInt8(10);
+    }
+
+    namespace readUInt8 {
+        const a: number = buffer.readUInt8();
+        const b: number = buffer.readUInt8(10);
+    }
+
+    namespace readInt16LE {
+        const a: number = buffer.readInt16LE();
+        const b: number = buffer.readInt16LE(10);
+    }
+
+    namespace readUInt16LE {
+        const a: number = buffer.readUInt16LE();
+        const b: number = buffer.readUInt16LE(10);
+    }
+
+    namespace readInt16BE {
+        const a: number = buffer.readInt16BE();
+        const b: number = buffer.readInt16BE(10);
+    }
+
+    namespace readUInt16BE {
+        const a: number = buffer.readUInt16BE();
+        const b: number = buffer.readUInt16BE(10);
+    }
+
+    namespace readInt32LE {
+        const a: number = buffer.readInt32LE();
+        const b: number = buffer.readInt32LE(10);
+    }
+
+    namespace readUInt32LE {
+        const a: number = buffer.readUInt32LE();
+        const b: number = buffer.readUInt32LE(10);
+    }
+
+    namespace readInt32BE {
+        const a: number = buffer.readInt32BE();
+        const b: number = buffer.readInt32BE(10);
+    }
+
+    namespace readUInt32BE {
+        const a: number = buffer.readUInt32BE();
+        const b: number = buffer.readUInt32BE(10);
+    }
+
+    namespace readInt64LE {
+        const a: adone.math.Long = buffer.readInt64LE();
+        const b: adone.math.Long = buffer.readInt64LE(10);
+    }
+
+    namespace readUInt64LE {
+        const a: adone.math.Long = buffer.readUInt64LE();
+        const b: adone.math.Long = buffer.readUInt64LE(10);
+    }
+
+    namespace readInt64BE {
+        const a: adone.math.Long = buffer.readInt64BE();
+        const b: adone.math.Long = buffer.readInt64BE(10);
+    }
+
+    namespace readUInt64BE {
+        const a: adone.math.Long = buffer.readUInt64BE();
+        const b: adone.math.Long = buffer.readUInt64BE(10);
+    }
+
+    namespace readFloatLE {
+        const a: number = buffer.readFloatLE();
+        const b: number = buffer.readFloatLE(10);
+    }
+
+    namespace readFloatBE {
+        const a: number = buffer.readFloatBE();
+        const b: number = buffer.readFloatBE(10);
+    }
+
+    namespace readDoubleLE {
+        const a: number = buffer.readDoubleLE();
+        const b: number = buffer.readDoubleLE(10);
+    }
+
+    namespace readDoubleBE {
+        const a: number = buffer.readDoubleBE();
+        const b: number = buffer.readDoubleBE(10);
+    }
+
+    namespace write {
+        const a: adone.collection.ByteArray = buffer.write("1");
+        const b: adone.collection.ByteArray = buffer.write(new ByteArray());
+        const c: adone.collection.ByteArray = buffer.write(Buffer.alloc(10));
+        const d: adone.collection.ByteArray = buffer.write(new Uint8Array([1, 2, 3]));
+        const e: adone.collection.ByteArray = buffer.write(new ArrayBuffer(10));
+        const f: adone.collection.ByteArray = buffer.write("1", 10);
+        const g: adone.collection.ByteArray = buffer.write("1", 10, 10);
+        const h: adone.collection.ByteArray = buffer.write("1", 10, 10, "utf8");
+    }
+
+    namespace writeBitSet {
+        const a: adone.collection.ByteArray = buffer.writeBitSet([1, 2, 3]);
+        const b: number = buffer.writeBitSet([1, 2, 3], 10);
+    }
+
+    namespace writeInt8 {
+        const a: adone.collection.ByteArray = buffer.writeInt8(10);
+        const b: adone.collection.ByteArray = buffer.writeInt8(10, 10);
+    }
+
+    namespace writeUInt8 {
+        const a: adone.collection.ByteArray = buffer.writeUInt8(10);
+        const b: adone.collection.ByteArray = buffer.writeUInt8(10, 10);
+    }
+
+    namespace writeInt16LE {
+        const a: adone.collection.ByteArray = buffer.writeInt16LE(10);
+        const b: adone.collection.ByteArray = buffer.writeInt16LE(10, 10);
+    }
+
+    namespace writeInt16BE {
+        const a: adone.collection.ByteArray = buffer.writeInt16BE(10);
+        const b: adone.collection.ByteArray = buffer.writeInt16BE(10, 10);
+    }
+
+    namespace writeUInt16LE {
+        const a: adone.collection.ByteArray = buffer.writeUInt16LE(10);
+        const b: adone.collection.ByteArray = buffer.writeUInt16LE(10, 10);
+    }
+
+    namespace writeUInt16BE {
+        const a: adone.collection.ByteArray = buffer.writeUInt16BE(10);
+        const b: adone.collection.ByteArray = buffer.writeUInt16BE(10, 10);
+    }
+
+    namespace writeInt32LE {
+        const a: adone.collection.ByteArray = buffer.writeInt32LE(10);
+        const b: adone.collection.ByteArray = buffer.writeInt32LE(10, 10);
+    }
+
+    namespace writeInt32BE {
+        const a: adone.collection.ByteArray = buffer.writeInt32BE(10);
+        const b: adone.collection.ByteArray = buffer.writeInt32BE(10, 10);
+    }
+
+    namespace writeUInt32LE {
+        const a: adone.collection.ByteArray = buffer.writeUInt32LE(10);
+        const b: adone.collection.ByteArray = buffer.writeUInt32LE(10, 10);
+    }
+
+    namespace writeUInt32BE {
+        const a: adone.collection.ByteArray = buffer.writeUInt32BE(10);
+        const b: adone.collection.ByteArray = buffer.writeUInt32BE(10, 10);
+    }
+
+    namespace writeInt64LE {
+        const a: adone.collection.ByteArray = buffer.writeInt64LE(10);
+        const b: adone.collection.ByteArray = buffer.writeInt64LE(10, 10);
+    }
+
+    namespace writeInt64BE {
+        const a: adone.collection.ByteArray = buffer.writeInt64BE(10);
+        const b: adone.collection.ByteArray = buffer.writeInt64BE(10, 10);
+    }
+
+    namespace writeUInt64LE {
+        const a: adone.collection.ByteArray = buffer.writeUInt64LE(10);
+        const b: adone.collection.ByteArray = buffer.writeUInt64LE(10, 10);
+    }
+
+    namespace writeUInt64BE {
+        const a: adone.collection.ByteArray = buffer.writeUInt64BE(10);
+        const b: adone.collection.ByteArray = buffer.writeUInt64BE(10, 10);
+    }
+
+    namespace writeFloatLE {
+        const a: adone.collection.ByteArray = buffer.writeFloatLE(10);
+        const b: adone.collection.ByteArray = buffer.writeFloatLE(10, 10);
+    }
+
+    namespace writeFloatBE {
+        const a: adone.collection.ByteArray = buffer.writeFloatBE(10);
+        const b: adone.collection.ByteArray = buffer.writeFloatBE(10, 10);
+    }
+
+    namespace writeDoubleLE {
+        const a: adone.collection.ByteArray = buffer.writeDoubleLE(10);
+        const b: adone.collection.ByteArray = buffer.writeDoubleLE(10, 10);
+    }
+
+    namespace writeDoubleBE {
+        const a: adone.collection.ByteArray = buffer.writeDoubleBE(10);
+        const b: adone.collection.ByteArray = buffer.writeDoubleBE(10, 10);
+    }
+
+    namespace writeVarInt32 {
+        const a: adone.collection.ByteArray = buffer.writeVarint32(10);
+        const b: number = buffer.writeVarint32(10, 10);
+    }
+
+    namespace writeVarInt32ZigZag {
+        const a: adone.collection.ByteArray = buffer.writeVarint32ZigZag(10);
+        const b: number = buffer.writeVarint32ZigZag(10, 10);
+    }
+
+    namespace readVarint32 {
+        const a: number = buffer.readVarint32();
+        const b: { value: number, length: number } = buffer.readVarint32(10);
+    }
+
+    namespace readVarint32ZigZag {
+        const a: number = buffer.readVarint32ZigZag();
+        const b: { value: number, length: number } = buffer.readVarint32ZigZag(10);
+    }
+
+    namespace writeVarint64 {
+        const a: adone.collection.ByteArray = buffer.writeVarint64(10);
+        const b: number = buffer.writeVarint64(10, 10);
+    }
+
+    namespace writeVarint64ZigZag {
+        const a: adone.collection.ByteArray = buffer.writeVarint64ZigZag(10);
+        const b: number = buffer.writeVarint64ZigZag(10, 10);
+    }
+
+    namespace readVarint64 {
+        const a: adone.math.Long = buffer.readVarint64();
+        const b: { value: adone.math.Long, length: number } = buffer.readVarint64(10);
+    }
+
+    namespace readVarint64ZigZag {
+        const a: adone.math.Long = buffer.readVarint64ZigZag();
+        const b: { value: adone.math.Long, length: number } = buffer.readVarint64ZigZag(10);
+    }
+
+    namespace writeCString {
+        const a: adone.collection.ByteArray = buffer.writeCString("asd");
+        const b: number = buffer.writeCString("123", 10);
+    }
+
+    namespace readCString {
+        const a: string = buffer.readCString();
+        const b: { string: string, length: number } = buffer.readCString(10);
+    }
+
+    namespace writeString {
+        const a: adone.collection.ByteArray = buffer.writeString("abc");
+        const b: number = buffer.writeString("abc", 10);
+    }
+
+    namespace readString {
+        const a: string = buffer.readString(10);
+        const b: string = buffer.readString(10, "b");
+        const c: string = buffer.readString(10, "c");
+        const d: { string: string, length: number } = buffer.readString(10, "c", 10);
+    }
+
+    namespace writeVString {
+        const a: adone.collection.ByteArray = buffer.writeVString("abc");
+        const b: number = buffer.writeVString("abc", 10);
+    }
+
+    namespace readVString {
+        const a: string = buffer.readVString();
+        const b: { string: string, length: number } = buffer.readVString(10);
+    }
+
+    namespace appendTo {
+        const a: adone.collection.ByteArray = buffer.appendTo(new ByteArray());
+        const b: adone.collection.ByteArray = buffer.appendTo(new ByteArray(), 10);
+    }
+
+    namespace assert {
+        const a: adone.collection.ByteArray = buffer.assert();
+        const b: adone.collection.ByteArray = buffer.assert(true);
+    }
+
+    namespace capacity {
+        const a: number = buffer.capacity();
+    }
+
+    namespace clear {
+        const a: adone.collection.ByteArray = buffer.clear();
+    }
+
+    namespace copy {
+        const a: adone.collection.ByteArray = buffer.clone();
+        const c: adone.collection.ByteArray = buffer.clone(true);
+    }
+
+    namespace compact {
+        const a: adone.collection.ByteArray = buffer.compact();
+        const b: adone.collection.ByteArray = buffer.compact(1);
+        const c: adone.collection.ByteArray = buffer.compact(1, 10);
+    }
+
+    namespace copyTo {
+        const a: adone.collection.ByteArray = buffer.copyTo(new ByteArray());
+        const b: adone.collection.ByteArray = buffer.copyTo(new ByteArray(), 0);
+        const c: adone.collection.ByteArray = buffer.copyTo(new ByteArray(), 0, 0);
+        const d: adone.collection.ByteArray = buffer.copyTo(new ByteArray(), 0, 0, 10);
+    }
+
+    namespace ensureCapacity {
+        const a: adone.collection.ByteArray = buffer.ensureCapacity(10);
+    }
+
+    namespace fill {
+        const a: adone.collection.ByteArray = buffer.fill("0");
+        const b: adone.collection.ByteArray = buffer.fill(0);
+        const c: adone.collection.ByteArray = buffer.fill(0, 0);
+        const d: adone.collection.ByteArray = buffer.fill(0, 0, 10);
+    }
+
+    namespace flip {
+        const a: adone.collection.ByteArray = buffer.flip();
+    }
+
+    namespace mark {
+        const a: adone.collection.ByteArray = buffer.mark();
+        const b: adone.collection.ByteArray = buffer.mark(10);
+    }
+
+    namespace prepend {
+        const a: adone.collection.ByteArray = buffer.prepend("");
+        const b: adone.collection.ByteArray = buffer.prepend(new ByteArray());
+        const c: adone.collection.ByteArray = buffer.prepend(Buffer.alloc(10));
+        const d: adone.collection.ByteArray = buffer.prepend(new Uint8Array([1, 2, 3]));
+        const e: adone.collection.ByteArray = buffer.prepend(new ArrayBuffer(10));
+        const f: adone.collection.ByteArray = buffer.prepend("", "utf8");
+        const g: adone.collection.ByteArray = buffer.prepend("", "utf8", 10);
+        const h: adone.collection.ByteArray = buffer.prepend("", 10);
+    }
+
+    namespace prependTo {
+        const a: adone.collection.ByteArray = buffer.prependTo(new ByteArray());
+        const b: adone.collection.ByteArray = buffer.prependTo(new ByteArray(), 10);
+    }
+
+    namespace remaining {
+        const a: number = buffer.remaining();
+    }
+
+    namespace reset {
+        const a: adone.collection.ByteArray = buffer.reset();
+    }
+
+    namespace resize {
+        const a: adone.collection.ByteArray = buffer.resize(10);
+    }
+
+    namespace reverse {
+        const a: adone.collection.ByteArray = buffer.reverse();
+        const b: adone.collection.ByteArray = buffer.reverse(1);
+        const c: adone.collection.ByteArray = buffer.reverse(1, 10);
+    }
+
+    namespace skip {
+        const a: adone.collection.ByteArray = buffer.skip(10);
+    }
+
+    namespace slice {
+        const a: adone.collection.ByteArray = buffer.slice();
+        const b: adone.collection.ByteArray = buffer.slice(1);
+        const c: adone.collection.ByteArray = buffer.slice(1, 10);
+    }
+
+    namespace toBuffer {
+        const a: Buffer = buffer.toBuffer();
+        const b: Buffer = buffer.toBuffer(true);
+        const c: Buffer = buffer.toBuffer(true, 0);
+        const d: Buffer = buffer.toBuffer(true, 0, 10);
+    }
+
+    namespace toArrayBuffer {
+        const a: ArrayBuffer = buffer.toArrayBuffer();
+    }
+
+    namespace toString {
+        const a: string = buffer.toString();
+        const b: string = buffer.toString("utf8");
+        const c: string = buffer.toString("utf8", 0);
+        const d: string = buffer.toString("utf8", 0, 10);
+    }
+
+    namespace toBase64 {
+        const a: string = buffer.toBase64();
+        const b: string = buffer.toBase64(0);
+        const c: string = buffer.toBase64(0, 10);
+    }
+
+    namespace toBinary {
+        const a: string = buffer.toBinary();
+        const b: string = buffer.toBinary(0);
+        const c: string = buffer.toBinary(0, 10);
+    }
+
+    namespace toDebug {
+        const a: string = buffer.toDebug();
+        const b: string = buffer.toDebug(true);
+    }
+
+    namespace toUTF8 {
+        const a: string = buffer.toUTF8();
+        const b: string = buffer.toUTF8(0);
+        const c: string = buffer.toUTF8(0, 10);
+    }
+
+    namespace static {
+        namespace accessor {
+            const a: typeof Buffer = ByteArray.accessor();
+        }
+
+        namespace allocate {
+            const a: adone.collection.ByteArray = ByteArray.allocate();
+            const b: adone.collection.ByteArray = ByteArray.allocate(10);
+            const c: adone.collection.ByteArray = ByteArray.allocate(10, true);
+        }
+
+        namespace concat {
+            const a: adone.collection.ByteArray = ByteArray.concat([
+                new ByteArray(),
+                Buffer.alloc(10),
+                new Uint8Array([1, 2, 3]),
+                new ArrayBuffer(10)
+            ]);
+            const b: adone.collection.ByteArray = ByteArray.concat([
+                new ByteArray(),
+                Buffer.alloc(10),
+                new Uint8Array([1, 2, 3]),
+                new ArrayBuffer(10)
+            ], "utf8");
+            const c: adone.collection.ByteArray = ByteArray.concat([
+                new ByteArray(),
+                Buffer.alloc(10),
+                new Uint8Array([1, 2, 3]),
+                new ArrayBuffer(10)
+            ], "utf8", true);
+        }
+
+        namespace type {
+            const a: typeof Buffer = ByteArray.type();
+        }
+
+        namespace wrap {
+            const a: adone.collection.ByteArray = ByteArray.wrap("");
+            const b: adone.collection.ByteArray = ByteArray.wrap(new ByteArray());
+            const c: adone.collection.ByteArray = ByteArray.wrap(Buffer.alloc(10));
+            const d: adone.collection.ByteArray = ByteArray.wrap(new Uint8Array([1, 2, 3]));
+            const e: adone.collection.ByteArray = ByteArray.wrap(new ArrayBuffer(10));
+            const f: adone.collection.ByteArray = ByteArray.wrap("", "utf8");
+            const g: adone.collection.ByteArray = ByteArray.wrap("", "utf8", true);
+        }
+
+        namespace calculateVarint32 {
+            const a: number = ByteArray.calculateVarint32(10);
+        }
+
+        namespace zigZagEncode32 {
+            const a: number = ByteArray.zigZagEncode32(10);
+        }
+
+        namespace zigZagDecode32 {
+            const a: number = ByteArray.zigZagDecode32(10);
+        }
+
+        namespace calculateVarint64 {
+            const a: number = ByteArray.calculateVarint64(10);
+            const b: number = ByteArray.calculateVarint64("10");
+        }
+
+        namespace zigZagEncode64 {
+            const a: adone.math.Long = ByteArray.zigZagEncode64(10);
+            const b: adone.math.Long = ByteArray.zigZagEncode64("10");
+            const c: adone.math.Long = ByteArray.zigZagEncode64(adone.math.Long.fromValue(10));
+        }
+
+        namespace zigZagDecode64 {
+            const a: adone.math.Long = ByteArray.zigZagDecode64(10);
+            const b: adone.math.Long = ByteArray.zigZagDecode64("10");
+            const c: adone.math.Long = ByteArray.zigZagDecode64(adone.math.Long.fromValue(10));
+        }
+
+        namespace calculateUTF8Chars {
+            const a: number = ByteArray.calculateUTF8Chars("123");
+        }
+
+        namespace calculateString {
+            const a: number = ByteArray.calculateString("123");
+        }
+
+        namespace fromBase64 {
+            const a: adone.collection.ByteArray = ByteArray.fromBase64("123");
+        }
+
+        namespace btoa {
+            const a: string = ByteArray.btoa("123");
+        }
+
+        namespace atob {
+            const a: string = ByteArray.atob("123");
+        }
+
+        namespace fromBinary {
+            const a: adone.collection.ByteArray = ByteArray.fromBinary("123");
+        }
+
+        namespace fromDebug {
+            const a: adone.collection.ByteArray = ByteArray.fromDebug("12");
+            const b: adone.collection.ByteArray = ByteArray.fromDebug("12", true);
+        }
+
+        namespace fromHex {
+            const a: adone.collection.ByteArray = ByteArray.fromHex("192");
+            const b: adone.collection.ByteArray = ByteArray.fromHex("192", true);
+        }
+
+        namespace fromUTF8 {
+            const a: adone.collection.ByteArray = ByteArray.fromUTF8("123");
+            const b: adone.collection.ByteArray = ByteArray.fromUTF8("123", true);
+        }
+
+        namespace constants {
+            const a: number = ByteArray.DEFAULT_CAPACITY;
+            const b: boolean = ByteArray.DEFAULT_NOASSERT;
+            const c: number = ByteArray.MAX_VARINT32_BYTES;
+            const d: number = ByteArray.MAX_VARINT64_BYTES;
+            const e: string = ByteArray.METRICS_CHARS;
+            const f: string = ByteArray.METRICS_BYTES;
+        }
+    }
+}
diff --git a/types/adone/test/glosses/collections/default_map.ts b/types/adone/test/glosses/collections/default_map.ts
new file mode 100644
index 0000000000..1273b91982
--- /dev/null
+++ b/types/adone/test/glosses/collections/default_map.ts
@@ -0,0 +1,14 @@
+namespace adoneTests.collection.DefaultMap {
+    const {
+        collection: {
+            DefaultMap
+        }
+    } = adone;
+
+    type DefaultMap<K = any, V = any> = adone.collection.DefaultMap<K, V>;
+
+    new DefaultMap();
+    { const a: DefaultMap<string, number> = new DefaultMap(undefined, [["1", 2]]); }
+    { const a: DefaultMap<string, number> = new DefaultMap((key: string) => 123); }
+    { const a: DefaultMap<string, number> = new DefaultMap({ a: 123 }); }
+}
diff --git a/types/adone/test/glosses/collections/fast_lru.ts b/types/adone/test/glosses/collections/fast_lru.ts
new file mode 100644
index 0000000000..0e61f51dc5
--- /dev/null
+++ b/types/adone/test/glosses/collections/fast_lru.ts
@@ -0,0 +1,21 @@
+namespace adoneTests.collection.FastLRU {
+    const {
+        collection: {
+            FastLRU
+        }
+    } = adone;
+
+    new FastLRU();
+    new FastLRU(100);
+    new FastLRU<string, number>(100, { dispose: (key: string, value: number) => null });
+    { const a: number = new FastLRU().size; }
+    { const a: number | undefined = new FastLRU<string, number>().get("key"); }
+    new FastLRU<string, number>().set("key", 123);
+    { const a: boolean = new FastLRU<string, number>().delete("key"); }
+    { const a: boolean = new FastLRU<string, number>().has("key"); }
+    { const a: string[] = [...new FastLRU<string, number>().keys()]; }
+    { const a: number[] = [...new FastLRU<string, number>().values()]; }
+    { const a: number[] = [...new FastLRU<string, number>().values()]; }
+    { const a: Array<[string, number]> = [...new FastLRU<string, number>().entries()]; }
+    new FastLRU<string, number>().clear();
+}
diff --git a/types/adone/test/glosses/collections/linked_list.ts b/types/adone/test/glosses/collections/linked_list.ts
new file mode 100644
index 0000000000..f64a32c1aa
--- /dev/null
+++ b/types/adone/test/glosses/collections/linked_list.ts
@@ -0,0 +1,123 @@
+namespace adoneTests.collection.LinkedList {
+    const {
+        collection: {
+            LinkedList
+        }
+    } = adone;
+
+    namespace creation {
+        new LinkedList();
+        new LinkedList(10);
+    }
+
+    namespace properties {
+        { const a: boolean = new LinkedList().full; }
+        { const a: boolean = new LinkedList().empty; }
+        { const a: number = new LinkedList().maxLength; }
+        { const a: number = new LinkedList().length; }
+        { const a: boolean = new LinkedList().autoresize; }
+    }
+
+    namespace resize {
+        { const a: boolean = new LinkedList().resize(100).full; }
+    }
+
+    namespace push {
+        const a = new LinkedList<number>().push(10);
+        a.next;
+        a.prev;
+        const b: number = a.value;
+    }
+
+    namespace pop {
+        const a: number | undefined = new LinkedList<number>().pop();
+    }
+
+    namespace shift {
+        const a: number | undefined = new LinkedList<number>().shift();
+    }
+
+    namespace unshift {
+        const a = new LinkedList<string>().unshift("hello");
+        a.next;
+        a.prev;
+        const b: string = a.value;
+    }
+
+    namespace pushNode {
+        const a = new LinkedList<string>();
+        const node = a.push("1230");
+        a.pushNode(node);
+    }
+
+    namespace unshiftNode {
+        const a = new LinkedList();
+        const node = a.push(10);
+        a.unshiftNode(node);
+    }
+
+    namespace removeNode {
+        const a = new LinkedList<string>();
+        const node = a.unshift("10");
+        a.removeNode(node);
+    }
+
+    namespace clear {
+        new LinkedList().clear();
+        new LinkedList().clear(true);
+    }
+
+    namespace toArray {
+        const a = new LinkedList<number>();
+        const b: number[] = a.toArray();
+    }
+
+    namespace front {
+        const a = new LinkedList<number>();
+        const b: number = a.front;
+    }
+
+    namespace back {
+        const a = new LinkedList<number>();
+        const b: number = a.back;
+    }
+
+    namespace iterating {
+        const a = new LinkedList<string>();
+        for (const b of a) {
+            const i: string = b;
+        }
+        const c = new LinkedList<number>();
+        for (const b of c) {
+            const i: number = b;
+        }
+    }
+
+    namespace nextNode {
+        const a = new LinkedList<string>();
+        const n1 = a.push("h");
+        const n2 = a.nextNode(n1);
+        n1.next;
+        n1.prev;
+        const t: string = n1.value;
+    }
+
+    namespace map {
+        const a = new LinkedList<number>();
+        const f = (a: number, idx: number) => `${a}${idx}`;
+        const b = a.map(f);
+        const c: string = b.front;
+    }
+
+    namespace forEach {
+        const a = new LinkedList<number>();
+
+        a.forEach((a: number, b: number) => {
+            const c = a + b;
+        });
+    }
+
+    namespace static {
+        const a: number = LinkedList.DEFAULT_LENGTH;
+    }
+}
diff --git a/types/adone/test/glosses/collections/lru.ts b/types/adone/test/glosses/collections/lru.ts
new file mode 100644
index 0000000000..934e5a1fbf
--- /dev/null
+++ b/types/adone/test/glosses/collections/lru.ts
@@ -0,0 +1,67 @@
+namespace adoneTests.collection.LRU {
+    const {
+        collection: {
+            LRU
+        }
+    } = adone;
+
+    type LRU = adone.collection.LRU;
+
+    new LRU();
+    new LRU(100);
+    new LRU({});
+    new LRU({ max: 100 });
+    new LRU<string, number>({ dispose: (key: string, value: number) => null });
+    new LRU<string, number>({ maxAge: 100 });
+    new LRU<string, number>({ noDisposeOnSet: false });
+    new LRU<string, number>({ stale: true });
+    { const a: number = new LRU<string, number>().max; }
+    { new LRU<string, number>().max = 100; }
+    { const a: boolean = new LRU<string, number>().allowStale; }
+    { new LRU<string, number>().allowStale = false; }
+    { const a: number = new LRU<string, number>().maxAge; }
+    { new LRU<string, number>().maxAge = 100; }
+    { const a: (v: number, k: string) => number = new LRU<string, number>().lengthCalculator; }
+    { new LRU<string, number>().lengthCalculator = () => 123; }
+    { const a: number = new LRU<string, number>().length; }
+    { const a: number = new LRU<string, number>().itemCount; }
+    new LRU<string, number>().rforEach((value: number, key: string) => null);
+    new LRU<string, number>().rforEach(function (value: number, key: string) {
+        const b: number = this.a;
+    }, { a: 1 });
+    new LRU<string, number>().forEach((value: number, key: string) => null);
+    new LRU<string, number>().forEach(function (value: number, key: string) {
+        const b: number = this.a;
+    }, { a: 1 });
+    { const a: string[] = new LRU<string, number>().keys(); }
+    { const a: number[] = new LRU<string, number>().values(); }
+    new LRU<string, number>().reset();
+    {
+        const a: Array<adone.collection.I.LRU.SerializedEntry<string, number>> = new LRU<string, number>().dump();
+        const [b] = a;
+        { const c: number = b.e; }
+        { const c: string = b.key; }
+        { const c: number = b.value; }
+    }
+    {
+        const a: adone.collection.LinkedList<adone.collection.I.LRU.Entry<string, number>> = new LRU<string, number>().dumpLru();
+        const b = a.shift();
+        if (b !== undefined) {
+            { const a: string = b.key; }
+            { const a: number = b.value; }
+            { const a: number = b.now; }
+            { const a: number = b.maxAge; }
+        }
+    }
+    { const a: string = new LRU<string, number>().inspect(); }
+    { const a: string = new LRU<string, number>().inspect({}); }
+    { const a: boolean = new LRU<string, number>().set("asd", 13); }
+    { const a: boolean = new LRU<string, number>().set("asd", 13, 100500); }
+    { const a: boolean = new LRU<string, number>().has("asd"); }
+    { const a: number | undefined = new LRU<string, number>().get("asd"); }
+    { const a: number | undefined = new LRU<string, number>().peek("asd"); }
+    { const a: adone.collection.I.LRU.Entry<string, number> = new LRU<string, number>().pop(); }
+    new LRU<string, number>().del("asd");
+    new LRU<string, number>().load(new LRU<string, number>().dump());
+    new LRU<string, number>().prune();
+}
diff --git a/types/adone/test/glosses/collections/map_cache.ts b/types/adone/test/glosses/collections/map_cache.ts
new file mode 100644
index 0000000000..bcd0ffb887
--- /dev/null
+++ b/types/adone/test/glosses/collections/map_cache.ts
@@ -0,0 +1,21 @@
+namespace adoneTests.collection.MapCache {
+    const {
+        collection: {
+            MapCache
+        }
+    } = adone;
+
+    new MapCache();
+
+    new MapCache().has("hello");
+    new MapCache().get("hello");
+    new MapCache().set("hello", "world");
+    new MapCache().delete("hello");
+    new MapCache().clear();
+
+    {
+        const a = new MapCache<string>();
+        a.set("a", "b");
+        a.get("a").charCodeAt(20);
+    }
+}
diff --git a/types/adone/test/glosses/collections/ns_cache.ts b/types/adone/test/glosses/collections/ns_cache.ts
new file mode 100644
index 0000000000..a8e8c14397
--- /dev/null
+++ b/types/adone/test/glosses/collections/ns_cache.ts
@@ -0,0 +1,21 @@
+namespace adoneTests.collection.NSCache {
+    const {
+        collection: {
+            NSCache
+        }
+    } = adone;
+
+    new NSCache(10, ["a", "b", "c"]);
+    new NSCache(10, ["a", "b", "c"]).resize(100);
+    new NSCache(10, ["a", "b", "c"]).set("a", "b", "c");
+    new NSCache(10, ["a", "b", "c"]).get("a", "b");
+    new NSCache(10, ["a", "b", "c"]).has("a", "b");
+    new NSCache(10, ["a", "b", "c"]).delete("a", "b");
+    new NSCache(10, ["a", "b", "c"]).clear();
+
+    {
+        const a = new NSCache<string>(10, ["a", "b", "c"]);
+        a.set("a", "b", "c");
+        a.get("a", "b").charCodeAt(100);
+    }
+}
diff --git a/types/adone/test/glosses/collections/priority_queue.ts b/types/adone/test/glosses/collections/priority_queue.ts
new file mode 100644
index 0000000000..950e7394e7
--- /dev/null
+++ b/types/adone/test/glosses/collections/priority_queue.ts
@@ -0,0 +1,36 @@
+namespace adoneTests.collection.PriorityQueue {
+    const {
+        collection: {
+            PriorityQueue
+        }
+    } = adone;
+
+    type PriorityQueue<T = any> = adone.collection.PriorityQueue<T>;
+
+    { const a: boolean = new PriorityQueue().empty; }
+    { const a: number = new PriorityQueue().length; }
+    new PriorityQueue();
+    new PriorityQueue({});
+    new PriorityQueue<number>({
+        compare(a: number, b: number) {
+            return a - b;
+        }
+    });
+    new PriorityQueue<string>({
+        priority(a: string, b: string) {
+            return a.length - b.length;
+        }
+    });
+    { const a: PriorityQueue<string> = new PriorityQueue<string>().clone(); }
+    { const a: PriorityQueue<string> = new PriorityQueue<string>().push("123"); }
+    { const a: string | undefined = new PriorityQueue<string>().pop(); }
+    { const a: PriorityQueue<string> = new PriorityQueue<string>().delete("123"); }
+    { const a: PriorityQueue<string> = new PriorityQueue<string>().delete("123"); }
+    { const a: string = new PriorityQueue<string>().replace("123"); }
+    { const a: string = new PriorityQueue<string>().pushpop("123"); }
+    { const a: string[] = new PriorityQueue<string>().toArray(); }
+    { const a: PriorityQueue<string> = PriorityQueue.from(["1"]); }
+    { const a: PriorityQueue<string> = PriorityQueue.from(["1"], {}); }
+    { const a: PriorityQueue<string> = PriorityQueue.from(["1"], { compare: (a: string, b: string) => a.length - b.length }); }
+    { const a: PriorityQueue<string> = PriorityQueue.from(["1"], { priority: (a: string, b: string) => a.length - b.length }); }
+}
diff --git a/types/adone/test/glosses/collections/queue.ts b/types/adone/test/glosses/collections/queue.ts
new file mode 100644
index 0000000000..fd6df7f39b
--- /dev/null
+++ b/types/adone/test/glosses/collections/queue.ts
@@ -0,0 +1,17 @@
+namespace adoneTests.collection.Queue {
+    const {
+        collection: {
+            Queue
+        }
+    } = adone;
+
+    type Queue = adone.collection.Queue;
+
+    new Queue();
+    { const a: Queue = new Queue().push(123).push(123); }
+    { const a: number | undefined = new Queue<number>().push(123).pop(); }
+    { const a: string | undefined = new Queue<number, string>().push(123).pop(); }
+    { const a: boolean = new Queue().full; }
+    { const a: number = new Queue().length; }
+    { const a: boolean = new Queue().empty; }
+}
diff --git a/types/adone/test/glosses/collections/rb_tree.ts b/types/adone/test/glosses/collections/rb_tree.ts
new file mode 100644
index 0000000000..1b624284f6
--- /dev/null
+++ b/types/adone/test/glosses/collections/rb_tree.ts
@@ -0,0 +1,48 @@
+namespace adoneTests.collection.RedBlackTree {
+    const {
+        collection: {
+            RedBlackTree
+        }
+    } = adone;
+
+    type RedBlackTree<K = any, V = any> = adone.collection.RedBlackTree<K, V>;
+    type RedBlackTreeIterator<K = any, V = any> = adone.collection.I.RedBlackTree.Iterator<K, V>;
+    type RedBlackTreeNode<K = any, V = any> = adone.collection.I.RedBlackTree.Node<K, V>;
+
+    new RedBlackTree();
+    new RedBlackTree<string, number>((a: string, b: string) => a.length - b.length);
+    new RedBlackTree<string, number>(undefined, new RedBlackTree());
+    { const a: string[] = new RedBlackTree<string, number>().keys; }
+    { const a: number[] = new RedBlackTree<string, number>().values; }
+    { const a: number = new RedBlackTree<string, number>().length; }
+    {
+        const a: RedBlackTreeIterator<string, number> = new RedBlackTree<string, number>().begin;
+        { const b: boolean = a.valid; }
+        { const b: RedBlackTreeNode<string, number> | null = a.node; }
+        { const b: string | undefined = a.key; }
+        { const b: number | undefined = a.value; }
+        { const b: number = a.index; }
+        { const b: boolean = a.hasNext; }
+        { const b: boolean = a.hasPrev; }
+        { const b: RedBlackTree<string, number> = a.tree; }
+        { const b: RedBlackTreeIterator<string, number> = a.clone(); }
+        { const b: RedBlackTree<string, number> = a.remove(); }
+        a.next();
+        { const b: RedBlackTree<string, number> = a.update(333); }
+        a.prev();
+    }
+    { const a: RedBlackTreeIterator<string, number> = new RedBlackTree<string, number>().end; }
+    { const a: RedBlackTree<string, number> = new RedBlackTree<string, number>().insert("123", 456); }
+    { const a: number = new RedBlackTree<string, number>().forEach((key: string, value: number) => value); }
+    { const a: number = new RedBlackTree<string, number>().forEach((key: string, value: number) => value, "1"); }
+    { const a: number = new RedBlackTree<string, number>().forEach((key: string, value: number) => value, "1", "2"); }
+    { const a: RedBlackTreeIterator<string, number> = new RedBlackTree<string, number>().at(1); }
+    { const a: RedBlackTreeIterator<string, number> = new RedBlackTree<string, number>().ge("1"); }
+    { const a: RedBlackTreeIterator<string, number> = new RedBlackTree<string, number>().gt("1"); }
+    { const a: RedBlackTreeIterator<string, number> = new RedBlackTree<string, number>().lt("1"); }
+    { const a: RedBlackTreeIterator<string, number> = new RedBlackTree<string, number>().le("1"); }
+    { const a: RedBlackTreeIterator<string, number> | null = new RedBlackTree<string, number>().find("1"); }
+    { const a: RedBlackTree<string, number> = new RedBlackTree<string, number>().remove("1"); }
+    { const a: RedBlackTree<string, number> = new RedBlackTree<string, number>().remove("1"); }
+    { const a: number | undefined = new RedBlackTree<string, number>().get("1"); }
+}
diff --git a/types/adone/test/glosses/collections/refcounted_cache.ts b/types/adone/test/glosses/collections/refcounted_cache.ts
new file mode 100644
index 0000000000..6262d57d60
--- /dev/null
+++ b/types/adone/test/glosses/collections/refcounted_cache.ts
@@ -0,0 +1,17 @@
+namespace adoneTests.collection.RefcountedCache {
+    const {
+        collection: {
+            RefcountedCache
+        }
+    } = adone;
+
+    new RefcountedCache();
+    new RefcountedCache().ref("a");
+    new RefcountedCache().unref("a");
+    new RefcountedCache().references("a") === 5;
+
+    {
+        const a = new RefcountedCache<string>();
+        a.get("b").charCodeAt(100);
+    }
+}
diff --git a/types/adone/test/glosses/collections/set.ts b/types/adone/test/glosses/collections/set.ts
new file mode 100644
index 0000000000..2e2314956e
--- /dev/null
+++ b/types/adone/test/glosses/collections/set.ts
@@ -0,0 +1,26 @@
+namespace adoneTests.collection.Set {
+    const {
+        collection: {
+            Set
+        }
+    } = adone;
+
+    new Set().add("a");
+    new Set().has("a");
+    new Set().delete("a");
+    new Set().get("a");
+    new Set().has("a") === true;
+    new Set().only();
+    new Set().size === 5;
+
+    {
+        const a = new Set<number>();
+
+        a.add(1);
+        a.has(2);
+        a.delete(2);
+        a.get(2); // ???
+        a.only() === 5;
+        a.size === 5;
+    }
+}
diff --git a/types/adone/test/glosses/collections/stack.ts b/types/adone/test/glosses/collections/stack.ts
new file mode 100644
index 0000000000..df13f82f8e
--- /dev/null
+++ b/types/adone/test/glosses/collections/stack.ts
@@ -0,0 +1,16 @@
+namespace adoneTests.collection.Stack {
+    const {
+        collection: {
+            Stack
+        }
+    } = adone;
+
+    type Stack<T = any> = adone.collection.Stack<T>;
+
+    { const a: boolean = new Stack().empty; }
+    { const a: number = new Stack<number>().top; }
+    { const a: Stack<number> = new Stack<number>().push(123); }
+    { const a: number | undefined = new Stack<number>().pop(); }
+    { const a: number[] = [...new Stack<number>()]; }
+    { const a: Stack<number> = Stack.from([1, 2, 3]); }
+}
diff --git a/types/adone/test/glosses/collections/timedout_map.ts b/types/adone/test/glosses/collections/timedout_map.ts
new file mode 100644
index 0000000000..ffca754e2a
--- /dev/null
+++ b/types/adone/test/glosses/collections/timedout_map.ts
@@ -0,0 +1,22 @@
+namespace adoneTests.collection.TimedoutMap {
+    const {
+        collection: {
+            TimedoutMap
+        }
+    } = adone;
+
+    type TimedoutMap<K = any, V = any> = adone.collection.TimedoutMap<K, V>;
+
+    new TimedoutMap();
+    new TimedoutMap(1000);
+    new TimedoutMap<string, number>(1000, (key: string) => null);
+    {
+        const a: TimedoutMap<string, number> = new TimedoutMap<string, number>().forEach((value: number, key: string) => null);
+    }
+    {
+        const a: TimedoutMap<string, number> = new TimedoutMap<string, number>().forEach(function (value: number, key: string) {
+            const a: number = this.a;
+        }, { a: 1 });
+    }
+    { const a: boolean = new TimedoutMap<string, number>().delete("123"); }
+}
diff --git a/types/adone/test/glosses/crypto/asn1.ts b/types/adone/test/glosses/crypto/asn1.ts
new file mode 100644
index 0000000000..447c71c34e
--- /dev/null
+++ b/types/adone/test/glosses/crypto/asn1.ts
@@ -0,0 +1,3183 @@
+namespace adoneTests.crypto.asn1 {
+    const {
+        crypto: {
+            asn1
+        }
+    } = adone;
+
+    let arrBuf: ArrayBuffer;
+    let num: number;
+    let bool: boolean;
+    let str: string;
+    let date: Date;
+
+    namespace BaseBlock {
+        const {
+            BaseBlock
+        } = asn1;
+
+        new BaseBlock({
+            blockLength: 10
+        });
+        new BaseBlock({
+            error: "a"
+        });
+        new BaseBlock({
+            name: "a"
+        });
+        new BaseBlock({
+            optional: true
+        });
+        new BaseBlock({
+            primitiveSchema: {}
+        });
+        new BaseBlock({
+            valueBeforeDecode: new ArrayBuffer(10)
+        });
+        new BaseBlock({
+            warnings: ["a"]
+        });
+
+        const b = new BaseBlock();
+
+        namespace idblock {
+            num = b.idBlock.blockLength;
+            str = b.idBlock.error;
+            bool = b.idBlock.isConstructed;
+            bool = b.idBlock.isHexOnly;
+            num = b.idBlock.tagClass;
+            num = b.idBlock.tagNumber;
+            arrBuf = b.idBlock.toBER();
+            {
+                const j = b.idBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+            arrBuf = b.idBlock.valueBeforeDecode;
+            arrBuf = b.idBlock.valueHex;
+            str = b.idBlock.warnings[0];
+        }
+
+        namespace lenblock {
+            num = b.lenBlock.blockLength;
+            str = b.lenBlock.error;
+            b.lenBlock.fromBER(new ArrayBuffer(10), 1, 1);
+            bool = b.lenBlock.isIndefiniteForm;
+            num = b.lenBlock.length;
+            bool = b.lenBlock.longFormUsed;
+            arrBuf = b.lenBlock.toBER();
+            {
+                const j = b.lenBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+            arrBuf = b.lenBlock.valueBeforeDecode;
+            str = b.lenBlock.warnings[0];
+        }
+
+        arrBuf = b.toBER();
+        arrBuf = b.toBER(true);
+
+        {
+            const j = b.toJSON();
+            num = j.blockLength;
+            str = j.blockName;
+            str = j.error;
+            arrBuf = j.valueBeforeDecode;
+            str = j.warnings[0];
+        }
+        arrBuf = b.valueBeforeDecode;
+
+        namespace valueBlock {
+            num = b.valueBlock.blockLength;
+            str = b.valueBlock.error;
+            b.valueBlock.fromBER(new ArrayBuffer(10), 0, 0);
+            arrBuf = b.valueBlock.toBER();
+            {
+                const j = b.valueBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+        }
+
+        str = b.warnings[0];
+    }
+
+    namespace Primitive {
+        const {
+            Primitive
+        } = asn1;
+
+        new Primitive({
+            blockLength: 10
+        });
+        new Primitive({
+            error: "a"
+        });
+        new Primitive({
+            name: "a"
+        });
+        new Primitive({
+            optional: true
+        });
+        new Primitive({
+            primitiveSchema: {}
+        });
+        new Primitive({
+            valueBeforeDecode: new ArrayBuffer(10)
+        });
+        new Primitive({
+            warnings: ["a"]
+        });
+
+        const b = new Primitive();
+
+        namespace idblock {
+            num = b.idBlock.blockLength;
+            str = b.idBlock.error;
+            bool = b.idBlock.isConstructed;
+            bool = b.idBlock.isHexOnly;
+            num = b.idBlock.tagClass;
+            num = b.idBlock.tagNumber;
+            arrBuf = b.idBlock.toBER();
+            {
+                const j = b.idBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+            arrBuf = b.idBlock.valueBeforeDecode;
+            arrBuf = b.idBlock.valueHex;
+            str = b.idBlock.warnings[0];
+        }
+
+        namespace lenblock {
+            num = b.lenBlock.blockLength;
+            str = b.lenBlock.error;
+            b.lenBlock.fromBER(new ArrayBuffer(10), 1, 1);
+            bool = b.lenBlock.isIndefiniteForm;
+            num = b.lenBlock.length;
+            bool = b.lenBlock.longFormUsed;
+            arrBuf = b.lenBlock.toBER();
+            {
+                const j = b.lenBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+            arrBuf = b.lenBlock.valueBeforeDecode;
+            str = b.lenBlock.warnings[0];
+        }
+
+        arrBuf = b.toBER();
+        arrBuf = b.toBER(true);
+
+        {
+            const j = b.toJSON();
+            num = j.blockLength;
+            str = j.blockName;
+            str = j.error;
+            arrBuf = j.valueBeforeDecode;
+            str = j.warnings[0];
+        }
+        arrBuf = b.valueBeforeDecode;
+
+        namespace valueBlock {
+            num = b.valueBlock.blockLength;
+            str = b.valueBlock.error;
+            b.valueBlock.fromBER(new ArrayBuffer(10), 0, 0);
+            bool = b.valueBlock.isHexOnly;
+            arrBuf = b.valueBlock.toBER();
+            {
+                const j = b.valueBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+        }
+
+        str = b.warnings[0];
+    }
+
+    namespace Constructed {
+        const {
+            Constructed
+        } = asn1;
+
+        new Constructed({
+            blockLength: 10
+        });
+        new Constructed({
+            error: "a"
+        });
+        new Constructed({
+            name: "a"
+        });
+        new Constructed({
+            optional: true
+        });
+        new Constructed({
+            primitiveSchema: {}
+        });
+        new Constructed({
+            valueBeforeDecode: new ArrayBuffer(10)
+        });
+        new Constructed({
+            warnings: ["a"]
+        });
+
+        const b = new Constructed();
+
+        namespace idblock {
+            num = b.idBlock.blockLength;
+            str = b.idBlock.error;
+            bool = b.idBlock.isConstructed;
+            bool = b.idBlock.isHexOnly;
+            num = b.idBlock.tagClass;
+            num = b.idBlock.tagNumber;
+            arrBuf = b.idBlock.toBER();
+            {
+                const j = b.idBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+            arrBuf = b.idBlock.valueBeforeDecode;
+            arrBuf = b.idBlock.valueHex;
+            str = b.idBlock.warnings[0];
+        }
+
+        namespace lenblock {
+            num = b.lenBlock.blockLength;
+            str = b.lenBlock.error;
+            b.lenBlock.fromBER(new ArrayBuffer(10), 1, 1);
+            bool = b.lenBlock.isIndefiniteForm;
+            num = b.lenBlock.length;
+            bool = b.lenBlock.longFormUsed;
+            arrBuf = b.lenBlock.toBER();
+            {
+                const j = b.lenBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+            arrBuf = b.lenBlock.valueBeforeDecode;
+            str = b.lenBlock.warnings[0];
+        }
+
+        arrBuf = b.toBER();
+        arrBuf = b.toBER(true);
+
+        {
+            const j = b.toJSON();
+            num = j.blockLength;
+            str = j.blockName;
+            str = j.error;
+            arrBuf = j.valueBeforeDecode;
+            str = j.warnings[0];
+        }
+        arrBuf = b.valueBeforeDecode;
+
+        namespace valueBlock {
+            num = b.valueBlock.blockLength;
+            str = b.valueBlock.error;
+            b.valueBlock.fromBER(new ArrayBuffer(10), 0, 0);
+            bool = b.valueBlock.isIndefiniteForm;
+            arrBuf = b.valueBlock.toBER();
+            {
+                const j = b.valueBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+        }
+
+        str = b.warnings[0];
+    }
+
+    namespace EndOfContent {
+        const {
+            EndOfContent
+        } = asn1;
+
+        new EndOfContent({
+            blockLength: 10
+        });
+        new EndOfContent({
+            error: "a"
+        });
+        new EndOfContent({
+            name: "a"
+        });
+        new EndOfContent({
+            optional: true
+        });
+        new EndOfContent({
+            primitiveSchema: {}
+        });
+        new EndOfContent({
+            valueBeforeDecode: new ArrayBuffer(10)
+        });
+        new EndOfContent({
+            warnings: ["a"]
+        });
+
+        const b = new EndOfContent();
+
+        namespace idblock {
+            num = b.idBlock.blockLength;
+            str = b.idBlock.error;
+            bool = b.idBlock.isConstructed;
+            bool = b.idBlock.isHexOnly;
+            num = b.idBlock.tagClass;
+            num = b.idBlock.tagNumber;
+            arrBuf = b.idBlock.toBER();
+            {
+                const j = b.idBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+            arrBuf = b.idBlock.valueBeforeDecode;
+            arrBuf = b.idBlock.valueHex;
+            str = b.idBlock.warnings[0];
+        }
+
+        namespace lenblock {
+            num = b.lenBlock.blockLength;
+            str = b.lenBlock.error;
+            b.lenBlock.fromBER(new ArrayBuffer(10), 1, 1);
+            bool = b.lenBlock.isIndefiniteForm;
+            num = b.lenBlock.length;
+            bool = b.lenBlock.longFormUsed;
+            arrBuf = b.lenBlock.toBER();
+            {
+                const j = b.lenBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+            arrBuf = b.lenBlock.valueBeforeDecode;
+            str = b.lenBlock.warnings[0];
+        }
+
+        arrBuf = b.toBER();
+        arrBuf = b.toBER(true);
+
+        {
+            const j = b.toJSON();
+            num = j.blockLength;
+            str = j.blockName;
+            str = j.error;
+            arrBuf = j.valueBeforeDecode;
+            str = j.warnings[0];
+        }
+        arrBuf = b.valueBeforeDecode;
+
+        namespace valueBlock {
+            num = b.valueBlock.blockLength;
+            str = b.valueBlock.error;
+            b.valueBlock.fromBER(new ArrayBuffer(10), 0, 0);
+            arrBuf = b.valueBlock.toBER();
+            {
+                const j = b.valueBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+        }
+
+        str = b.warnings[0];
+    }
+
+    namespace Boolean {
+        const {
+            Boolean: _Boolean
+        } = asn1;
+
+        new _Boolean({
+            blockLength: 10
+        });
+        new _Boolean({
+            error: "a"
+        });
+        new _Boolean({
+            name: "a"
+        });
+        new _Boolean({
+            optional: true
+        });
+        new _Boolean({
+            primitiveSchema: {}
+        });
+        new _Boolean({
+            valueBeforeDecode: new ArrayBuffer(10)
+        });
+        new _Boolean({
+            warnings: ["a"]
+        });
+
+        const b = new _Boolean();
+
+        namespace idblock {
+            num = b.idBlock.blockLength;
+            str = b.idBlock.error;
+            bool = b.idBlock.isConstructed;
+            bool = b.idBlock.isHexOnly;
+            num = b.idBlock.tagClass;
+            num = b.idBlock.tagNumber;
+            arrBuf = b.idBlock.toBER();
+            {
+                const j = b.idBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+            arrBuf = b.idBlock.valueBeforeDecode;
+            arrBuf = b.idBlock.valueHex;
+            str = b.idBlock.warnings[0];
+        }
+
+        namespace lenblock {
+            num = b.lenBlock.blockLength;
+            str = b.lenBlock.error;
+            b.lenBlock.fromBER(new ArrayBuffer(10), 1, 1);
+            bool = b.lenBlock.isIndefiniteForm;
+            num = b.lenBlock.length;
+            bool = b.lenBlock.longFormUsed;
+            arrBuf = b.lenBlock.toBER();
+            {
+                const j = b.lenBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+            arrBuf = b.lenBlock.valueBeforeDecode;
+            str = b.lenBlock.warnings[0];
+        }
+
+        arrBuf = b.toBER();
+        arrBuf = b.toBER(true);
+
+        {
+            const j = b.toJSON();
+            num = j.blockLength;
+            str = j.blockName;
+            str = j.error;
+            arrBuf = j.valueBeforeDecode;
+            str = j.warnings[0];
+        }
+        arrBuf = b.valueBeforeDecode;
+
+        namespace valueBlock {
+            num = b.valueBlock.blockLength;
+            str = b.valueBlock.error;
+            b.valueBlock.fromBER(new ArrayBuffer(10), 0, 0);
+            bool = b.valueBlock.isHexOnly;
+            arrBuf = b.valueBlock.toBER();
+            {
+                const j = b.valueBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+        }
+
+        str = b.warnings[0];
+    }
+
+    namespace Sequence {
+        const {
+            Sequence
+        } = asn1;
+
+        new Sequence({
+            blockLength: 10
+        });
+        new Sequence({
+            error: "a"
+        });
+        new Sequence({
+            name: "a"
+        });
+        new Sequence({
+            optional: true
+        });
+        new Sequence({
+            primitiveSchema: {}
+        });
+        new Sequence({
+            valueBeforeDecode: new ArrayBuffer(10)
+        });
+        new Sequence({
+            warnings: ["a"]
+        });
+
+        const b = new Sequence();
+
+        namespace idblock {
+            num = b.idBlock.blockLength;
+            str = b.idBlock.error;
+            bool = b.idBlock.isConstructed;
+            bool = b.idBlock.isHexOnly;
+            num = b.idBlock.tagClass;
+            num = b.idBlock.tagNumber;
+            arrBuf = b.idBlock.toBER();
+            {
+                const j = b.idBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+            arrBuf = b.idBlock.valueBeforeDecode;
+            arrBuf = b.idBlock.valueHex;
+            str = b.idBlock.warnings[0];
+        }
+
+        namespace lenblock {
+            num = b.lenBlock.blockLength;
+            str = b.lenBlock.error;
+            b.lenBlock.fromBER(new ArrayBuffer(10), 1, 1);
+            bool = b.lenBlock.isIndefiniteForm;
+            num = b.lenBlock.length;
+            bool = b.lenBlock.longFormUsed;
+            arrBuf = b.lenBlock.toBER();
+            {
+                const j = b.lenBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+            arrBuf = b.lenBlock.valueBeforeDecode;
+            str = b.lenBlock.warnings[0];
+        }
+
+        arrBuf = b.toBER();
+        arrBuf = b.toBER(true);
+
+        {
+            const j = b.toJSON();
+            num = j.blockLength;
+            str = j.blockName;
+            str = j.error;
+            arrBuf = j.valueBeforeDecode;
+            str = j.warnings[0];
+        }
+        arrBuf = b.valueBeforeDecode;
+
+        namespace valueBlock {
+            num = b.valueBlock.blockLength;
+            str = b.valueBlock.error;
+            b.valueBlock.fromBER(new ArrayBuffer(10), 0, 0);
+            bool = b.valueBlock.isIndefiniteForm;
+            arrBuf = b.valueBlock.toBER();
+            {
+                const j = b.valueBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+        }
+
+        str = b.warnings[0];
+    }
+
+    namespace Set {
+        const {
+            Set
+        } = asn1;
+
+        new Set({
+            blockLength: 10
+        });
+        new Set({
+            error: "a"
+        });
+        new Set({
+            name: "a"
+        });
+        new Set({
+            optional: true
+        });
+        new Set({
+            primitiveSchema: {}
+        });
+        new Set({
+            valueBeforeDecode: new ArrayBuffer(10)
+        });
+        new Set({
+            warnings: ["a"]
+        });
+
+        const b = new Set();
+
+        namespace idblock {
+            num = b.idBlock.blockLength;
+            str = b.idBlock.error;
+            bool = b.idBlock.isConstructed;
+            bool = b.idBlock.isHexOnly;
+            num = b.idBlock.tagClass;
+            num = b.idBlock.tagNumber;
+            arrBuf = b.idBlock.toBER();
+            {
+                const j = b.idBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+            arrBuf = b.idBlock.valueBeforeDecode;
+            arrBuf = b.idBlock.valueHex;
+            str = b.idBlock.warnings[0];
+        }
+
+        namespace lenblock {
+            num = b.lenBlock.blockLength;
+            str = b.lenBlock.error;
+            b.lenBlock.fromBER(new ArrayBuffer(10), 1, 1);
+            bool = b.lenBlock.isIndefiniteForm;
+            num = b.lenBlock.length;
+            bool = b.lenBlock.longFormUsed;
+            arrBuf = b.lenBlock.toBER();
+            {
+                const j = b.lenBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+            arrBuf = b.lenBlock.valueBeforeDecode;
+            str = b.lenBlock.warnings[0];
+        }
+
+        arrBuf = b.toBER();
+        arrBuf = b.toBER(true);
+
+        {
+            const j = b.toJSON();
+            num = j.blockLength;
+            str = j.blockName;
+            str = j.error;
+            arrBuf = j.valueBeforeDecode;
+            str = j.warnings[0];
+        }
+        arrBuf = b.valueBeforeDecode;
+
+        namespace valueBlock {
+            num = b.valueBlock.blockLength;
+            str = b.valueBlock.error;
+            b.valueBlock.fromBER(new ArrayBuffer(10), 0, 0);
+            bool = b.valueBlock.isIndefiniteForm;
+            arrBuf = b.valueBlock.toBER();
+            {
+                const j = b.valueBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+        }
+
+        str = b.warnings[0];
+    }
+
+    namespace Null {
+        const {
+            Null: Null
+        } = asn1;
+
+        new Null({
+            blockLength: 10
+        });
+        new Null({
+            error: "a"
+        });
+        new Null({
+            name: "a"
+        });
+        new Null({
+            optional: true
+        });
+        new Null({
+            primitiveSchema: {}
+        });
+        new Null({
+            valueBeforeDecode: new ArrayBuffer(10)
+        });
+        new Null({
+            warnings: ["a"]
+        });
+
+        const b = new Null();
+
+        namespace idblock {
+            num = b.idBlock.blockLength;
+            str = b.idBlock.error;
+            bool = b.idBlock.isConstructed;
+            bool = b.idBlock.isHexOnly;
+            num = b.idBlock.tagClass;
+            num = b.idBlock.tagNumber;
+            arrBuf = b.idBlock.toBER();
+            {
+                const j = b.idBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+            arrBuf = b.idBlock.valueBeforeDecode;
+            arrBuf = b.idBlock.valueHex;
+            str = b.idBlock.warnings[0];
+        }
+
+        namespace lenblock {
+            num = b.lenBlock.blockLength;
+            str = b.lenBlock.error;
+            b.lenBlock.fromBER(new ArrayBuffer(10), 1, 1);
+            bool = b.lenBlock.isIndefiniteForm;
+            num = b.lenBlock.length;
+            bool = b.lenBlock.longFormUsed;
+            arrBuf = b.lenBlock.toBER();
+            {
+                const j = b.lenBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+            arrBuf = b.lenBlock.valueBeforeDecode;
+            str = b.lenBlock.warnings[0];
+        }
+
+        arrBuf = b.toBER();
+        arrBuf = b.toBER(true);
+
+        {
+            const j = b.toJSON();
+            num = j.blockLength;
+            str = j.blockName;
+            str = j.error;
+            arrBuf = j.valueBeforeDecode;
+            str = j.warnings[0];
+        }
+        arrBuf = b.valueBeforeDecode;
+
+        namespace valueBlock {
+            num = b.valueBlock.blockLength;
+            str = b.valueBlock.error;
+            b.valueBlock.fromBER(new ArrayBuffer(10), 0, 0);
+            arrBuf = b.valueBlock.toBER();
+            {
+                const j = b.valueBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+        }
+
+        str = b.warnings[0];
+    }
+
+    namespace OctetString {
+        const {
+            OctetString
+        } = asn1;
+
+        new OctetString({
+            blockLength: 10
+        });
+        new OctetString({
+            error: "a"
+        });
+        new OctetString({
+            valueBeforeDecode: new ArrayBuffer(10)
+        });
+        new OctetString({
+            warnings: ["a"]
+        });
+
+        const b = new OctetString();
+
+        namespace idblock {
+            num = b.idBlock.blockLength;
+            str = b.idBlock.error;
+            bool = b.idBlock.isConstructed;
+            bool = b.idBlock.isHexOnly;
+            num = b.idBlock.tagClass;
+            num = b.idBlock.tagNumber;
+            arrBuf = b.idBlock.toBER();
+            {
+                const j = b.idBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+            arrBuf = b.idBlock.valueBeforeDecode;
+            arrBuf = b.idBlock.valueHex;
+            str = b.idBlock.warnings[0];
+        }
+
+        namespace lenblock {
+            num = b.lenBlock.blockLength;
+            str = b.lenBlock.error;
+            b.lenBlock.fromBER(new ArrayBuffer(10), 1, 1);
+            bool = b.lenBlock.isIndefiniteForm;
+            num = b.lenBlock.length;
+            bool = b.lenBlock.longFormUsed;
+            arrBuf = b.lenBlock.toBER();
+            {
+                const j = b.lenBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+            arrBuf = b.lenBlock.valueBeforeDecode;
+            str = b.lenBlock.warnings[0];
+        }
+
+        arrBuf = b.toBER();
+        arrBuf = b.toBER(true);
+
+        {
+            const j = b.toJSON();
+            num = j.blockLength;
+            str = j.blockName;
+            str = j.error;
+            arrBuf = j.valueBeforeDecode;
+            str = j.warnings[0];
+        }
+        arrBuf = b.valueBeforeDecode;
+
+        namespace valueBlock {
+            num = b.valueBlock.blockLength;
+            str = b.valueBlock.error;
+            b.valueBlock.fromBER(new ArrayBuffer(10), 0, 0);
+            bool = b.valueBlock.isConstructed;
+            bool = b.valueBlock.isHexOnly;
+            bool = b.valueBlock.isIndefiniteForm;
+            arrBuf = b.valueBlock.toBER();
+            {
+                const j = b.valueBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+            const [v] = b.valueBlock.value;
+            num = v.blockLength;
+            str = v.error;
+            v.fromBER(new ArrayBuffer(10), 0, 0);
+            arrBuf = v.toBER();
+            {
+                const j = v.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+            arrBuf = v.valueBeforeDecode;
+            str = v.warnings[0];
+        }
+
+        str = b.warnings[0];
+    }
+
+    namespace BitString {
+        const {
+            BitString
+        } = asn1;
+
+        new BitString({
+            blockLength: 10
+        });
+        new BitString({
+            error: "a"
+        });
+        new BitString({
+            valueBeforeDecode: new ArrayBuffer(10)
+        });
+        new BitString({
+            warnings: ["a"]
+        });
+
+        const b = new BitString();
+
+        namespace idblock {
+            num = b.idBlock.blockLength;
+            str = b.idBlock.error;
+            bool = b.idBlock.isConstructed;
+            bool = b.idBlock.isHexOnly;
+            num = b.idBlock.tagClass;
+            num = b.idBlock.tagNumber;
+            arrBuf = b.idBlock.toBER();
+            {
+                const j = b.idBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+            arrBuf = b.idBlock.valueBeforeDecode;
+            arrBuf = b.idBlock.valueHex;
+            str = b.idBlock.warnings[0];
+        }
+
+        namespace lenblock {
+            num = b.lenBlock.blockLength;
+            str = b.lenBlock.error;
+            b.lenBlock.fromBER(new ArrayBuffer(10), 1, 1);
+            bool = b.lenBlock.isIndefiniteForm;
+            num = b.lenBlock.length;
+            bool = b.lenBlock.longFormUsed;
+            arrBuf = b.lenBlock.toBER();
+            {
+                const j = b.lenBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+            arrBuf = b.lenBlock.valueBeforeDecode;
+            str = b.lenBlock.warnings[0];
+        }
+
+        arrBuf = b.toBER();
+        arrBuf = b.toBER(true);
+
+        {
+            const j = b.toJSON();
+            num = j.blockLength;
+            str = j.blockName;
+            str = j.error;
+            arrBuf = j.valueBeforeDecode;
+            str = j.warnings[0];
+        }
+        arrBuf = b.valueBeforeDecode;
+
+        namespace valueBlock {
+            num = b.valueBlock.blockLength;
+            str = b.valueBlock.error;
+            b.valueBlock.fromBER(new ArrayBuffer(10), 0, 0);
+            bool = b.valueBlock.isConstructed;
+            bool = b.valueBlock.isHexOnly;
+            bool = b.valueBlock.isIndefiniteForm;
+            arrBuf = b.valueBlock.toBER();
+            {
+                const j = b.valueBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+            const [v] = b.valueBlock.value;
+            num = v.blockLength;
+            str = v.error;
+            v.fromBER(new ArrayBuffer(10), 0, 0);
+            arrBuf = v.toBER();
+            {
+                const j = v.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+            arrBuf = v.valueBeforeDecode;
+            str = v.warnings[0];
+        }
+
+        str = b.warnings[0];
+    }
+
+    namespace Integer {
+        const {
+            Integer
+        } = asn1;
+
+        new Integer({
+            value: 10
+        });
+
+        const b = new Integer();
+
+        namespace idblock {
+            num = b.idBlock.blockLength;
+            str = b.idBlock.error;
+            bool = b.idBlock.isConstructed;
+            bool = b.idBlock.isHexOnly;
+            num = b.idBlock.tagClass;
+            num = b.idBlock.tagNumber;
+            arrBuf = b.idBlock.toBER();
+            {
+                const j = b.idBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+            arrBuf = b.idBlock.valueBeforeDecode;
+            arrBuf = b.idBlock.valueHex;
+            str = b.idBlock.warnings[0];
+        }
+
+        namespace lenblock {
+            num = b.lenBlock.blockLength;
+            str = b.lenBlock.error;
+            b.lenBlock.fromBER(new ArrayBuffer(10), 1, 1);
+            bool = b.lenBlock.isIndefiniteForm;
+            num = b.lenBlock.length;
+            bool = b.lenBlock.longFormUsed;
+            arrBuf = b.lenBlock.toBER();
+            {
+                const j = b.lenBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+            arrBuf = b.lenBlock.valueBeforeDecode;
+            str = b.lenBlock.warnings[0];
+        }
+
+        arrBuf = b.toBER();
+        arrBuf = b.toBER(true);
+
+        {
+            const j = b.toJSON();
+            num = j.blockLength;
+            str = j.blockName;
+            str = j.error;
+            arrBuf = j.valueBeforeDecode;
+            str = j.warnings[0];
+        }
+        arrBuf = b.valueBeforeDecode;
+
+        namespace valueBlock {
+            num = b.valueBlock.blockLength;
+            str = b.valueBlock.error;
+            b.valueBlock.fromBER(new ArrayBuffer(10), 0, 0);
+            bool = b.valueBlock.isHexOnly;
+            arrBuf = b.valueBlock.toBER();
+            {
+                const j = b.valueBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+            num = b.valueBlock.valueDec;
+        }
+
+        str = b.warnings[0];
+    }
+
+    namespace Enumerated {
+        const {
+            Enumerated
+        } = asn1;
+
+        new Enumerated({
+            value: 10
+        });
+
+        const b = new Enumerated();
+
+        namespace idblock {
+            num = b.idBlock.blockLength;
+            str = b.idBlock.error;
+            bool = b.idBlock.isConstructed;
+            bool = b.idBlock.isHexOnly;
+            num = b.idBlock.tagClass;
+            num = b.idBlock.tagNumber;
+            arrBuf = b.idBlock.toBER();
+            {
+                const j = b.idBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+            arrBuf = b.idBlock.valueBeforeDecode;
+            arrBuf = b.idBlock.valueHex;
+            str = b.idBlock.warnings[0];
+        }
+
+        namespace lenblock {
+            num = b.lenBlock.blockLength;
+            str = b.lenBlock.error;
+            b.lenBlock.fromBER(new ArrayBuffer(10), 1, 1);
+            bool = b.lenBlock.isIndefiniteForm;
+            num = b.lenBlock.length;
+            bool = b.lenBlock.longFormUsed;
+            arrBuf = b.lenBlock.toBER();
+            {
+                const j = b.lenBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+            arrBuf = b.lenBlock.valueBeforeDecode;
+            str = b.lenBlock.warnings[0];
+        }
+
+        arrBuf = b.toBER();
+        arrBuf = b.toBER(true);
+
+        {
+            const j = b.toJSON();
+            num = j.blockLength;
+            str = j.blockName;
+            str = j.error;
+            arrBuf = j.valueBeforeDecode;
+            str = j.warnings[0];
+        }
+        arrBuf = b.valueBeforeDecode;
+
+        namespace valueBlock {
+            num = b.valueBlock.blockLength;
+            str = b.valueBlock.error;
+            b.valueBlock.fromBER(new ArrayBuffer(10), 0, 0);
+            bool = b.valueBlock.isHexOnly;
+            arrBuf = b.valueBlock.toBER();
+            {
+                const j = b.valueBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+            num = b.valueBlock.valueDec;
+        }
+
+        str = b.warnings[0];
+    }
+
+    namespace ObjectIdentifier {
+        const {
+            ObjectIdentifier
+        } = asn1;
+
+        new ObjectIdentifier({
+            blockLength: 10
+        });
+        new ObjectIdentifier({
+            error: "a"
+        });
+        new ObjectIdentifier({
+            value: "ha"
+        });
+        new ObjectIdentifier({
+            valueBeforeDecode: new ArrayBuffer(10)
+        });
+        new ObjectIdentifier({
+            warnings: ["a"]
+        });
+
+        const b = new ObjectIdentifier();
+
+        namespace idblock {
+            num = b.idBlock.blockLength;
+            str = b.idBlock.error;
+            bool = b.idBlock.isConstructed;
+            bool = b.idBlock.isHexOnly;
+            num = b.idBlock.tagClass;
+            num = b.idBlock.tagNumber;
+            arrBuf = b.idBlock.toBER();
+            {
+                const j = b.idBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+            arrBuf = b.idBlock.valueBeforeDecode;
+            arrBuf = b.idBlock.valueHex;
+            str = b.idBlock.warnings[0];
+        }
+
+        namespace lenblock {
+            num = b.lenBlock.blockLength;
+            str = b.lenBlock.error;
+            b.lenBlock.fromBER(new ArrayBuffer(10), 1, 1);
+            bool = b.lenBlock.isIndefiniteForm;
+            num = b.lenBlock.length;
+            bool = b.lenBlock.longFormUsed;
+            arrBuf = b.lenBlock.toBER();
+            {
+                const j = b.lenBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+            arrBuf = b.lenBlock.valueBeforeDecode;
+            str = b.lenBlock.warnings[0];
+        }
+
+        arrBuf = b.toBER();
+        arrBuf = b.toBER(true);
+
+        {
+            const j = b.toJSON();
+            num = j.blockLength;
+            str = j.blockName;
+            str = j.error;
+            arrBuf = j.valueBeforeDecode;
+            str = j.warnings[0];
+        }
+        arrBuf = b.valueBeforeDecode;
+
+        namespace valueBlock {
+            num = b.valueBlock.blockLength;
+            str = b.valueBlock.error;
+            b.valueBlock.fromBER(new ArrayBuffer(10), 0, 0);
+            arrBuf = b.valueBlock.toBER();
+            {
+                const j = b.valueBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+            str = b.valueBlock.toString();
+            arrBuf = b.valueBlock.valueBeforeDecode;
+            str = b.valueBlock.warnings[0];
+        }
+
+        str = b.warnings[0];
+    }
+
+    namespace Utf8String {
+        const {
+            Utf8String
+        } = asn1;
+
+        new Utf8String({
+            value: "ha"
+        });
+
+        const b = new Utf8String({
+            value: "a"
+        });
+
+        namespace idblock {
+            num = b.idBlock.blockLength;
+            str = b.idBlock.error;
+            bool = b.idBlock.isConstructed;
+            bool = b.idBlock.isHexOnly;
+            num = b.idBlock.tagClass;
+            num = b.idBlock.tagNumber;
+            arrBuf = b.idBlock.toBER();
+            {
+                const j = b.idBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+            arrBuf = b.idBlock.valueBeforeDecode;
+            arrBuf = b.idBlock.valueHex;
+            str = b.idBlock.warnings[0];
+        }
+
+        namespace lenblock {
+            num = b.lenBlock.blockLength;
+            str = b.lenBlock.error;
+            b.lenBlock.fromBER(new ArrayBuffer(10), 1, 1);
+            bool = b.lenBlock.isIndefiniteForm;
+            num = b.lenBlock.length;
+            bool = b.lenBlock.longFormUsed;
+            arrBuf = b.lenBlock.toBER();
+            {
+                const j = b.lenBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+            arrBuf = b.lenBlock.valueBeforeDecode;
+            str = b.lenBlock.warnings[0];
+        }
+
+        arrBuf = b.toBER();
+        arrBuf = b.toBER(true);
+
+        {
+            const j = b.toJSON();
+            num = j.blockLength;
+            str = j.blockName;
+            str = j.error;
+            arrBuf = j.valueBeforeDecode;
+            str = j.warnings[0];
+        }
+        arrBuf = b.valueBeforeDecode;
+
+        namespace valueBlock {
+            num = b.valueBlock.blockLength;
+            str = b.valueBlock.error;
+            b.valueBlock.fromBER(new ArrayBuffer(10), 0, 0);
+            arrBuf = b.valueBlock.toBER();
+            {
+                const j = b.valueBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+            str = b.valueBlock.toString();
+            arrBuf = b.valueBlock.valueBeforeDecode;
+            str = b.valueBlock.warnings[0];
+            bool = b.valueBlock.isHexOnly;
+            arrBuf = b.valueBlock.valueHex;
+        }
+
+        str = b.warnings[0];
+    }
+
+    namespace BmpString {
+        const {
+            BmpString
+        } = asn1;
+
+        new BmpString({
+            value: "ha"
+        });
+
+        const b = new BmpString();
+
+        namespace idblock {
+            num = b.idBlock.blockLength;
+            str = b.idBlock.error;
+            bool = b.idBlock.isConstructed;
+            bool = b.idBlock.isHexOnly;
+            num = b.idBlock.tagClass;
+            num = b.idBlock.tagNumber;
+            arrBuf = b.idBlock.toBER();
+            {
+                const j = b.idBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+            arrBuf = b.idBlock.valueBeforeDecode;
+            arrBuf = b.idBlock.valueHex;
+            str = b.idBlock.warnings[0];
+        }
+
+        namespace lenblock {
+            num = b.lenBlock.blockLength;
+            str = b.lenBlock.error;
+            b.lenBlock.fromBER(new ArrayBuffer(10), 1, 1);
+            bool = b.lenBlock.isIndefiniteForm;
+            num = b.lenBlock.length;
+            bool = b.lenBlock.longFormUsed;
+            arrBuf = b.lenBlock.toBER();
+            {
+                const j = b.lenBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+            arrBuf = b.lenBlock.valueBeforeDecode;
+            str = b.lenBlock.warnings[0];
+        }
+
+        arrBuf = b.toBER();
+        arrBuf = b.toBER(true);
+
+        {
+            const j = b.toJSON();
+            num = j.blockLength;
+            str = j.blockName;
+            str = j.error;
+            arrBuf = j.valueBeforeDecode;
+            str = j.warnings[0];
+        }
+        arrBuf = b.valueBeforeDecode;
+
+        namespace valueBlock {
+            num = b.valueBlock.blockLength;
+            str = b.valueBlock.error;
+            b.valueBlock.fromBER(new ArrayBuffer(10), 0, 0);
+            arrBuf = b.valueBlock.toBER();
+            {
+                const j = b.valueBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+            str = b.valueBlock.toString();
+            arrBuf = b.valueBlock.valueBeforeDecode;
+            str = b.valueBlock.warnings[0];
+            bool = b.valueBlock.isHexOnly;
+            arrBuf = b.valueBlock.valueHex;
+            str = b.valueBlock.value;
+        }
+
+        str = b.warnings[0];
+    }
+
+    namespace UniversalString {
+        const {
+            UniversalString
+        } = asn1;
+
+        new UniversalString({
+            value: "ha"
+        });
+
+        const b = new UniversalString();
+
+        namespace idblock {
+            num = b.idBlock.blockLength;
+            str = b.idBlock.error;
+            bool = b.idBlock.isConstructed;
+            bool = b.idBlock.isHexOnly;
+            num = b.idBlock.tagClass;
+            num = b.idBlock.tagNumber;
+            arrBuf = b.idBlock.toBER();
+            {
+                const j = b.idBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+            arrBuf = b.idBlock.valueBeforeDecode;
+            arrBuf = b.idBlock.valueHex;
+            str = b.idBlock.warnings[0];
+        }
+
+        namespace lenblock {
+            num = b.lenBlock.blockLength;
+            str = b.lenBlock.error;
+            b.lenBlock.fromBER(new ArrayBuffer(10), 1, 1);
+            bool = b.lenBlock.isIndefiniteForm;
+            num = b.lenBlock.length;
+            bool = b.lenBlock.longFormUsed;
+            arrBuf = b.lenBlock.toBER();
+            {
+                const j = b.lenBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+            arrBuf = b.lenBlock.valueBeforeDecode;
+            str = b.lenBlock.warnings[0];
+        }
+
+        arrBuf = b.toBER();
+        arrBuf = b.toBER(true);
+
+        {
+            const j = b.toJSON();
+            num = j.blockLength;
+            str = j.blockName;
+            str = j.error;
+            arrBuf = j.valueBeforeDecode;
+            str = j.warnings[0];
+        }
+        arrBuf = b.valueBeforeDecode;
+
+        namespace valueBlock {
+            num = b.valueBlock.blockLength;
+            str = b.valueBlock.error;
+            b.valueBlock.fromBER(new ArrayBuffer(10), 0, 0);
+            arrBuf = b.valueBlock.toBER();
+            {
+                const j = b.valueBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+            str = b.valueBlock.toString();
+            arrBuf = b.valueBlock.valueBeforeDecode;
+            str = b.valueBlock.warnings[0];
+            bool = b.valueBlock.isHexOnly;
+            arrBuf = b.valueBlock.valueHex;
+            str = b.valueBlock.value;
+        }
+
+        str = b.warnings[0];
+    }
+
+    namespace NumericString {
+        const {
+            NumericString
+        } = asn1;
+
+        new NumericString({
+            value: "123"
+        });
+
+        const b = new NumericString();
+
+        namespace idblock {
+            num = b.idBlock.blockLength;
+            str = b.idBlock.error;
+            bool = b.idBlock.isConstructed;
+            bool = b.idBlock.isHexOnly;
+            num = b.idBlock.tagClass;
+            num = b.idBlock.tagNumber;
+            arrBuf = b.idBlock.toBER();
+            {
+                const j = b.idBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+            arrBuf = b.idBlock.valueBeforeDecode;
+            arrBuf = b.idBlock.valueHex;
+            str = b.idBlock.warnings[0];
+        }
+
+        namespace lenblock {
+            num = b.lenBlock.blockLength;
+            str = b.lenBlock.error;
+            b.lenBlock.fromBER(new ArrayBuffer(10), 1, 1);
+            bool = b.lenBlock.isIndefiniteForm;
+            num = b.lenBlock.length;
+            bool = b.lenBlock.longFormUsed;
+            arrBuf = b.lenBlock.toBER();
+            {
+                const j = b.lenBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+            arrBuf = b.lenBlock.valueBeforeDecode;
+            str = b.lenBlock.warnings[0];
+        }
+
+        arrBuf = b.toBER();
+        arrBuf = b.toBER(true);
+
+        {
+            const j = b.toJSON();
+            num = j.blockLength;
+            str = j.blockName;
+            str = j.error;
+            arrBuf = j.valueBeforeDecode;
+            str = j.warnings[0];
+        }
+        arrBuf = b.valueBeforeDecode;
+
+        namespace valueBlock {
+            num = b.valueBlock.blockLength;
+            str = b.valueBlock.error;
+            b.valueBlock.fromBER(new ArrayBuffer(10), 0, 0);
+            arrBuf = b.valueBlock.toBER();
+            {
+                const j = b.valueBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+            bool = b.valueBlock.isHexOnly;
+            str = b.valueBlock.value;
+            arrBuf = b.valueBlock.valueBeforeDecode;
+            arrBuf = b.valueBlock.valueHex;
+            str = b.valueBlock.warnings[0];
+        }
+
+        str = b.warnings[0];
+    }
+
+    namespace PrintableString {
+        const {
+            PrintableString
+        } = asn1;
+
+        new PrintableString({
+            value: "123"
+        });
+
+        const b = new PrintableString();
+
+        namespace idblock {
+            num = b.idBlock.blockLength;
+            str = b.idBlock.error;
+            bool = b.idBlock.isConstructed;
+            bool = b.idBlock.isHexOnly;
+            num = b.idBlock.tagClass;
+            num = b.idBlock.tagNumber;
+            arrBuf = b.idBlock.toBER();
+            {
+                const j = b.idBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+            arrBuf = b.idBlock.valueBeforeDecode;
+            arrBuf = b.idBlock.valueHex;
+            str = b.idBlock.warnings[0];
+        }
+
+        namespace lenblock {
+            num = b.lenBlock.blockLength;
+            str = b.lenBlock.error;
+            b.lenBlock.fromBER(new ArrayBuffer(10), 1, 1);
+            bool = b.lenBlock.isIndefiniteForm;
+            num = b.lenBlock.length;
+            bool = b.lenBlock.longFormUsed;
+            arrBuf = b.lenBlock.toBER();
+            {
+                const j = b.lenBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+            arrBuf = b.lenBlock.valueBeforeDecode;
+            str = b.lenBlock.warnings[0];
+        }
+
+        arrBuf = b.toBER();
+        arrBuf = b.toBER(true);
+
+        {
+            const j = b.toJSON();
+            num = j.blockLength;
+            str = j.blockName;
+            str = j.error;
+            arrBuf = j.valueBeforeDecode;
+            str = j.warnings[0];
+        }
+        arrBuf = b.valueBeforeDecode;
+
+        namespace valueBlock {
+            num = b.valueBlock.blockLength;
+            str = b.valueBlock.error;
+            b.valueBlock.fromBER(new ArrayBuffer(10), 0, 0);
+            arrBuf = b.valueBlock.toBER();
+            {
+                const j = b.valueBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+            bool = b.valueBlock.isHexOnly;
+            str = b.valueBlock.value;
+            arrBuf = b.valueBlock.valueBeforeDecode;
+            arrBuf = b.valueBlock.valueHex;
+            str = b.valueBlock.warnings[0];
+        }
+
+        str = b.warnings[0];
+    }
+
+    namespace TeletexString {
+        const {
+            TeletexString
+        } = asn1;
+
+        new TeletexString({
+            value: "123"
+        });
+
+        const b = new TeletexString();
+
+        namespace idblock {
+            num = b.idBlock.blockLength;
+            str = b.idBlock.error;
+            bool = b.idBlock.isConstructed;
+            bool = b.idBlock.isHexOnly;
+            num = b.idBlock.tagClass;
+            num = b.idBlock.tagNumber;
+            arrBuf = b.idBlock.toBER();
+            {
+                const j = b.idBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+            arrBuf = b.idBlock.valueBeforeDecode;
+            arrBuf = b.idBlock.valueHex;
+            str = b.idBlock.warnings[0];
+        }
+
+        namespace lenblock {
+            num = b.lenBlock.blockLength;
+            str = b.lenBlock.error;
+            b.lenBlock.fromBER(new ArrayBuffer(10), 1, 1);
+            bool = b.lenBlock.isIndefiniteForm;
+            num = b.lenBlock.length;
+            bool = b.lenBlock.longFormUsed;
+            arrBuf = b.lenBlock.toBER();
+            {
+                const j = b.lenBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+            arrBuf = b.lenBlock.valueBeforeDecode;
+            str = b.lenBlock.warnings[0];
+        }
+
+        arrBuf = b.toBER();
+        arrBuf = b.toBER(true);
+
+        {
+            const j = b.toJSON();
+            num = j.blockLength;
+            str = j.blockName;
+            str = j.error;
+            arrBuf = j.valueBeforeDecode;
+            str = j.warnings[0];
+        }
+        arrBuf = b.valueBeforeDecode;
+
+        namespace valueBlock {
+            num = b.valueBlock.blockLength;
+            str = b.valueBlock.error;
+            b.valueBlock.fromBER(new ArrayBuffer(10), 0, 0);
+            arrBuf = b.valueBlock.toBER();
+            {
+                const j = b.valueBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+            bool = b.valueBlock.isHexOnly;
+            str = b.valueBlock.value;
+            arrBuf = b.valueBlock.valueBeforeDecode;
+            arrBuf = b.valueBlock.valueHex;
+            str = b.valueBlock.warnings[0];
+        }
+
+        str = b.warnings[0];
+    }
+
+    namespace VideotexString {
+        const {
+            VideotexString
+        } = asn1;
+
+        new VideotexString({
+            value: "123"
+        });
+
+        const b = new VideotexString();
+
+        namespace idblock {
+            num = b.idBlock.blockLength;
+            str = b.idBlock.error;
+            bool = b.idBlock.isConstructed;
+            bool = b.idBlock.isHexOnly;
+            num = b.idBlock.tagClass;
+            num = b.idBlock.tagNumber;
+            arrBuf = b.idBlock.toBER();
+            {
+                const j = b.idBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+            arrBuf = b.idBlock.valueBeforeDecode;
+            arrBuf = b.idBlock.valueHex;
+            str = b.idBlock.warnings[0];
+        }
+
+        namespace lenblock {
+            num = b.lenBlock.blockLength;
+            str = b.lenBlock.error;
+            b.lenBlock.fromBER(new ArrayBuffer(10), 1, 1);
+            bool = b.lenBlock.isIndefiniteForm;
+            num = b.lenBlock.length;
+            bool = b.lenBlock.longFormUsed;
+            arrBuf = b.lenBlock.toBER();
+            {
+                const j = b.lenBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+            arrBuf = b.lenBlock.valueBeforeDecode;
+            str = b.lenBlock.warnings[0];
+        }
+
+        arrBuf = b.toBER();
+        arrBuf = b.toBER(true);
+
+        {
+            const j = b.toJSON();
+            num = j.blockLength;
+            str = j.blockName;
+            str = j.error;
+            arrBuf = j.valueBeforeDecode;
+            str = j.warnings[0];
+        }
+        arrBuf = b.valueBeforeDecode;
+
+        namespace valueBlock {
+            num = b.valueBlock.blockLength;
+            str = b.valueBlock.error;
+            b.valueBlock.fromBER(new ArrayBuffer(10), 0, 0);
+            arrBuf = b.valueBlock.toBER();
+            {
+                const j = b.valueBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+            bool = b.valueBlock.isHexOnly;
+            str = b.valueBlock.value;
+            arrBuf = b.valueBlock.valueBeforeDecode;
+            arrBuf = b.valueBlock.valueHex;
+            str = b.valueBlock.warnings[0];
+        }
+
+        str = b.warnings[0];
+    }
+
+    namespace IA5String {
+        const {
+            IA5String
+        } = asn1;
+
+        new IA5String({
+            value: "123"
+        });
+
+        const b = new IA5String();
+
+        namespace idblock {
+            num = b.idBlock.blockLength;
+            str = b.idBlock.error;
+            bool = b.idBlock.isConstructed;
+            bool = b.idBlock.isHexOnly;
+            num = b.idBlock.tagClass;
+            num = b.idBlock.tagNumber;
+            arrBuf = b.idBlock.toBER();
+            {
+                const j = b.idBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+            arrBuf = b.idBlock.valueBeforeDecode;
+            arrBuf = b.idBlock.valueHex;
+            str = b.idBlock.warnings[0];
+        }
+
+        namespace lenblock {
+            num = b.lenBlock.blockLength;
+            str = b.lenBlock.error;
+            b.lenBlock.fromBER(new ArrayBuffer(10), 1, 1);
+            bool = b.lenBlock.isIndefiniteForm;
+            num = b.lenBlock.length;
+            bool = b.lenBlock.longFormUsed;
+            arrBuf = b.lenBlock.toBER();
+            {
+                const j = b.lenBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+            arrBuf = b.lenBlock.valueBeforeDecode;
+            str = b.lenBlock.warnings[0];
+        }
+
+        arrBuf = b.toBER();
+        arrBuf = b.toBER(true);
+
+        {
+            const j = b.toJSON();
+            num = j.blockLength;
+            str = j.blockName;
+            str = j.error;
+            arrBuf = j.valueBeforeDecode;
+            str = j.warnings[0];
+        }
+        arrBuf = b.valueBeforeDecode;
+
+        namespace valueBlock {
+            num = b.valueBlock.blockLength;
+            str = b.valueBlock.error;
+            b.valueBlock.fromBER(new ArrayBuffer(10), 0, 0);
+            arrBuf = b.valueBlock.toBER();
+            {
+                const j = b.valueBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+            bool = b.valueBlock.isHexOnly;
+            str = b.valueBlock.value;
+            arrBuf = b.valueBlock.valueBeforeDecode;
+            arrBuf = b.valueBlock.valueHex;
+            str = b.valueBlock.warnings[0];
+        }
+
+        str = b.warnings[0];
+    }
+
+    namespace GraphicString {
+        const {
+            GraphicString
+        } = asn1;
+
+        new GraphicString({
+            value: "123"
+        });
+
+        const b = new GraphicString();
+
+        namespace idblock {
+            num = b.idBlock.blockLength;
+            str = b.idBlock.error;
+            bool = b.idBlock.isConstructed;
+            bool = b.idBlock.isHexOnly;
+            num = b.idBlock.tagClass;
+            num = b.idBlock.tagNumber;
+            arrBuf = b.idBlock.toBER();
+            {
+                const j = b.idBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+            arrBuf = b.idBlock.valueBeforeDecode;
+            arrBuf = b.idBlock.valueHex;
+            str = b.idBlock.warnings[0];
+        }
+
+        namespace lenblock {
+            num = b.lenBlock.blockLength;
+            str = b.lenBlock.error;
+            b.lenBlock.fromBER(new ArrayBuffer(10), 1, 1);
+            bool = b.lenBlock.isIndefiniteForm;
+            num = b.lenBlock.length;
+            bool = b.lenBlock.longFormUsed;
+            arrBuf = b.lenBlock.toBER();
+            {
+                const j = b.lenBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+            arrBuf = b.lenBlock.valueBeforeDecode;
+            str = b.lenBlock.warnings[0];
+        }
+
+        arrBuf = b.toBER();
+        arrBuf = b.toBER(true);
+
+        {
+            const j = b.toJSON();
+            num = j.blockLength;
+            str = j.blockName;
+            str = j.error;
+            arrBuf = j.valueBeforeDecode;
+            str = j.warnings[0];
+        }
+        arrBuf = b.valueBeforeDecode;
+
+        namespace valueBlock {
+            num = b.valueBlock.blockLength;
+            str = b.valueBlock.error;
+            b.valueBlock.fromBER(new ArrayBuffer(10), 0, 0);
+            arrBuf = b.valueBlock.toBER();
+            {
+                const j = b.valueBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+            bool = b.valueBlock.isHexOnly;
+            str = b.valueBlock.value;
+            arrBuf = b.valueBlock.valueBeforeDecode;
+            arrBuf = b.valueBlock.valueHex;
+            str = b.valueBlock.warnings[0];
+        }
+
+        str = b.warnings[0];
+    }
+
+    namespace VisibleString {
+        const {
+            VisibleString
+        } = asn1;
+
+        new VisibleString({
+            value: "123"
+        });
+
+        const b = new VisibleString();
+
+        namespace idblock {
+            num = b.idBlock.blockLength;
+            str = b.idBlock.error;
+            bool = b.idBlock.isConstructed;
+            bool = b.idBlock.isHexOnly;
+            num = b.idBlock.tagClass;
+            num = b.idBlock.tagNumber;
+            arrBuf = b.idBlock.toBER();
+            {
+                const j = b.idBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+            arrBuf = b.idBlock.valueBeforeDecode;
+            arrBuf = b.idBlock.valueHex;
+            str = b.idBlock.warnings[0];
+        }
+
+        namespace lenblock {
+            num = b.lenBlock.blockLength;
+            str = b.lenBlock.error;
+            b.lenBlock.fromBER(new ArrayBuffer(10), 1, 1);
+            bool = b.lenBlock.isIndefiniteForm;
+            num = b.lenBlock.length;
+            bool = b.lenBlock.longFormUsed;
+            arrBuf = b.lenBlock.toBER();
+            {
+                const j = b.lenBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+            arrBuf = b.lenBlock.valueBeforeDecode;
+            str = b.lenBlock.warnings[0];
+        }
+
+        arrBuf = b.toBER();
+        arrBuf = b.toBER(true);
+
+        {
+            const j = b.toJSON();
+            num = j.blockLength;
+            str = j.blockName;
+            str = j.error;
+            arrBuf = j.valueBeforeDecode;
+            str = j.warnings[0];
+        }
+        arrBuf = b.valueBeforeDecode;
+
+        namespace valueBlock {
+            num = b.valueBlock.blockLength;
+            str = b.valueBlock.error;
+            b.valueBlock.fromBER(new ArrayBuffer(10), 0, 0);
+            arrBuf = b.valueBlock.toBER();
+            {
+                const j = b.valueBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+            bool = b.valueBlock.isHexOnly;
+            str = b.valueBlock.value;
+            arrBuf = b.valueBlock.valueBeforeDecode;
+            arrBuf = b.valueBlock.valueHex;
+            str = b.valueBlock.warnings[0];
+        }
+
+        str = b.warnings[0];
+    }
+
+    namespace GeneralString {
+        const {
+            GeneralString
+        } = asn1;
+
+        new GeneralString({
+            value: "123"
+        });
+
+        const b = new GeneralString();
+
+        namespace idblock {
+            num = b.idBlock.blockLength;
+            str = b.idBlock.error;
+            bool = b.idBlock.isConstructed;
+            bool = b.idBlock.isHexOnly;
+            num = b.idBlock.tagClass;
+            num = b.idBlock.tagNumber;
+            arrBuf = b.idBlock.toBER();
+            {
+                const j = b.idBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+            arrBuf = b.idBlock.valueBeforeDecode;
+            arrBuf = b.idBlock.valueHex;
+            str = b.idBlock.warnings[0];
+        }
+
+        namespace lenblock {
+            num = b.lenBlock.blockLength;
+            str = b.lenBlock.error;
+            b.lenBlock.fromBER(new ArrayBuffer(10), 1, 1);
+            bool = b.lenBlock.isIndefiniteForm;
+            num = b.lenBlock.length;
+            bool = b.lenBlock.longFormUsed;
+            arrBuf = b.lenBlock.toBER();
+            {
+                const j = b.lenBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+            arrBuf = b.lenBlock.valueBeforeDecode;
+            str = b.lenBlock.warnings[0];
+        }
+
+        arrBuf = b.toBER();
+        arrBuf = b.toBER(true);
+
+        {
+            const j = b.toJSON();
+            num = j.blockLength;
+            str = j.blockName;
+            str = j.error;
+            arrBuf = j.valueBeforeDecode;
+            str = j.warnings[0];
+        }
+        arrBuf = b.valueBeforeDecode;
+
+        namespace valueBlock {
+            num = b.valueBlock.blockLength;
+            str = b.valueBlock.error;
+            b.valueBlock.fromBER(new ArrayBuffer(10), 0, 0);
+            arrBuf = b.valueBlock.toBER();
+            {
+                const j = b.valueBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+            bool = b.valueBlock.isHexOnly;
+            str = b.valueBlock.value;
+            arrBuf = b.valueBlock.valueBeforeDecode;
+            arrBuf = b.valueBlock.valueHex;
+            str = b.valueBlock.warnings[0];
+        }
+
+        str = b.warnings[0];
+    }
+
+    namespace CharacterString {
+        const {
+            CharacterString
+        } = asn1;
+
+        new CharacterString({
+            value: "123"
+        });
+
+        const b = new CharacterString();
+
+        namespace idblock {
+            num = b.idBlock.blockLength;
+            str = b.idBlock.error;
+            bool = b.idBlock.isConstructed;
+            bool = b.idBlock.isHexOnly;
+            num = b.idBlock.tagClass;
+            num = b.idBlock.tagNumber;
+            arrBuf = b.idBlock.toBER();
+            {
+                const j = b.idBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+            arrBuf = b.idBlock.valueBeforeDecode;
+            arrBuf = b.idBlock.valueHex;
+            str = b.idBlock.warnings[0];
+        }
+
+        namespace lenblock {
+            num = b.lenBlock.blockLength;
+            str = b.lenBlock.error;
+            b.lenBlock.fromBER(new ArrayBuffer(10), 1, 1);
+            bool = b.lenBlock.isIndefiniteForm;
+            num = b.lenBlock.length;
+            bool = b.lenBlock.longFormUsed;
+            arrBuf = b.lenBlock.toBER();
+            {
+                const j = b.lenBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+            arrBuf = b.lenBlock.valueBeforeDecode;
+            str = b.lenBlock.warnings[0];
+        }
+
+        arrBuf = b.toBER();
+        arrBuf = b.toBER(true);
+
+        {
+            const j = b.toJSON();
+            num = j.blockLength;
+            str = j.blockName;
+            str = j.error;
+            arrBuf = j.valueBeforeDecode;
+            str = j.warnings[0];
+        }
+        arrBuf = b.valueBeforeDecode;
+
+        namespace valueBlock {
+            num = b.valueBlock.blockLength;
+            str = b.valueBlock.error;
+            b.valueBlock.fromBER(new ArrayBuffer(10), 0, 0);
+            arrBuf = b.valueBlock.toBER();
+            {
+                const j = b.valueBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+            bool = b.valueBlock.isHexOnly;
+            str = b.valueBlock.value;
+            arrBuf = b.valueBlock.valueBeforeDecode;
+            arrBuf = b.valueBlock.valueHex;
+            str = b.valueBlock.warnings[0];
+        }
+
+        str = b.warnings[0];
+    }
+
+    namespace UTCTime {
+        const {
+            UTCTime
+        } = asn1;
+
+        new UTCTime({
+            value: "123"
+        });
+
+        new UTCTime({
+            blockLength: 10
+        });
+
+        new UTCTime({
+            error: "a"
+        });
+
+        new UTCTime({
+            isHexOnly: true
+        });
+
+        new UTCTime({
+            valueBeforeDecode: new ArrayBuffer(10)
+        });
+
+        new UTCTime({
+            valueDate: new Date()
+        });
+
+        new UTCTime({
+            valueHex: new ArrayBuffer(10)
+        });
+
+        new UTCTime({
+            warnings: ["a"]
+        });
+
+        const b = new UTCTime();
+
+        num = b.year;
+        num = b.month;
+        num = b.day;
+        num = b.hour;
+        num = b.minute;
+        num = b.second;
+
+        arrBuf = b.toBuffer();
+
+        b.fromDate(new Date());
+
+        date = b.toDate();
+
+        namespace idblock {
+            num = b.idBlock.blockLength;
+            str = b.idBlock.error;
+            bool = b.idBlock.isConstructed;
+            bool = b.idBlock.isHexOnly;
+            num = b.idBlock.tagClass;
+            num = b.idBlock.tagNumber;
+            arrBuf = b.idBlock.toBER();
+            {
+                const j = b.idBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+            arrBuf = b.idBlock.valueBeforeDecode;
+            arrBuf = b.idBlock.valueHex;
+            str = b.idBlock.warnings[0];
+        }
+
+        namespace lenblock {
+            num = b.lenBlock.blockLength;
+            str = b.lenBlock.error;
+            b.lenBlock.fromBER(new ArrayBuffer(10), 1, 1);
+            bool = b.lenBlock.isIndefiniteForm;
+            num = b.lenBlock.length;
+            bool = b.lenBlock.longFormUsed;
+            arrBuf = b.lenBlock.toBER();
+            {
+                const j = b.lenBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+            arrBuf = b.lenBlock.valueBeforeDecode;
+            str = b.lenBlock.warnings[0];
+        }
+
+        arrBuf = b.toBER();
+        arrBuf = b.toBER(true);
+
+        {
+            const j = b.toJSON();
+            num = j.blockLength;
+            str = j.blockName;
+            str = j.error;
+            arrBuf = j.valueBeforeDecode;
+            str = j.warnings[0];
+        }
+        arrBuf = b.valueBeforeDecode;
+
+        namespace valueBlock {
+            num = b.valueBlock.blockLength;
+            str = b.valueBlock.error;
+            b.valueBlock.fromBER(new ArrayBuffer(10), 0, 0);
+            arrBuf = b.valueBlock.toBER();
+            {
+                const j = b.valueBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+            bool = b.valueBlock.isHexOnly;
+            str = b.valueBlock.value;
+            arrBuf = b.valueBlock.valueBeforeDecode;
+            arrBuf = b.valueBlock.valueHex;
+            str = b.valueBlock.warnings[0];
+        }
+
+        str = b.warnings[0];
+    }
+
+    namespace GeneralizedTime {
+        const {
+            GeneralizedTime
+        } = asn1;
+
+        new GeneralizedTime({
+            value: "123"
+        });
+
+        new GeneralizedTime({
+            blockLength: 10
+        });
+
+        new GeneralizedTime({
+            error: "a"
+        });
+
+        new GeneralizedTime({
+            isHexOnly: true
+        });
+
+        new GeneralizedTime({
+            valueBeforeDecode: new ArrayBuffer(10)
+        });
+
+        new GeneralizedTime({
+            valueDate: new Date()
+        });
+
+        new GeneralizedTime({
+            valueHex: new ArrayBuffer(10)
+        });
+
+        new GeneralizedTime({
+            warnings: ["a"]
+        });
+
+        const b = new GeneralizedTime();
+
+        num = b.year;
+        num = b.month;
+        num = b.day;
+        num = b.hour;
+        num = b.minute;
+        num = b.second;
+        num = b.millisecond;
+
+        arrBuf = b.toBuffer();
+
+        b.fromDate(new Date());
+
+        date = b.toDate();
+
+        namespace idblock {
+            num = b.idBlock.blockLength;
+            str = b.idBlock.error;
+            bool = b.idBlock.isConstructed;
+            bool = b.idBlock.isHexOnly;
+            num = b.idBlock.tagClass;
+            num = b.idBlock.tagNumber;
+            arrBuf = b.idBlock.toBER();
+            {
+                const j = b.idBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+            arrBuf = b.idBlock.valueBeforeDecode;
+            arrBuf = b.idBlock.valueHex;
+            str = b.idBlock.warnings[0];
+        }
+
+        namespace lenblock {
+            num = b.lenBlock.blockLength;
+            str = b.lenBlock.error;
+            b.lenBlock.fromBER(new ArrayBuffer(10), 1, 1);
+            bool = b.lenBlock.isIndefiniteForm;
+            num = b.lenBlock.length;
+            bool = b.lenBlock.longFormUsed;
+            arrBuf = b.lenBlock.toBER();
+            {
+                const j = b.lenBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+            arrBuf = b.lenBlock.valueBeforeDecode;
+            str = b.lenBlock.warnings[0];
+        }
+
+        arrBuf = b.toBER();
+        arrBuf = b.toBER(true);
+
+        {
+            const j = b.toJSON();
+            num = j.blockLength;
+            str = j.blockName;
+            str = j.error;
+            arrBuf = j.valueBeforeDecode;
+            str = j.warnings[0];
+        }
+        arrBuf = b.valueBeforeDecode;
+
+        namespace valueBlock {
+            num = b.valueBlock.blockLength;
+            str = b.valueBlock.error;
+            b.valueBlock.fromBER(new ArrayBuffer(10), 0, 0);
+            arrBuf = b.valueBlock.toBER();
+            {
+                const j = b.valueBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+            bool = b.valueBlock.isHexOnly;
+            str = b.valueBlock.value;
+            arrBuf = b.valueBlock.valueBeforeDecode;
+            arrBuf = b.valueBlock.valueHex;
+            str = b.valueBlock.warnings[0];
+        }
+
+        str = b.warnings[0];
+    }
+
+    namespace DATE {
+        const {
+            DATE
+        } = asn1;
+
+        new DATE({
+            value: "ha"
+        });
+
+        const b = new DATE({
+            value: "a"
+        });
+
+        namespace idblock {
+            num = b.idBlock.blockLength;
+            str = b.idBlock.error;
+            bool = b.idBlock.isConstructed;
+            bool = b.idBlock.isHexOnly;
+            num = b.idBlock.tagClass;
+            num = b.idBlock.tagNumber;
+            arrBuf = b.idBlock.toBER();
+            {
+                const j = b.idBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+            arrBuf = b.idBlock.valueBeforeDecode;
+            arrBuf = b.idBlock.valueHex;
+            str = b.idBlock.warnings[0];
+        }
+
+        namespace lenblock {
+            num = b.lenBlock.blockLength;
+            str = b.lenBlock.error;
+            b.lenBlock.fromBER(new ArrayBuffer(10), 1, 1);
+            bool = b.lenBlock.isIndefiniteForm;
+            num = b.lenBlock.length;
+            bool = b.lenBlock.longFormUsed;
+            arrBuf = b.lenBlock.toBER();
+            {
+                const j = b.lenBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+            arrBuf = b.lenBlock.valueBeforeDecode;
+            str = b.lenBlock.warnings[0];
+        }
+
+        arrBuf = b.toBER();
+        arrBuf = b.toBER(true);
+
+        {
+            const j = b.toJSON();
+            num = j.blockLength;
+            str = j.blockName;
+            str = j.error;
+            arrBuf = j.valueBeforeDecode;
+            str = j.warnings[0];
+        }
+        arrBuf = b.valueBeforeDecode;
+
+        namespace valueBlock {
+            num = b.valueBlock.blockLength;
+            str = b.valueBlock.error;
+            b.valueBlock.fromBER(new ArrayBuffer(10), 0, 0);
+            arrBuf = b.valueBlock.toBER();
+            {
+                const j = b.valueBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+            str = b.valueBlock.toString();
+            arrBuf = b.valueBlock.valueBeforeDecode;
+            str = b.valueBlock.warnings[0];
+            bool = b.valueBlock.isHexOnly;
+            arrBuf = b.valueBlock.valueHex;
+        }
+
+        str = b.warnings[0];
+    }
+
+    namespace TimeOfDay {
+        const {
+            TimeOfDay
+        } = asn1;
+
+        new TimeOfDay({
+            value: "ha"
+        });
+
+        const b = new TimeOfDay({
+            value: "a"
+        });
+
+        namespace idblock {
+            num = b.idBlock.blockLength;
+            str = b.idBlock.error;
+            bool = b.idBlock.isConstructed;
+            bool = b.idBlock.isHexOnly;
+            num = b.idBlock.tagClass;
+            num = b.idBlock.tagNumber;
+            arrBuf = b.idBlock.toBER();
+            {
+                const j = b.idBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+            arrBuf = b.idBlock.valueBeforeDecode;
+            arrBuf = b.idBlock.valueHex;
+            str = b.idBlock.warnings[0];
+        }
+
+        namespace lenblock {
+            num = b.lenBlock.blockLength;
+            str = b.lenBlock.error;
+            b.lenBlock.fromBER(new ArrayBuffer(10), 1, 1);
+            bool = b.lenBlock.isIndefiniteForm;
+            num = b.lenBlock.length;
+            bool = b.lenBlock.longFormUsed;
+            arrBuf = b.lenBlock.toBER();
+            {
+                const j = b.lenBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+            arrBuf = b.lenBlock.valueBeforeDecode;
+            str = b.lenBlock.warnings[0];
+        }
+
+        arrBuf = b.toBER();
+        arrBuf = b.toBER(true);
+
+        {
+            const j = b.toJSON();
+            num = j.blockLength;
+            str = j.blockName;
+            str = j.error;
+            arrBuf = j.valueBeforeDecode;
+            str = j.warnings[0];
+        }
+        arrBuf = b.valueBeforeDecode;
+
+        namespace valueBlock {
+            num = b.valueBlock.blockLength;
+            str = b.valueBlock.error;
+            b.valueBlock.fromBER(new ArrayBuffer(10), 0, 0);
+            arrBuf = b.valueBlock.toBER();
+            {
+                const j = b.valueBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+            str = b.valueBlock.toString();
+            arrBuf = b.valueBlock.valueBeforeDecode;
+            str = b.valueBlock.warnings[0];
+            bool = b.valueBlock.isHexOnly;
+            arrBuf = b.valueBlock.valueHex;
+        }
+
+        str = b.warnings[0];
+    }
+
+    namespace DateTime {
+        const {
+            DateTime
+        } = asn1;
+
+        new DateTime({
+            value: "ha"
+        });
+
+        const b = new DateTime({
+            value: "a"
+        });
+
+        namespace idblock {
+            num = b.idBlock.blockLength;
+            str = b.idBlock.error;
+            bool = b.idBlock.isConstructed;
+            bool = b.idBlock.isHexOnly;
+            num = b.idBlock.tagClass;
+            num = b.idBlock.tagNumber;
+            arrBuf = b.idBlock.toBER();
+            {
+                const j = b.idBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+            arrBuf = b.idBlock.valueBeforeDecode;
+            arrBuf = b.idBlock.valueHex;
+            str = b.idBlock.warnings[0];
+        }
+
+        namespace lenblock {
+            num = b.lenBlock.blockLength;
+            str = b.lenBlock.error;
+            b.lenBlock.fromBER(new ArrayBuffer(10), 1, 1);
+            bool = b.lenBlock.isIndefiniteForm;
+            num = b.lenBlock.length;
+            bool = b.lenBlock.longFormUsed;
+            arrBuf = b.lenBlock.toBER();
+            {
+                const j = b.lenBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+            arrBuf = b.lenBlock.valueBeforeDecode;
+            str = b.lenBlock.warnings[0];
+        }
+
+        arrBuf = b.toBER();
+        arrBuf = b.toBER(true);
+
+        {
+            const j = b.toJSON();
+            num = j.blockLength;
+            str = j.blockName;
+            str = j.error;
+            arrBuf = j.valueBeforeDecode;
+            str = j.warnings[0];
+        }
+        arrBuf = b.valueBeforeDecode;
+
+        namespace valueBlock {
+            num = b.valueBlock.blockLength;
+            str = b.valueBlock.error;
+            b.valueBlock.fromBER(new ArrayBuffer(10), 0, 0);
+            arrBuf = b.valueBlock.toBER();
+            {
+                const j = b.valueBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+            str = b.valueBlock.toString();
+            arrBuf = b.valueBlock.valueBeforeDecode;
+            str = b.valueBlock.warnings[0];
+            bool = b.valueBlock.isHexOnly;
+            arrBuf = b.valueBlock.valueHex;
+        }
+
+        str = b.warnings[0];
+    }
+
+    namespace Duration {
+        const {
+            Duration
+        } = asn1;
+
+        new Duration({
+            value: "ha"
+        });
+
+        const b = new Duration({
+            value: "a"
+        });
+
+        namespace idblock {
+            num = b.idBlock.blockLength;
+            str = b.idBlock.error;
+            bool = b.idBlock.isConstructed;
+            bool = b.idBlock.isHexOnly;
+            num = b.idBlock.tagClass;
+            num = b.idBlock.tagNumber;
+            arrBuf = b.idBlock.toBER();
+            {
+                const j = b.idBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+            arrBuf = b.idBlock.valueBeforeDecode;
+            arrBuf = b.idBlock.valueHex;
+            str = b.idBlock.warnings[0];
+        }
+
+        namespace lenblock {
+            num = b.lenBlock.blockLength;
+            str = b.lenBlock.error;
+            b.lenBlock.fromBER(new ArrayBuffer(10), 1, 1);
+            bool = b.lenBlock.isIndefiniteForm;
+            num = b.lenBlock.length;
+            bool = b.lenBlock.longFormUsed;
+            arrBuf = b.lenBlock.toBER();
+            {
+                const j = b.lenBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+            arrBuf = b.lenBlock.valueBeforeDecode;
+            str = b.lenBlock.warnings[0];
+        }
+
+        arrBuf = b.toBER();
+        arrBuf = b.toBER(true);
+
+        {
+            const j = b.toJSON();
+            num = j.blockLength;
+            str = j.blockName;
+            str = j.error;
+            arrBuf = j.valueBeforeDecode;
+            str = j.warnings[0];
+        }
+        arrBuf = b.valueBeforeDecode;
+
+        namespace valueBlock {
+            num = b.valueBlock.blockLength;
+            str = b.valueBlock.error;
+            b.valueBlock.fromBER(new ArrayBuffer(10), 0, 0);
+            arrBuf = b.valueBlock.toBER();
+            {
+                const j = b.valueBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+            str = b.valueBlock.toString();
+            arrBuf = b.valueBlock.valueBeforeDecode;
+            str = b.valueBlock.warnings[0];
+            bool = b.valueBlock.isHexOnly;
+            arrBuf = b.valueBlock.valueHex;
+        }
+
+        str = b.warnings[0];
+    }
+
+    namespace TIME {
+        const {
+            TIME
+        } = asn1;
+
+        new TIME({
+            value: "ha"
+        });
+
+        const b = new TIME({
+            value: "a"
+        });
+
+        namespace idblock {
+            num = b.idBlock.blockLength;
+            str = b.idBlock.error;
+            bool = b.idBlock.isConstructed;
+            bool = b.idBlock.isHexOnly;
+            num = b.idBlock.tagClass;
+            num = b.idBlock.tagNumber;
+            arrBuf = b.idBlock.toBER();
+            {
+                const j = b.idBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+            arrBuf = b.idBlock.valueBeforeDecode;
+            arrBuf = b.idBlock.valueHex;
+            str = b.idBlock.warnings[0];
+        }
+
+        namespace lenblock {
+            num = b.lenBlock.blockLength;
+            str = b.lenBlock.error;
+            b.lenBlock.fromBER(new ArrayBuffer(10), 1, 1);
+            bool = b.lenBlock.isIndefiniteForm;
+            num = b.lenBlock.length;
+            bool = b.lenBlock.longFormUsed;
+            arrBuf = b.lenBlock.toBER();
+            {
+                const j = b.lenBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+            arrBuf = b.lenBlock.valueBeforeDecode;
+            str = b.lenBlock.warnings[0];
+        }
+
+        arrBuf = b.toBER();
+        arrBuf = b.toBER(true);
+
+        {
+            const j = b.toJSON();
+            num = j.blockLength;
+            str = j.blockName;
+            str = j.error;
+            arrBuf = j.valueBeforeDecode;
+            str = j.warnings[0];
+        }
+        arrBuf = b.valueBeforeDecode;
+
+        namespace valueBlock {
+            num = b.valueBlock.blockLength;
+            str = b.valueBlock.error;
+            b.valueBlock.fromBER(new ArrayBuffer(10), 0, 0);
+            arrBuf = b.valueBlock.toBER();
+            {
+                const j = b.valueBlock.toJSON();
+                num = j.blockLength;
+                str = j.blockName;
+                str = j.error;
+                arrBuf = j.valueBeforeDecode;
+                str = j.warnings[0];
+            }
+            str = b.valueBlock.toString();
+            arrBuf = b.valueBlock.valueBeforeDecode;
+            str = b.valueBlock.warnings[0];
+            bool = b.valueBlock.isHexOnly;
+            arrBuf = b.valueBlock.valueHex;
+        }
+
+        str = b.warnings[0];
+    }
+
+    namespace Choice {
+        const {
+            Choice
+        } = asn1;
+
+        new Choice({
+            optional: true
+        });
+
+        const c = new Choice({
+            value: [new asn1.Integer({ value: 10 })]
+        });
+
+        c.value[0].toBER();
+        bool = c.optional;
+    }
+
+    namespace Any {
+        const {
+            Any
+        } = asn1;
+
+        const a = new Any({
+            name: "A",
+            optional: true
+        });
+
+        str = a.name;
+        bool = a.optional;
+    }
+
+    namespace Repeated {
+        const {
+            Repeated
+        } = asn1;
+
+        new Repeated();
+        new Repeated({
+            local: true
+        });
+        new Repeated({
+            name: "a"
+        });
+        new Repeated({
+            optional: true
+        });
+        const r = new Repeated({
+            value: new asn1.Any()
+        });
+
+        str = r.name;
+        bool = r.optional;
+        str = r.value.name;
+        bool = r.value.optional;
+        bool = r.local;
+    }
+
+    namespace RawData {
+        const {
+            RawData
+        } = asn1;
+
+        const r = new RawData({
+            data: new ArrayBuffer(10)
+        });
+        arrBuf = r.data;
+        num = r.fromBER(new ArrayBuffer(10), 0, 0);
+        arrBuf = r.toBER();
+    }
+
+    namespace fromBER {
+        const r = asn1.fromBER(new ArrayBuffer(10));
+        num = r.offset;
+        const { result } = r;
+        num = result.blockLength;
+        str = result.error;
+        {
+            const j = result.toJSON();
+            num = j.blockLength;
+            str = j.blockName;
+            str = j.error;
+            arrBuf = j.valueBeforeDecode;
+            str = j.warnings[0];
+        }
+        arrBuf = result.valueBeforeDecode;
+        str = result.warnings[0];
+    }
+
+    namespace compareSchema {
+        const res = asn1.compareSchema({}, {}, {});
+        bool = res.verified;
+        res.result;
+    }
+
+    namespace verifySchema {
+        const res = asn1.verifySchema(new ArrayBuffer(10), {});
+        bool = res.verified;
+        res.result;
+    }
+}
diff --git a/types/adone/test/glosses/crypto/ed25519.ts b/types/adone/test/glosses/crypto/ed25519.ts
new file mode 100644
index 0000000000..8c0326abf9
--- /dev/null
+++ b/types/adone/test/glosses/crypto/ed25519.ts
@@ -0,0 +1,28 @@
+namespace adoneTests.crypto.ed25519 {
+    const {
+        crypto: {
+            ed25519
+        }
+    } = adone;
+
+    let buf: Buffer;
+    let num: number;
+    let bool: boolean;
+
+    num = ed25519.privateKeyLength;
+    num = ed25519.publicKeyLength;
+
+    const pair = ed25519.generateKeyPair(Buffer.from("123"));
+    buf = pair.publicKey;
+    buf = pair.privateKey;
+
+    buf = ed25519.sign(Buffer.from("hello"), Buffer.from("seed"));
+    buf = ed25519.sign(Buffer.from("hello"), {
+        publicKey: Buffer.from("hello"),
+        privateKey: Buffer.from("hello")
+    });
+
+    buf = ed25519.sign(Buffer.from("hello"), ed25519.generateKeyPair(Buffer.from("hello")));
+
+    bool = ed25519.verify(Buffer.from("hello"), Buffer.from("world"), Buffer.from("key"));
+}
diff --git a/types/adone/test/glosses/crypto/secp256k1.ts b/types/adone/test/glosses/crypto/secp256k1.ts
new file mode 100644
index 0000000000..5f80b61537
--- /dev/null
+++ b/types/adone/test/glosses/crypto/secp256k1.ts
@@ -0,0 +1,97 @@
+namespace adoneTests.crypto.secp256k1 {
+    const {
+        crypto: {
+            secp256k1
+        }
+    } = adone;
+
+    let bool: boolean;
+    let buf: Buffer;
+    let num: number;
+
+    const privateKey = Buffer.from("hello");
+    const tweak = Buffer.from("world");
+    const publicKey = Buffer.from("olleh");
+    const signature = Buffer.from("dlrow");
+
+    bool = secp256k1.privateKeyVerify(privateKey);
+
+    buf = secp256k1.privateKeyExport(privateKey);
+    buf = secp256k1.privateKeyExport(privateKey, true);
+
+    buf = secp256k1.privateKeyImport(privateKey);
+
+    buf = secp256k1.privateKeyNegate(privateKey);
+
+    buf = secp256k1.privateKeyTweakAdd(privateKey, tweak);
+
+    buf = secp256k1.privateKeyTweakMul(privateKey, tweak);
+
+    buf = secp256k1.publicKeyConvert(publicKey);
+    buf = secp256k1.publicKeyConvert(publicKey, true);
+
+    bool = secp256k1.publicKeyVerify(publicKey);
+
+    buf = secp256k1.publicKeyTweakAdd(publicKey, tweak);
+    buf = secp256k1.publicKeyTweakAdd(publicKey, tweak, true);
+
+    buf = secp256k1.publicKeyTweakMul(publicKey, tweak);
+    buf = secp256k1.publicKeyTweakMul(publicKey, tweak, true);
+
+    buf = secp256k1.publicKeyCombine([publicKey, publicKey]);
+    buf = secp256k1.publicKeyCombine([publicKey, publicKey], true);
+
+    buf = secp256k1.signatureNormalize(signature);
+
+    buf = secp256k1.signatureExport(signature);
+
+    buf = secp256k1.signatureImport(signature);
+
+    buf = secp256k1.signatureImportLax(signature);
+
+    const message = Buffer.from("msg");
+
+    {
+        const res = secp256k1.sign(message, privateKey);
+        buf = res.signature;
+        num = res.recovery;
+    }
+    {
+        const res = secp256k1.sign(message, privateKey, {});
+        buf = res.signature;
+        num = res.recovery;
+    }
+    {
+        const res = secp256k1.sign(message, privateKey, {
+            data: null
+        });
+        buf = res.signature;
+        num = res.recovery;
+    }
+    {
+        const res = secp256k1.sign(message, privateKey, {
+            data: Buffer.from("123")
+        });
+        buf = res.signature;
+        num = res.recovery;
+    }
+    {
+        const res = secp256k1.sign(message, privateKey, {
+            noncefn(msg: Buffer, privateKey: Buffer, algo: Buffer, data: Buffer, attempt: number) {
+                return Buffer.from("hehe");
+            }
+        });
+        buf = res.signature;
+        num = res.recovery;
+    }
+
+    bool = secp256k1.verify(message, signature, publicKey);
+
+    buf = secp256k1.recover(message, signature, 1);
+    buf = secp256k1.recover(message, signature, 1, true);
+
+    buf = secp256k1.ecdh(publicKey, privateKey);
+
+    buf = secp256k1.ecdhUnsafe(publicKey, privateKey);
+    buf = secp256k1.ecdhUnsafe(publicKey, privateKey, true);
+}
diff --git a/types/adone/test/glosses/data.ts b/types/adone/test/glosses/data.ts
index e9ef88d14b..00403a56da 100644
--- a/types/adone/test/glosses/data.ts
+++ b/types/adone/test/glosses/data.ts
@@ -570,4 +570,277 @@ namespace dataTests {
         bson.decode(bson.encode({ a: 1 }), { promoteLongs: false }).a;
         bson.decode(bson.encode({ a: 1 }), { promoteValues: true }).a;
     }
+
+    namespace protobuf {
+        const {
+            protobuf
+        } = data;
+
+        protobuf.create("hello");
+        protobuf.create(Buffer.from("hello"));
+        protobuf.create({});
+        protobuf.create({}, {});
+
+        namespace schema {
+            const {
+                schema
+            } = protobuf;
+
+            const s = schema.parse("hello");
+            s.syntax;
+            s.package;
+            if (!adone.is.null(s.package)) {
+                const c: string = s.package;
+            }
+            s.imports[0].charCodeAt(100);
+
+            namespace enums {
+                const [a] = s.enums;
+                a.name.charCodeAt(100);
+                a.values;
+                a.options;
+            }
+
+            namespace message {
+                const [msg] = s.messages;
+                msg.name;
+                {
+                    const [a] = msg.enums;
+                    a.name;
+                    a.options;
+                    a.values;
+                }
+                {
+                    const [a] = msg.extends;
+                    a.name;
+                    a.message;
+                }
+                {
+                    const [a] = msg.messages;
+                    a.name;
+                    a.enums;
+                    a.extends;
+                    a.messages;
+                    a.fields;
+                    a.extensions;
+                }
+                {
+                    const [a] = msg.fields;
+                    if (!adone.is.null(a.name)) {
+                        a.name.charCodeAt(100);
+                    }
+                    if (!adone.is.null(a.type)) {
+                        a.type.charCodeAt(100);
+                    }
+                    a.tag === 3;
+                    if (!adone.is.null(a.map)) {
+                        a.map.from.charCodeAt(100);
+                        a.map.to.charCodeAt(100);
+                    }
+                    if (!adone.is.null(a.oneof)) {
+                        a.oneof.charCodeAt(100);
+                    }
+                    a.required === false;
+                    a.repeated === true;
+                    a.options;
+                }
+                if (!adone.is.null(msg.extensions)) {
+                    msg.extensions.from === 2;
+                    msg.extensions.to === 3;
+                }
+            }
+
+            s.options;
+
+            s.extends[0].message;
+            s.extends[0].name;
+
+            if (!adone.is.nil(s.services)) {
+                const [svc] = s.services;
+
+                svc.name.charCodeAt(100);
+                svc.options;
+
+                const [m] = svc.methods;
+
+                m.name.charCodeAt(100);
+                if (!adone.is.null(m.input_type)) {
+                    m.input_type.charCodeAt(100);
+                }
+                if (!adone.is.null(m.output_type)) {
+                    m.output_type.charCodeAt(100);
+                }
+                m.client_streaming === true;
+                m.server_streaming === true;
+                m.options;
+            }
+        }
+    }
+
+    namespace base32 {
+        const {
+            base32
+        } = data;
+
+        base32.charmap("asd");
+        base32.charmap("asd", {});
+
+        base32.rfc4648.alphabet.charCodeAt(0);
+        base32.rfc4648.charmap["X"] === 2;
+
+        base32.crockford.alphabet.charCodeAt(0);
+        base32.crockford.charmap["X"] === 2;
+
+        base32.base32hex.alphabet.charCodeAt(0);
+        base32.base32hex.charmap["X"] === 2;
+
+        namespace decoder {
+            const {
+                Decoder
+            } = base32;
+            new Decoder();
+            new Decoder({
+                type: "base32hex"
+            });
+            new Decoder({
+                type: "crockford"
+            });
+            new Decoder({
+                type: "rfc4648"
+            });
+            new Decoder({
+                type: "rfc4648",
+                charmap: {}
+            });
+            const d = new Decoder();
+            d.write("asd").write("aa");
+            { const a: Buffer = d.finalize(); }
+            { const a: Buffer = d.finalize("c"); }
+        }
+
+        namespace encoder {
+            const {
+                Encoder
+            } = base32;
+
+            new Encoder();
+            new Encoder({
+                type: "base32hex"
+            });
+            new Encoder({
+                type: "crockford"
+            });
+            new Encoder({
+                type: "rfc4648"
+            });
+            new Encoder({
+                type: "rfc4648",
+                alphabet: "a"
+            });
+
+            const e = new Encoder();
+            e.write(Buffer.from("b")).write(Buffer.from("a"));
+            { const a: string = e.finalize(); }
+            { const a: string = e.finalize(Buffer.from("c")); }
+        }
+
+        base32.encode(Buffer.from("hello")).charCodeAt(100);
+        base32.encode(Buffer.from("hello"), {
+            type: "rfc4648"
+        }).charCodeAt(100);
+        base32.encode(Buffer.from("hello"), {
+            type: "crockford"
+        }).charCodeAt(100);
+        base32.encode(Buffer.from("hello"), {
+            type: "base32hex"
+        }).charCodeAt(100);
+        base32.encode(Buffer.from("hello"), {
+            type: "base32hex",
+            alphabet: "asd"
+        }).charCodeAt(100);
+
+        base32.decode("asd").writeUInt8(100, 0);
+        base32.decode("asd", {
+            type: "base32hex"
+        }).writeUInt8(100, 0);
+        base32.decode("asd", {
+            type: "crockford"
+        }).writeUInt8(100, 0);
+        base32.decode("asd", {
+            type: "rfc4648"
+        }).writeUInt8(100, 0);
+        base32.decode("asd", {
+            type: "rfc4648",
+            charmap: {}
+        }).writeUInt8(100, 0);
+    }
+
+    namespace basex {
+        const {
+            basex
+        } = data;
+
+        const d = basex("abc");
+        const a: Buffer = d.decode("str");
+        const b: string = d.encode(Buffer.from("hello"));
+        const c: Buffer = d.decodeUnsafe("hello");
+    }
+
+    namespace base58 {
+        const {
+            base58
+        } = data;
+
+        const a: Buffer = base58.decode("str");
+        const b: string = base58.encode(Buffer.from("hello"));
+        const c: Buffer = base58.decodeUnsafe("hello");
+    }
+
+    namespace base64url {
+        const {
+            base64url
+        } = data;
+
+        base64url.unescape("a").charCodeAt(100);
+        base64url.escape("a").charCodeAt(100);
+
+        base64url.encode("a").charCodeAt(100);
+        base64url.encode(Buffer.from("a")).charCodeAt(100);
+        base64url.encode(Buffer.from("a"), {}).charCodeAt(100);
+        base64url.encode(Buffer.from("a"), {
+            encoding: "utf8"
+        }).charCodeAt(100);
+
+        base64url.decode("a").charCodeAt(100);
+        base64url.decode("a", { buffer: true }).writeUInt8(0, 0);
+        base64url.decode("a", { encoding: "utf8" }).charCodeAt(100);
+    }
+
+    namespace varint {
+        const {
+            varint
+        } = data;
+
+        varint.encode(12)[0];
+        varint.encode(12, [])[0];
+        varint.encode(12, [], 1)[0];
+
+        varint.decode(Buffer.from("hello")) === 5;
+        varint.decode(Buffer.from("hello"), 2) === 5;
+        varint.encodingLength(100500) === 5;
+    }
+
+    namespace varintSigned {
+        const {
+            varintSigned
+        } = data;
+
+        varintSigned.encode(12)[0];
+        varintSigned.encode(12, [])[0];
+        varintSigned.encode(12, [], 1)[0];
+
+        varintSigned.decode(Buffer.from("hello")) === 5;
+        varintSigned.decode(Buffer.from("hello"), 2) === 5;
+        varintSigned.encodingLength(100500) === 5;
+    }
 }
diff --git a/types/adone/test/glosses/fake.ts b/types/adone/test/glosses/fake.ts
new file mode 100644
index 0000000000..016d7ba7b0
--- /dev/null
+++ b/types/adone/test/glosses/fake.ts
@@ -0,0 +1,206 @@
+namespace adoneTests.fake {
+    const {
+        fake
+    } = adone;
+
+    { const a: string = fake.address.zipCode(); }
+    { const a: string = fake.address.zipCode('###'); }
+    { const a: string = fake.address.city(); }
+    { const a: string = fake.address.city(0); }
+    { const a: string = fake.address.cityPrefix(); }
+    { const a: string = fake.address.citySuffix(); }
+    { const a: string = fake.address.streetName(); }
+    { const a: string = fake.address.streetAddress(); }
+    { const a: string = fake.address.streetAddress(false); }
+    { const a: string = fake.address.streetSuffix(); }
+    { const a: string = fake.address.streetPrefix(); }
+    { const a: string = fake.address.secondaryAddress(); }
+    { const a: string = fake.address.county(); }
+    { const a: string = fake.address.country(); }
+    { const a: string = fake.address.countryCode(); }
+    { const a: string = fake.address.state(); }
+    { const a: string = fake.address.state(false); }
+    { const a: string = fake.address.stateAbbr(); }
+    { const a: string = fake.address.latitude(); }
+    { const a: string = fake.address.longitude(); }
+
+    { const a: string = fake.commerce.color(); }
+    { const a: string = fake.commerce.department(); }
+    { const a: string = fake.commerce.productName(); }
+    { const a: string = fake.commerce.price(); }
+    { const a: string = fake.commerce.price(0, 0, 0, '#'); }
+    { const a: string = fake.commerce.productAdjective(); }
+    { const a: string = fake.commerce.productMaterial(); }
+    { const a: string = fake.commerce.product(); }
+
+    { const a: string[] = fake.company.suffixes(); }
+    { const a: string = fake.company.companyName(); }
+    { const a: string = fake.company.companyName(0); }
+    { const a: string = fake.company.companySuffix(); }
+    { const a: string = fake.company.catchPhrase(); }
+    { const a: string = fake.company.bs(); }
+    { const a: string = fake.company.catchPhraseAdjective(); }
+    { const a: string = fake.company.catchPhraseDescriptor(); }
+    { const a: string = fake.company.catchPhraseNoun(); }
+    { const a: string = fake.company.bsAdjective(); }
+    { const a: string = fake.company.bsBuzz(); }
+    { const a: string = fake.company.bsNoun(); }
+
+    { const a: string = fake.database.column(); }
+    { const a: string = fake.database.type(); }
+    { const a: string = fake.database.collation(); }
+    { const a: string = fake.database.engine(); }
+
+    { const a: Date = fake.date.past(); }
+    { const a: Date = fake.date.future(); }
+    { const a: Date = fake.date.between('foo', 'bar'); }
+    { const a: Date = fake.date.between(new Date(), new Date()); }
+    { const a: Date = fake.date.recent(); }
+    { const a: Date = fake.date.recent(100); }
+    { const a: Date = fake.date.soon(); }
+    { const a: Date = fake.date.soon(30); }
+    { const a: string = fake.date.month(); }
+    { const a: string = fake.date.month({
+        abbr: true,
+        context: true
+    }); }
+    { const a: string = fake.date.weekday(); }
+    { const a: string = fake.date.weekday({
+        abbr: true,
+        context: true
+    }); }
+
+    { const a: string = fake.finance.account(); }
+    { const a: string = fake.finance.account(0); }
+    { const a: string = fake.finance.accountName(); }
+    { const a: string = fake.finance.mask(); }
+    { const a: string = fake.finance.mask(0, false, false); }
+    { const a: string = fake.finance.amount(); }
+    { const a: string = fake.finance.amount(0, 0, 0, '#'); }
+    { const a: string = fake.finance.transactionType(); }
+    { const a: string = fake.finance.currencyCode(); }
+    { const a: string = fake.finance.currencyName(); }
+    { const a: string = fake.finance.currencySymbol(); }
+    { const a: string = fake.finance.bitcoinAddress(); }
+    { const a: string = fake.finance.ethereumAddress(); }
+    { const a: string = fake.finance.iban(); }
+    { const a: string = fake.finance.iban(true); }
+    { const a: string = fake.finance.bic(); }
+
+    { const a: string = fake.hacker.abbreviation(); }
+    { const a: string = fake.hacker.adjective(); }
+    { const a: string = fake.hacker.noun(); }
+    { const a: string = fake.hacker.verb(); }
+    { const a: string = fake.hacker.ingverb(); }
+    { const a: string = fake.hacker.phrase(); }
+
+    { const a: string = fake.helpers.randomize(); }
+    { const a: number = fake.helpers.randomize([1, 2, 3, 4]); }
+    { const a: string = fake.helpers.randomize(['foo', 'bar', 'quux']); }
+    { const a: string = fake.helpers.slugify('foo bar quux'); }
+    { const a: string = fake.helpers.replaceSymbolWithNumber('foo# bar#'); }
+    { const a: string = fake.helpers.replaceSymbols('foo# bar? quux#'); }
+    { const a: string[] = fake.helpers.shuffle(['foo', 'bar', 'quux']); }
+    { const a: string = fake.helpers.mustache('{{foo}}{{bar}}', {foo: 'x', bar: 'y'}); }
+
+    const card = fake.helpers.createCard();
+    { const a: string = card.name; }
+    { const a: string = card.address.streetA; }
+    const contextualCard = fake.helpers.contextualCard();
+    { const a: string = contextualCard.name; }
+    { const a: string = contextualCard.address.suite; }
+    const userCard = fake.helpers.userCard();
+    { const a: string = userCard.name; }
+    { const a: string = userCard.address.suite; }
+
+    { const a: string = fake.internet.avatar(); }
+    { const a: string = fake.internet.email(); }
+    { const a: string = fake.internet.email('foo', 'bar', 'quux'); }
+    { const a: string = fake.internet.exampleEmail(); }
+    { const a: string = fake.internet.exampleEmail('foo', 'bar'); }
+    { const a: string = fake.internet.protocol(); }
+    { const a: string = fake.internet.url(); }
+    { const a: string = fake.internet.domainName(); }
+    { const a: string = fake.internet.domainSuffix(); }
+    { const a: string = fake.internet.domainWord(); }
+    { const a: string = fake.internet.ip(); }
+    { const a: string = fake.internet.userAgent(); }
+    { const a: string = fake.internet.color(); }
+    { const a: string = fake.internet.color(0, 0, 0); }
+    { const a: string = fake.internet.mac(); }
+    { const a: string = fake.internet.password(); }
+    { const a: string = fake.internet.password(0, false, '#', 'foo'); }
+
+    { const a: string = fake.lorem.word(); }
+    { const a: string = fake.lorem.words(); }
+    { const a: string = fake.lorem.words(0); }
+    { const a: string = fake.lorem.sentence(); }
+    { const a: string = fake.lorem.sentence(0, 0); }
+    { const a: string = fake.lorem.slug(); }
+    { const a: string = fake.lorem.slug(0); }
+    { const a: string = fake.lorem.sentences(); }
+    { const a: string = fake.lorem.sentences(0); }
+    { const a: string = fake.lorem.paragraph(); }
+    { const a: string = fake.lorem.paragraph(0); }
+    { const a: string = fake.lorem.paragraphs(); }
+    { const a: string = fake.lorem.paragraphs(0, ''); }
+    { const a: string = fake.lorem.text(); }
+    { const a: string = fake.lorem.text(0); }
+    { const a: string = fake.lorem.lines(); }
+    { const a: string = fake.lorem.lines(0); }
+
+    { const a: string = fake.name.firstName(); }
+    { const a: string = fake.name.firstName(0); }
+    { const a: string = fake.name.lastName(); }
+    { const a: string = fake.name.lastName(0); }
+    { const a: string = fake.name.findName(); }
+    { const a: string = fake.name.findName('', '', 0); }
+    { const a: string = fake.name.jobTitle(); }
+    { const a: string = fake.name.prefix(); }
+    { const a: string = fake.name.suffix(); }
+    { const a: string = fake.name.title(); }
+    { const a: string = fake.name.jobDescriptor(); }
+    { const a: string = fake.name.jobArea(); }
+    { const a: string = fake.name.jobType(); }
+
+    { const a: string = fake.phone.phoneNumber(); }
+    { const a: string = fake.phone.phoneNumber('#'); }
+    { const a: string = fake.phone.phoneNumberFormat(); }
+    { const a: string = fake.phone.phoneNumberFormat(0); }
+    { const a: string = fake.phone.phoneFormats(); }
+
+    { const a: number = fake.random.number(); }
+    { const a: number = fake.random.number(0); }
+    { const a: number = fake.random.number({
+        min: 0,
+        max: 0,
+        precision: 0
+    }); }
+    { const a: string = fake.random.arrayElement(); }
+    { const a: string = fake.random.arrayElement(['foo', 'bar', 'quux']); }
+    { const a: string = fake.random.objectElement(); }
+    { const a: string = fake.random.objectElement({foo: 'bar', field: 'foo'}); }
+    { const a: string = fake.random.uuid(); }
+    { const a: boolean = fake.random.boolean(); }
+    { const a: string = fake.random.word(); }
+    { const a: string = fake.random.word("noun"); }
+    { const a: string = fake.random.words(); }
+    { const a: string = fake.random.words(0); }
+    { const a: string = fake.random.image(); }
+    { const a: string = fake.random.locale(); }
+    { const a: string = fake.random.alphaNumeric(); }
+    { const a: string = fake.random.alphaNumeric(0); }
+    { const a: string = fake.random.hexaDecimal(); }
+    { const a: string = fake.random.hexaDecimal(3); }
+
+    { const a: string = fake.system.fileName("foo", "bar"); }
+    { const a: string = fake.system.commonFileName("foo", "bar"); }
+    { const a: string = fake.system.mimeType(); }
+    { const a: string = fake.system.commonFileType(); }
+    { const a: string = fake.system.commonFileExt(); }
+    { const a: string = fake.system.fileType(); }
+    { const a: string = fake.system.fileExt("foo"); }
+    { const a: string = fake.system.directoryPath(); }
+    { const a: string = fake.system.filePath(); }
+    { const a: string = fake.system.semver(); }
+}
diff --git a/types/adone/test/glosses/is.ts b/types/adone/test/glosses/is.ts
index 13b00530d7..045818f0ec 100644
--- a/types/adone/test/glosses/is.ts
+++ b/types/adone/test/glosses/is.ts
@@ -99,15 +99,34 @@ namespace isTests {
         }
     }
     { const a: boolean = is.json({}); }
-    { const a: boolean = is.object({}); }
-    { const a: boolean = is.plainObject({}); }
+    {
+        const a: boolean = is.object({});
+        const b: any = 2;
+        if (is.object(b)) {
+            const c: object = b;
+        }
+    }
+    {
+        const a: boolean = is.plainObject({});
+        const b: any = 2;
+        if (is.plainObject(b)) {
+            const c: object = b;
+        }
+    }
     { const a: boolean = is.class({}); }
     { const a: boolean = is.emptyObject({}); }
     { const a: boolean = is.propertyOwned({}, "a"); }
     { const a: boolean = is.propertyDefined({}, "a"); }
     { const a: boolean = is.conforms({}, {}); }
     { const a: boolean = is.conforms({}, {}, true); }
-    { const a: boolean = is.arrayLikeObject({}); }
+    {
+        const a: boolean = is.arrayLikeObject({});
+        const b: any = {};
+        if (is.arrayLikeObject(b)) {
+            const c: number = b.length;
+            b[0];
+        }
+    }
     { const a: boolean = is.inArray(1, [1, 2, 3]); }
     { const a: boolean = is.inArray(1, [1, 2, 3], 0); }
     { const a: boolean = is.inArray(1, [1, 2, 3], 0, (a, b) => a === b); }
@@ -133,8 +152,20 @@ namespace isTests {
         }
     }
     { const a: boolean = is.dotfile("abc"); }
-    { const a: boolean = is.function(() => { }); }
-    { const a: boolean = is.asyncFunction(async () => { }); }
+    {
+        const a: boolean = is.function(() => { });
+        const b: any = 2;
+        if (is.function(b)) {
+            b();
+        }
+    }
+    {
+        const a: boolean = is.asyncFunction(async () => { });
+        const b: any = 2;
+        if (is.asyncFunction(b)) {
+            b().then(() => {});
+        }
+    }
     {
         const a: boolean = is.promise({});
         const b: any = 2;
@@ -155,7 +186,13 @@ namespace isTests {
         }
     }
     { const a: boolean = is.callback({}); }
-    { const a: boolean = is.generator({}); }
+    {
+        const a: boolean = is.generator({});
+        const b: any = 2;
+        if (is.generator(b)) {
+            b().next();
+        }
+    }
     { const a: boolean = is.nan({}); }
     {
         const a: boolean = is.finite({});
@@ -226,13 +263,51 @@ namespace isTests {
         }
     }
     { const a: boolean = is.transform({}); }
-    { const a: boolean = is.subsystem({}); }
-    { const a: boolean = is.application({}); }
+    {
+        const a: boolean = is.subsystem({});
+        const b: any = 2;
+        if (is.subsystem(b)) {
+            b.configureSubsystems().then(() => {});
+        }
+    }
+    {
+        const a: boolean = is.application({});
+        const b: any = 2;
+        if (is.application(b)) {
+            b.exitOnSignal("SIGINT");
+        }
+    }
     { const a: boolean = is.logger({}); }
-    { const a: boolean = is.coreStream({}); }
-    { const a: boolean = is.fastStream({}); }
-    { const a: boolean = is.fastLocalStream({}); }
-    { const a: boolean = is.fastLocalMapStream({}); }
+    {
+        const a: boolean = is.coreStream({});
+        const b: any = 2;
+        if (is.coreStream(b)) {
+            b.map((x) => 2).forEach((t: number) => {
+                //
+            });
+        }
+    }
+    {
+        const a: boolean = is.fastStream({});
+        const b: any = 2;
+        if (is.fastStream(b)) {
+            b.compress("deflate");
+        }
+    }
+    {
+        const a: boolean = is.fastLocalStream({});
+        const b: any = 2;
+        if (is.fastLocalStream(b)) {
+            b.compress("gz");
+        }
+    }
+    {
+        const a: boolean = is.fastLocalMapStream({});
+        const b: any = 2;
+        if (is.fastLocalMapStream(b)) {
+            b.decompress("gz");
+        }
+    }
     { const a: boolean = is.genesisNetron({}); }
     { const a: boolean = is.genesisPeer({}); }
     { const a: boolean = is.netronAdapter({}); }
@@ -248,7 +323,14 @@ namespace isTests {
     { const a: boolean = is.netronStub({}); }
     { const a: boolean = is.netronRemoteStub({}); }
     { const a: boolean = is.netronStream({}); }
-    { const a: boolean = is.iterable({}); }
+    {
+        const a: boolean = is.iterable({});
+        const b: any = 2;
+        if (is.iterable(b)) {
+            const it = b[Symbol.iterator]();
+            it.next();
+        }
+    }
     { const a: boolean = is.windows; }
     { const a: boolean = is.linux; }
     { const a: boolean = is.freebsd; }
diff --git a/types/adone/test/glosses/net/http/client.ts b/types/adone/test/glosses/net/http/client.ts
new file mode 100644
index 0000000000..0992c1576c
--- /dev/null
+++ b/types/adone/test/glosses/net/http/client.ts
@@ -0,0 +1,499 @@
+namespace adoneTests.net.http.client {
+    const {
+        net: {
+            http: {
+                client
+            }
+        }
+    } = adone;
+
+    let bool: boolean;
+    let num: number;
+    let str: string;
+    let buf: Buffer;
+    let stream: nodestd.stream.Readable;
+
+    namespace Client {
+        const {
+            Client
+        } = client;
+
+        new Client();
+        new Client({});
+        new Client({
+            auth: {
+                username: "a"
+            }
+        });
+        new Client({
+            auth: {
+                password: "a"
+            }
+        });
+        new Client({
+            cancelToken: new client.CancelToken(() => {})
+        });
+        new Client({
+            data: Buffer.from("hello")
+        });
+        new Client({
+            data: "hello"
+        });
+        new Client({
+            data: adone.fs.createReadStream(__filename)
+        });
+        new Client({
+            data: new ArrayBuffer(10)
+        });
+        new Client({
+            formData: {
+                a: "string"
+            }
+        });
+        new Client({
+            formData: {
+                a: ["string"]
+            }
+        });
+        new Client({
+            formData: {
+                a: [adone.fs.createReadStream(__filename)]
+            }
+        });
+        new Client({
+            formData: {
+                a: {
+                    value: "string",
+                    options: {}
+                }
+            }
+        });
+        new Client({
+            formData: {
+                a: {
+                    value: "string",
+                    options: {
+                        contentType: "a"
+                    }
+                }
+            }
+        });
+        new Client({
+            formData: {
+                a: {
+                    value: "string",
+                    options: {
+                        filename: "a"
+                    }
+                }
+            }
+        });
+        new Client({
+            formData: {
+                a: {
+                    value: "string",
+                    options: {
+                        header: "a"
+                    }
+                }
+            }
+        });
+        new Client({
+            formData: {
+                a: {
+                    value: "string",
+                    options: {
+                        header: {
+                            a: "a"
+                        }
+                    }
+                }
+            }
+        });
+        new Client({
+            formData: {
+                a: {
+                    value: "string",
+                    options: {
+                        knownLength: 100500
+                    }
+                }
+            }
+        });
+        new Client({
+            formData: {
+                a: [{
+                    value: "string",
+                    options: {
+                        knownLength: 100500
+                    }
+                }]
+            }
+        });
+        new Client({
+            headers: {
+                "User-Agent": "true"
+            }
+        });
+        new Client({
+            httpAgent: {}
+        });
+        new Client({
+            httpsAgent: {}
+        });
+        new Client({
+            maxContentLength: 100500
+        });
+        new Client({
+            maxRedirects: 100500
+        });
+        new Client({
+            method: "GET"
+        });
+        new Client({
+            onUploadProgress(event) {
+                bool = event.lengthComputable;
+                num = event.loaded;
+                num = event.total;
+            }
+        });
+        new Client({
+            params: {
+                a: 1
+            }
+        });
+        new Client({
+            paramsSerializer(params: object) {
+                return "asd";
+            }
+        });
+        new Client({
+            proxy: "socks5://localhost"
+        });
+        new Client({
+            proxy: {
+                protocol: "socks5",
+                host: "127.0.0.1",
+                port: 9000,
+                auth: {
+                    username: "hello",
+                    password: "world"
+                }
+            }
+        });
+
+        new Client({
+            rejectUnauthorized: true
+        });
+        new Client({
+            responseEncoding: "CP1251"
+        });
+        new Client({
+            responseType: "stream"
+        });
+        new Client({
+            timeout: 100
+        });
+        new Client({
+            transformRequest: [(data, headers, config) => {
+                return data;
+            }]
+        });
+        new Client({
+            transformResponse: [(data, headers, config) => {
+                return data;
+            }]
+        });
+        new Client({
+            transport: adone.std.http
+        });
+        new Client({
+            validateStatus(status) {
+                return status > 100;
+            }
+        });
+        new Client({
+            xsrfCookieName: "a"
+        });
+        new Client({
+            xsrfHeaderName: "a"
+        });
+
+        const req = new Client();
+
+        namespace request {
+            req.request({
+                method: "GET"
+            }).then((resp) => {
+                num = resp.status;
+                str = resp.statusText;
+                const len = resp.headers["content-length"];
+                if (!adone.is.undefined(len)) {
+                    str = len;
+                }
+                const data = resp.data;
+                if (!adone.is.object(data)) {
+                    str = data;
+                }
+            });
+            req.request({
+                method: "GET",
+                responseType: "string"
+            }).then((resp) => {
+                num = resp.status;
+                str = resp.statusText;
+                str = resp.data;
+            });
+            req.request({
+                method: "GET",
+                responseType: "buffer"
+            }).then((resp) => {
+                num = resp.status;
+                str = resp.statusText;
+                buf = resp.data;
+            });
+            req.request({
+                method: "GET",
+                responseType: "stream"
+            }).then((resp) => {
+                num = resp.status;
+                str = resp.statusText;
+                stream = resp.data;
+            });
+        }
+
+        namespace get {
+            req.get("url").then((resp) => {
+                num = resp.status;
+                str = resp.statusText;
+                const data = resp.data;
+                if (!adone.is.object(data)) {
+                    str = data;
+                }
+            });
+            req.get("url", {
+                responseType: "string"
+            }).then((resp) => {
+                num = resp.status;
+                str = resp.statusText;
+                str = resp.data;
+            });
+            req.get("url", {
+                responseType: "buffer"
+            }).then((resp) => {
+                num = resp.status;
+                str = resp.statusText;
+                buf = resp.data;
+            });
+            req.get("url", {
+                responseType: "stream"
+            }).then((resp) => {
+                num = resp.status;
+                str = resp.statusText;
+                stream = resp.data;
+            });
+        }
+
+        namespace post {
+            req.post("url", {}).then((resp) => {
+                num = resp.status;
+                str = resp.statusText;
+                const data = resp.data;
+                if (!adone.is.object(data)) {
+                    str = data;
+                }
+            });
+            req.post("url", {}, {
+                responseType: "string"
+            }).then((resp) => {
+                num = resp.status;
+                str = resp.statusText;
+                str = resp.data;
+            });
+            req.post("url", {}, {
+                responseType: "buffer"
+            }).then((resp) => {
+                num = resp.status;
+                str = resp.statusText;
+                buf = resp.data;
+            });
+            req.post("url", {}, {
+                responseType: "stream"
+            }).then((resp) => {
+                num = resp.status;
+                str = resp.statusText;
+                stream = resp.data;
+            });
+        }
+
+        namespace put {
+            req.put("url", {}).then((resp) => {
+                num = resp.status;
+                str = resp.statusText;
+                const data = resp.data;
+                if (!adone.is.object(data)) {
+                    str = data;
+                }
+            });
+            req.put("url", {}, {
+                responseType: "string"
+            }).then((resp) => {
+                num = resp.status;
+                str = resp.statusText;
+                str = resp.data;
+            });
+            req.put("url", {}, {
+                responseType: "buffer"
+            }).then((resp) => {
+                num = resp.status;
+                str = resp.statusText;
+                buf = resp.data;
+            });
+            req.put("url", {}, {
+                responseType: "stream"
+            }).then((resp) => {
+                num = resp.status;
+                str = resp.statusText;
+                stream = resp.data;
+            });
+        }
+
+        namespace patch {
+            req.patch("url", {}).then((resp) => {
+                num = resp.status;
+                str = resp.statusText;
+                const data = resp.data;
+                if (!adone.is.object(data)) {
+                    str = data;
+                }
+            });
+            req.patch("url", {}, {
+                responseType: "string"
+            }).then((resp) => {
+                num = resp.status;
+                str = resp.statusText;
+                str = resp.data;
+            });
+            req.patch("url", {}, {
+                responseType: "buffer"
+            }).then((resp) => {
+                num = resp.status;
+                str = resp.statusText;
+                buf = resp.data;
+            });
+            req.patch("url", {}, {
+                responseType: "stream"
+            }).then((resp) => {
+                num = resp.status;
+                str = resp.statusText;
+                stream = resp.data;
+            });
+        }
+
+        namespace _delete {
+            req.delete("url").then((resp) => {
+                num = resp.status;
+                str = resp.statusText;
+                const data = resp.data;
+                if (!adone.is.object(data)) {
+                    str = data;
+                }
+            });
+            req.delete("url", {
+                responseType: "string"
+            }).then((resp) => {
+                num = resp.status;
+                str = resp.statusText;
+                str = resp.data;
+            });
+            req.delete("url", {
+                responseType: "buffer"
+            }).then((resp) => {
+                num = resp.status;
+                str = resp.statusText;
+                buf = resp.data;
+            });
+            req.delete("url", {
+                responseType: "stream"
+            }).then((resp) => {
+                num = resp.status;
+                str = resp.statusText;
+                stream = resp.data;
+            });
+        }
+
+        namespace options {
+            req.options("url").then((resp) => {
+                num = resp.status;
+                str = resp.statusText;
+                const data = resp.data;
+                if (!adone.is.object(data)) {
+                    str = data;
+                }
+            });
+            req.options("url", {
+                responseType: "string"
+            }).then((resp) => {
+                num = resp.status;
+                str = resp.statusText;
+                str = resp.data;
+            });
+            req.options("url", {
+                responseType: "buffer"
+            }).then((resp) => {
+                num = resp.status;
+                str = resp.statusText;
+                buf = resp.data;
+            });
+            req.options("url", {
+                responseType: "stream"
+            }).then((resp) => {
+                num = resp.status;
+                str = resp.statusText;
+                stream = resp.data;
+            });
+        }
+    }
+
+    namespace request {
+        client.request.get("htllo").then((x) => {
+            num = x.status;
+        });
+    }
+
+    namespace create {
+        client.create();
+        client.create({});
+        const req = client.create({
+            headers: {
+                "User-Agent": "Hello"
+            }
+        });
+        req.get("hello world").then((x) => {
+            num = x.status;
+        });
+    }
+
+    namespace cancel {
+        const {
+            Cancel,
+            CancelToken,
+            isCancel
+        } = client;
+
+        new CancelToken((s: string) => 123).promise.then((x) => {
+            str = x.message;
+        });
+        new CancelToken((s: string) => 123).reason;
+        CancelToken.source().token.promise;
+        CancelToken.source().cancel("hello");
+
+        new Cancel("hello").message;
+
+        const a: any = 2;
+
+        if (isCancel(a)) {
+            str = a.message;
+        }
+    }
+}
diff --git a/types/adone/test/glosses/regex.ts b/types/adone/test/glosses/regex.ts
new file mode 100644
index 0000000000..7aab1e0d8d
--- /dev/null
+++ b/types/adone/test/glosses/regex.ts
@@ -0,0 +1,17 @@
+namespace adoneTests.regex {
+    const {
+        regex
+    } = adone;
+
+    regex.ansi().test("a");
+    regex.filename().test("a");
+    regex.idn().test("a");
+    regex.ip4().test("a");
+    regex.ip6().test("a");
+    regex.protocol().test("a");
+    regex.punycode().test("a");
+    regex.shebang().test("a");
+    regex.uri().test("a");
+    regex.uuid4().test("a");
+    regex.uuid5().test("a");
+}
diff --git a/types/adone/test/glosses/semver.ts b/types/adone/test/glosses/semver.ts
new file mode 100644
index 0000000000..e6ac7a50b0
--- /dev/null
+++ b/types/adone/test/glosses/semver.ts
@@ -0,0 +1,131 @@
+namespace adoneTests.semver {
+    const {
+        semver
+    } = adone;
+
+    type ReleaseType = adone.semver.I.ReleaseType;
+    type Operator = adone.semver.I.Operator;
+    type SemVer = adone.semver.SemVer;
+    type Comparator = adone.semver.Comparator;
+
+    let bool: boolean;
+    let num: number;
+    let str = '';
+    let strn: string | null = '';
+    let diff: ReleaseType | null;
+    const op: Operator = '';
+    declare const arr: any[];
+    declare const exp: RegExp;
+    let strArr: string[] | null;
+    declare const numArr: string[];
+    let comparatorResult: -1 | 0 | 1;
+    let versionsArr: Array<string | SemVer>;
+
+    const v1 = '';
+    const v2 = '';
+    const version = '';
+    const versions: string[] = [];
+    const loose = true;
+    let sem: SemVer | null;
+
+    sem = semver.parse(str);
+    strn = semver.valid(str);
+    strn = semver.clean(str);
+
+    strn = semver.valid(str, loose);
+    strn = semver.clean(str, loose);
+    strn = semver.inc(str, "major", loose);
+    strn = semver.inc(str, "premajor", loose);
+    strn = semver.inc(str, "minor", loose);
+    strn = semver.inc(str, "preminor", loose);
+    strn = semver.inc(str, "patch", loose);
+    strn = semver.inc(str, "prepatch", loose);
+    strn = semver.inc(str, "prerelease", loose);
+    strn = semver.inc(str, "prerelease", loose, "alpha");
+    num = semver.major(str, loose);
+    num = semver.minor(str, loose);
+    num = semver.patch(str, loose);
+    strArr = semver.prerelease(str, loose);
+
+    // Comparison
+    bool = semver.gt(v1, v2, loose);
+    bool = semver.gte(v1, v2, loose);
+    bool = semver.lt(v1, v2, loose);
+    bool = semver.lte(v1, v2, loose);
+    bool = semver.eq(v1, v2, loose);
+    bool = semver.neq(v1, v2, loose);
+    bool = semver.cmp(v1, op, v2, loose);
+    comparatorResult = semver.compare(v1, v2, loose);
+    comparatorResult = semver.rcompare(v1, v2, loose);
+    comparatorResult = semver.compareIdentifiers(str, str);
+    comparatorResult = semver.rcompareIdentifiers(str, str);
+    versionsArr = semver.sort(['', new semver.SemVer('')]);
+    versionsArr = semver.rsort(['', new semver.SemVer('')]);
+    diff = semver.diff(v1, v2, loose);
+
+    // Ranges
+    str = semver.validRange(str, loose);
+    bool = semver.satisfies(version, str, loose);
+    str = semver.maxSatisfying(versions, str, loose);
+    str = semver.minSatisfying(versions, str, loose);
+    bool = semver.gtr(version, str, loose);
+    bool = semver.ltr(version, str, loose);
+    bool = semver.outside(version, str, '<', loose);
+    bool = semver.intersects(str, str, loose);
+
+    // Coercion
+    sem = semver.coerce(str);
+
+    let ver = new semver.SemVer(str, bool);
+    str = ver.raw;
+    bool = ver.loose;
+    str = ver.format();
+    str = ver.inspect();
+    str = ver.toString();
+
+    num = ver.major;
+    num = ver.minor;
+    num = ver.patch;
+    str = ver.version;
+    strArr = ver.build;
+    strArr = ver.prerelease;
+
+    comparatorResult = ver.compare(ver);
+    comparatorResult = ver.compareMain(ver);
+    comparatorResult = ver.comparePre(ver);
+    ver = ver.inc("major");
+    ver = ver.inc("premajor");
+    ver = ver.inc("minor");
+    ver = ver.inc("preminor");
+    ver = ver.inc("patch");
+    ver = ver.inc("prepatch");
+    ver = ver.inc("prerelease");
+    ver = ver.inc("prerelease", "alpha");
+
+    const comp = new semver.Comparator(str, bool);
+    str = comp.toString();
+
+    ver = comp.semver;
+    str = comp.operator;
+    bool = comp.value;
+    comp.parse(str);
+    bool = comp.test(ver);
+    bool = comp.intersects(new semver.Comparator(str));
+    bool = comp.intersects(new semver.Comparator(str), bool);
+
+    const range = new semver.Range(str, bool);
+    str = range.raw;
+    bool = range.loose;
+    str = range.format();
+    str = range.inspect();
+    str = range.toString();
+    bool = range.test(ver);
+    bool = range.intersects(new semver.Range(''));
+    bool = range.intersects(new semver.Range(''), bool);
+
+    let sets: Comparator[][];
+    sets = range.set;
+
+    let lims: Comparator[];
+    lims = range.parseRange(str);
+}
diff --git a/types/adone/test/glosses/std.ts b/types/adone/test/glosses/std.ts
index 9bcb6687d4..a84d9cc901 100644
--- a/types/adone/test/glosses/std.ts
+++ b/types/adone/test/glosses/std.ts
@@ -39,6 +39,12 @@ namespace stdTests {
         std.http.get("http://localhost").end();
     }
 
+    namespace http2 {
+        std.http2.connect("somewhere").on("stream", (stream) => {
+            stream.pipe(process.stdout);
+        });
+    }
+
     namespace https {
         std.https.get("https://adone.io").end();
     }
@@ -91,6 +97,10 @@ namespace stdTests {
         std.domain.create().members;
     }
 
+    namespace module {
+        new std.module.Module("1").exports;
+    }
+
     namespace tty {
         const a: boolean = std.tty.isatty(1);
     }
@@ -126,4 +136,8 @@ namespace stdTests {
     namespace dgram {
         std.dgram.createSocket("udp4").bind(31337);
     }
+
+    namespace perf_hooks {
+        std.perf_hooks.performance.measure("1", "2", "3");
+    }
 }
diff --git a/types/adone/test/glosses/system/env.ts b/types/adone/test/glosses/system/env.ts
new file mode 100644
index 0000000000..6f77ede2fa
--- /dev/null
+++ b/types/adone/test/glosses/system/env.ts
@@ -0,0 +1,25 @@
+namespace adoneTests.system.env {
+    const {
+        system: {
+            env
+        }
+    } = adone;
+
+    let str: string;
+
+    str = env.user();
+
+    str = env.prompt();
+
+    str = env.hostname();
+
+    str = env.tmpdir();
+
+    str = env.home();
+
+    str = env.path();
+
+    str = env.editor();
+
+    str = env.shell();
+}
diff --git a/types/adone/test/glosses/system/process.ts b/types/adone/test/glosses/system/process.ts
new file mode 100644
index 0000000000..9ffd3c33a5
--- /dev/null
+++ b/types/adone/test/glosses/system/process.ts
@@ -0,0 +1,1200 @@
+namespace adoneTests.system.process {
+    const {
+        system: {
+            process
+        }
+    } = adone;
+
+    let str: string;
+    let num: number;
+    let bool: boolean;
+    let anyArr: any[];
+
+    str = process.errname(1);
+
+    str = process.errnameFallback({}, 1);
+
+    anyArr = process.stdio({});
+
+    namespace exec {
+        process.exec("node");
+        process.exec("node", ["1.js"]);
+        process.exec("node", ["1.js"], {});
+        process.exec("node", ["1.js"], {
+            cwd: "hello"
+        });
+        process.exec("node", ["1.js"], {
+            env: {
+                a: "a"
+            }
+        });
+        process.exec("node", ["1.js"], {
+            extendEnv: true
+        });
+        process.exec("node", ["1.js"], {
+            argv0: "a"
+        });
+        {
+            process.exec("node", ["1.js"], {
+                stdio: "pipe"
+            });
+            process.exec("node", ["1.js"], {
+                stdio: "ignore"
+            });
+            process.exec("node", ["1.js"], {
+                stdio: "inherit"
+            });
+            process.exec("node", ["1.js"], {
+                stdio: ["pipe"]
+            });
+            process.exec("node", ["1.js"], {
+                stdio: ["ipc"]
+            });
+            process.exec("node", ["1.js"], {
+                stdio: ["ignore"]
+            });
+            process.exec("node", ["1.js"], {
+                stdio: [new adone.std.stream.Stream()]
+            });
+            process.exec("node", ["1.js"], {
+                stdio: [0]
+            });
+            process.exec("node", ["1.js"], {
+                stdio: [null]
+            });
+            process.exec("node", ["1.js"], {
+                stdio: [undefined]
+            });
+        }
+        process.exec("node", ["1.js"], {
+            detached: true
+        });
+        process.exec("node", ["1.js"], {
+            uid: 1000
+        });
+        process.exec("node", ["1.js"], {
+            gid: 1000
+        });
+        process.exec("node", ["1.js"], {
+            shell: true
+        });
+        process.exec("node", ["1.js"], {
+            windowsVerbatimArguments: true
+        });
+        process.exec("node", ["1.js"], {
+            stripEof: true
+        });
+        process.exec("node", ["1.js"], {
+            preferLocal: true
+        });
+        process.exec("node", ["1.js"], {
+            localDir: "a"
+        });
+        process.exec("node", ["1.js"], {
+            reject: false
+        });
+        process.exec("node", ["1.js"], {
+            cleanup: true
+        });
+        process.exec("node", ["1.js"], {
+            encoding: "utf8"
+        });
+        process.exec("node", ["1.js"], {
+            timeout: 100
+        });
+        process.exec("node", ["1.js"], {
+            maxBuffer: 1010101
+        });
+        process.exec("node", ["1.js"], {
+            killSignal: "SIGINT"
+        });
+        {
+            process.exec("node", ["1.js"], {
+                stdin: "pipe"
+            });
+            process.exec("node", ["1.js"], {
+                stdin: "ignore"
+            });
+            process.exec("node", ["1.js"], {
+                stdin: "ipc"
+            });
+            process.exec("node", ["1.js"], {
+                stdin: "ignore"
+            });
+            process.exec("node", ["1.js"], {
+                stdin: new adone.std.stream.Stream()
+            });
+            process.exec("node", ["1.js"], {
+                stdin: 0
+            });
+            process.exec("node", ["1.js"], {
+                stdin: null
+            });
+            process.exec("node", ["1.js"], {
+                stdin: undefined
+            });
+        }
+        {
+            process.exec("node", ["1.js"], {
+                stdout: "pipe"
+            });
+            process.exec("node", ["1.js"], {
+                stdout: "ignore"
+            });
+            process.exec("node", ["1.js"], {
+                stdout: "ipc"
+            });
+            process.exec("node", ["1.js"], {
+                stdout: "ignore"
+            });
+            process.exec("node", ["1.js"], {
+                stdout: new adone.std.stream.Stream()
+            });
+            process.exec("node", ["1.js"], {
+                stdout: 0
+            });
+            process.exec("node", ["1.js"], {
+                stdout: null
+            });
+            process.exec("node", ["1.js"], {
+                stdout: undefined
+            });
+        }
+        {
+            process.exec("node", ["1.js"], {
+                stderr: "pipe"
+            });
+            process.exec("node", ["1.js"], {
+                stderr: "ignore"
+            });
+            process.exec("node", ["1.js"], {
+                stderr: "ipc"
+            });
+            process.exec("node", ["1.js"], {
+                stderr: "ignore"
+            });
+            process.exec("node", ["1.js"], {
+                stderr: new adone.std.stream.Stream()
+            });
+            process.exec("node", ["1.js"], {
+                stderr: 0
+            });
+            process.exec("node", ["1.js"], {
+                stderr: null
+            });
+            process.exec("node", ["1.js"], {
+                stderr: undefined
+            });
+        }
+        {
+            process.exec("node", ["1.js"], {
+                input: "a"
+            });
+            process.exec("node", ["1.js"], {
+                input: Buffer.from("a")
+            });
+            process.exec("node", ["1.js"], {
+                input: adone.fs.createReadStream(__filename)
+            });
+        }
+        {
+            const ret = process.exec("node", ["1.js"]);
+            ret.then((x) => {
+                str = x.cmd;
+                num = x.code;
+                bool = x.killed;
+                if (!adone.is.null(x.signal)) {
+                    str = x.signal;
+                }
+                str = x.stderr;
+                str = x.stdout;
+                bool = x.timedOut;
+            });
+            ret.catch((x) => {
+                str = x.cmd;
+                num = x.code;
+                bool = x.killed;
+                if (!adone.is.null(x.signal)) {
+                    str = x.signal;
+                }
+                str = x.stderr;
+                str = x.stdout;
+                bool = x.timedOut;
+            });
+
+            ret.on("message", () => {});
+            ret.stdout.pipe(adone.fs.createWriteStream(__filename));
+        }
+    }
+
+    namespace execStdout {
+        process.execStdout("node");
+        process.execStdout("node", ["1.js"]);
+        process.execStdout("node", ["1.js"], {});
+        process.execStdout("node", ["1.js"], {
+            cwd: "hello"
+        });
+        process.execStdout("node", ["1.js"], {
+            env: {
+                a: "a"
+            }
+        });
+        process.execStdout("node", ["1.js"], {
+            extendEnv: true
+        });
+        process.execStdout("node", ["1.js"], {
+            argv0: "a"
+        });
+        {
+            process.execStdout("node", ["1.js"], {
+                stdio: "pipe"
+            });
+            process.execStdout("node", ["1.js"], {
+                stdio: "ignore"
+            });
+            process.execStdout("node", ["1.js"], {
+                stdio: "inherit"
+            });
+            process.execStdout("node", ["1.js"], {
+                stdio: ["pipe"]
+            });
+            process.execStdout("node", ["1.js"], {
+                stdio: ["ipc"]
+            });
+            process.execStdout("node", ["1.js"], {
+                stdio: ["ignore"]
+            });
+            process.execStdout("node", ["1.js"], {
+                stdio: [new adone.std.stream.Stream()]
+            });
+            process.execStdout("node", ["1.js"], {
+                stdio: [0]
+            });
+            process.execStdout("node", ["1.js"], {
+                stdio: [null]
+            });
+            process.execStdout("node", ["1.js"], {
+                stdio: [undefined]
+            });
+        }
+        process.execStdout("node", ["1.js"], {
+            detached: true
+        });
+        process.execStdout("node", ["1.js"], {
+            uid: 1000
+        });
+        process.execStdout("node", ["1.js"], {
+            gid: 1000
+        });
+        process.execStdout("node", ["1.js"], {
+            shell: true
+        });
+        process.execStdout("node", ["1.js"], {
+            windowsVerbatimArguments: true
+        });
+        process.execStdout("node", ["1.js"], {
+            stripEof: true
+        });
+        process.execStdout("node", ["1.js"], {
+            preferLocal: true
+        });
+        process.execStdout("node", ["1.js"], {
+            localDir: "a"
+        });
+        process.execStdout("node", ["1.js"], {
+            reject: false
+        });
+        process.execStdout("node", ["1.js"], {
+            cleanup: true
+        });
+        process.execStdout("node", ["1.js"], {
+            encoding: "utf8"
+        });
+        process.execStdout("node", ["1.js"], {
+            timeout: 100
+        });
+        process.execStdout("node", ["1.js"], {
+            maxBuffer: 1010101
+        });
+        process.execStdout("node", ["1.js"], {
+            killSignal: "SIGINT"
+        });
+        {
+            process.execStdout("node", ["1.js"], {
+                stdin: "pipe"
+            });
+            process.execStdout("node", ["1.js"], {
+                stdin: "ignore"
+            });
+            process.execStdout("node", ["1.js"], {
+                stdin: "ipc"
+            });
+            process.execStdout("node", ["1.js"], {
+                stdin: "ignore"
+            });
+            process.execStdout("node", ["1.js"], {
+                stdin: new adone.std.stream.Stream()
+            });
+            process.execStdout("node", ["1.js"], {
+                stdin: 0
+            });
+            process.execStdout("node", ["1.js"], {
+                stdin: null
+            });
+            process.execStdout("node", ["1.js"], {
+                stdin: undefined
+            });
+        }
+        {
+            process.execStdout("node", ["1.js"], {
+                stdout: "pipe"
+            });
+            process.execStdout("node", ["1.js"], {
+                stdout: "ignore"
+            });
+            process.execStdout("node", ["1.js"], {
+                stdout: "ipc"
+            });
+            process.execStdout("node", ["1.js"], {
+                stdout: "ignore"
+            });
+            process.execStdout("node", ["1.js"], {
+                stdout: new adone.std.stream.Stream()
+            });
+            process.execStdout("node", ["1.js"], {
+                stdout: 0
+            });
+            process.execStdout("node", ["1.js"], {
+                stdout: null
+            });
+            process.execStdout("node", ["1.js"], {
+                stdout: undefined
+            });
+        }
+        {
+            process.execStdout("node", ["1.js"], {
+                stderr: "pipe"
+            });
+            process.execStdout("node", ["1.js"], {
+                stderr: "ignore"
+            });
+            process.execStdout("node", ["1.js"], {
+                stderr: "ipc"
+            });
+            process.execStdout("node", ["1.js"], {
+                stderr: "ignore"
+            });
+            process.execStdout("node", ["1.js"], {
+                stderr: new adone.std.stream.Stream()
+            });
+            process.execStdout("node", ["1.js"], {
+                stderr: 0
+            });
+            process.execStdout("node", ["1.js"], {
+                stderr: null
+            });
+            process.execStdout("node", ["1.js"], {
+                stderr: undefined
+            });
+        }
+        {
+            process.execStdout("node", ["1.js"], {
+                input: "a"
+            });
+            process.execStdout("node", ["1.js"], {
+                input: Buffer.from("a")
+            });
+            process.execStdout("node", ["1.js"], {
+                input: adone.fs.createReadStream(__filename)
+            });
+        }
+        {
+            const ret = process.execStdout("node", ["1.js"]);
+            ret.then((x) => {
+                str = x;
+            });
+        }
+    }
+
+    namespace execStderr {
+        process.execStderr("node");
+        process.execStderr("node", ["1.js"]);
+        process.execStderr("node", ["1.js"], {});
+        process.execStderr("node", ["1.js"], {
+            cwd: "hello"
+        });
+        process.execStderr("node", ["1.js"], {
+            env: {
+                a: "a"
+            }
+        });
+        process.execStderr("node", ["1.js"], {
+            extendEnv: true
+        });
+        process.execStderr("node", ["1.js"], {
+            argv0: "a"
+        });
+        {
+            process.execStderr("node", ["1.js"], {
+                stdio: "pipe"
+            });
+            process.execStderr("node", ["1.js"], {
+                stdio: "ignore"
+            });
+            process.execStderr("node", ["1.js"], {
+                stdio: "inherit"
+            });
+            process.execStderr("node", ["1.js"], {
+                stdio: ["pipe"]
+            });
+            process.execStderr("node", ["1.js"], {
+                stdio: ["ipc"]
+            });
+            process.execStderr("node", ["1.js"], {
+                stdio: ["ignore"]
+            });
+            process.execStderr("node", ["1.js"], {
+                stdio: [new adone.std.stream.Stream()]
+            });
+            process.execStderr("node", ["1.js"], {
+                stdio: [0]
+            });
+            process.execStderr("node", ["1.js"], {
+                stdio: [null]
+            });
+            process.execStderr("node", ["1.js"], {
+                stdio: [undefined]
+            });
+        }
+        process.execStderr("node", ["1.js"], {
+            detached: true
+        });
+        process.execStderr("node", ["1.js"], {
+            uid: 1000
+        });
+        process.execStderr("node", ["1.js"], {
+            gid: 1000
+        });
+        process.execStderr("node", ["1.js"], {
+            shell: true
+        });
+        process.execStderr("node", ["1.js"], {
+            windowsVerbatimArguments: true
+        });
+        process.execStderr("node", ["1.js"], {
+            stripEof: true
+        });
+        process.execStderr("node", ["1.js"], {
+            preferLocal: true
+        });
+        process.execStderr("node", ["1.js"], {
+            localDir: "a"
+        });
+        process.execStderr("node", ["1.js"], {
+            reject: false
+        });
+        process.execStderr("node", ["1.js"], {
+            cleanup: true
+        });
+        process.execStderr("node", ["1.js"], {
+            encoding: "utf8"
+        });
+        process.execStderr("node", ["1.js"], {
+            timeout: 100
+        });
+        process.execStderr("node", ["1.js"], {
+            maxBuffer: 1010101
+        });
+        process.execStderr("node", ["1.js"], {
+            killSignal: "SIGINT"
+        });
+        {
+            process.execStderr("node", ["1.js"], {
+                stdin: "pipe"
+            });
+            process.execStderr("node", ["1.js"], {
+                stdin: "ignore"
+            });
+            process.execStderr("node", ["1.js"], {
+                stdin: "ipc"
+            });
+            process.execStderr("node", ["1.js"], {
+                stdin: "ignore"
+            });
+            process.execStderr("node", ["1.js"], {
+                stdin: new adone.std.stream.Stream()
+            });
+            process.execStderr("node", ["1.js"], {
+                stdin: 0
+            });
+            process.execStderr("node", ["1.js"], {
+                stdin: null
+            });
+            process.execStderr("node", ["1.js"], {
+                stdin: undefined
+            });
+        }
+        {
+            process.execStderr("node", ["1.js"], {
+                stdout: "pipe"
+            });
+            process.execStderr("node", ["1.js"], {
+                stdout: "ignore"
+            });
+            process.execStderr("node", ["1.js"], {
+                stdout: "ipc"
+            });
+            process.execStderr("node", ["1.js"], {
+                stdout: "ignore"
+            });
+            process.execStderr("node", ["1.js"], {
+                stdout: new adone.std.stream.Stream()
+            });
+            process.execStderr("node", ["1.js"], {
+                stdout: 0
+            });
+            process.execStderr("node", ["1.js"], {
+                stdout: null
+            });
+            process.execStderr("node", ["1.js"], {
+                stdout: undefined
+            });
+        }
+        {
+            process.execStderr("node", ["1.js"], {
+                stderr: "pipe"
+            });
+            process.execStderr("node", ["1.js"], {
+                stderr: "ignore"
+            });
+            process.execStderr("node", ["1.js"], {
+                stderr: "ipc"
+            });
+            process.execStderr("node", ["1.js"], {
+                stderr: "ignore"
+            });
+            process.execStderr("node", ["1.js"], {
+                stderr: new adone.std.stream.Stream()
+            });
+            process.execStderr("node", ["1.js"], {
+                stderr: 0
+            });
+            process.execStderr("node", ["1.js"], {
+                stderr: null
+            });
+            process.execStderr("node", ["1.js"], {
+                stderr: undefined
+            });
+        }
+        {
+            process.execStderr("node", ["1.js"], {
+                input: "a"
+            });
+            process.execStderr("node", ["1.js"], {
+                input: Buffer.from("a")
+            });
+            process.execStderr("node", ["1.js"], {
+                input: adone.fs.createReadStream(__filename)
+            });
+        }
+        {
+            const ret = process.execStderr("node", ["1.js"]);
+            ret.then((x) => {
+                str = x;
+            });
+        }
+    }
+
+    namespace shell {
+        process.shell("node 1.js");
+        process.shell("node 1.js", {});
+        process.shell("node 1.js", {
+            cwd: "hello"
+        });
+        process.shell("node 1.js", {
+            env: {
+                a: "a"
+            }
+        });
+        process.shell("node 1.js", {
+            extendEnv: true
+        });
+        process.shell("node 1.js", {
+            argv0: "a"
+        });
+        {
+            process.shell("node 1.js", {
+                stdio: "pipe"
+            });
+            process.shell("node 1.js", {
+                stdio: "ignore"
+            });
+            process.shell("node 1.js", {
+                stdio: "inherit"
+            });
+            process.shell("node 1.js", {
+                stdio: ["pipe"]
+            });
+            process.shell("node 1.js", {
+                stdio: ["ipc"]
+            });
+            process.shell("node 1.js", {
+                stdio: ["ignore"]
+            });
+            process.shell("node 1.js", {
+                stdio: [new adone.std.stream.Stream()]
+            });
+            process.shell("node 1.js", {
+                stdio: [0]
+            });
+            process.shell("node 1.js", {
+                stdio: [null]
+            });
+            process.shell("node 1.js", {
+                stdio: [undefined]
+            });
+        }
+        process.shell("node 1.js", {
+            detached: true
+        });
+        process.shell("node 1.js", {
+            uid: 1000
+        });
+        process.shell("node 1.js", {
+            gid: 1000
+        });
+        process.shell("node 1.js", {
+            shell: true
+        });
+        process.shell("node 1.js", {
+            windowsVerbatimArguments: true
+        });
+        process.shell("node 1.js", {
+            stripEof: true
+        });
+        process.shell("node 1.js", {
+            preferLocal: true
+        });
+        process.shell("node 1.js", {
+            localDir: "a"
+        });
+        process.shell("node 1.js", {
+            reject: false
+        });
+        process.shell("node 1.js", {
+            cleanup: true
+        });
+        process.shell("node 1.js", {
+            encoding: "utf8"
+        });
+        process.shell("node 1.js", {
+            timeout: 100
+        });
+        process.shell("node 1.js", {
+            maxBuffer: 1010101
+        });
+        process.shell("node 1.js", {
+            killSignal: "SIGINT"
+        });
+        {
+            process.shell("node 1.js", {
+                stdin: "pipe"
+            });
+            process.shell("node 1.js", {
+                stdin: "ignore"
+            });
+            process.shell("node 1.js", {
+                stdin: "ipc"
+            });
+            process.shell("node 1.js", {
+                stdin: "ignore"
+            });
+            process.shell("node 1.js", {
+                stdin: new adone.std.stream.Stream()
+            });
+            process.shell("node 1.js", {
+                stdin: 0
+            });
+            process.shell("node 1.js", {
+                stdin: null
+            });
+            process.shell("node 1.js", {
+                stdin: undefined
+            });
+        }
+        {
+            process.shell("node 1.js", {
+                stdout: "pipe"
+            });
+            process.shell("node 1.js", {
+                stdout: "ignore"
+            });
+            process.shell("node 1.js", {
+                stdout: "ipc"
+            });
+            process.shell("node 1.js", {
+                stdout: "ignore"
+            });
+            process.shell("node 1.js", {
+                stdout: new adone.std.stream.Stream()
+            });
+            process.shell("node 1.js", {
+                stdout: 0
+            });
+            process.shell("node 1.js", {
+                stdout: null
+            });
+            process.shell("node 1.js", {
+                stdout: undefined
+            });
+        }
+        {
+            process.shell("node 1.js", {
+                stderr: "pipe"
+            });
+            process.shell("node 1.js", {
+                stderr: "ignore"
+            });
+            process.shell("node 1.js", {
+                stderr: "ipc"
+            });
+            process.shell("node 1.js", {
+                stderr: "ignore"
+            });
+            process.shell("node 1.js", {
+                stderr: new adone.std.stream.Stream()
+            });
+            process.shell("node 1.js", {
+                stderr: 0
+            });
+            process.shell("node 1.js", {
+                stderr: null
+            });
+            process.shell("node 1.js", {
+                stderr: undefined
+            });
+        }
+        {
+            process.shell("node 1.js", {
+                input: "a"
+            });
+            process.shell("node 1.js", {
+                input: Buffer.from("a")
+            });
+            process.shell("node 1.js", {
+                input: adone.fs.createReadStream(__filename)
+            });
+        }
+        {
+            const ret = process.shell("node 1.js");
+            ret.then((x) => {
+                str = x.cmd;
+                num = x.code;
+                bool = x.killed;
+                if (!adone.is.null(x.signal)) {
+                    str = x.signal;
+                }
+                str = x.stderr;
+                str = x.stdout;
+                bool = x.timedOut;
+            });
+            ret.catch((x) => {
+                str = x.cmd;
+                num = x.code;
+                bool = x.killed;
+                if (!adone.is.null(x.signal)) {
+                    str = x.signal;
+                }
+                str = x.stderr;
+                str = x.stdout;
+                bool = x.timedOut;
+            });
+
+            ret.on("message", () => {});
+            ret.stdout.pipe(adone.fs.createWriteStream(__filename));
+        }
+    }
+
+    namespace execSync {
+        process.execSync("node");
+        process.execSync("node", ["1.js"]);
+        process.execSync("node", ["1.js"], {});
+        process.execSync("node", ["1.js"], {
+            cwd: "hello"
+        });
+        process.execSync("node", ["1.js"], {
+            env: {
+                a: "a"
+            }
+        });
+        process.execSync("node", ["1.js"], {
+            extendEnv: true
+        });
+        process.execSync("node", ["1.js"], {
+            argv0: "a"
+        });
+        {
+            process.execSync("node", ["1.js"], {
+                stdio: "pipe"
+            });
+            process.execSync("node", ["1.js"], {
+                stdio: "ignore"
+            });
+            process.execSync("node", ["1.js"], {
+                stdio: "inherit"
+            });
+            process.execSync("node", ["1.js"], {
+                stdio: ["pipe"]
+            });
+            process.execSync("node", ["1.js"], {
+                stdio: ["ipc"]
+            });
+            process.execSync("node", ["1.js"], {
+                stdio: ["ignore"]
+            });
+            process.execSync("node", ["1.js"], {
+                stdio: [new adone.std.stream.Stream()]
+            });
+            process.execSync("node", ["1.js"], {
+                stdio: [0]
+            });
+            process.execSync("node", ["1.js"], {
+                stdio: [null]
+            });
+            process.execSync("node", ["1.js"], {
+                stdio: [undefined]
+            });
+        }
+        process.execSync("node", ["1.js"], {
+            detached: true
+        });
+        process.execSync("node", ["1.js"], {
+            uid: 1000
+        });
+        process.execSync("node", ["1.js"], {
+            gid: 1000
+        });
+        process.execSync("node", ["1.js"], {
+            shell: true
+        });
+        process.execSync("node", ["1.js"], {
+            windowsVerbatimArguments: true
+        });
+        process.execSync("node", ["1.js"], {
+            stripEof: true
+        });
+        process.execSync("node", ["1.js"], {
+            preferLocal: true
+        });
+        process.execSync("node", ["1.js"], {
+            localDir: "a"
+        });
+        process.execSync("node", ["1.js"], {
+            reject: false
+        });
+        process.execSync("node", ["1.js"], {
+            cleanup: true
+        });
+        process.execSync("node", ["1.js"], {
+            encoding: "utf8"
+        });
+        process.execSync("node", ["1.js"], {
+            timeout: 100
+        });
+        process.execSync("node", ["1.js"], {
+            maxBuffer: 1010101
+        });
+        process.execSync("node", ["1.js"], {
+            killSignal: "SIGINT"
+        });
+        {
+            process.execSync("node", ["1.js"], {
+                stdin: "pipe"
+            });
+            process.execSync("node", ["1.js"], {
+                stdin: "ignore"
+            });
+            process.execSync("node", ["1.js"], {
+                stdin: "ipc"
+            });
+            process.execSync("node", ["1.js"], {
+                stdin: "ignore"
+            });
+            process.execSync("node", ["1.js"], {
+                stdin: new adone.std.stream.Stream()
+            });
+            process.execSync("node", ["1.js"], {
+                stdin: 0
+            });
+            process.execSync("node", ["1.js"], {
+                stdin: null
+            });
+            process.execSync("node", ["1.js"], {
+                stdin: undefined
+            });
+        }
+        {
+            process.execSync("node", ["1.js"], {
+                stdout: "pipe"
+            });
+            process.execSync("node", ["1.js"], {
+                stdout: "ignore"
+            });
+            process.execSync("node", ["1.js"], {
+                stdout: "ipc"
+            });
+            process.execSync("node", ["1.js"], {
+                stdout: "ignore"
+            });
+            process.execSync("node", ["1.js"], {
+                stdout: new adone.std.stream.Stream()
+            });
+            process.execSync("node", ["1.js"], {
+                stdout: 0
+            });
+            process.execSync("node", ["1.js"], {
+                stdout: null
+            });
+            process.execSync("node", ["1.js"], {
+                stdout: undefined
+            });
+        }
+        {
+            process.execSync("node", ["1.js"], {
+                stderr: "pipe"
+            });
+            process.execSync("node", ["1.js"], {
+                stderr: "ignore"
+            });
+            process.execSync("node", ["1.js"], {
+                stderr: "ipc"
+            });
+            process.execSync("node", ["1.js"], {
+                stderr: "ignore"
+            });
+            process.execSync("node", ["1.js"], {
+                stderr: new adone.std.stream.Stream()
+            });
+            process.execSync("node", ["1.js"], {
+                stderr: 0
+            });
+            process.execSync("node", ["1.js"], {
+                stderr: null
+            });
+            process.execSync("node", ["1.js"], {
+                stderr: undefined
+            });
+        }
+        {
+            process.execSync("node", ["1.js"], {
+                input: "a"
+            });
+            process.execSync("node", ["1.js"], {
+                input: Buffer.from("a")
+            });
+        }
+        {
+            const x = process.execSync("node", ["1.js"]);
+            str = x.cmd;
+            num = x.code;
+            bool = x.killed;
+            if (!adone.is.null(x.signal)) {
+                str = x.signal;
+            }
+            str = x.stderr;
+            str = x.stdout;
+            bool = x.timedOut;
+        }
+    }
+
+    namespace shell {
+        process.shellSync("node 1.js");
+        process.shellSync("node 1.js", {});
+        process.shellSync("node 1.js", {
+            cwd: "hello"
+        });
+        process.shellSync("node 1.js", {
+            env: {
+                a: "a"
+            }
+        });
+        process.shellSync("node 1.js", {
+            extendEnv: true
+        });
+        process.shellSync("node 1.js", {
+            argv0: "a"
+        });
+        {
+            process.shellSync("node 1.js", {
+                stdio: "pipe"
+            });
+            process.shellSync("node 1.js", {
+                stdio: "ignore"
+            });
+            process.shellSync("node 1.js", {
+                stdio: "inherit"
+            });
+            process.shellSync("node 1.js", {
+                stdio: ["pipe"]
+            });
+            process.shellSync("node 1.js", {
+                stdio: ["ipc"]
+            });
+            process.shellSync("node 1.js", {
+                stdio: ["ignore"]
+            });
+            process.shellSync("node 1.js", {
+                stdio: [new adone.std.stream.Stream()]
+            });
+            process.shellSync("node 1.js", {
+                stdio: [0]
+            });
+            process.shellSync("node 1.js", {
+                stdio: [null]
+            });
+            process.shellSync("node 1.js", {
+                stdio: [undefined]
+            });
+        }
+        process.shellSync("node 1.js", {
+            detached: true
+        });
+        process.shellSync("node 1.js", {
+            uid: 1000
+        });
+        process.shellSync("node 1.js", {
+            gid: 1000
+        });
+        process.shellSync("node 1.js", {
+            shell: true
+        });
+        process.shellSync("node 1.js", {
+            windowsVerbatimArguments: true
+        });
+        process.shellSync("node 1.js", {
+            stripEof: true
+        });
+        process.shellSync("node 1.js", {
+            preferLocal: true
+        });
+        process.shellSync("node 1.js", {
+            localDir: "a"
+        });
+        process.shellSync("node 1.js", {
+            reject: false
+        });
+        process.shellSync("node 1.js", {
+            cleanup: true
+        });
+        process.shellSync("node 1.js", {
+            encoding: "utf8"
+        });
+        process.shellSync("node 1.js", {
+            timeout: 100
+        });
+        process.shellSync("node 1.js", {
+            maxBuffer: 1010101
+        });
+        process.shellSync("node 1.js", {
+            killSignal: "SIGINT"
+        });
+        {
+            process.shellSync("node 1.js", {
+                stdin: "pipe"
+            });
+            process.shellSync("node 1.js", {
+                stdin: "ignore"
+            });
+            process.shellSync("node 1.js", {
+                stdin: "ipc"
+            });
+            process.shellSync("node 1.js", {
+                stdin: "ignore"
+            });
+            process.shellSync("node 1.js", {
+                stdin: new adone.std.stream.Stream()
+            });
+            process.shellSync("node 1.js", {
+                stdin: 0
+            });
+            process.shellSync("node 1.js", {
+                stdin: null
+            });
+            process.shellSync("node 1.js", {
+                stdin: undefined
+            });
+        }
+        {
+            process.shellSync("node 1.js", {
+                stdout: "pipe"
+            });
+            process.shellSync("node 1.js", {
+                stdout: "ignore"
+            });
+            process.shellSync("node 1.js", {
+                stdout: "ipc"
+            });
+            process.shellSync("node 1.js", {
+                stdout: "ignore"
+            });
+            process.shellSync("node 1.js", {
+                stdout: new adone.std.stream.Stream()
+            });
+            process.shellSync("node 1.js", {
+                stdout: 0
+            });
+            process.shellSync("node 1.js", {
+                stdout: null
+            });
+            process.shellSync("node 1.js", {
+                stdout: undefined
+            });
+        }
+        {
+            process.shellSync("node 1.js", {
+                stderr: "pipe"
+            });
+            process.shellSync("node 1.js", {
+                stderr: "ignore"
+            });
+            process.shellSync("node 1.js", {
+                stderr: "ipc"
+            });
+            process.shellSync("node 1.js", {
+                stderr: "ignore"
+            });
+            process.shellSync("node 1.js", {
+                stderr: new adone.std.stream.Stream()
+            });
+            process.shellSync("node 1.js", {
+                stderr: 0
+            });
+            process.shellSync("node 1.js", {
+                stderr: null
+            });
+            process.shellSync("node 1.js", {
+                stderr: undefined
+            });
+        }
+        {
+            process.shellSync("node 1.js", {
+                input: "a"
+            });
+            process.shellSync("node 1.js", {
+                input: Buffer.from("a")
+            });
+        }
+        {
+            const x = process.shellSync("node 1.js");
+            str = x.cmd;
+            num = x.code;
+            bool = x.killed;
+            if (!adone.is.null(x.signal)) {
+                str = x.signal;
+            }
+            str = x.stderr;
+            str = x.stdout;
+            bool = x.timedOut;
+        }
+    }
+}
diff --git a/types/adone/test/glosses/system/user.ts b/types/adone/test/glosses/system/user.ts
new file mode 100644
index 0000000000..3e1b643d7d
--- /dev/null
+++ b/types/adone/test/glosses/system/user.ts
@@ -0,0 +1,22 @@
+namespace adoneTests.system.process.user {
+    const {
+        system: {
+            user
+        }
+    } = adone;
+
+    let str: string;
+    let num: number;
+
+    const a = user.uid("hello");
+    num = a.uid;
+    num = a.gid;
+
+    num = user.gid("hello");
+
+    num = user.gids("hello")[0];
+
+    str = user.username(1000);
+
+    str = user.groupname(1000);
+}
diff --git a/types/adone/test/glosses/templating/dot.ts b/types/adone/test/glosses/templating/dot.ts
new file mode 100644
index 0000000000..69cd15d500
--- /dev/null
+++ b/types/adone/test/glosses/templating/dot.ts
@@ -0,0 +1,70 @@
+namespace adoneTests.templating.dot {
+    const {
+        templating: {
+            dot
+        }
+    } = adone;
+
+    let str: string;
+    let bool;
+    let regexp: RegExp;
+
+    str = dot.version;
+
+    bool = dot.templateSettings.append;
+    regexp = dot.templateSettings.conditional;
+    regexp = dot.templateSettings.define;
+    regexp = dot.templateSettings.defineParams;
+    regexp = dot.templateSettings.encode;
+    regexp = dot.templateSettings.evaluate;
+    regexp = dot.templateSettings.interpolate;
+    regexp = dot.templateSettings.iterate;
+    bool = dot.templateSettings.selfcontained;
+    bool = dot.templateSettings.strip;
+    regexp = dot.templateSettings.use;
+    regexp = dot.templateSettings.useParams;
+    str = dot.templateSettings.varname;
+
+    const r = dot.template("asd", {
+        append: true,
+        define: /a/,
+        encode: /a/,
+        evaluate: /a/,
+        conditional: /a/,
+        defineParams: /a/,
+        interpolate: /a/,
+        iterate: /a/,
+        selfcontained: true,
+        strip: false,
+        use: /a/,
+        useParams: /a/,
+        varname: "a"
+    });
+    str = r("a");
+
+    str = dot.compile("asd")();
+    str = dot.compile("asd", {})();
+
+    const a = dot.process();
+    str = a["hello"]();
+
+    dot.process({
+        destination: "a"
+    });
+    dot.process({
+        global: "a"
+    });
+    dot.process({
+        path: "a"
+    });
+    dot.process({
+        templateSettings: {
+            append: true
+        }
+    });
+    dot.process({
+        templateSettings: {
+            useParams: /a/
+        }
+    });
+}
diff --git a/types/adone/test/glosses/templating/nunjucks.ts b/types/adone/test/glosses/templating/nunjucks.ts
new file mode 100644
index 0000000000..85bd2e49e5
--- /dev/null
+++ b/types/adone/test/glosses/templating/nunjucks.ts
@@ -0,0 +1,139 @@
+namespace adoneTests.templating.nunjucks {
+    const {
+        templating: {
+            nunjucks
+        }
+    } = adone;
+
+    let str: string;
+    let bool: boolean;
+    let pstr: Promise<string>;
+
+    namespace Environment {
+        const {
+            Environment
+        } = nunjucks;
+
+        new Environment();
+        new Environment(new nunjucks.FileSystemLoader());
+        new Environment(new nunjucks.FileSystemLoader(), { autoescape: true });
+        new Environment(new nunjucks.FileSystemLoader(), { dev: true });
+        new Environment(new nunjucks.FileSystemLoader(), { lstripBlocks: true });
+        new Environment(new nunjucks.FileSystemLoader(), { throOnUndefined: true });
+        new Environment(new nunjucks.FileSystemLoader(), { trimBlocks: true });
+
+        const e = new Environment();
+        str = e.render("a");
+        e.render("a", {}, (e, r: string) => {});
+        str = e.renderString("a");
+        str = e.renderString("a", {});
+        e.renderString("a", {}, (e, r: string) => {});
+
+        e.addFilter("name", () => 2);
+        e.addFilter("name", () => 2, true);
+        e.getFilter("name")();
+
+        e.addExtension("name", { parse() { return "a"; }, tags: ["a"] });
+        e.removeExtension("name");
+        e.getExtension("name").parse({}, {}, {});
+        str = e.getExtension("name").tags[0];
+        bool = e.hasExtension("name");
+        e.addGlobal("a", "b");
+        str = e.getTemplate("name", true).render();
+        str = e.getTemplate("name").render();
+    }
+
+    namespace Template {
+        const {
+            Template
+        } = nunjucks;
+
+        new Template("asd");
+        new Template("asd", new nunjucks.Environment());
+        new Template("asd", new nunjucks.Environment(), true);
+        str = new Template("asd").render();
+        new Template("asd").render({}, (e: any, res: string) => {});
+    }
+
+    namespace Loader {
+        const {
+            Loader
+        } = nunjucks;
+
+        new Loader();
+        new Loader().on("asd", () => {});
+        new Loader().emit("asd", 1, 2, 3);
+        str = new Loader().resolve("asd", "asd");
+        bool = new Loader().isRelative("asd");
+        new Loader().extend({
+            async: true,
+            getSource(name: string) {
+                return { src: "a", path: "b", noCache: true };
+            },
+            extend(extender) {
+                extender.async;
+                extender.extend;
+                extender.getSource("a");
+                return extender;
+            }
+        });
+    }
+
+    namespace FileSystemLoader {
+        const {
+            FileSystemLoader
+        } = nunjucks;
+
+        new FileSystemLoader();
+        new FileSystemLoader(["a"]);
+        new FileSystemLoader(["a"], { noCache: true });
+        new FileSystemLoader(["a"], { watch: true });
+        bool = new FileSystemLoader(["a"], { watch: true }).getSource("name").noCache;
+        str = new FileSystemLoader(["a"], { watch: true }).getSource("name").path;
+        str = new FileSystemLoader(["a"], { watch: true }).getSource("name").src;
+    }
+
+    namespace PrecompiledLoader {
+        const {
+            PrecompiledLoader
+        } = nunjucks;
+
+        new PrecompiledLoader();
+        bool = new PrecompiledLoader().getSource("name").noCache;
+        str = new PrecompiledLoader().getSource("name").path;
+        str = new PrecompiledLoader().getSource("name").src;
+    }
+
+    pstr = nunjucks.render("he");
+    pstr = nunjucks.render("he", {});
+
+    str = nunjucks.renderSync("he");
+    str = nunjucks.renderSync("he", {});
+
+    pstr = nunjucks.renderString("he");
+    pstr = nunjucks.renderString("he", {});
+
+    str = nunjucks.renderStringSync("he");
+    str = nunjucks.renderStringSync("he", {});
+
+    let t = nunjucks.compile("he");
+    t = nunjucks.compile("he", new nunjucks.Environment());
+    t = nunjucks.compile("he", new nunjucks.Environment(), "asd");
+    t = nunjucks.compile("he", new nunjucks.Environment(), "asd", true);
+    str = t.render();
+
+    let e = nunjucks.configure();
+    e = nunjucks.configure({});
+    e = nunjucks.configure({ autoescape: true });
+    e = nunjucks.configure({ dev: true });
+    e = nunjucks.configure({ lstripBlocks: true });
+    e = nunjucks.configure({ noCache: true });
+    e = nunjucks.configure({ tags: { blockEnd: "{" } });
+    e = nunjucks.configure({ throOnUndefined: true });
+    e = nunjucks.configure({ trimBlocks: true });
+    e = nunjucks.configure({ watch: true });
+    e = nunjucks.configure("a", { watch: true });
+    e.addFilter("name", () => true);
+
+    nunjucks.installJinjaCompat();
+}
diff --git a/types/adone/test/glosses/text/index.ts b/types/adone/test/glosses/text/index.ts
new file mode 100644
index 0000000000..7f5fc88692
--- /dev/null
+++ b/types/adone/test/glosses/text/index.ts
@@ -0,0 +1,58 @@
+namespace adoneTests.text {
+    const {
+        text
+    } = adone;
+
+    let str: string;
+    let regExp: RegExp;
+    let bool: boolean;
+    let num: number;
+
+    namespace escape {
+        const {
+            escape
+        } = text;
+
+        str = escape.regExpPattern("asd");
+        str = escape.regExpReplacement("asd");
+        str = escape.format("asd");
+        str = escape.shellArg("asd");
+        str = escape.control("sad");
+        str = escape.htmlSpecialChars("asd");
+    }
+
+    namespace regexp {
+        const {
+            regexp
+        } = text;
+
+        str = regexp.array2alternatives(["a"]);
+    }
+
+    str = text.escapeStringRegexp("asd");
+    str = text.toCamelCase("asd");
+    str = text.camelCaseToDashed("asd");
+    regExp = text.endLineRegExp;
+    str = text.splitLines("a")[0];
+    str = text.regExpIndexOf("a", /ads/);
+    str = text.regExpIndexOf("a", /ads/, 1);
+    str = text.stripAnsi("ad");
+    bool = text.hasAnsi("asd");
+    str = text.random(100);
+    str = text.detectNewLine("asd");
+    str = text.wordwrap("ads", 10)[0];
+    str = text.wordwrap("ads", 10, { join: true });
+    str = text.wordwrap("ads", 10, { countAnsiEscapeCodes: true });
+    str = text.wordwrap("ads", 10, { mode: "hard" });
+    num = text.stringDistance("as", "ds");
+    num = text.stringDistance("as", "ds", [[1]]);
+    num = text.stringDistanceCapped("a", "b", 10);
+    str = text.capitalize("asd");
+    str = text.capitalizeWords("asd");
+    num = text.width("asd");
+    str = text.indent("asd", 10);
+    str = text.stripEof("asd");
+    str = text.stripLastCRLF("asd");
+    str = text.stripBOM("ads");
+    num = text.toUTF8Array("asd")[0];
+}
diff --git a/types/adone/test/glosses/text/pretties.ts b/types/adone/test/glosses/text/pretties.ts
new file mode 100644
index 0000000000..3061275cdd
--- /dev/null
+++ b/types/adone/test/glosses/text/pretties.ts
@@ -0,0 +1,203 @@
+namespace adoneTests.text.pretty {
+    const {
+        text: {
+            pretty
+        }
+    } = adone;
+
+    let str: string;
+
+    namespace json {
+        const {
+            json
+        } = pretty;
+
+        str = json({});
+        str = json({}, {});
+        str = json({}, {}, 1);
+        str = json({}, { dashColor: "green" });
+        str = json({}, { defaultIndentation: 10 });
+        str = json({}, { emptyArrayMsg: "asdas" });
+        str = json({}, { keysColor: "green" });
+        str = json({}, { noAlign: true });
+        str = json({}, { noColor: true });
+        str = json({}, { numberColor: "green" });
+        str = json({}, { stringColor: "green" });
+    }
+
+    namespace table {
+        const {
+            table
+        } = pretty;
+
+        str = table([], {
+            model: []
+        });
+        str = table([], {
+            borderless: true,
+            model: []
+        });
+        str = table([], {
+            countAnsiEscapeCodes: true,
+            model: []
+        });
+        str = table([], {
+            noHeader: true,
+            model: []
+        });
+        str = table([], {
+            style: {
+                "padding-left": 1
+            },
+            model: []
+        });
+        str = table([], {
+            style: {
+                "padding-right": 1
+            },
+            model: []
+        });
+        str = table([], {
+            style: {
+                broder: ["a"]
+            },
+            model: []
+        });
+        str = table([], {
+            style: {
+                compact: true
+            },
+            model: []
+        });
+        str = table([], {
+            style: {
+                head: ["a"]
+            },
+            model: []
+        });
+        str = table([], {
+            width: 100,
+            model: []
+        });
+        str = table([], {
+            width: "100%",
+            model: []
+        });
+        str = table([], {
+            model: [{
+                id: "ads",
+                align: "center"
+            }]
+        });
+        str = table([], {
+            model: [{
+                id: "ads",
+                format: "%s"
+            }]
+        });
+        str = table([], {
+            model: [{
+                id: "ads",
+                format(val: any, item: object) {
+                    return "2";
+                }
+            }]
+        });
+        str = table([], {
+            model: [{
+                id: "ads",
+                handle(item: object) {
+                    return "a";
+                }
+            }]
+        });
+        str = table([], {
+            model: [{
+                id: "ads",
+                header: "he"
+            }]
+        });
+        str = table([], {
+            model: [{
+                id: "ads",
+                maxWidth: "100%"
+            }]
+        });
+        str = table([], {
+            model: [{
+                id: "ads",
+                maxWidth: 100
+            }]
+        });
+        str = table([], {
+            model: [{
+                id: "ads",
+                style: "asd"
+            }]
+        });
+        str = table([], {
+            model: [{
+                id: "ads",
+                style(val: any, str: string) {
+                    return "1";
+                }
+            }]
+        });
+        str = table([], {
+            model: [{
+                id: "ads",
+                width: 100
+            }]
+        });
+        str = table([], {
+            model: [{
+                id: "ads",
+                width: "100%"
+            }]
+        });
+        str = table([], {
+            model: [{
+                id: "ads",
+                wordwrap: "soft"
+            }]
+        });
+        str = table([], {
+            model: [{
+                id: "ads",
+                wordwrap: "hard"
+            }]
+        });
+        str = table([], {
+            model: [{
+                id: "ads",
+                wordwrap: {
+                    countAnsiEscapeCodes: true
+                }
+            }]
+        });
+        str = table([], {
+            model: [{
+                id: "ads",
+                wordwrap: {
+                    join: true
+                }
+            }]
+        });
+        str = table([], {
+            model: [{
+                id: "ads",
+                wordwrap: {
+                    mode: "soft"
+                }
+            }]
+        });
+        str = table([], {
+            model: [{
+                id: "ads",
+                wordwrap: {
+                    mode: "hard"
+                }
+            }]
+        });
+    }
+}
diff --git a/types/adone/test/glosses/text/spinners.ts b/types/adone/test/glosses/text/spinners.ts
new file mode 100644
index 0000000000..abd3627151
--- /dev/null
+++ b/types/adone/test/glosses/text/spinners.ts
@@ -0,0 +1,41 @@
+namespace adoneTests.text.spinners {
+    const {
+        text: {
+            spinner
+        }
+    } = adone;
+
+    let sp: {
+        interval: number;
+        frames: string[]
+    };
+
+    sp = spinner.dots;
+    sp = spinner.dots2;
+    sp = spinner.dots3;
+    sp = spinner.dots4;
+    sp = spinner.dots5;
+    sp = spinner.dots6;
+    sp = spinner.dots7;
+    sp = spinner.dots8;
+    sp = spinner.dots9;
+    sp = spinner.dots10;
+    sp = spinner.dots11;
+    sp = spinner.dots12;
+    sp = spinner.line;
+    sp = spinner.pipe;
+    sp = spinner.simpleDots;
+    sp = spinner.flip;
+    sp = spinner.growVertical;
+    sp = spinner.growHorizontal;
+    sp = spinner.boxBounce;
+    sp = spinner.boxBounce2;
+    sp = spinner.triangle;
+    sp = spinner.squareCorners;
+    sp = spinner.circleQuarters;
+    sp = spinner.circleHalves;
+    sp = spinner.arrow;
+    sp = spinner.arrow3;
+    sp = spinner.bouncingBar;
+    sp = spinner.clock;
+}
diff --git a/types/adone/test/glosses/text/table.ts b/types/adone/test/glosses/text/table.ts
new file mode 100644
index 0000000000..7670f6b1de
--- /dev/null
+++ b/types/adone/test/glosses/text/table.ts
@@ -0,0 +1,65 @@
+namespace adoneTests.text.table {
+    const {
+        text: {
+            table
+        }
+    } = adone;
+
+    let num: number;
+    let str: string;
+
+    namespace Table {
+        const {
+            Table
+        } = table;
+
+        new Table();
+        new Table({ chars: {} });
+        new Table({ chars: { "bottom-left": "a" } });
+        new Table({ chars: { "bottom-mid": "a" } });
+        new Table({ chars: { "bottom-right": "a" } });
+        new Table({ chars: { "left-mid": "a" } });
+        new Table({ chars: { "mid-mid": "a" } });
+        new Table({ chars: { "right-mid": "a" } });
+        new Table({ chars: { "top-left": "a" } });
+        new Table({ chars: { "top-mid": "a" } });
+        new Table({ chars: { "top-right": "a" } });
+        new Table({ chars: { bottom: "a" } });
+        new Table({ chars: { left: "a" } });
+        new Table({ chars: { mid: "a" } });
+        new Table({ chars: { middle: "a" } });
+        new Table({ chars: { right: "a" } });
+        new Table({ chars: { top: "a" } });
+        new Table({ colAligns: ["left"] });
+        new Table({ rowAligns: ["top"] });
+        new Table({ head: ["a"] });
+        new Table({ rowHeights: [10] });
+        new Table({ style: { "padding-left": 1 } });
+        new Table({ style: { "padding-right": 1 } });
+        new Table({ style: { border: ["a"] } });
+        new Table({ style: { compact: true } });
+        new Table({ style: { head: ["a"] } });
+        new Table({ truncate: "a" });
+        new Table({ colWidths: [10] });
+
+        num = new Table().width;
+        str = new Table().toString();
+
+        const def = Table.defaultOptions;
+        str = def.chars["bottom-mid"];
+        num = def.style["padding-right"];
+    }
+
+    namespace BorderlessTable {
+        const {
+            BorderlessTable
+        } = table;
+
+        new BorderlessTable();
+        new BorderlessTable({});
+        new BorderlessTable({ colAligns: ["center"] });
+        new BorderlessTable({ colWidths: [10] });
+        new BorderlessTable({ head: ["a"] });
+        new BorderlessTable({ style: { "padding-right": 1 } });
+    }
+}
diff --git a/types/adone/test/glosses/text/unicode.ts b/types/adone/test/glosses/text/unicode.ts
new file mode 100644
index 0000000000..9b331afa60
--- /dev/null
+++ b/types/adone/test/glosses/text/unicode.ts
@@ -0,0 +1,135 @@
+namespace adoneTests.text.unicode {
+    const {
+        text: {
+            unicode
+        }
+    } = adone;
+
+    let str: string;
+    let num: number;
+    let bool: boolean;
+
+    str = unicode.symbol.tick;
+    str = unicode.symbol.cross;
+    str = unicode.symbol.star;
+    str = unicode.symbol.square;
+    str = unicode.symbol.squareSmall;
+    str = unicode.symbol.squareSmallFilled;
+    str = unicode.symbol.play;
+    str = unicode.symbol.circle;
+    str = unicode.symbol.circleFilled;
+    str = unicode.symbol.circleDotted;
+    str = unicode.symbol.circleDouble;
+    str = unicode.symbol.circleCircle;
+    str = unicode.symbol.circleCross;
+    str = unicode.symbol.circlePipe;
+    str = unicode.symbol.circleQuestionMark;
+    str = unicode.symbol.bullet;
+    str = unicode.symbol.dot;
+    str = unicode.symbol.line;
+    str = unicode.symbol.ellipsis;
+    str = unicode.symbol.pointer;
+    str = unicode.symbol.pointerSmall;
+    str = unicode.symbol.info;
+    str = unicode.symbol.warning;
+    str = unicode.symbol.hamburger;
+    str = unicode.symbol.smiley;
+    str = unicode.symbol.mustache;
+    str = unicode.symbol.heart;
+    str = unicode.symbol.arrowUp;
+    str = unicode.symbol.arrowDown;
+    str = unicode.symbol.arrowLeft;
+    str = unicode.symbol.arrowRight;
+    str = unicode.symbol.radioOn;
+    str = unicode.symbol.radioOff;
+    str = unicode.symbol.checkboxOn;
+    str = unicode.symbol.checkboxOff;
+    str = unicode.symbol.checkboxCircleOn;
+    str = unicode.symbol.checkboxCircleOff;
+    str = unicode.symbol.questionMarkPrefix;
+    str = unicode.symbol.oneHalf;
+    str = unicode.symbol.oneThird;
+    str = unicode.symbol.oneQuarter;
+    str = unicode.symbol.oneFifth;
+    str = unicode.symbol.oneSixth;
+    str = unicode.symbol.oneSeventh;
+    str = unicode.symbol.oneEighth;
+    str = unicode.symbol.oneNinth;
+    str = unicode.symbol.oneTenth;
+    str = unicode.symbol.twoThirds;
+    str = unicode.symbol.twoFifths;
+    str = unicode.symbol.threeQuarters;
+    str = unicode.symbol.threeFifths;
+    str = unicode.symbol.threeEighths;
+    str = unicode.symbol.fourFifths;
+    str = unicode.symbol.fiveSixths;
+    str = unicode.symbol.fiveEighths;
+    str = unicode.symbol.sevenEighths;
+    str = unicode.symbol.minus;
+
+    str = unicode.symbolFallback.tick;
+    str = unicode.symbolFallback.cross;
+    str = unicode.symbolFallback.star;
+    str = unicode.symbolFallback.square;
+    str = unicode.symbolFallback.squareSmall;
+    str = unicode.symbolFallback.squareSmallFilled;
+    str = unicode.symbolFallback.play;
+    str = unicode.symbolFallback.circle;
+    str = unicode.symbolFallback.circleFilled;
+    str = unicode.symbolFallback.circleDotted;
+    str = unicode.symbolFallback.circleDouble;
+    str = unicode.symbolFallback.circleCircle;
+    str = unicode.symbolFallback.circleCross;
+    str = unicode.symbolFallback.circlePipe;
+    str = unicode.symbolFallback.circleQuestionMark;
+    str = unicode.symbolFallback.bullet;
+    str = unicode.symbolFallback.dot;
+    str = unicode.symbolFallback.line;
+    str = unicode.symbolFallback.ellipsis;
+    str = unicode.symbolFallback.pointer;
+    str = unicode.symbolFallback.pointerSmall;
+    str = unicode.symbolFallback.info;
+    str = unicode.symbolFallback.warning;
+    str = unicode.symbolFallback.hamburger;
+    str = unicode.symbolFallback.smiley;
+    str = unicode.symbolFallback.mustache;
+    str = unicode.symbolFallback.heart;
+    str = unicode.symbolFallback.arrowUp;
+    str = unicode.symbolFallback.arrowDown;
+    str = unicode.symbolFallback.arrowLeft;
+    str = unicode.symbolFallback.arrowRight;
+    str = unicode.symbolFallback.radioOn;
+    str = unicode.symbolFallback.radioOff;
+    str = unicode.symbolFallback.checkboxOn;
+    str = unicode.symbolFallback.checkboxOff;
+    str = unicode.symbolFallback.checkboxCircleOn;
+    str = unicode.symbolFallback.checkboxCircleOff;
+    str = unicode.symbolFallback.questionMarkPrefix;
+    str = unicode.symbolFallback.oneHalf;
+    str = unicode.symbolFallback.oneThird;
+    str = unicode.symbolFallback.oneQuarter;
+    str = unicode.symbolFallback.oneFifth;
+    str = unicode.symbolFallback.oneSixth;
+    str = unicode.symbolFallback.oneSeventh;
+    str = unicode.symbolFallback.oneEighth;
+    str = unicode.symbolFallback.oneNinth;
+    str = unicode.symbolFallback.oneTenth;
+    str = unicode.symbolFallback.twoThirds;
+    str = unicode.symbolFallback.twoFifths;
+    str = unicode.symbolFallback.threeQuarters;
+    str = unicode.symbolFallback.threeFifths;
+    str = unicode.symbolFallback.threeEighths;
+    str = unicode.symbolFallback.fourFifths;
+    str = unicode.symbolFallback.fiveSixths;
+    str = unicode.symbolFallback.fiveEighths;
+    str = unicode.symbolFallback.sevenEighths;
+    str = unicode.symbolFallback.minus;
+
+    str = unicode.approx("asd");
+    num = unicode.length("ad");
+    str = unicode.toArray("asd")[0];
+    num = unicode.surrogatePair("a");
+    bool = unicode.isFullWidthCodePoint(100);
+    bool = unicode.isFullWidth("a");
+    str = unicode.toFullWidth("asd");
+}
diff --git a/types/adone/test/glosses/utils.ts b/types/adone/test/glosses/utils.ts
index 1ffabbd59b..656e000f8b 100644
--- a/types/adone/test/glosses/utils.ts
+++ b/types/adone/test/glosses/utils.ts
@@ -494,6 +494,33 @@ namespace utilTests {
         const k = util.throttle.create(() => { }, { dropLast: true });
 
         const l: symbol = util.throttle.DROPPED;
+
+        {
+            const t = util.throttle.create();
+            t(() => 2).then((x: number) => {});
+            t(() => Promise.resolve(2)).then((x: number) => {});
+
+            t(() => "2").then((x: string) => {});
+            t(() => Promise.resolve("2")).then((x: string) => {});
+
+            t((a) => a, 2).then((x: number) => {});
+            t((a) => Promise.resolve(a), 2).then((x: number) => {});
+
+            t((a, b) => String(a) + b, 2, "3").then((x: string) => {});
+            t(async (a, b) => String(a) + b, 2, "3").then((x: string) => x);
+
+            t((a, b, c) => String(a) + b + c, 2, "3", "4").then((x: string) => {});
+            t(async (a, b, c) => String(a) + b + c, 2, "3", "4").then((x: string) => x);
+
+            t((a, b, c, d) => String(a) + b + c + String(d), 2, "3", "4", 5).then((x: string) => {});
+            t(async (a, b, c, d) => String(a) + b + c + String(d), 2, "3", "4", 5).then((x: string) => x);
+
+            t((a, b, c, d, e) => String(a) + b + c + String(d) + e.join(","), 2, "3", "4", 5, [1, 2, 3]).then((x: string) => {});
+            t(async (a, b, c, d, e) => String(a) + b + c + String(d) + e.join(","), 2, "3", "4", 5, [1, 2, 3]).then((x: string) => x);
+
+            t((a, b, c, d, e, f) => String(a) + b + c + String(d) + e.join(",") + f, 2, "3", "4", 5, [1, 2, 3], 6).then((x: any) => {});
+            t(async (a, b, c, d, e, f) => String(a) + b + c + String(d) + e.join(",") + f, 2, "3", "4", 5, [1, 2, 3], 6).then((x: any) => x);
+        }
     }
 
     namespace fakeClock {
@@ -1354,4 +1381,22 @@ namespace utilTests {
         match.resizeCache(10050);
         { const a: object = match.getCache(); }
     }
+
+    namespace iconv {
+        const {
+            iconv
+        } = util;
+
+        let str: string;
+        let buf: Buffer;
+        let bool: boolean;
+
+        str = iconv.decode(Buffer.from("hello"), "CP1251");
+        str = iconv.decode(Buffer.from("hello"), "CP1251", {});
+
+        buf = iconv.encode("привет", "CP1251");
+        buf = iconv.encode("привет", "CP1251", {});
+
+        bool = iconv.encodingExists("cp1251");
+    }
 }
diff --git a/types/adone/tsconfig.json b/types/adone/tsconfig.json
index 8d1f4040d6..66671bc175 100644
--- a/types/adone/tsconfig.json
+++ b/types/adone/tsconfig.json
@@ -19,53 +19,129 @@
         "experimentalDecorators": true
     },
     "files": [
-        "index.d.ts",
+        "adone-tests.ts",
         "adone.d.ts",
+        "glosses/archives.d.ts",
+        "glosses/assertion.d.ts",
+        "glosses/collections/array_set.d.ts",
+        "glosses/collections/async_queue.d.ts",
+        "glosses/collections/avl_tree.d.ts",
+        "glosses/collections/binary_search_tree.d.ts",
+        "glosses/collections/buffer_list.d.ts",
+        "glosses/collections/byte_array.d.ts",
+        "glosses/collections/default_map.d.ts",
+        "glosses/collections/fast_lru.d.ts",
+        "glosses/collections/index.d.ts",
+        "glosses/collections/linked_list.d.ts",
+        "glosses/collections/lru.d.ts",
+        "glosses/collections/map_cache.d.ts",
+        "glosses/collections/ns_cache.d.ts",
+        "glosses/collections/priority_queue.d.ts",
+        "glosses/collections/queue.d.ts",
+        "glosses/collections/rb_tree.d.ts",
+        "glosses/collections/refcounted_cache.d.ts",
+        "glosses/collections/set.d.ts",
+        "glosses/collections/stack.d.ts",
+        "glosses/collections/timedout_map.d.ts",
+        "glosses/compressors.d.ts",
+        "glosses/crypto/asn1.d.ts",
+        "glosses/crypto/ed25519.d.ts",
+        "glosses/crypto/index.d.ts",
+        "glosses/crypto/secp256k1.d.ts",
+        "glosses/data.d.ts",
+        "glosses/datetime.d.ts",
+        "glosses/events.d.ts",
+        "glosses/exceptions.d.ts",
+        "glosses/fake.d.ts",
+        "glosses/fast.d.ts",
+        "glosses/fs.d.ts",
+        "glosses/is.d.ts",
         "glosses/math/index.d.ts",
         "glosses/math/matrix.d.ts",
         "glosses/math/simd.d.ts",
         "glosses/meta.d.ts",
-        "glosses/std.d.ts",
-        "glosses/utils.d.ts",
-        "glosses/assertion.d.ts",
+        "glosses/net/http/client.d.ts",
+        "glosses/net/http/index.d.ts",
+        "glosses/net/index.d.ts",
         "glosses/promise.d.ts",
-        "glosses/shani.d.ts",
+        "glosses/regex.d.ts",
+        "glosses/semver.d.ts",
         "glosses/shani-global.d.ts",
-        "glosses/collections.d.ts",
-        "glosses/events.d.ts",
-        "glosses/fs.d.ts",
-        "glosses/is.d.ts",
-        "glosses/exceptions.d.ts",
+        "glosses/shani.d.ts",
+        "glosses/std.d.ts",
         "glosses/streams.d.ts",
-        "glosses/fast.d.ts",
-        "glosses/data.d.ts",
-        "glosses/datetime.d.ts",
-        "glosses/compressors.d.ts",
-        "glosses/archives.d.ts",
-        "adone-tests.ts",
-        "test/index.ts",
-        "test/index-import.ts",
+        "glosses/system/env.d.ts",
+        "glosses/system/index.d.ts",
+        "glosses/system/process.d.ts",
+        "glosses/system/user.d.ts",
+        "glosses/templating/dot.d.ts",
+        "glosses/templating/index.d.ts",
+        "glosses/templating/nunjucks.d.ts",
+        "glosses/text/index.d.ts",
+        "glosses/text/pretties.d.ts",
+        "glosses/text/spinners.d.ts",
+        "glosses/text/table.d.ts",
+        "glosses/text/unicode.d.ts",
+        "glosses/utils.d.ts",
+        "index.d.ts",
         "test/glosses/application.ts",
+        "test/glosses/archives.ts",
+        "test/glosses/assertion.ts",
+        "test/glosses/collections/array_set.ts",
+        "test/glosses/collections/async_queue.ts",
+        "test/glosses/collections/avl_tree.ts",
+        "test/glosses/collections/binary_search_tree.ts",
+        "test/glosses/collections/buffer_list.ts",
+        "test/glosses/collections/byte_array.ts",
+        "test/glosses/collections/default_map.ts",
+        "test/glosses/collections/fast_lru.ts",
+        "test/glosses/collections/linked_list.ts",
+        "test/glosses/collections/lru.ts",
+        "test/glosses/collections/map_cache.ts",
+        "test/glosses/collections/ns_cache.ts",
+        "test/glosses/collections/priority_queue.ts",
+        "test/glosses/collections/queue.ts",
+        "test/glosses/collections/rb_tree.ts",
+        "test/glosses/collections/refcounted_cache.ts",
+        "test/glosses/collections/set.ts",
+        "test/glosses/collections/stack.ts",
+        "test/glosses/collections/timedout_map.ts",
+        "test/glosses/compressors.ts",
+        "test/glosses/crypto/asn1.ts",
+        "test/glosses/crypto/ed25519.ts",
+        "test/glosses/crypto/secp256k1.ts",
+        "test/glosses/data.ts",
+        "test/glosses/datetime.ts",
+        "test/glosses/events.ts",
+        "test/glosses/exceptions.ts",
+        "test/glosses/fake.ts",
+        "test/glosses/fast.ts",
+        "test/glosses/fs.ts",
+        "test/glosses/is.ts",
         "test/glosses/math/index.ts",
         "test/glosses/math/matrix.ts",
         "test/glosses/math/simd.ts",
         "test/glosses/meta.ts",
-        "test/glosses/std.ts",
-        "test/glosses/utils.ts",
-        "test/glosses/assertion.ts",
+        "test/glosses/net/http/client.ts",
         "test/glosses/promise.ts",
-        "test/glosses/shani.ts",
+        "test/glosses/regex.ts",
+        "test/glosses/semver.ts",
         "test/glosses/shani-global.ts",
-        "test/glosses/collections.ts",
-        "test/glosses/events.ts",
-        "test/glosses/fs.ts",
-        "test/glosses/is.ts",
-        "test/glosses/exceptions.ts",
+        "test/glosses/shani.ts",
+        "test/glosses/std.ts",
         "test/glosses/streams.ts",
-        "test/glosses/fast.ts",
-        "test/glosses/data.ts",
-        "test/glosses/datetime.ts",
-        "test/glosses/compressors.ts",
-        "test/glosses/archives.ts"
+        "test/glosses/system/env.ts",
+        "test/glosses/system/process.ts",
+        "test/glosses/system/user.ts",
+        "test/glosses/templating/dot.ts",
+        "test/glosses/templating/nunjucks.ts",
+        "test/glosses/text/index.ts",
+        "test/glosses/text/pretties.ts",
+        "test/glosses/text/spinners.ts",
+        "test/glosses/text/table.ts",
+        "test/glosses/text/unicode.ts",
+        "test/glosses/utils.ts",
+        "test/index-import.ts",
+        "test/index.ts"
     ]
 }
\ No newline at end of file
diff --git a/types/agenda/agenda-tests.ts b/types/agenda/agenda-tests.ts
index 964eb1b836..5cd18baf76 100644
--- a/types/agenda/agenda-tests.ts
+++ b/types/agenda/agenda-tests.ts
@@ -1,4 +1,4 @@
-import * as Agenda from "agenda";
+import Agenda = require("agenda");
 
 var mongoConnectionString = "mongodb://127.0.0.1/agenda";
 
diff --git a/types/alexa-sdk/tsconfig.json b/types/alexa-sdk/tsconfig.json
index d1932fa469..acc11c8263 100644
--- a/types/alexa-sdk/tsconfig.json
+++ b/types/alexa-sdk/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "alexa-sdk-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/algoliasearch/tsconfig.json b/types/algoliasearch/tsconfig.json
index 4d7e52dd8b..3358732ba3 100644
--- a/types/algoliasearch/tsconfig.json
+++ b/types/algoliasearch/tsconfig.json
@@ -1,16 +1,23 @@
 {
-  "compilerOptions": {
-    "module": "commonjs",
-    "lib": ["es6"],
-    "noImplicitAny": true,
-    "noImplicitThis": true,
-    "strictNullChecks": false,
-    "strictFunctionTypes": true,
-    "baseUrl": "../",
-    "typeRoots": ["../"],
-    "types": [],
-    "noEmit": true,
-    "forceConsistentCasingInFileNames": true
-  },
-  "files": ["index.d.ts", "algoliasearch-tests.ts"]
-}
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": false,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "algoliasearch-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/alt/index.d.ts b/types/alt/index.d.ts
index 2d4c6e259f..0c69e4020a 100644
--- a/types/alt/index.d.ts
+++ b/types/alt/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/goatslacker/alt
 // Definitions by: Michael Shearer <https://github.com/Shearerbeard>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 ///<reference types="react"/>
 
diff --git a/types/analytics-node/analytics-node-tests.ts b/types/analytics-node/analytics-node-tests.ts
index 5207fe560b..5dfabb426c 100644
--- a/types/analytics-node/analytics-node-tests.ts
+++ b/types/analytics-node/analytics-node-tests.ts
@@ -18,6 +18,22 @@ function testIdentify(): void {
       friends: 42
     }
   });
+
+  analytics.identify({
+    userId: '019mr8mf4r',
+    traits: {
+      name: 'Michael Bolton',
+      email: 'mbolton@initech.com',
+      plan: 'Enterprise',
+      friends: 42
+    }
+  }, (err, data) => {
+    if (err) {
+      console.error(err);
+    } else {
+      data.batch.forEach((message) => console.log(`${data.sentAt} : ${message}`))
+    }
+  });
 }
 
 function testTrack(): void {
@@ -29,6 +45,21 @@ function testTrack(): void {
       shippingMethod: '2-day'
     }
   });
+
+  analytics.track({
+    userId: '019mr8mf4r',
+    event: 'Purchased an Item',
+    properties: {
+      revenue: 39.95,
+      shippingMethod: '2-day'
+    }
+  }, (err, data) => {
+    if (err) {
+      console.error(err);
+    } else {
+      data.batch.forEach((message) => console.log(`${data.sentAt} : ${message}`))
+    }
+  });
 }
 
 function testPage(): void {
@@ -43,6 +74,24 @@ function testPage(): void {
       referrer: 'https://github.com/segmentio/analytics-node'
     }
   });
+
+  analytics.page({
+    userId: '019mr8mf4r',
+    category: 'Docs',
+    name: 'Node.js Library',
+    properties: {
+      url: 'https://segment.com/docs/libraries/node',
+      path: '/docs/libraries/node/',
+      title: 'Node.js Library - Segment',
+      referrer: 'https://github.com/segmentio/analytics-node'
+    }
+  }, (err, data) => {
+    if (err) {
+      console.error(err);
+    } else {
+      data.batch.forEach((message) => console.log(`${data.sentAt} : ${message}`))
+    }
+  });
 }
 
 function testAlias(): void {
@@ -65,6 +114,21 @@ function testGroup(): void {
       description: 'Accounting Software'
     }
   });
+
+  analytics.group({
+    userId: '019mr8mf4r',
+    groupId: '56',
+    traits: {
+      name: 'Initech',
+      description: 'Accounting Software'
+    }
+  }, (err, data) => {
+    if (err) {
+      console.error(err);
+    } else {
+      data.batch.forEach((message) => console.log(`${data.sentAt} : ${message}`))
+    }
+  });
 }
 
 function testIntegrations(): void {
@@ -77,11 +141,27 @@ function testIntegrations(): void {
       'Google Analytics': false
     }
   });
+
+  analytics.track({
+    event: 'Upgraded Membershipt',
+    userId: '97234974',
+    integrations: {
+      'All': false,
+      'Vero': true,
+      'Google Analytics': false
+    }
+  }, (err, data) => {
+    if (err) {
+      console.error(err);
+    } else {
+      data.batch.forEach((message) => console.log(`${data.sentAt} : ${message}`))
+    }
+  });
 }
 
 function testFlush(): void {
   analytics.flush();
-  analytics.flush(function(err, batch) {
+  analytics.flush((err, batch) => {
     if (err) { alert("Oh nos!"); }
     else { console.log(batch.batch[0].type); }
   });
diff --git a/types/analytics-node/index.d.ts b/types/analytics-node/index.d.ts
index fa0b8d6426..a1de134195 100644
--- a/types/analytics-node/index.d.ts
+++ b/types/analytics-node/index.d.ts
@@ -1,11 +1,36 @@
 // Type definitions for Segment's analytics.js for Node.js
 // Project: https://segment.com/docs/libraries/node/
 // Definitions by: Andrew Fong <https://github.com/fongandrew>
+//                 Thomas Thiebaud <https://github.com/thomasthiebaud>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 export = AnalyticsNode.Analytics;
 
 declare namespace AnalyticsNode {
+  interface Message {
+    type: string;
+    context: {
+      library: {
+        name: string;
+        version: string;
+      },
+      [key: string]: any
+    };
+    _metadata: {
+      nodeVersion: string;
+      [key: string]: any;
+    },
+    timestamp?: Date;
+    messageId?: string;
+    anonymousId: string | number;
+    userId: string | number;
+  }
+
+  interface Data {
+    batch: Message[],
+    timestamp: Date;
+    sentAt: Date;
+  }
 
   interface Integrations {
     [index: string]: boolean;
@@ -25,7 +50,7 @@ declare namespace AnalyticsNode {
       timestamp?: Date;
       context?: Object;
       integrations?: Integrations;
-    }): Analytics;
+    }, callback?: (err: Error, data: Data) => void): Analytics;
 
     /* The track method lets you record the actions your users perform. */
     track(message: {
@@ -35,7 +60,7 @@ declare namespace AnalyticsNode {
       timestamp?: Date;
       context?: Object;
       integrations?: Integrations;
-    }): Analytics;
+    }, callback?: (err: Error, data: Data) => void): Analytics;
 
     /* The page method lets you record page views on your website, along with
        optional extra information about the page being viewed. */
@@ -47,14 +72,14 @@ declare namespace AnalyticsNode {
       timestamp?: Date;
       context?: Object;
       integrations?: Integrations;
-    }): Analytics;
+    }, callback?: (err: Error, data: Data) => void): Analytics;
 
     /* alias is how you associate one identity with another. */
     alias(message: {
       previousId: string | number;
       userId: string | number;
       integrations?: Integrations;
-    }): Analytics;
+    }, callback?: (err: Error, data: Data) => void): Analytics;
 
     /* Group calls can be used to associate individual users with shared
        accounts or companies. */
@@ -66,16 +91,9 @@ declare namespace AnalyticsNode {
       timestamp?: Date;
       anonymous_id?: string | number;
       integrations?: Integrations;
-    }): Analytics;
+    }, callback?: (err: Error, data: Data) => void): Analytics;
 
     /* Flush batched calls to make sure nothing is left in the queue */
-    flush(fn?: (err: Error, batch: {
-      batch: Array<{
-        type: string;
-      }>;
-      messageId: string;
-      sentAt: Date;
-      timestamp: Date;
-    }) => void): Analytics;
+    flush(callback?: (err: Error, data: Data) => void): Analytics;
   }
 }
diff --git a/types/angular-hotkeys/tsconfig.json b/types/angular-hotkeys/tsconfig.json
index acb11ff247..81fdf31b45 100644
--- a/types/angular-hotkeys/tsconfig.json
+++ b/types/angular-hotkeys/tsconfig.json
@@ -21,4 +21,4 @@
         "index.d.ts",
         "angular-hotkeys-tests.ts"
     ]
-}
+}
\ 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 8d6955c697..ad79cff2db 100644
--- a/types/angular-material/angular-material-tests.ts
+++ b/types/angular-material/angular-material-tests.ts
@@ -164,8 +164,7 @@ myApp.controller('DialogController', ($scope: TestScope, $mdDialog: ng.material.
         .controller(function TestController(param) { })
         .controller(class { })
         .controller(['fakeService', function TestController(fake) { }])
-        .controller(['fakeService', class { }])
-        ;
+        .controller(['fakeService', class { }]);
 
     const dialogOptions: ng.material.IDialogOptions = {};
 
@@ -389,3 +388,11 @@ myApp.controller('PanelController', ($scope: TestScope, $mdPanel: ng.material.IP
         $mdPanel.newPanelAnimation().openFrom({ top: 0, left: 0 });
     };
 });
+
+myApp.controller('StickyController', ($scope: TestScope, $mdSticky: ng.material.IStickyService) => {
+    const stickyElement = angular.element(new Element());
+    const cloneStickyElement = stickyElement.clone();
+
+    $mdSticky($scope, stickyElement);
+    $mdSticky($scope, stickyElement, cloneStickyElement);
+});
diff --git a/types/angular-material/index.d.ts b/types/angular-material/index.d.ts
index 92f6d46751..d77f5ae7ce 100644
--- a/types/angular-material/index.d.ts
+++ b/types/angular-material/index.d.ts
@@ -494,5 +494,7 @@ declare module 'angular' {
         interface IProgressCircularProvider {
             configure(options: IProgressCircularConfig): void;
         }
+
+        type IStickyService = (scope: IScope, element: JQuery, elementClone?: JQuery) => void;
     }
 }
diff --git a/types/angular-websocket/tsconfig.json b/types/angular-websocket/tsconfig.json
index 89d5cb9dc3..e4d648dbda 100644
--- a/types/angular-websocket/tsconfig.json
+++ b/types/angular-websocket/tsconfig.json
@@ -21,4 +21,4 @@
         "index.d.ts",
         "angular-websocket-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/angular/angular-tests.ts b/types/angular/angular-tests.ts
index 0b05400f6d..ca9d2c7568 100644
--- a/types/angular/angular-tests.ts
+++ b/types/angular/angular-tests.ts
@@ -710,6 +710,24 @@ function test_angular_forEach() {
         this.push(`${key}: ${value}`);
     }, log);
     // expect(log).toEqual(['name: misko', 'gender: male']);
+    // $ExpectType NodeListOf<HTMLImageElement>
+    angular.forEach(document.getElementsByTagName('img'), (value, key, obj) => {
+        value; // $ExpectType HTMLImageElement
+        key; // $ExpectType number
+        obj; // $ExpectType NodeListOf<HTMLImageElement>
+    });
+    // $ExpectType number[]
+    angular.forEach([1, 2, 3], (value, key, obj) => {
+        value; // $ExpectType number
+        key; // $ExpectType number
+        obj; // $ExpectType number[]
+    });
+    // $ExpectType string
+    angular.forEach('123', (value, key, obj) => {
+        value; // $ExpectType string
+        key; // $ExpectType number
+        obj; // $ExpectType string
+    });
 }
 
 // angular.element() tests
diff --git a/types/angular/index.d.ts b/types/angular/index.d.ts
index 32a5c74b52..4c896eb430 100644
--- a/types/angular/index.d.ts
+++ b/types/angular/index.d.ts
@@ -100,7 +100,11 @@ declare namespace angular {
          * @param iterator Iterator function.
          * @param context Object to become context (this) for the iterator function.
          */
-        forEach<T>(obj: T[], iterator: (value: T, key: number, obj: T[]) => void, context?: any): T[];
+        forEach<T, U extends ArrayLike<T> = T[]>(
+            obj: U,
+            iterator: (value: U[number], key: number, obj: U) => void,
+            context?: any
+        ): U;
         /**
          * Invokes the iterator function once for each item in obj collection, which can be either an object or an array. The iterator function is invoked with iterator(value, key), where value is the value of an object property or an array element and key is the object property key or array element index. Specifying a context for the function is optional.
          *
diff --git a/types/angular/tsconfig.json b/types/angular/tsconfig.json
index 5ce810f938..46eeb69c7a 100644
--- a/types/angular/tsconfig.json
+++ b/types/angular/tsconfig.json
@@ -25,4 +25,4 @@
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     }
-}
+}
\ No newline at end of file
diff --git a/types/ansi-colors/tsconfig.json b/types/ansi-colors/tsconfig.json
index 8a0f980cbc..ebd56021f9 100644
--- a/types/ansi-colors/tsconfig.json
+++ b/types/ansi-colors/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "ansi-colors-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/ansi-regex/tsconfig.json b/types/ansi-regex/tsconfig.json
index cf1ac84a5c..4d0c1ff787 100644
--- a/types/ansi-regex/tsconfig.json
+++ b/types/ansi-regex/tsconfig.json
@@ -7,7 +7,7 @@
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
-	"strictFunctionTypes": true,
+        "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"
@@ -20,4 +20,4 @@
         "index.d.ts",
         "ansi-regex-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/apex.js/apex.js-tests.ts b/types/apex.js/apex.js-tests.ts
index 0595ef43ea..f5d96e2c54 100644
--- a/types/apex.js/apex.js-tests.ts
+++ b/types/apex.js/apex.js-tests.ts
@@ -1,4 +1,4 @@
-import * as λ from "apex.js";
+import λ = require("apex.js");
 
 const handler = λ((event, context) => {
     console.log("Event: " + JSON.stringify(event));
diff --git a/types/apex.js/index.d.ts b/types/apex.js/index.d.ts
index 0998ce794c..20e05d2a5e 100644
--- a/types/apex.js/index.d.ts
+++ b/types/apex.js/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/apex/node-apex
 // Definitions by: Yoriki Yamaguchi <https://github.com/y13i>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 /// <reference types="aws-lambda" />
 
diff --git a/types/aphrodite/index.d.ts b/types/aphrodite/index.d.ts
index 0e04b07af7..00d1908d9f 100644
--- a/types/aphrodite/index.d.ts
+++ b/types/aphrodite/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/Khan/aphrodite
 // Definitions by: Alexey Svetliakov <https://github.com/asvetliakov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from "react";
 
diff --git a/types/api-error-handler/api-error-handler-tests.ts b/types/api-error-handler/api-error-handler-tests.ts
index 67afbb0fce..aa72342d75 100644
--- a/types/api-error-handler/api-error-handler-tests.ts
+++ b/types/api-error-handler/api-error-handler-tests.ts
@@ -1,4 +1,4 @@
-import * as errorHandler from 'api-error-handler';
+import errorHandler = require('api-error-handler');
 import * as express from 'express';
 
 var api = express.Router();
diff --git a/types/appdmg/tsconfig.json b/types/appdmg/tsconfig.json
index f4ca0f95c5..452b9a4af3 100644
--- a/types/appdmg/tsconfig.json
+++ b/types/appdmg/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "appdmg-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/archiver/archiver-tests.ts b/types/archiver/archiver-tests.ts
index fc2e481330..752d9cc944 100644
--- a/types/archiver/archiver-tests.ts
+++ b/types/archiver/archiver-tests.ts
@@ -1,4 +1,4 @@
-import * as Archiver from 'archiver';
+import Archiver = require('archiver');
 import * as fs from 'fs';
 
 const options: Archiver.ArchiverOptions = {
diff --git a/types/argon2-browser/tsconfig.json b/types/argon2-browser/tsconfig.json
index a380778b29..c3e9586f3c 100644
--- a/types/argon2-browser/tsconfig.json
+++ b/types/argon2-browser/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "argon2-browser-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/arr-union/tsconfig.json b/types/arr-union/tsconfig.json
index 64a3b1efed..de2c9671e9 100644
--- a/types/arr-union/tsconfig.json
+++ b/types/arr-union/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "arr-union-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/artillery/tsconfig.json b/types/artillery/tsconfig.json
index 0ad4bae0ee..02b327a508 100644
--- a/types/artillery/tsconfig.json
+++ b/types/artillery/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "artillery-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/assert-equal-jsx/index.d.ts b/types/assert-equal-jsx/index.d.ts
index f571020ef8..e017fcf57c 100644
--- a/types/assert-equal-jsx/index.d.ts
+++ b/types/assert-equal-jsx/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/thejameskyle/assert-equal-jsx
 // Definitions by: Josh Toft <https://github.com/seryl>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from 'react';
 
diff --git a/types/assets-webpack-plugin/assets-webpack-plugin-tests.ts b/types/assets-webpack-plugin/assets-webpack-plugin-tests.ts
index 6851f853f2..b02c707d81 100644
--- a/types/assets-webpack-plugin/assets-webpack-plugin-tests.ts
+++ b/types/assets-webpack-plugin/assets-webpack-plugin-tests.ts
@@ -1,5 +1,5 @@
 import * as webpack from 'webpack';
-import * as AssetsPlugin from 'assets-webpack-plugin';
+import AssetsPlugin = require('assets-webpack-plugin');
 
 const config: webpack.Configuration = {
     plugins: [
diff --git a/types/async-retry/tsconfig.json b/types/async-retry/tsconfig.json
index 8bdf98656d..c010746fa3 100644
--- a/types/async-retry/tsconfig.json
+++ b/types/async-retry/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "async-retry-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/asynciterator/tsconfig.json b/types/asynciterator/tsconfig.json
index 8b8b919abc..c50f09f902 100644
--- a/types/asynciterator/tsconfig.json
+++ b/types/asynciterator/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "asynciterator-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/atom-keymap/tsconfig.json b/types/atom-keymap/tsconfig.json
index 8a17cc061c..14797a013b 100644
--- a/types/atom-keymap/tsconfig.json
+++ b/types/atom-keymap/tsconfig.json
@@ -21,4 +21,4 @@
         "index.d.ts",
         "atom-keymap-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/atom-mocha-test-runner/tsconfig.json b/types/atom-mocha-test-runner/tsconfig.json
index c6e9fb20c0..40639f83aa 100644
--- a/types/atom-mocha-test-runner/tsconfig.json
+++ b/types/atom-mocha-test-runner/tsconfig.json
@@ -22,4 +22,4 @@
         "index.d.ts",
         "atom-mocha-test-runner-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/atom/atom-tests.ts b/types/atom/atom-tests.ts
index fbd5f6d0d8..e53e29b176 100644
--- a/types/atom/atom-tests.ts
+++ b/types/atom/atom-tests.ts
@@ -2897,7 +2897,6 @@ function testTextEditor() {
 
     // Grammars
     grammar = editor.getGrammar();
-    editor.setGrammar(grammar);
 
     // Managing Syntax Scopes
     scopeDescriptor = editor.getRootScopeDescriptor();
diff --git a/types/atom/index.d.ts b/types/atom/index.d.ts
index f83f751657..9b0d194976 100644
--- a/types/atom/index.d.ts
+++ b/types/atom/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Atom 1.23
+// Type definitions for Atom 1.24
 // Project: https://github.com/atom/atom
 // Definitions by: GlenCFL <https://github.com/GlenCFL>
 //                 smhxx <https://github.com/smhxx>
@@ -7,7 +7,7 @@
 // TypeScript Version: 2.3
 
 // NOTE: only those classes exported within this file should be retain that status below.
-// https://github.com/atom/atom/blob/v1.23.0/exports/atom.js
+// https://github.com/atom/atom/blob/v1.24.0/exports/atom.js
 
 /// <reference types="jquery" />
 /// <reference types="node" />
@@ -1312,6 +1312,12 @@ export class TextEditor {
     /** Retrieves the current TextBuffer. */
     getBuffer(): TextBuffer;
 
+    /** Sets the read-only state for the editor. */
+    setReadOnly(readonly: boolean): void;
+
+    /** Whether or not this editor is in read-only mode. */
+    isReadOnly(): boolean;
+
     /**
      *  Calls your callback when a Gutter is added to the editor. Immediately calls
      *  your callback for each existing gutter.
@@ -1911,7 +1917,7 @@ export class TextEditor {
     getCursors(): Cursor[];
 
     /**
-     *  Get all Cursorss, ordered by their position in the buffer instead of the
+     *  Get all Cursors, ordered by their position in the buffer instead of the
      *  order in which they were added.
      */
     getCursorsOrderedByBufferPosition(): Cursor[];
@@ -2260,12 +2266,6 @@ export class TextEditor {
     /** Get the current Grammar of this editor. */
     getGrammar(): Grammar;
 
-    /**
-     *  Set the current Grammar of this editor.
-     *  Assigning a grammar will cause the editor to re-tokenize based on the new grammar.
-     */
-    setGrammar(grammar: Grammar): void;
-
     // Managing Syntax Scopes
     /**
      *  Returns a ScopeDescriptor that includes this editor's language.
@@ -3341,7 +3341,7 @@ export class Directory {
     getEntriesSync(): Array<File|Directory>;
 
     /** Reads file entries in this directory from disk asynchronously. */
-    getEntries(callback: (error: Error, entries: Array<File|Directory>) => void): void;
+    getEntries(callback: (error: Error|null, entries: Array<File|Directory>) => void): void;
 
     /**
      *  Determines if the given path (real or symbolic) is inside this directory. This
@@ -3847,6 +3847,51 @@ export interface GrammarRegistry {
      *  @return An array of Token instances decoded from the given tags.
      */
     decodeTokens(lineText: string, tags: Array<number|string>): GrammarToken[];
+
+    /**
+     *  Set a TextBuffer's language mode based on its path and content, and continue
+     *  to update its language mode as grammars are added or updated, or the buffer's
+     *  file path changes.
+     *  @param buffer The buffer whose language mode will be maintained.
+     *  @return A Disposable that can be used to stop updating the buffer's
+     *  language mode.
+     */
+    maintainLanguageMode(buffer: TextBuffer): Disposable;
+
+    /**
+     *  Force a TextBuffer to use a different grammar than the one that would otherwise
+     *  be selected for it.
+     *  @param buffer The buffer whose grammar will be set.
+     *  @param languageId The identifier of the desired language.
+     *  @return Returns a boolean that indicates whether the language was successfully
+     * found.
+     */
+    assignLanguageMode(buffer: TextBuffer, languageId: string): boolean;
+
+    /**
+     *  Remove any language mode override that has been set for the given TextBuffer.
+     *  This will assign to the buffer the best language mode available.
+     */
+    autoAssignLanguageMode(buffer: TextBuffer): void;
+
+    /**
+     *  Select a grammar for the given file path and file contents.
+     *
+     *  This picks the best match by checking the file path and contents against
+     *  each grammar.
+     *  @param filePath A string file path.
+     *  @param fileContents A string of text for that file path.
+     */
+    selectGrammar(filePath: string, fileContents: string): Grammar;
+
+    /**
+     *  Returns a number representing how well the grammar matches the
+     *  `filePath` and `contents`.
+     *  @param grammar The grammar to score.
+     *  @param filePath A string file path.
+     *  @param contents A string of text for that file path.
+     */
+    getGrammarScore(grammar: Grammar, filePath: string, contents: string): number;
 }
 
 /** Represents a gutter within a TextEditor. */
@@ -4366,7 +4411,7 @@ export interface PathWatcher extends DisposableLike {
 
     /**
      *  Unsubscribe all subscribers from filesystem events. Native resources will be
-     *  release asynchronously, but this watcher will stop broadcasting events
+     *  released asynchronously, but this watcher will stop broadcasting events
      *  immediately.
      */
     dispose(): void;
@@ -4391,7 +4436,11 @@ export interface Project {
     onDidChangeFiles(callback: (events: FilesystemChangeEvent) => void): Disposable;
 
     // Accessing the Git Repository
-    /** Get an Array of GitRepositorys associated with the project's directories. */
+    /**
+     * Get an Array of GitRepositorys associated with the project's directories.
+     *
+     * This method will be removed in 2.0 because it does synchronous I/O.
+     */
     getRepositories(): GitRepository[];
 
     /** Get the repository for a given directory asynchronously. */
@@ -5075,7 +5124,7 @@ export class TextBuffer {
 
     /**
      *  Get a MarkerLayer by id.
-     *  Returns a MarkerLayer or `` if no layer exists with the given id.
+     *  Returns a MarkerLayer or undefined if no layer exists with the given id.
      */
     getMarkerLayer(id: string): MarkerLayer|undefined;
 
@@ -5313,7 +5362,7 @@ export interface ThemeManager {
     /** Returns an Array of all the loaded themes. */
     getLoadedThemes(): Package[]|undefined;
 
-    // Accessing Active Themes
+    // Managing Enabled Themes
     /** Returns an Array of strings all the active theme names. */
     getActiveThemeNames(): string[]|undefined;
 
@@ -5695,7 +5744,7 @@ export interface TextEditorObservedEvent {
 // information under certain contexts.
 
 // NOTE: the config schema with these defaults can be found here:
-//   https://github.com/atom/atom/blob/v1.23.0/src/config-schema.js
+//   https://github.com/atom/atom/blob/v1.24.0/src/config-schema.js
 /**
  *  Allows you to strongly type Atom configuration variables. Additional key:value
  *  pairings merged into this interface will result in configuration values under
diff --git a/types/atom/tsconfig.json b/types/atom/tsconfig.json
index a58ec7b74c..35ece9c1dd 100644
--- a/types/atom/tsconfig.json
+++ b/types/atom/tsconfig.json
@@ -24,4 +24,4 @@
         "linter/index.d.ts",
         "status-bar/index.d.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/auto-sni/auto-sni-tests.ts b/types/auto-sni/auto-sni-tests.ts
index 6be54148fb..8cd17af850 100644
--- a/types/auto-sni/auto-sni-tests.ts
+++ b/types/auto-sni/auto-sni-tests.ts
@@ -1,4 +1,4 @@
-import * as autosni from "auto-sni";
+import autosni = require("auto-sni");
 const a = autosni({
 	agreeTos: true,
 	email: '',
diff --git a/types/autosuggest-highlight/autosuggest-highlight-tests.ts b/types/autosuggest-highlight/autosuggest-highlight-tests.ts
new file mode 100644
index 0000000000..50283a24bd
--- /dev/null
+++ b/types/autosuggest-highlight/autosuggest-highlight-tests.ts
@@ -0,0 +1,11 @@
+import match = require('autosuggest-highlight/match');
+import parse = require('autosuggest-highlight/parse');
+
+function matchTest() {
+    let matches = match('some text', 'te'); // $ExpectType number[] | number[][]
+    matches = match('some sweet text', 's s'); // $ExpectType number[] | number[][]
+}
+
+function parseTest() {
+    const parts = parse('Pretty cool text', [[7, 9], [12, 13]]); // $ExpectType { text: string; highlight: boolean; }[]
+}
diff --git a/types/autosuggest-highlight/index.d.ts b/types/autosuggest-highlight/index.d.ts
new file mode 100644
index 0000000000..e05c30d608
--- /dev/null
+++ b/types/autosuggest-highlight/index.d.ts
@@ -0,0 +1,5 @@
+// Type definitions for autosuggest-highlight 3.1
+// Project: https://github.com/moroshko/autosuggest-highlight#readme
+// Definitions by: Artur Sianiuk <https://github.com/senukartur>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
diff --git a/types/autosuggest-highlight/match/index.d.ts b/types/autosuggest-highlight/match/index.d.ts
new file mode 100644
index 0000000000..19d18c48b3
--- /dev/null
+++ b/types/autosuggest-highlight/match/index.d.ts
@@ -0,0 +1,3 @@
+declare function match(text: string, query: string): number[] | number[][];
+
+export = match;
diff --git a/types/autosuggest-highlight/parse/index.d.ts b/types/autosuggest-highlight/parse/index.d.ts
new file mode 100644
index 0000000000..01038cd116
--- /dev/null
+++ b/types/autosuggest-highlight/parse/index.d.ts
@@ -0,0 +1,3 @@
+declare function parse(text: string, matches: number[] | number[][]): Array<{ text: string; highlight: boolean; }>;
+
+export = parse;
diff --git a/types/autosuggest-highlight/tsconfig.json b/types/autosuggest-highlight/tsconfig.json
new file mode 100644
index 0000000000..8201d360ec
--- /dev/null
+++ b/types/autosuggest-highlight/tsconfig.json
@@ -0,0 +1,26 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "esModuleInterop": true
+    },
+    "files": [
+        "index.d.ts",
+        "autosuggest-highlight-tests.ts",
+        "match/index.d.ts",
+        "parse/index.d.ts"
+    ]
+}
diff --git a/types/autosuggest-highlight/tslint.json b/types/autosuggest-highlight/tslint.json
new file mode 100644
index 0000000000..946997cb87
--- /dev/null
+++ b/types/autosuggest-highlight/tslint.json
@@ -0,0 +1,6 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "no-useless-files": false
+    }
+}
diff --git a/types/aws-lambda/aws-lambda-tests.ts b/types/aws-lambda/aws-lambda-tests.ts
index 6d0d83b210..bd29160912 100644
--- a/types/aws-lambda/aws-lambda-tests.ts
+++ b/types/aws-lambda/aws-lambda-tests.ts
@@ -1,28 +1,34 @@
-let str: string;
-let date: Date;
-let anyObj: any;
-let num: number;
-let error: Error;
-let b: boolean;
-let apiGwEvtReqCtx: AWSLambda.APIGatewayEventRequestContext;
-let apiGwEvt: AWSLambda.APIGatewayEvent;
-let customAuthorizerEvt: AWSLambda.CustomAuthorizerEvent;
-let clientCtx: AWSLambda.ClientContext;
-let clientContextEnv: AWSLambda.ClientContextEnv;
-let clientContextClient: AWSLambda.ClientContextClient;
-let context: AWSLambda.Context;
-let identity: AWSLambda.CognitoIdentity;
-let proxyResult: AWSLambda.ProxyResult;
-let authResponse: AWSLambda.AuthResponse;
-let policyDocument: AWSLambda.PolicyDocument;
-let statement: AWSLambda.Statement;
-let authResponseContext: AWSLambda.AuthResponseContext;
-let snsEvt: AWSLambda.SNSEvent;
-let snsEvtRecs: AWSLambda.SNSEventRecord[];
-let snsEvtRec: AWSLambda.SNSEventRecord;
-let snsMsg: AWSLambda.SNSMessage;
-let snsMsgAttr: AWSLambda.SNSMessageAttribute;
-let snsMsgAttrs: AWSLambda.SNSMessageAttributes;
+declare let str: string;
+declare let strOrNull: string | null;
+declare let strOrUndefined: string | undefined;
+declare let date: Date;
+declare let anyObj: any;
+declare let num: number;
+declare let error: Error;
+declare let bool: boolean;
+declare let boolOrUndefined: boolean | undefined;
+declare let apiGwEvtReqCtx: AWSLambda.APIGatewayEventRequestContext;
+declare let apiGwEvt: AWSLambda.APIGatewayEvent;
+declare let customAuthorizerEvt: AWSLambda.CustomAuthorizerEvent;
+declare let clientCtx: AWSLambda.ClientContext;
+declare let clientCtxOrUndefined: AWSLambda.ClientContext | undefined;
+declare let clientContextEnv: AWSLambda.ClientContextEnv;
+declare let clientContextClient: AWSLambda.ClientContextClient;
+declare let context: AWSLambda.Context;
+declare let identity: AWSLambda.CognitoIdentity;
+declare let identityOrUndefined: AWSLambda.CognitoIdentity | undefined;
+declare let proxyResult: AWSLambda.ProxyResult;
+declare let authResponse: AWSLambda.AuthResponse;
+declare let policyDocument: AWSLambda.PolicyDocument;
+declare let statement: AWSLambda.Statement;
+declare let authResponseContext: AWSLambda.AuthResponseContext;
+declare let authResponseContextOpt: AWSLambda.AuthResponseContext | null | undefined;
+declare let snsEvt: AWSLambda.SNSEvent;
+declare let snsEvtRecs: AWSLambda.SNSEventRecord[];
+declare let snsEvtRec: AWSLambda.SNSEventRecord;
+declare let snsMsg: AWSLambda.SNSMessage;
+declare let snsMsgAttr: AWSLambda.SNSMessageAttribute;
+declare let snsMsgAttrs: AWSLambda.SNSMessageAttributes;
 const S3EvtRec: AWSLambda.S3EventRecord = {
     eventVersion: '2.0',
     eventSource: 'aws:s3',
@@ -72,44 +78,44 @@ declare const scheduledEvent: AWSLambda.ScheduledEvent;
 /* API Gateway Event request context */
 str = apiGwEvtReqCtx.accountId;
 str = apiGwEvtReqCtx.apiId;
-authResponseContext = apiGwEvtReqCtx.authorizer;
+authResponseContextOpt = apiGwEvtReqCtx.authorizer;
 str = apiGwEvtReqCtx.httpMethod;
-str = apiGwEvtReqCtx.identity.accessKey;
-str = apiGwEvtReqCtx.identity.accountId;
-str = apiGwEvtReqCtx.identity.apiKey;
-str = apiGwEvtReqCtx.identity.caller;
-str = apiGwEvtReqCtx.identity.cognitoAuthenticationProvider;
-str = apiGwEvtReqCtx.identity.cognitoAuthenticationType;
-str = apiGwEvtReqCtx.identity.cognitoIdentityId;
-str = apiGwEvtReqCtx.identity.cognitoIdentityPoolId;
+strOrNull = apiGwEvtReqCtx.identity.accessKey;
+strOrNull = apiGwEvtReqCtx.identity.accountId;
+strOrNull = apiGwEvtReqCtx.identity.apiKey;
+strOrNull = apiGwEvtReqCtx.identity.caller;
+strOrNull = apiGwEvtReqCtx.identity.cognitoAuthenticationProvider;
+strOrNull = apiGwEvtReqCtx.identity.cognitoAuthenticationType;
+strOrNull = apiGwEvtReqCtx.identity.cognitoIdentityId;
+strOrNull = apiGwEvtReqCtx.identity.cognitoIdentityPoolId;
 str = apiGwEvtReqCtx.identity.sourceIp;
-str = apiGwEvtReqCtx.identity.user;
-str = apiGwEvtReqCtx.identity.userAgent;
-str = apiGwEvtReqCtx.identity.userArn;
+strOrNull = apiGwEvtReqCtx.identity.user;
+strOrNull = apiGwEvtReqCtx.identity.userAgent;
+strOrNull = apiGwEvtReqCtx.identity.userArn;
 str = apiGwEvtReqCtx.stage;
 str = apiGwEvtReqCtx.requestId;
 str = apiGwEvtReqCtx.resourceId;
 str = apiGwEvtReqCtx.resourcePath;
 
 /* API Gateway Event */
-str = apiGwEvt.body;
+strOrNull = apiGwEvt.body;
 str = apiGwEvt.headers["example"];
 str = apiGwEvt.httpMethod;
-b = apiGwEvt.isBase64Encoded;
+bool = apiGwEvt.isBase64Encoded;
 str = apiGwEvt.path;
-str = apiGwEvt.pathParameters["example"];
-str = apiGwEvt.queryStringParameters["example"];
-str = apiGwEvt.stageVariables["example"];
+str = apiGwEvt.pathParameters!["example"];
+str = apiGwEvt.queryStringParameters!["example"];
+str = apiGwEvt.stageVariables!["example"];
 apiGwEvtReqCtx = apiGwEvt.requestContext;
 str = apiGwEvt.resource;
 
 /* API Gateway CustomAuthorizer Event */
 str = customAuthorizerEvt.type;
 str = customAuthorizerEvt.methodArn;
-str = customAuthorizerEvt.authorizationToken;
-str = apiGwEvt.pathParameters["example"];
-str = apiGwEvt.queryStringParameters["example"];
-str = apiGwEvt.stageVariables["example"];
+strOrUndefined = customAuthorizerEvt.authorizationToken;
+str = apiGwEvt.pathParameters!["example"];
+str = apiGwEvt.queryStringParameters!["example"];
+str = apiGwEvt.stageVariables!["example"];
 apiGwEvtReqCtx = apiGwEvt.requestContext;
 
 /* DynamoDB Stream Event */
@@ -234,17 +240,17 @@ str = snsMsgAttr.Value;
 
 /* Lambda Proxy Result */
 num = proxyResult.statusCode;
-proxyResult.headers["example"] = str;
-proxyResult.headers["example"] = b;
-proxyResult.headers["example"] = num;
-b = proxyResult.isBase64Encoded;
+proxyResult.headers!["example"] = str;
+proxyResult.headers!["example"] = bool;
+proxyResult.headers!["example"] = num;
+boolOrUndefined = proxyResult.isBase64Encoded;
 str = proxyResult.body;
 
 /* API Gateway CustomAuthorizer AuthResponse */
 authResponseContext = {
     stringKey: str,
     numberKey: num,
-    booleanKey: b
+    booleanKey: bool
 };
 
 statement = {
@@ -300,36 +306,36 @@ cognitoUserPoolEvent.triggerSource === "TokenGeneration_AuthenticateDevice";
 cognitoUserPoolEvent.triggerSource === "TokenGeneration_RefreshTokens";
 str = cognitoUserPoolEvent.region;
 str = cognitoUserPoolEvent.userPoolId;
-str = cognitoUserPoolEvent.userName;
+strOrUndefined = cognitoUserPoolEvent.userName;
 str = cognitoUserPoolEvent.callerContext.awsSdkVersion;
 str = cognitoUserPoolEvent.callerContext.clientId;
 str = cognitoUserPoolEvent.request.userAttributes["email"];
-str = cognitoUserPoolEvent.request.validationData["k1"];
-str = cognitoUserPoolEvent.request.codeParameter;
-str = cognitoUserPoolEvent.request.usernameParameter;
-b = cognitoUserPoolEvent.request.newDeviceUsed;
-cognitoUserPoolEvent.request.session[0].challengeName === "CUSTOM_CHALLENGE";
-cognitoUserPoolEvent.request.session[0].challengeName === "PASSWORD_VERIFIER";
-cognitoUserPoolEvent.request.session[0].challengeName === "SMS_MFA";
-cognitoUserPoolEvent.request.session[0].challengeName === "DEVICE_SRP_AUTH";
-cognitoUserPoolEvent.request.session[0].challengeName === "DEVICE_PASSWORD_VERIFIER";
-cognitoUserPoolEvent.request.session[0].challengeName === "ADMIN_NO_SRP_AUTH";
-b = cognitoUserPoolEvent.request.session[0].challengeResult;
-str = cognitoUserPoolEvent.request.session[0].challengeMetaData;
-str = cognitoUserPoolEvent.request.challengeName;
-str = cognitoUserPoolEvent.request.privateChallengeParameters["answer"];
-str = cognitoUserPoolEvent.request.challengeAnswer["answer"];
-b = cognitoUserPoolEvent.response.answerCorrect;
-str = cognitoUserPoolEvent.response.smsMessage;
-str = cognitoUserPoolEvent.response.emailMessage;
-str = cognitoUserPoolEvent.response.emailSubject;
-str = cognitoUserPoolEvent.response.challengeName;
-b = cognitoUserPoolEvent.response.issueTokens;
-b = cognitoUserPoolEvent.response.failAuthentication;
-str = cognitoUserPoolEvent.response.publicChallengeParameters["captchaUrl"];
-str = cognitoUserPoolEvent.response.privateChallengeParameters["answer"];
-str = cognitoUserPoolEvent.response.challengeMetaData;
-b = cognitoUserPoolEvent.response.answerCorrect;
+str = cognitoUserPoolEvent.request.validationData!["k1"];
+strOrUndefined = cognitoUserPoolEvent.request.codeParameter;
+strOrUndefined = cognitoUserPoolEvent.request.usernameParameter;
+boolOrUndefined = cognitoUserPoolEvent.request.newDeviceUsed;
+cognitoUserPoolEvent.request.session![0].challengeName === "CUSTOM_CHALLENGE";
+cognitoUserPoolEvent.request.session![0].challengeName === "PASSWORD_VERIFIER";
+cognitoUserPoolEvent.request.session![0].challengeName === "SMS_MFA";
+cognitoUserPoolEvent.request.session![0].challengeName === "DEVICE_SRP_AUTH";
+cognitoUserPoolEvent.request.session![0].challengeName === "DEVICE_PASSWORD_VERIFIER";
+cognitoUserPoolEvent.request.session![0].challengeName === "ADMIN_NO_SRP_AUTH";
+bool = cognitoUserPoolEvent.request.session![0].challengeResult;
+strOrUndefined = cognitoUserPoolEvent.request.session![0].challengeMetaData;
+strOrUndefined = cognitoUserPoolEvent.request.challengeName;
+str = cognitoUserPoolEvent.request.privateChallengeParameters!["answer"];
+str = cognitoUserPoolEvent.request.challengeAnswer!["answer"];
+boolOrUndefined = cognitoUserPoolEvent.response.answerCorrect;
+strOrUndefined = cognitoUserPoolEvent.response.smsMessage;
+strOrUndefined = cognitoUserPoolEvent.response.emailMessage;
+strOrUndefined = cognitoUserPoolEvent.response.emailSubject;
+strOrUndefined = cognitoUserPoolEvent.response.challengeName;
+boolOrUndefined = cognitoUserPoolEvent.response.issueTokens;
+boolOrUndefined = cognitoUserPoolEvent.response.failAuthentication;
+str = cognitoUserPoolEvent.response.publicChallengeParameters!["captchaUrl"];
+str = cognitoUserPoolEvent.response.privateChallengeParameters!["answer"];
+strOrUndefined = cognitoUserPoolEvent.response.challengeMetaData;
+boolOrUndefined = cognitoUserPoolEvent.response.answerCorrect;
 
 // CloudFormation Custom Resource
 switch (cloudformationCustomResourceEvent.RequestType) {
@@ -353,7 +359,7 @@ switch (cloudformationCustomResourceEvent.RequestType) {
 anyObj = cloudformationCustomResourceResponse.Data;
 str = cloudformationCustomResourceResponse.LogicalResourceId;
 str = cloudformationCustomResourceResponse.PhysicalResourceId;
-str = cloudformationCustomResourceResponse.Reason;
+strOrUndefined = cloudformationCustomResourceResponse.Reason;
 str = cloudformationCustomResourceResponse.RequestId;
 str = cloudformationCustomResourceResponse.StackId;
 str = cloudformationCustomResourceResponse.Status;
@@ -368,7 +374,7 @@ str = scheduledEvent.source;
 str = scheduledEvent.time;
 
 /* Context */
-b = context.callbackWaitsForEmptyEventLoop;
+bool = context.callbackWaitsForEmptyEventLoop;
 str = context.functionName;
 str = context.functionVersion;
 str = context.invokedFunctionArn;
@@ -376,8 +382,8 @@ num = context.memoryLimitInMB;
 str = context.awsRequestId;
 str = context.logGroupName;
 str = context.logStreamName;
-identity = context.identity;
-clientCtx = context.clientContext;
+identityOrUndefined = context.identity;
+clientCtxOrUndefined = context.clientContext;
 
 /* CognitoIdentity */
 str = identity.cognitoIdentityId;
@@ -420,7 +426,7 @@ function callback(cb: AWSLambda.Callback) {
     cb(null);
     cb(error);
     cb(null, anyObj);
-    cb(null, b);
+    cb(null, bool);
     cb(null, str);
     cb(null, num);
 }
@@ -578,8 +584,72 @@ context.fail(str);
 
 /* Handler */
 let handler: AWSLambda.Handler = (event: any, context: AWSLambda.Context, cb: AWSLambda.Callback) => { };
+
+// async methods return Promise, test assignability
 let asyncHandler: AWSLambda.Handler = async (event: any, context: AWSLambda.Context, cb: AWSLambda.Callback) => { };
+
+let inferredHandler: AWSLambda.S3Handler = (event, context, cb) => {
+    // $ExpectType S3Event
+    event;
+    str = event.Records[0].eventName;
+    // $ExpectType Context
+    context;
+    str = context.functionName;
+    // $ExpectType Callback<void>
+    cb;
+    cb();
+    cb(null);
+    cb(new Error());
+    // $ExpectError
+    cb(null, { });
+};
+
+// Test using default Callback type still works.
+let defaultCallbackHandler: AWSLambda.APIGatewayProxyHandler = (event: AWSLambda.APIGatewayEvent, context: AWSLambda.Context, cb: AWSLambda.Callback) => { };
+
+// Specific types
+let s3Handler: AWSLambda.S3Handler = (event: AWSLambda.S3Event, context: AWSLambda.Context, cb: AWSLambda.Callback<void>) => {};
+// Test old name
+let s3CreateHandler: AWSLambda.S3Handler = (event: AWSLambda.S3CreateEvent, context: AWSLambda.Context, cb: AWSLambda.Callback<void>) => {};
+s3Handler = s3CreateHandler;
+
+let dynamoDBStreamHandler: AWSLambda.DynamoDBStreamHandler = (event: AWSLambda.DynamoDBStreamEvent, context: AWSLambda.Context, cb: AWSLambda.Callback<void>) => {};
+
+let snsHandler: AWSLambda.SNSHandler = (event: AWSLambda.SNSEvent, context: AWSLambda.Context, cb: AWSLambda.Callback<void>) => {};
+
+let cognitoUserPoolHandler: AWSLambda.CognitoUserPoolTriggerHandler = (event: AWSLambda.CognitoUserPoolEvent, context: AWSLambda.Context, cb: AWSLambda.Callback<void>) => {};
+
+let cloudFormationCustomResourceHandler: AWSLambda.CloudFormationCustomResourceHandler =
+    (event: AWSLambda.CloudFormationCustomResourceEvent, context: AWSLambda.Context, cb: AWSLambda.Callback<void>) => {};
+
+let cloudWatchLogsHandler: AWSLambda.CloudWatchLogsHandler = (event: AWSLambda.CloudWatchLogsEvent, context: AWSLambda.Context, cb: AWSLambda.Callback<void>) => {};
+
+let scheduledHandler: AWSLambda.ScheduledHandler = (event: AWSLambda.ScheduledEvent, context: AWSLambda.Context, cb: AWSLambda.Callback<void>) => {};
+
+let apiGtwProxyHandler: AWSLambda.APIGatewayProxyHandler = (event: AWSLambda.APIGatewayProxyEvent, context: AWSLambda.Context, cb: AWSLambda.APIGatewayProxyCallback) => { };
+// Test old names
 let proxyHandler: AWSLambda.ProxyHandler = (event: AWSLambda.APIGatewayEvent, context: AWSLambda.Context, cb: AWSLambda.ProxyCallback) => { };
-let asyncProxyHandler: AWSLambda.ProxyHandler = async (event: AWSLambda.APIGatewayEvent, context: AWSLambda.Context, cb: AWSLambda.ProxyCallback) => { };
+apiGtwProxyHandler = proxyHandler;
+
+let cloudFrontRequestHandler: AWSLambda.CloudFrontRequestHandler = (event: AWSLambda.CloudFrontRequestEvent, context: AWSLambda.Context, cb: AWSLambda.CloudFrontRequestCallback) => { };
+
+let cloudFrontResponseHandler: AWSLambda.CloudFrontResponseHandler = (event: AWSLambda.CloudFrontResponseEvent, context: AWSLambda.Context, cb: AWSLambda.CloudFrontResponseCallback) => { };
+
 let customAuthorizerHandler: AWSLambda.CustomAuthorizerHandler = (event: AWSLambda.CustomAuthorizerEvent, context: AWSLambda.Context, cb: AWSLambda.CustomAuthorizerCallback) => { };
-let asyncCustomAuthorizerHandler: AWSLambda.CustomAuthorizerHandler = async (event: AWSLambda.CustomAuthorizerEvent, context: AWSLambda.Context, cb: AWSLambda.CustomAuthorizerCallback) => { };
+
+interface CustomEvent { eventString: string; eventBool: boolean; }
+interface CustomResult { resultString: string; resultBool?: boolean; }
+type CustomCallback = AWSLambda.Callback<CustomResult>;
+let customHandler: AWSLambda.Handler<CustomEvent, CustomResult> = (event, context, cb) => {
+    // $ExpectType CustomEvent
+    event;
+    str = event.eventString;
+    bool = event.eventBool;
+    // $ExpectType Context
+    context;
+    // $ExpectType Callback<CustomResult>
+    cb;
+    cb(null, { resultString: str, resultBool: bool });
+    // $ExpectError
+    cb(null, { resultString: bool });
+};
diff --git a/types/aws-lambda/index.d.ts b/types/aws-lambda/index.d.ts
index 09070fb13c..03910b108c 100644
--- a/types/aws-lambda/index.d.ts
+++ b/types/aws-lambda/index.d.ts
@@ -14,8 +14,9 @@
 //                 Markus Tacker <https://github.com/coderbyheart>
 //                 Palmi Valgeirsson <https://github.com/palmithor>
 //                 Danilo Raisi <https://github.com/daniloraisi>
+//                 Simon Buchan <https://github.com/simonbuchan>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 // API Gateway "event" request context
 export interface APIGatewayEventRequestContext {
@@ -45,7 +46,7 @@ export interface APIGatewayEventRequestContext {
 }
 
 // API Gateway "event"
-export interface APIGatewayEvent {
+export interface APIGatewayProxyEvent {
     body: string | null;
     headers: { [name: string]: string };
     httpMethod: string;
@@ -57,6 +58,7 @@ export interface APIGatewayEvent {
     requestContext: APIGatewayEventRequestContext;
     resource: string;
 }
+export type APIGatewayEvent = APIGatewayProxyEvent; // Old name
 
 // API Gateway CustomAuthorizer "event"
 export interface CustomAuthorizerEvent {
@@ -191,15 +193,16 @@ export interface S3EventRecord {
     };
 }
 
-export interface S3CreateEvent {
+export interface S3Event {
     Records: S3EventRecord[];
 }
+export type S3CreateEvent = S3Event; // old name
 
 /**
  * Cognito User Pool event
  * http://docs.aws.amazon.com/cognito/latest/developerguide/cognito-user-identity-pools-working-with-aws-lambda-triggers.html
  */
-export interface CognitoUserPoolEvent {
+export interface CognitoUserPoolTriggerEvent {
     version: number;
     triggerSource:
         | "PreSignUp_SignUp"
@@ -259,6 +262,7 @@ export interface CognitoUserPoolEvent {
         answerCorrect?: boolean;
     };
 }
+export type CognitoUserPoolEvent = CognitoUserPoolTriggerEvent;
 
 /**
  * CloudFormation Custom Resource event and response
@@ -414,7 +418,7 @@ export interface ClientContextEnv {
     locale: string;
 }
 
-export interface ProxyResult {
+export interface APIGatewayProxyResult {
     statusCode: number;
     headers?: {
         [header: string]: boolean | number | string;
@@ -422,16 +426,18 @@ export interface ProxyResult {
     body: string;
     isBase64Encoded?: boolean;
 }
+export type ProxyResult = APIGatewayProxyResult; // Old name
 
 /**
  * API Gateway CustomAuthorizer AuthResponse.
  * http://docs.aws.amazon.com/apigateway/latest/developerguide/use-custom-authorizer.html#api-gateway-custom-authorizer-output
  */
-export interface AuthResponse {
+export interface CustomAuthorizerResult {
     principalId: string;
     policyDocument: PolicyDocument;
     context?: AuthResponseContext;
 }
+export type AuthResponse = CustomAuthorizerResult;
 
 /**
  * API Gateway CustomAuthorizer AuthResponse.PolicyDocument.
@@ -492,6 +498,15 @@ export interface CloudFrontEvent {
     };
 }
 
+// https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/lambda-generating-http-responses.html#lambda-generating-http-responses-object
+export interface CloudFrontResultResponse {
+    status: string;
+    statusDescription?: string;
+    headers?: CloudFrontHeaders;
+    bodyEncoding?: 'text' | 'base64';
+    body?: string;
+}
+
 export interface CloudFrontResponseEvent {
     Records: Array<{
         cf: CloudFrontEvent & {
@@ -501,6 +516,8 @@ export interface CloudFrontResponseEvent {
     }>;
 }
 
+export type CloudFrontRequestResult = undefined | null | CloudFrontResultResponse;
+
 export interface CloudFrontRequestEvent {
     Records: Array<{
         cf: CloudFrontEvent & {
@@ -509,6 +526,8 @@ export interface CloudFrontRequestEvent {
     }>;
 }
 
+export type CloudFrontResponseResult = undefined | null | CloudFrontResultResponse;
+
 /**
  * AWS Lambda handler function.
  * http://docs.aws.amazon.com/lambda/latest/dg/nodejs-prog-model-handler.html
@@ -517,9 +536,7 @@ export interface CloudFrontRequestEvent {
  * @param context – runtime information of the Lambda function that is executing.
  * @param callback – optional callback to return information to the caller, otherwise return value is null.
  */
-export type Handler = (event: any, context: Context, callback?: Callback) => Promise<void> | void;
-export type ProxyHandler = (event: APIGatewayEvent, context: Context, callback?: ProxyCallback) => Promise<void> | void;
-export type CustomAuthorizerHandler = (event: CustomAuthorizerEvent, context: Context, callback?: CustomAuthorizerCallback) => Promise<void> | void;
+export type Handler<TEvent = any, TResult = any> = (event: TEvent, context: Context, callback: Callback<TResult>) => void;
 
 /**
  * Optional callback parameter.
@@ -528,8 +545,58 @@ export type CustomAuthorizerHandler = (event: CustomAuthorizerEvent, context: Co
  * @param error – an optional parameter that you can use to provide results of the failed Lambda function execution.
  * @param result – an optional parameter that you can use to provide the result of a successful function execution. The result provided must be JSON.stringify compatible.
  */
-export type Callback = (error?: Error | null, result?: object | boolean | number | string) => void;
-export type ProxyCallback = (error?: Error | null, result?: ProxyResult) => void;
-export type CustomAuthorizerCallback = (error?: Error | null, result?: AuthResponse) => void;
+export type Callback<TResult = any> = (error?: Error | null, result?: TResult) => void;
+
+// Begin defining Handler and Callback types for each API trigger type.
+// Ordered by https://docs.aws.amazon.com/lambda/latest/dg/invoking-lambda-function.html
+// though that list is incomplete.
+
+export type S3Handler = Handler<S3Event, void>;
+
+export type DynamoDBStreamHandler = Handler<DynamoDBStreamEvent, void>;
+
+export type SNSHandler = Handler<SNSEvent, void>;
+
+// No SESHandler: SES event source is delivered as SNS notifications
+// https://docs.aws.amazon.com/lambda/latest/dg/invoking-lambda-function.html#supported-event-source-ses
+
+// Result type is weird: docs and samples say to return the mutated event, but it only requires an object
+// with a "response" field, the type of which is specific to the event.triggerType. Leave as any for now.
+export type CognitoUserPoolTriggerHandler = Handler<CognitoUserPoolTriggerEvent>;
+// TODO: Different event/handler types for each event trigger so we can type the result?
+
+// TODO: CognitoSync
+
+export type CloudFormationCustomResourceHandler = Handler<CloudFormationCustomResourceEvent, void>;
+
+// TODO: CloudWatchEvents
+
+export type CloudWatchLogsHandler = Handler<CloudWatchLogsEvent, void>;
+
+// TODO: CodeCommit
+
+export type ScheduledHandler = Handler<ScheduledEvent, void>;
+
+// TODO: AWS Config
+
+// TODO: Alexa
+
+export type APIGatewayProxyHandler = Handler<APIGatewayProxyEvent, APIGatewayProxyResult>;
+export type APIGatewayProxyCallback = Callback<APIGatewayProxyResult>;
+export type ProxyHandler = APIGatewayProxyHandler; // Old name
+export type ProxyCallback = APIGatewayProxyCallback; // Old name
+
+// TODO: IoT
+
+export type CloudFrontRequestHandler = Handler<CloudFrontRequestEvent, CloudFrontRequestResult>;
+export type CloudFrontRequestCallback = Callback<CloudFrontRequestResult>;
+
+export type CloudFrontResponseHandler = Handler<CloudFrontResponseEvent, CloudFrontResponseResult>;
+export type CloudFrontResponseCallback = Callback<CloudFrontResponseResult>;
+
+// TODO: Kinesis (should be very close to DynamoDB stream?)
+
+export type CustomAuthorizerHandler = Handler<CustomAuthorizerEvent, CustomAuthorizerResult>;
+export type CustomAuthorizerCallback = Callback<CustomAuthorizerResult>;
 
 export as namespace AWSLambda;
diff --git a/types/aws-lambda/tsconfig.json b/types/aws-lambda/tsconfig.json
index f4f2cc28f6..79e058b7ab 100644
--- a/types/aws-lambda/tsconfig.json
+++ b/types/aws-lambda/tsconfig.json
@@ -6,7 +6,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
diff --git a/types/aws-serverless-express/aws-serverless-express-tests.ts b/types/aws-serverless-express/aws-serverless-express-tests.ts
index 4770163b3b..9bfd1b0e99 100644
--- a/types/aws-serverless-express/aws-serverless-express-tests.ts
+++ b/types/aws-serverless-express/aws-serverless-express-tests.ts
@@ -1,5 +1,5 @@
 import * as awsServerlessExpress from 'aws-serverless-express';
-import * as express from 'express';
+import express = require('express');
 import { eventContext } from 'aws-serverless-express/middleware';
 
 const app = express();
diff --git a/types/azure-sb/tsconfig.json b/types/azure-sb/tsconfig.json
index 09c9a2a9e4..6e015480dc 100644
--- a/types/azure-sb/tsconfig.json
+++ b/types/azure-sb/tsconfig.json
@@ -38,5 +38,4 @@
         "azure-sb-tests.ts",
         "index.d.ts"
     ]
-}
-
+}
\ No newline at end of file
diff --git a/types/babel-webpack-plugin/tsconfig.json b/types/babel-webpack-plugin/tsconfig.json
index 3e73343283..b7aadac43d 100644
--- a/types/babel-webpack-plugin/tsconfig.json
+++ b/types/babel-webpack-plugin/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "babel-webpack-plugin-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/bash-glob/tsconfig.json b/types/bash-glob/tsconfig.json
index 6a45a2d74d..d62dc6e114 100644
--- a/types/bash-glob/tsconfig.json
+++ b/types/bash-glob/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "bash-glob-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/beats/tsconfig.json b/types/beats/tsconfig.json
index 89bd0b5995..7b360083c1 100644
--- a/types/beats/tsconfig.json
+++ b/types/beats/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "beats-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/bech32/tsconfig.json b/types/bech32/tsconfig.json
index 886ec79796..501b2438b2 100644
--- a/types/bech32/tsconfig.json
+++ b/types/bech32/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "bech32-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/better-sqlite3/better-sqlite3-tests.ts b/types/better-sqlite3/better-sqlite3-tests.ts
index 43d78e1503..34ee6808c3 100644
--- a/types/better-sqlite3/better-sqlite3-tests.ts
+++ b/types/better-sqlite3/better-sqlite3-tests.ts
@@ -1,4 +1,4 @@
-import * as Database from 'better-sqlite3';
+import Database = require('better-sqlite3');
 
 const integer = Database.Integer(1);
 const err = new Database.SqliteError('ok', 'ok');
diff --git a/types/better-sqlite3/index.d.ts b/types/better-sqlite3/index.d.ts
index 530f5c3e53..899a85a2e2 100644
--- a/types/better-sqlite3/index.d.ts
+++ b/types/better-sqlite3/index.d.ts
@@ -4,9 +4,7 @@
 //                 Mathew Rumsey <https://github.com/matrumz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference types="node" />
-
-import * as Integer from 'integer';
+import Integer = require('integer');
 
 interface RunResult {
 	changes: number;
diff --git a/types/binary-parser/tsconfig.json b/types/binary-parser/tsconfig.json
index cb361f52c5..5e720245df 100644
--- a/types/binary-parser/tsconfig.json
+++ b/types/binary-parser/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "binary-parser-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/bindings/tsconfig.json b/types/bindings/tsconfig.json
index fb9350642a..787b28c3d0 100644
--- a/types/bindings/tsconfig.json
+++ b/types/bindings/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "bindings-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/bip38/tsconfig.json b/types/bip38/tsconfig.json
index 6ce875b1d1..74baba8f90 100644
--- a/types/bip38/tsconfig.json
+++ b/types/bip38/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "bip38-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/bip39/tsconfig.json b/types/bip39/tsconfig.json
index d44c1197ad..bb95bb90d0 100644
--- a/types/bip39/tsconfig.json
+++ b/types/bip39/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "bip39-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/bitcore-lib/bitcore-lib-tests.ts b/types/bitcore-lib/bitcore-lib-tests.ts
new file mode 100644
index 0000000000..fb39c85fc1
--- /dev/null
+++ b/types/bitcore-lib/bitcore-lib-tests.ts
@@ -0,0 +1,27 @@
+import * as bitcore from 'bitcore-lib';
+
+const transaction = new bitcore.Transaction({});
+
+const output: bitcore.Output = transaction.outputs[0];
+
+const privateKey: bitcore.PrivateKey = new bitcore.PrivateKey('privateKey');
+const publicKey: bitcore.PublicKey = privateKey.publicKey;
+const publicKeyAsString: string = publicKey.toString();
+
+const signature = bitcore.crypto.ECDSA.sign(Buffer.from('sign this message', 'hex'), new bitcore.PrivateKey('privateKey'));
+
+bitcore.crypto.ECDSA.verify(
+  Buffer.from('buffer', 'hex'),
+  bitcore.crypto.Signature.fromString('signature'),
+  new bitcore.PublicKey('publicKey')
+);
+
+const utxo: bitcore.Transaction.UnspentOutput[] = [new bitcore.Transaction.UnspentOutput({})];
+
+new bitcore.Block(Buffer.from('123', 'hex'));
+
+const tx = new bitcore.Transaction()
+  .from(utxo)
+  .change('bitcoinAddress')
+  .addData(Buffer.from(''))
+  .sign('bitcoinAddressPrivateKey');
diff --git a/types/bitcore-lib/index.d.ts b/types/bitcore-lib/index.d.ts
new file mode 100644
index 0000000000..0846b85c0d
--- /dev/null
+++ b/types/bitcore-lib/index.d.ts
@@ -0,0 +1,130 @@
+// Type definitions for bitcore-lib 0.15
+// Project: https://github.com/bitpay/bitcore-lib
+// Definitions by: Lautaro Dragan <https://github.com/lautarodragan>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// TypeScript Version: 2.2
+
+/// <reference types="node" />
+
+export namespace crypto {
+    class BN { }
+    namespace ECDSA {
+        function sign(message: Buffer, key: PrivateKey): Signature;
+        function verify(hashbuf: Buffer, sig: Signature, pubkey: PublicKey, endian?: 'little'): boolean;
+    }
+    namespace Hash {
+        function sha256(buffer: Buffer): Uint8Array;
+    }
+    namespace Random {
+       function getRandomBuffer(size: number): Buffer;
+    }
+    namespace Point {}
+    class Signature {
+        static fromDER(sig: Buffer): Signature;
+        static fromString(data: string): Signature;
+        SIGHASH_ALL: number;
+        toString(): string;
+    }
+}
+
+export class Transaction {
+    inputs: Input[];
+    outputs: Output[];
+    readonly id: string;
+    readonly hash: string;
+    nid: string;
+
+    constructor(serialized?: any);
+
+    from(utxos: Transaction.UnspentOutput[]): Transaction;
+    to(address: Address | string, amount: number): Transaction;
+    change(address: Address | string): Transaction;
+    sign(privateKey: PrivateKey | string): Transaction;
+    applySignature(sig: crypto.Signature): Transaction;
+    addData(data: Buffer): this;
+    serialize(): string;
+}
+
+export namespace Transaction {
+    class UnspentOutput {
+        static fromObject(o: object): UnspentOutput;
+
+        readonly address: Address;
+        readonly txId: string;
+        readonly outputIndex: number;
+        readonly script: Script;
+        readonly satoshis: number;
+
+        constructor(data: object);
+
+        inspect(): string;
+        toObject(): this;
+        toString(): string;
+    }
+}
+
+export class Block {
+    hash: string;
+    height: number;
+    transactions: Transaction[];
+    header: {
+        time: number;
+        prevHash: string;
+    };
+
+    constructor(data: Buffer | object);
+}
+
+export class PrivateKey {
+    readonly publicKey: PublicKey;
+
+    constructor(key: string);
+}
+
+export class PublicKey {
+    constructor(source: string);
+
+    static fromPrivateKey(privateKey: PrivateKey): PublicKey;
+
+    toBuffer(): Buffer;
+    toDER(): Buffer;
+}
+
+export interface Output {
+    readonly script: any;
+}
+
+export namespace Script {
+    const types: {
+        DATA_OUT: string;
+    };
+    function buildPublicKeyHashOut(address: Address): Script;
+}
+
+export class Script { }
+
+export interface Util {
+    readonly buffer: {
+        reverse(a: any): any;
+    };
+}
+
+export namespace Networks {
+    interface Network {
+        readonly name: string;
+        readonly alias: string;
+    }
+
+    const livenet: Network;
+    const mainnet: Network;
+    const testnet: Network;
+
+    function add(data: any): Network;
+    function remove(network: Network): void;
+    function get(args: string | number | Network, keys: string | string[]): Network;
+}
+
+export class Address {}
+
+export class Input {}
diff --git a/types/bitcore-lib/tsconfig.json b/types/bitcore-lib/tsconfig.json
new file mode 100644
index 0000000000..30334d3846
--- /dev/null
+++ b/types/bitcore-lib/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "target": "es6",
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "bitcore-lib-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/bitcore-lib/tslint.json b/types/bitcore-lib/tslint.json
new file mode 100644
index 0000000000..dae7fb7540
--- /dev/null
+++ b/types/bitcore-lib/tslint.json
@@ -0,0 +1,4 @@
+{
+  "extends": "dtslint/dt.json",
+  "rules": {}
+}
\ No newline at end of file
diff --git a/types/bittorrent-protocol/bittorrent-protocol-tests.ts b/types/bittorrent-protocol/bittorrent-protocol-tests.ts
index c32b2af368..2faca76a5e 100644
--- a/types/bittorrent-protocol/bittorrent-protocol-tests.ts
+++ b/types/bittorrent-protocol/bittorrent-protocol-tests.ts
@@ -1,4 +1,4 @@
-import * as Protocol from 'bittorrent-protocol';
+import Protocol = require('bittorrent-protocol');
 import * as net from 'net';
 
 class TestExtension implements Protocol.Extension {
diff --git a/types/blob-to-buffer/tsconfig.json b/types/blob-to-buffer/tsconfig.json
index 2421ce2493..37848b0516 100644
--- a/types/blob-to-buffer/tsconfig.json
+++ b/types/blob-to-buffer/tsconfig.json
@@ -21,4 +21,4 @@
         "index.d.ts",
         "blob-to-buffer-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/bluebird-global/index.d.ts b/types/bluebird-global/index.d.ts
index c3f0fd9d43..6b22cb7114 100644
--- a/types/bluebird-global/index.d.ts
+++ b/types/bluebird-global/index.d.ts
@@ -31,6 +31,22 @@
  *    in the runtime. Do this by either importing bluebird.js via a `<script />` tag in your html or
  *    via importing it in your js entry file AND assigning it to the global Promise symbol.
  *
+ * c) if you're `--target`ing "es5", then you'll need to include the "es2015.iterable" lib typings to
+ *    let the bluebird.d.ts compile (requirement for Map, Iterable & friends). This is only for the
+ *    compile-time, since bluebird doesn't require these es6 features to be present in the runtime.
+ *    To summarise: when targeting "es5", make sure you have the follwing "lib" config in your tsconfig.json:
+ *
+ *    {
+ *      "compilerOptions": {
+ *        "lib": [
+ *          "es5",
+ *          "es2015.iterable",
+ *          "dom"
+ *          (more, if you need...)
+ *        ],
+ *      }
+ *    }
+ *
  * 3. Why so much effort?
  *
  * If a promise-polyfilling library wants to play nicely with TypeScript, it needs to augment
@@ -38,7 +54,7 @@
  * For various reasons this couldn't be done in The `bluebird` typings.
  *
  * 4. Contributors: After changing this file please manually test these cases (via altering ./tsconfig.json ):
- *   a. target es5, no `lib` key
+ *   a. target es5, with the following `lib` keys: "es5", "es2015.iterable", "dom"
  *   b. target es6, no `lib` key
  *   c. target es5, latest "es20xx", e.g. "es2017"
  *   d. target es6, latest "es20xx", e.g. "es2017"
@@ -65,7 +81,7 @@ declare global {
         each: typeof Bluebird.prototype.each;
         error: typeof Bluebird.prototype.error;
         filter: typeof Bluebird.prototype.filter;
-        finally: typeof Bluebird.prototype.finally;
+        // finally: typeof Bluebird.prototype.finally;
         get: typeof Bluebird.prototype.get;
         isCancelled: typeof Bluebird.prototype.isCancelled;
         isFulfilled: typeof Bluebird.prototype.isFulfilled;
@@ -124,6 +140,11 @@ declare global {
         catch<E extends Error, U>(ErrorClass: new (...args: any[]) => E, onReject: (error: E) => U | PromiseLike<U>): Bluebird<U | T>;
         catch(predicate: Object, onReject: (error: any) => T | PromiseLike<T> | void | PromiseLike<void>): Bluebird<T>;
         catch<U>(predicate: Object, onReject: (error: any) => U | PromiseLike<U>): Bluebird<U | T>;
+
+        /*
+         * See comments above `then` for the reason why this is needed. Taken from esnext.promise.d.ts.
+         */
+        finally(onfinally?: (() => void) | undefined | null): Promise<T>;
     }
 
     /*
diff --git a/types/bluebird/tsconfig.json b/types/bluebird/tsconfig.json
index 909dae3771..5ab3ff2494 100644
--- a/types/bluebird/tsconfig.json
+++ b/types/bluebird/tsconfig.json
@@ -20,4 +20,4 @@
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     }
-}
+}
\ No newline at end of file
diff --git a/types/body-parser/body-parser-tests.ts b/types/body-parser/body-parser-tests.ts
index fa18cad13b..2f6a33ea72 100644
--- a/types/body-parser/body-parser-tests.ts
+++ b/types/body-parser/body-parser-tests.ts
@@ -1,4 +1,4 @@
-import * as express from 'express';
+import express = require('express');
 import {
     json,
     raw,
diff --git a/types/bonjour/bonjour-tests.ts b/types/bonjour/bonjour-tests.ts
index 61e7373f01..aff3226eba 100644
--- a/types/bonjour/bonjour-tests.ts
+++ b/types/bonjour/bonjour-tests.ts
@@ -1,4 +1,4 @@
-import * as bonjour from 'bonjour';
+import bonjour = require('bonjour');
 
 let bonjourOptions: bonjour.BonjourOptions;
 let bonjourInstance: bonjour.Bonjour;
diff --git a/types/bookshelf/bookshelf-tests.ts b/types/bookshelf/bookshelf-tests.ts
index 77af31461b..81c42f7680 100644
--- a/types/bookshelf/bookshelf-tests.ts
+++ b/types/bookshelf/bookshelf-tests.ts
@@ -1,6 +1,6 @@
-import * as Knex from 'knex';
-import * as Bookshelf from 'bookshelf';
-import * as assert from 'assert';
+import Knex = require('knex');
+import Bookshelf = require('bookshelf');
+import assert = require('assert');
 import * as express from 'express';
 import * as _ from "lodash";
 
@@ -1124,7 +1124,7 @@ ships.on('fetched', (collection, response) => {
 	User.collection()
 		.orderBy('-name')
 		.fetch()
-		.then((users: Bookshelf.Collection<User>) => {
+		.then((users: Bookshelf.Collection<Bookshelf.Model<User>>) => {
 			console.log(users);
 		})
 }
diff --git a/types/bookshelf/index.d.ts b/types/bookshelf/index.d.ts
index dca8d5fad2..c151e81624 100644
--- a/types/bookshelf/index.d.ts
+++ b/types/bookshelf/index.d.ts
@@ -250,7 +250,7 @@ declare namespace Bookshelf {
 		detach(options?: SyncOptions): BlueBird<any>;
 		fetchOne(options?: CollectionFetchOneOptions): BlueBird<T>;
 		load(relations: string | string[], options?: SyncOptions): BlueBird<Collection<T>>;
-		orderBy(column: string, order?: SortOrder): T;
+		orderBy(column: string, order?: SortOrder): Collection<T>;
 
 		// Declaration order matters otherwise TypeScript gets confused between query() and query(...query: string[])
 		query(): Knex.QueryBuilder;
diff --git a/types/boom/v4/tsconfig.json b/types/boom/v4/tsconfig.json
index 58f1109eee..f8f2968c34 100644
--- a/types/boom/v4/tsconfig.json
+++ b/types/boom/v4/tsconfig.json
@@ -25,4 +25,4 @@
         "index.d.ts",
         "boom-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/bootstrap-3-typeahead/bootstrap-3-typeahead-tests.ts b/types/bootstrap-3-typeahead/bootstrap-3-typeahead-tests.ts
new file mode 100644
index 0000000000..0106ee2db3
--- /dev/null
+++ b/types/bootstrap-3-typeahead/bootstrap-3-typeahead-tests.ts
@@ -0,0 +1,19 @@
+$(document).ready(() => {
+    // basic usage
+    $('#typeahead').typeahead();
+    $('#typeahead').typeahead('lookup');
+    $('#typeahead').typeahead('lookup', 'Display name 1');
+    $('#typeahead').typeahead('getActive');
+    $('#typeahead').typeahead('destroy');
+
+    // with options example
+    const options: Bootstrap3Typeahead.Options = {
+        source: [
+            {id: 'someId1', name: 'Display name 1'},
+            {id: 'someId2', name: 'Display name 2'}
+        ],
+        autoSelect: true
+    };
+
+    $('#typeahead').typeahead(options);
+});
diff --git a/types/bootstrap-3-typeahead/index.d.ts b/types/bootstrap-3-typeahead/index.d.ts
new file mode 100644
index 0000000000..98d7eee664
--- /dev/null
+++ b/types/bootstrap-3-typeahead/index.d.ts
@@ -0,0 +1,107 @@
+// Type definitions for Bootstrap 3 Typeahead 4.0
+// Project: https://github.com/bassjobsen/Bootstrap-3-Typeahead
+// Definitions by: Anderson Friaça <https://github.com/AndersonFriaca>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+/// <reference types="jquery" />
+
+declare namespace Bootstrap3Typeahead {
+    interface Options {
+        /**
+         * The data source to query against
+         */
+        source?: string[] | object[] | ((query?: string, process?: ((callback: any) => string|string[]|object[])) => void);
+
+        /**
+         * The max number of items to display in the dropdown
+         */
+        items?: number;
+
+        /**
+         * The minimum character length needed before triggering autocomplete suggestions
+         */
+        minLength?: number;
+
+        /**
+         * If hints should be shown as soon as the input gets focus
+         */
+        showHintOnFocus?: boolean | 'all';
+
+        /**
+         * Number of pixels the scrollable parent container scrolled down
+         */
+        scrollHeight?: number | (() => number);
+
+        /**
+         * The method used to determine if a query matches an item
+         */
+        matcher?: (item: string) => boolean;
+
+        /**
+         * Method used to sort autocomplete results
+         */
+        sorter?: (items: string[]) => string[];
+
+        /**
+         * The method used to return selected item
+         */
+        updater?: (item: string) => string;
+
+        /**
+         * Method used to highlight autocomplete results
+         */
+        highlighter?: (item: string) => string;
+
+        /**
+         * Method used to get textual representation of an item of the sources
+         */
+        displayText?: (item: string|{name: string}) => string;
+
+        /**
+         * Allows you to dictate whether or not the first suggestion is selected automatically
+         */
+        autoSelect?: boolean;
+
+        /**
+         * Call back function to execute after selected an item
+         */
+        afterSelect?: (item: string) => void;
+
+        /**
+         * Adds a delay between lookups
+         */
+        delay?: number;
+
+        /**
+         * Use this option to add the menu to another div
+         */
+        appendTo?: JQuery;
+
+        /**
+         * Set to true if you want the menu to be the same size than the input it is attached to
+         */
+        fitToElement?: boolean;
+
+        /**
+         * Adds an item to the end of the list
+         */
+        addItem?: object;
+    }
+}
+interface JQuery {
+    /**
+     * Initialize or destroy Typeahead
+     */
+    typeahead(methodOrOptions?: 'destroy' | Bootstrap3Typeahead.Options): JQuery;
+
+    /**
+     * To get the currently active item
+     */
+    typeahead(method: 'getActive'): undefined|string|object;
+
+    /**
+     * To trigger the lookup function externally
+     */
+    typeahead(method: 'lookup', defaultValue?: string): JQuery;
+}
diff --git a/types/bootstrap-3-typeahead/tsconfig.json b/types/bootstrap-3-typeahead/tsconfig.json
new file mode 100644
index 0000000000..94e92a0050
--- /dev/null
+++ b/types/bootstrap-3-typeahead/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "bootstrap-3-typeahead-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/bootstrap-3-typeahead/tslint.json b/types/bootstrap-3-typeahead/tslint.json
new file mode 100644
index 0000000000..4e88071852
--- /dev/null
+++ b/types/bootstrap-3-typeahead/tslint.json
@@ -0,0 +1 @@
+{"extends": "dtslint/dt.json"}
diff --git a/types/bootstrap/index.d.ts b/types/bootstrap/index.d.ts
index a3117596af..06142cc1d1 100644
--- a/types/bootstrap/index.d.ts
+++ b/types/bootstrap/index.d.ts
@@ -87,7 +87,7 @@ interface TransitionEventNames {
 interface JQuery {
     modal(options?: ModalOptions): JQuery;
     modal(options?: ModalOptionsBackdropString): JQuery;
-    modal(command: string): JQuery;
+    modal(command: string, relatedTarget?: Element): JQuery;
 
     dropdown(): JQuery;
     dropdown(command: string): JQuery;
diff --git a/types/braft-editor/braft-editor-tests.tsx b/types/braft-editor/braft-editor-tests.tsx
index 584927e0bd..999850acaa 100644
--- a/types/braft-editor/braft-editor-tests.tsx
+++ b/types/braft-editor/braft-editor-tests.tsx
@@ -1,5 +1,5 @@
 import * as React from "react";
-import * as BraftEditor from "braft-editor";
+import BraftEditor = require("braft-editor");
 import {
 	RawDraftContentState,
 } from 'draft-js';
diff --git a/types/braft-editor/index.d.ts b/types/braft-editor/index.d.ts
index 225d32722d..505403d2f3 100644
--- a/types/braft-editor/index.d.ts
+++ b/types/braft-editor/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/margox/braft#readme
 // Definitions by: My Self <https://github.com/me>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from "react";
 import { RawDraftContentState } from 'draft-js';
diff --git a/types/brorand/brorand-tests.ts b/types/brorand/brorand-tests.ts
index ac090e8724..eb7bf16570 100644
--- a/types/brorand/brorand-tests.ts
+++ b/types/brorand/brorand-tests.ts
@@ -1,5 +1,4 @@
-
-import * as brorand from 'brorand';
+import brorand = require('brorand');
 
 {
 	let result: Buffer|Uint8Array = brorand(42);
diff --git a/types/browser-resolve/browser-resolve-tests.ts b/types/browser-resolve/browser-resolve-tests.ts
index 7d08de726f..25872b4b07 100644
--- a/types/browser-resolve/browser-resolve-tests.ts
+++ b/types/browser-resolve/browser-resolve-tests.ts
@@ -1,4 +1,4 @@
-import * as browserResolve from 'browser-resolve';
+import browserResolve = require('browser-resolve');
 
 function basic_test_async(callback: (err?: Error, resolved?: string) => void) {
   browserResolve('typescript', function(error, resolved) {
diff --git a/types/browser-sync/browser-sync-tests.ts b/types/browser-sync/browser-sync-tests.ts
index 85cd464a21..bcd829367a 100644
--- a/types/browser-sync/browser-sync-tests.ts
+++ b/types/browser-sync/browser-sync-tests.ts
@@ -1,4 +1,4 @@
-import * as browserSync from "browser-sync";
+import browserSync = require("browser-sync");
 
 (() => {
     //make sure that the interfaces are correctly exposed
diff --git a/types/builtin-modules/builtin-modules-tests.ts b/types/builtin-modules/builtin-modules-tests.ts
new file mode 100644
index 0000000000..dadcb6ea72
--- /dev/null
+++ b/types/builtin-modules/builtin-modules-tests.ts
@@ -0,0 +1,8 @@
+import * as builtins from 'builtin-modules';
+import * as builtinsStatic from 'builtin-modules/static';
+
+let builtin: string = builtins[0];
+builtin = builtinsStatic[0];
+
+builtins.push('foo'); // $ExpectError
+builtinsStatic.pop('foo'); // $ExpectError
diff --git a/types/builtin-modules/index.d.ts b/types/builtin-modules/index.d.ts
new file mode 100644
index 0000000000..a800bfd4f2
--- /dev/null
+++ b/types/builtin-modules/index.d.ts
@@ -0,0 +1,7 @@
+// Type definitions for builtin-modules 2.0
+// Project: https://github.com/sindresorhus/builtin-modules#readme
+// Definitions by: Klaus Meinhardt <https://github.com/ajafff>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare const builtinModules: ReadonlyArray<string>;
+export = builtinModules;
diff --git a/types/builtin-modules/static.d.ts b/types/builtin-modules/static.d.ts
new file mode 100644
index 0000000000..1b9dbb78cd
--- /dev/null
+++ b/types/builtin-modules/static.d.ts
@@ -0,0 +1,2 @@
+declare const builtinModules: ReadonlyArray<string>;
+export = builtinModules;
diff --git a/types/builtin-modules/tsconfig.json b/types/builtin-modules/tsconfig.json
new file mode 100644
index 0000000000..b8ce33b916
--- /dev/null
+++ b/types/builtin-modules/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "static.d.ts",
+        "builtin-modules-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/builtin-modules/tslint.json b/types/builtin-modules/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/builtin-modules/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/bull/bull-tests.tsx b/types/bull/bull-tests.tsx
index cbdcc83e0a..765be54733 100644
--- a/types/bull/bull-tests.tsx
+++ b/types/bull/bull-tests.tsx
@@ -2,8 +2,8 @@
  * Created by Bruno Grieder
  */
 
-import * as Redis from "ioredis";
-import * as Queue from "bull";
+import Redis = require("ioredis");
+import Queue = require("bull");
 
 const videoQueue = new Queue('video transcoding', 'redis://127.0.0.1:6379');
 const audioQueue = new Queue('audio transcoding', {redis: {port: 6379, host: '127.0.0.1'}}); // Specify Redis connection using object
diff --git a/types/bull/index.d.ts b/types/bull/index.d.ts
index 6cc4f5ed1d..8a12db0fd7 100644
--- a/types/bull/index.d.ts
+++ b/types/bull/index.d.ts
@@ -135,7 +135,7 @@ declare namespace Bull {
     promote(): Promise<void>;
   }
 
-  type JobStatus = 'completed' | 'wait' | 'active' | 'delayed' | 'failed';
+  type JobStatus = 'completed' | 'waiting' | 'active' | 'delayed' | 'failed';
 
   interface BackoffOptions {
     /**
@@ -431,6 +431,11 @@ declare namespace Bull {
      */
     getJob(jobId: JobId): Promise<Job>;
 
+    /**
+     * Returns a promise that will return an array with the waiting jobs between start and end.
+     */
+    getWaiting(start?: number, end?: number): Promise<Job[]>;
+
     /**
      * Returns a promise that will return an array with the active jobs between start and end.
      */
diff --git a/types/bull/v2/bull-tests.tsx b/types/bull/v2/bull-tests.tsx
index fcf339b3c3..e6c82fe4f9 100644
--- a/types/bull/v2/bull-tests.tsx
+++ b/types/bull/v2/bull-tests.tsx
@@ -2,7 +2,7 @@
  * Created by Bruno Grieder
  */
 
-import * as Queue from "bull"
+import Queue = require("bull");
 
 var videoQueue = Queue( 'video transcoding', 6379, '127.0.0.1' );
 var audioQueue = Queue( 'audio transcoding', 6379, '127.0.0.1' );
diff --git a/types/bump-regex/tsconfig.json b/types/bump-regex/tsconfig.json
index 001effea6a..6e944c4dfe 100644
--- a/types/bump-regex/tsconfig.json
+++ b/types/bump-regex/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "bump-regex-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/bunyan-bugsnag/bunyan-bugsnag-tests.ts b/types/bunyan-bugsnag/bunyan-bugsnag-tests.ts
index 3c46089690..39a4c14cf5 100644
--- a/types/bunyan-bugsnag/bunyan-bugsnag-tests.ts
+++ b/types/bunyan-bugsnag/bunyan-bugsnag-tests.ts
@@ -1,4 +1,4 @@
-import * as bunyanBugsnag from 'bunyan-bugsnag';
+import bunyanBugsnag = require('bunyan-bugsnag');
 import * as bunyan from 'bunyan';
 
 const stream1 = bunyanBugsnag();
diff --git a/types/bunyan-format/tsconfig.json b/types/bunyan-format/tsconfig.json
index c26359cdb6..db6bd4b234 100644
--- a/types/bunyan-format/tsconfig.json
+++ b/types/bunyan-format/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "bunyan-format-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/busboy/busboy-tests.ts b/types/busboy/busboy-tests.ts
index 24291621a5..309572a37c 100644
--- a/types/busboy/busboy-tests.ts
+++ b/types/busboy/busboy-tests.ts
@@ -1,4 +1,4 @@
-import * as Busboy from 'busboy';
+import Busboy = require('busboy');
 import * as http from 'http';
 import * as util from 'util';
 
diff --git a/types/bwip-js/bwip-js-tests.ts b/types/bwip-js/bwip-js-tests.ts
index 29cc419d2c..d016b81ae5 100644
--- a/types/bwip-js/bwip-js-tests.ts
+++ b/types/bwip-js/bwip-js-tests.ts
@@ -1,4 +1,4 @@
-import * as bwipjs from 'bwip-js';
+import bwipjs = require('bwip-js');
 import * as http from 'http';
 import * as fs from 'fs';
 
diff --git a/types/c3/index.d.ts b/types/c3/index.d.ts
index d68027f7d5..28f301237c 100644
--- a/types/c3/index.d.ts
+++ b/types/c3/index.d.ts
@@ -880,6 +880,7 @@ export interface ChartAPI {
         keys?: { x?: string; value: string[]; }
         rows?: PrimitiveArray[];
         columns?: PrimitiveArray[];
+        xs?: { [key: string]: string };
         names?: { [key: string]: string };
         classes?: { [key: string]: string };
         categories?: string[];
diff --git a/types/camaro/camaro-tests.ts b/types/camaro/camaro-tests.ts
new file mode 100644
index 0000000000..b99b0201c3
--- /dev/null
+++ b/types/camaro/camaro-tests.ts
@@ -0,0 +1,3 @@
+import transform = require('camaro');
+
+const x: object = transform('<root><child>text</child></root>', { text: 'root/child'});
diff --git a/types/camaro/index.d.ts b/types/camaro/index.d.ts
new file mode 100644
index 0000000000..5d8b8e5bae
--- /dev/null
+++ b/types/camaro/index.d.ts
@@ -0,0 +1,13 @@
+// Type definitions for camaro 2.2
+// Project: https://github.com/tuananh/camaro
+// Definitions by: Tuan Anh Tran <https://github.com/tuananh>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+/**
+ * Transform the input xml to json using the input template object.
+ * @param input The input xml string
+ * @param template The output template
+ */
+declare function transform(input: string, template: object): object;
+export = transform;
diff --git a/types/camaro/tsconfig.json b/types/camaro/tsconfig.json
new file mode 100644
index 0000000000..6df806555d
--- /dev/null
+++ b/types/camaro/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",
+        "camaro-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/camaro/tslint.json b/types/camaro/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/camaro/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/cancan/tsconfig.json b/types/cancan/tsconfig.json
index 8aace9dd52..304b690c51 100644
--- a/types/cancan/tsconfig.json
+++ b/types/cancan/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "cancan-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/case-sensitive-paths-webpack-plugin/index.d.ts b/types/case-sensitive-paths-webpack-plugin/index.d.ts
index 360d3d6d08..38fdd9c032 100644
--- a/types/case-sensitive-paths-webpack-plugin/index.d.ts
+++ b/types/case-sensitive-paths-webpack-plugin/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/Urthen/case-sensitive-paths-webpack-plugin#readme
 // Definitions by: Andrew Makarov <https://github.com/r3nya>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 import { Plugin } from 'webpack';
 
diff --git a/types/case-sensitive-paths-webpack-plugin/tsconfig.json b/types/case-sensitive-paths-webpack-plugin/tsconfig.json
index b8cb05390a..aa81dd4f9a 100644
--- a/types/case-sensitive-paths-webpack-plugin/tsconfig.json
+++ b/types/case-sensitive-paths-webpack-plugin/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "case-sensitive-paths-webpack-plugin-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/caseless/tsconfig.json b/types/caseless/tsconfig.json
index c7dace4424..2615e35963 100644
--- a/types/caseless/tsconfig.json
+++ b/types/caseless/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "caseless-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/catalog/catalog-tests.tsx b/types/catalog/catalog-tests.tsx
index c77c0c1667..37a87540d1 100644
--- a/types/catalog/catalog-tests.tsx
+++ b/types/catalog/catalog-tests.tsx
@@ -36,7 +36,7 @@ render(config, document.body);
 markdown`
 # Test
 
-${<ReactSpecimen>
+${<ReactSpecimen sourceText='.'>
   <div />
 </ReactSpecimen>}
 `;
diff --git a/types/catalog/index.d.ts b/types/catalog/index.d.ts
index 515008d7de..3476e86641 100644
--- a/types/catalog/index.d.ts
+++ b/types/catalog/index.d.ts
@@ -1,8 +1,8 @@
-// Type definitions for catalog 2.1
+// Type definitions for catalog 3.2
 // Project: https://github.com/interactivethings/catalog/
 // Definitions by: Peter Gassner <https://github.com/grossbart>, Tomas Carnecky <https://github.com/wereHamster>
 // Definitions: https://github.com/interactivethings/catalog/
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from "react";
 
@@ -100,6 +100,7 @@ export interface ReactSpecimenProps extends DefaultCatalogProps {
   frame?: boolean;
   state?: any;
   responsive?: boolean | string | string[];
+  sourceText?: string;
 }
 export class ReactSpecimen extends React.Component<ReactSpecimenProps> {}
 
diff --git a/types/catalog/tsconfig.json b/types/catalog/tsconfig.json
index 95f43ccaf0..ee00ec7af2 100644
--- a/types/catalog/tsconfig.json
+++ b/types/catalog/tsconfig.json
@@ -1,25 +1,25 @@
 {
-  "compilerOptions": {
-      "module": "commonjs",
-      "lib": [
-          "es6",
-          "dom"
-      ],
-      "noImplicitAny": true,
-      "noImplicitThis": true,
-      "strictNullChecks": true,
-      "strictFunctionTypes": true,
-      "baseUrl": "../",
-      "typeRoots": [
-          "../"
-      ],
-      "types": [],
-      "noEmit": true,
-      "forceConsistentCasingInFileNames": true,
-      "jsx": "react"
-  },
-  "files": [
-      "index.d.ts",
-      "catalog-tests.tsx"
-  ]
-}
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "jsx": "react"
+    },
+    "files": [
+        "index.d.ts",
+        "catalog-tests.tsx"
+    ]
+}
\ No newline at end of file
diff --git a/types/catbox/tsconfig.json b/types/catbox/tsconfig.json
index 16f6fb780e..24e8f7f34e 100644
--- a/types/catbox/tsconfig.json
+++ b/types/catbox/tsconfig.json
@@ -14,7 +14,9 @@
         ],
         "types": [],
         "paths": {
-            "boom": ["boom/v4"]
+            "boom": [
+                "boom/v4"
+            ]
         },
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
@@ -23,4 +25,4 @@
         "index.d.ts",
         "catbox-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/ccap/ccap-tests.ts b/types/ccap/ccap-tests.ts
index 12a38a9f60..111fa2f457 100644
--- a/types/ccap/ccap-tests.ts
+++ b/types/ccap/ccap-tests.ts
@@ -1,4 +1,4 @@
-import * as ccap from 'ccap';
+import ccap = require('ccap');
 
 const captcha1 = ccap();
 
diff --git a/types/chai-dom/chai-dom-tests.ts b/types/chai-dom/chai-dom-tests.ts
index 61b3b3c600..2cc7b0f232 100644
--- a/types/chai-dom/chai-dom-tests.ts
+++ b/types/chai-dom/chai-dom-tests.ts
@@ -1,5 +1,5 @@
 import * as chai from 'chai';
-import * as chaiDom from 'chai-dom';
+import chaiDom = require('chai-dom');
 
 chai.use(chaiDom);
 var expect = chai.expect;
diff --git a/types/chai-enzyme/chai-enzyme-tests.tsx b/types/chai-enzyme/chai-enzyme-tests.tsx
index 4b88d077aa..70cd34f2fd 100644
--- a/types/chai-enzyme/chai-enzyme-tests.tsx
+++ b/types/chai-enzyme/chai-enzyme-tests.tsx
@@ -1,5 +1,5 @@
 import * as React from "react";
-import * as chaiEnzyme from "chai-enzyme";
+import chaiEnzyme = require("chai-enzyme");
 import { expect } from "chai";
 import { shallow } from "enzyme";
 
diff --git a/types/chai-enzyme/index.d.ts b/types/chai-enzyme/index.d.ts
index f1283994f6..413f5ec545 100644
--- a/types/chai-enzyme/index.d.ts
+++ b/types/chai-enzyme/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/producthunt/chai-enzyme
 // Definitions by: Alexey Svetliakov <https://github.com/asvetliakov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 
 /// <reference types="enzyme" />
diff --git a/types/chai-http/chai-http-tests.ts b/types/chai-http/chai-http-tests.ts
index f4f65cae7b..882f089a47 100644
--- a/types/chai-http/chai-http-tests.ts
+++ b/types/chai-http/chai-http-tests.ts
@@ -37,6 +37,25 @@ chai.request(app)
 	.get('/protected')
 	.auth('user', 'pass');
 
+// HTTPS request, from: https://github.com/visionmedia/superagent/commit/6158efbf42cb93d77c1a70887284be783dd7dabe
+const ca = fs.readFileSync('ca.cert.pem');
+const key = fs.readFileSync('key.pem');
+const cert = fs.readFileSync('cert.pem');
+const callback = (err: any, res: ChaiHttp.Response) => {};
+
+chai.request(app)
+	.post('/secure')
+	.ca(ca)
+	.key(key)
+	.cert(cert)
+	.end(callback);
+
+const pfx = fs.readFileSync('cert.pfx');
+chai.request(app)
+	.post('/secure')
+	.pfx(pfx)
+	.end(callback);
+
 chai.request(app)
 	.get('/search')
 	.query({ name: 'foo', limit: 10 });
diff --git a/types/chai-http/index.d.ts b/types/chai-http/index.d.ts
index 6a9404c9da..77c711cb7f 100644
--- a/types/chai-http/index.d.ts
+++ b/types/chai-http/index.d.ts
@@ -3,12 +3,15 @@
 // Definitions by: Wim Looman <https://github.com/Nemo157>
 //                 Liam Jones <https://github.com/G1itcher>
 //                 Federico Caselli <https://github.com/CaselIT>
+//                 Bas Luksenburg <https://github.com/bas-l>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
 /// <reference types="node" />
 /// <reference types="chai" />
 
+import * as request from 'superagent';
+
 declare global {
 	namespace Chai {
 		interface ChaiStatic {
@@ -53,31 +56,14 @@ declare global {
 			on(event: string, fn: (...args: any[]) => void): void;
 		}
 
-		interface Request extends FinishedRequest {
-			attach(field: string, file: string|Buffer, filename: string): Request;
-			set(field: string, val: string): Request;
-			query(params: any): Request;
-			send(data: any): Request;
-			auth(user: string, name: string): Request;
-			field(name: string, val: string): Request;
-			buffer(): Request;
-			parse(fn: (res: Response, cb: (e?: Error, r?: any) => void) => void): Request;
-			end(callback?: (err: any, res: Response) => void): FinishedRequest;
-		}
-
-		interface FinishedRequest<T = Response> {
-			then<TR1 = T, TR2 = void>(success?: (res: T) => TR1 | PromiseLike<TR1>, failure?: (err: any) => TR2 | PromiseLike<TR2>): FinishedRequest<TR1>;
-			catch(failure?: (err: any) => void): FinishedRequest<T>;
-		}
-
-		interface Agent {
-			get(url: string, callback?: (err: any, res: Response) => void): Request;
-			post(url: string, callback?: (err: any, res: Response) => void): Request;
-			put(url: string, callback?: (err: any, res: Response) => void): Request;
-			head(url: string, callback?: (err: any, res: Response) => void): Request;
-			del(url: string, callback?: (err: any, res: Response) => void): Request;
-			options(url: string, callback?: (err: any, res: Response) => void): Request;
-			patch(url: string, callback?: (err: any, res: Response) => void): Request;
+		interface Agent  {
+			get(url: string, callback?: (err: any, res: Response) => void): request.Request;
+			post(url: string, callback?: (err: any, res: Response) => void): request.Request;
+			put(url: string, callback?: (err: any, res: Response) => void): request.Request;
+			head(url: string, callback?: (err: any, res: Response) => void): request.Request;
+			del(url: string, callback?: (err: any, res: Response) => void): request.Request;
+			options(url: string, callback?: (err: any, res: Response) => void): request.Request;
+			patch(url: string, callback?: (err: any, res: Response) => void): request.Request;
 		}
 
 		interface TypeComparison {
diff --git a/types/charset/tsconfig.json b/types/charset/tsconfig.json
index 52652c8e44..7c45445f29 100644
--- a/types/charset/tsconfig.json
+++ b/types/charset/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "charset-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/chart.js/chart.js-tests.ts b/types/chart.js/chart.js-tests.ts
index 8d2190478f..8ba81e8747 100644
--- a/types/chart.js/chart.js-tests.ts
+++ b/types/chart.js/chart.js-tests.ts
@@ -1,4 +1,4 @@
-import { Chart, ChartData } from 'chart.js';
+import { Chart, ChartData, Point } from 'chart.js';
 
 // alternative:
 // import chartjs = require('chart.js');
@@ -65,3 +65,11 @@ if (chart.chartArea) {
     console.log(chart.chartArea.bottom);
     console.log(chart.chartArea.left);
 }
+
+// http://www.chartjs.org/docs/latest/configuration/tooltip.html#position-modes
+Chart.Tooltip.positioners.custom = (elements: any[], eventPosition: Point) => {
+    return {
+        x: eventPosition.x,
+        y: eventPosition.y + 10
+    };
+};
diff --git a/types/chart.js/index.d.ts b/types/chart.js/index.d.ts
index db20617c2d..9a8269bee4 100644
--- a/types/chart.js/index.d.ts
+++ b/types/chart.js/index.d.ts
@@ -44,6 +44,9 @@ declare class Chart {
     static controllers: {
         [key: string]: any;
     };
+
+    // Tooltip Static Options
+    static Tooltip: Chart.ChartTooltipsStaticConfiguration;
 }
 declare class PluginServiceStatic {
     register(plugin: PluginServiceRegistrationOptions): void;
@@ -268,13 +271,19 @@ declare namespace Chart {
         callbacks?: ChartTooltipCallback;
         filter?(item: ChartTooltipItem): boolean;
         itemSort?(itemA: ChartTooltipItem, itemB: ChartTooltipItem): number;
-        position?: "average"|"nearest";
+        position?: string;
         caretPadding?: number;
         displayColors?: boolean;
         borderColor?: ChartColor;
         borderWidth?: number;
     }
 
+    interface ChartTooltipsStaticConfiguration {
+        positioners: {[mode: string]: ChartTooltipPositioner};
+    }
+
+    type ChartTooltipPositioner = (elements: any[], eventPosition: Point) => Point;
+
     interface ChartHoverOptions {
         mode?: string;
         animationDuration?: number;
@@ -561,6 +570,11 @@ declare namespace Chart {
         pointLabels?: PointLabelOptions;
         ticks?: TickOptions;
     }
+
+    interface Point {
+        x: number;
+        y: number;
+    }
 }
 
 export = Chart;
diff --git a/types/check-types/tsconfig.json b/types/check-types/tsconfig.json
index d3c89a7ac7..2f4d8d07c3 100644
--- a/types/check-types/tsconfig.json
+++ b/types/check-types/tsconfig.json
@@ -1,21 +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",
-    "check-types-tests.ts"
-  ]
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "check-types-tests.ts"
+    ]
 }
\ No newline at end of file
diff --git a/types/cheerio/cheerio-tests.ts b/types/cheerio/cheerio-tests.ts
index 1a9821a6bb..d686951213 100644
--- a/types/cheerio/cheerio-tests.ts
+++ b/types/cheerio/cheerio-tests.ts
@@ -1,6 +1,4 @@
-
-
-import * as cheerio from 'cheerio';
+import cheerio = require('cheerio');
 
 /*
  * LOADING
diff --git a/types/chessboardjs/chessboardjs-tests.ts b/types/chessboardjs/chessboardjs-tests.ts
new file mode 100644
index 0000000000..37c797037c
--- /dev/null
+++ b/types/chessboardjs/chessboardjs-tests.ts
@@ -0,0 +1,92 @@
+import chessboardjs = require('chessboardjs');
+
+/**
+ * Basic Usage
+ */
+
+// empty position
+let board = chessboardjs.ChessBoard('board');
+
+// Start position
+board = chessboardjs.ChessBoard('board', 'start');
+
+// FEN string
+const ruyLopez = 'r1bqkbnr/pppp1ppp/2n5/1B2p3/4P3/5N2/PPPP1PPP/RNBQK2R';
+board = chessboardjs.ChessBoard('board', ruyLopez);
+
+// Position Object
+let position: chessboardjs.BoardPositionType = {
+    d6: chessboardjs.Piece.bK,
+    d4: chessboardjs.Piece.wP,
+    e4: chessboardjs.Piece.wK
+};
+board = chessboardjs.ChessBoard('board', position);
+
+// Multiple boards
+const config1: chessboardjs.BoardConfig = {
+    position: 'start',
+    showNotation: false
+};
+const board1 = chessboardjs.ChessBoard('board1', config1);
+
+const board2 = chessboardjs.ChessBoard('board2', {
+    position: 'r1bqkbnr/pppp1ppp/2n5/1B2p3/4P3/5N2/PPPP1PPP/RNBQK2R',
+    showNotation: false
+});
+
+const board3 = chessboardjs.ChessBoard('board3', {
+    position: 'r1k4r/p2nb1p1/2b4p/1p1n1p2/2PP4/3Q1NB1/1P3PPP/R5K1',
+    showNotation: false
+});
+
+/**
+ * Methods
+ */
+
+// Get Position
+const cfg: chessboardjs.BoardConfig = {
+    draggable: true,
+    position: 'start'
+};
+board = chessboardjs.ChessBoard('board', cfg);
+const pos: chessboardjs.BoardPositionType = board.position();
+
+const posFEN: string = board.position('fen');
+
+// Set position
+
+// FEN
+board.position('r1k4r/p2nb1p1/2b4p/1p1n1p2/2PP4/3Q1NB1/1P3PPP/R5K1');
+
+// animated
+board.position(ruyLopez, true);
+
+// instantly
+board.position(ruyLopez, false);
+
+position = {
+    a4: chessboardjs.Piece.bK,
+    c4: chessboardjs.Piece.wK,
+    a7: chessboardjs.Piece.wR
+};
+board.position(position);
+
+// Clear
+board.clear(false);
+
+// Move
+board.start();
+board.move('e2-e4');
+
+// Orientation
+const oritentation = board.orientation();
+
+// change orientation
+board.orientation('black');
+
+// Recalculates board and square sizes based on the parent element and redraws
+// the board accordingly.
+board.resize();
+
+// Destroy
+board.destroy();
diff --git a/types/chessboardjs/index.d.ts b/types/chessboardjs/index.d.ts
new file mode 100644
index 0000000000..f6228f748e
--- /dev/null
+++ b/types/chessboardjs/index.d.ts
@@ -0,0 +1,82 @@
+// Type definitions for chessboardjs 0.3
+// Project: https://github.com/oakmac/chessboardjs/
+// Definitions by: Bayo Olatunji <https://github.com/sliverb>
+//                 David Paz <https://github.com/davidmpaz>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+export enum Square {
+    a8 = 'a8', b8 = 'b8', c8 = 'c8', d8 = 'd8', e8 = 'e8', f8 = 'f8', g8 = 'g7', h8 = 'h8',
+    a7 = 'a7', b7 = 'b7', c7 = 'c7', d7 = 'd7', e7 = 'e7', f7 = 'f7', g7 = 'g7', h7 = 'h7',
+    a6 = 'a6', b6 = 'b6', c6 = 'c6', d6 = 'd6', e6 = 'e6', f6 = 'f6', g6 = 'g7', h6 = 'h6',
+    a5 = 'a5', b5 = 'b5', c5 = 'c5', d5 = 'd5', e5 = 'e5', f5 = 'f5', g5 = 'g7', h5 = 'h5',
+    a4 = 'a4', b4 = 'b4', c4 = 'c4', d4 = 'd4', e4 = 'e4', f4 = 'f4', g4 = 'g7', h4 = 'h4',
+    a3 = 'a3', b3 = 'b3', c3 = 'c3', d3 = 'd3', e3 = 'e3', f3 = 'f3', g3 = 'g7', h3 = 'h3',
+    a2 = 'a2', b2 = 'b2', c2 = 'c2', d2 = 'd2', e2 = 'e2', f2 = 'f2', g2 = 'g7', h2 = 'h2',
+    a1 = 'a1', b1 = 'b1', c1 = 'c1', d1 = 'd1', e1 = 'e1', f1 = 'f1', g1 = 'g7', h1 = 'h1',
+}
+
+export enum Piece {
+    bK = 'bK', bQ = 'bQ', bR = 'bR', bN = 'bN', bB = 'bB', bP = 'bP',
+    wK = 'wK', wQ = 'wQ', wR = 'wR', wN = 'wN', wB = 'wB', wP = 'wP'
+}
+
+export type BoardPositionType = {
+    [P in Square]?: Piece;
+};
+
+export type PositionType = 'start' | string | BoardPositionType;
+export type PositionFenType = 'fen';
+export type SpeedType = 'slow' | 'fast';
+export type OrientationFlipType = 'flip';
+export type OrientationType = 'white' | 'black';
+export type DropOffBoardType = 'snapback' | 'trash';
+export type Callback = () => void;
+
+export interface BoardConfig {
+    onDrop?: Callback;
+    draggable?: boolean;
+    onChange?: Callback;
+    onMoveEnd?: Callback;
+    onSnapEnd?: Callback;
+    sparePieces?: boolean;
+    onDragMove?: Callback;
+    showNotation?: boolean;
+    onDragStart?: Callback;
+    onSnapbackEnd?: Callback;
+    onMouseoutSquare?: Callback;
+    onMouseoverSquare?: Callback;
+    pieceTheme?: string | Callback;
+    orientation?: OrientationType;
+    showErrors?: boolean | string | Callback;
+    moveSpeed?: number | SpeedType;
+    snapSpeed?: number | SpeedType;
+    trashSpeed?: number | SpeedType;
+    dropOffBoard?: DropOffBoardType;
+    appearSpeed?: number | SpeedType;
+    snapbackSpeed?: number | SpeedType;
+    position?: PositionType;
+}
+
+export interface ChessBoardInstance {
+    clear(useAnimation?: boolean): void;
+    destroy(): void;
+    fen(): string;
+    flip(): void;
+    move(...args: string[]): BoardPositionType;
+    position(): BoardPositionType;
+    position(fen: PositionFenType): string;
+    position(newPosition: PositionType, useAnimation?: boolean): void;
+    orientation(side?: OrientationType | OrientationFlipType): string;
+    resize(): void;
+    start(useAnimation?: boolean): void;
+}
+
+export interface ChessBoardFactory {
+    (containerElOrId: any, config?: BoardConfig): ChessBoardInstance;
+    (containerElOrId: any, position: string | BoardPositionType): ChessBoardInstance;
+    fenToObj(fen: string): boolean | BoardPositionType;
+    objToFen(obj: BoardPositionType): boolean | string;
+}
+
+export const ChessBoard: ChessBoardFactory;
diff --git a/types/chessboardjs/tsconfig.json b/types/chessboardjs/tsconfig.json
new file mode 100644
index 0000000000..883206b752
--- /dev/null
+++ b/types/chessboardjs/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "chessboardjs-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/chessboardjs/tslint.json b/types/chessboardjs/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/chessboardjs/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/chrome/tsconfig.json b/types/chrome/tsconfig.json
index 57e4524e5a..1463d006eb 100644
--- a/types/chrome/tsconfig.json
+++ b/types/chrome/tsconfig.json
@@ -26,4 +26,4 @@
         "test/chrome-app.ts",
         "test/chrome-webview.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/clamp-js-main/tsconfig.json b/types/clamp-js-main/tsconfig.json
index 5c05321afc..38e5f2271d 100644
--- a/types/clamp-js-main/tsconfig.json
+++ b/types/clamp-js-main/tsconfig.json
@@ -21,4 +21,4 @@
         "index.d.ts",
         "clamp-js-main-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/clean-webpack-plugin/index.d.ts b/types/clean-webpack-plugin/index.d.ts
index 7fc45cc3e4..afe8a65b69 100644
--- a/types/clean-webpack-plugin/index.d.ts
+++ b/types/clean-webpack-plugin/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/johnagan/clean-webpack-plugin
 // Definitions by: Jed Fox <https://github.com/j-f1>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 import { Plugin } from 'webpack';
 
diff --git a/types/clean-webpack-plugin/tsconfig.json b/types/clean-webpack-plugin/tsconfig.json
index 2f342b4d42..8d0f70d644 100644
--- a/types/clean-webpack-plugin/tsconfig.json
+++ b/types/clean-webpack-plugin/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "clean-webpack-plugin-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/cleave.js/index.d.ts b/types/cleave.js/index.d.ts
index eae6bc75b9..646cd72eea 100644
--- a/types/cleave.js/index.d.ts
+++ b/types/cleave.js/index.d.ts
@@ -4,7 +4,7 @@
 //                 J Giancono <https://github.com/jasongi-at-sportsbet>,
 //                 Alex Shakun <https://github.com/sashashakun>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import { CleaveOptions } from './options';
 
diff --git a/types/cleave.js/tsconfig.json b/types/cleave.js/tsconfig.json
index 40e69541bc..c2d5447360 100644
--- a/types/cleave.js/tsconfig.json
+++ b/types/cleave.js/tsconfig.json
@@ -24,4 +24,4 @@
         "options.d.ts",
         "react/index.d.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/cli-spinner/tsconfig.json b/types/cli-spinner/tsconfig.json
index 61c966becc..fb8e34bbb5 100644
--- a/types/cli-spinner/tsconfig.json
+++ b/types/cli-spinner/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "cli-spinner-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/clockpicker/tsconfig.json b/types/clockpicker/tsconfig.json
index 64b80a0278..3e5532fe0b 100644
--- a/types/clockpicker/tsconfig.json
+++ b/types/clockpicker/tsconfig.json
@@ -21,4 +21,4 @@
         "index.d.ts",
         "clockpicker-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/clusterize.js/tsconfig.json b/types/clusterize.js/tsconfig.json
index 10ca5c2a1a..f2067f97d1 100644
--- a/types/clusterize.js/tsconfig.json
+++ b/types/clusterize.js/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "clusterize.js-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/cmd-shim/tsconfig.json b/types/cmd-shim/tsconfig.json
index 753e3b8c58..ba380ed12a 100644
--- a/types/cmd-shim/tsconfig.json
+++ b/types/cmd-shim/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "cmd-shim-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/co-body/co-body-tests.ts b/types/co-body/co-body-tests.ts
index 944cadd394..0b15f2bcc5 100644
--- a/types/co-body/co-body-tests.ts
+++ b/types/co-body/co-body-tests.ts
@@ -1,5 +1,5 @@
-import * as koa from 'koa';
-import * as parse from 'co-body';
+import koa = require('koa');
+import parse = require('co-body');
 
 var app = new koa();
 
diff --git a/types/code/code-tests.ts b/types/code/code-tests.ts
index 1c2fa78fe5..9e5f12645f 100644
--- a/types/code/code-tests.ts
+++ b/types/code/code-tests.ts
@@ -159,3 +159,11 @@ expect<number[]>(foo).to.equal([]);
 const bar = Object.create(null);
 settings.comparePrototypes = false;
 expect(bar).to.equal({});
+
+const rejection = Promise.reject(new Error('Oh no!'));
+/* await */ expect(rejection).to.reject('Oh no!');
+/* await */  expect(rejection).rejects('Oh no!');
+
+const typedRejection = Promise.reject(new CustomError('Oh no!'));
+/* await */  expect(typedRejection).to.reject(CustomError, 'Oh no!');
+/* await */  expect(typedRejection).rejects(CustomError, 'Oh no!');
diff --git a/types/code/index.d.ts b/types/code/index.d.ts
index 7541831db2..3bdca4be9a 100644
--- a/types/code/index.d.ts
+++ b/types/code/index.d.ts
@@ -160,6 +160,10 @@ export interface Values<T> {
     match(regex: RegExp): AssertionChain<T>;
     /** Asserts that the reference value's toString() representation matches the provided regular expression. */
     matches(regex: RegExp): AssertionChain<T>;
+    /** Asserts that the Promise reference value rejects with an exception when called */
+    reject(type?: any, message?: string | RegExp): AssertionChain<T>;
+    /** Asserts that the Promise reference value rejects with an exception when called */
+    rejects(type?: any, message?: string | RegExp): AssertionChain<T>;
     /** Asserts that the reference value satisfies the provided validator function. */
     satisfy(validator: (value: T) => boolean): AssertionChain<T>;
     /** Asserts that the reference value satisfies the provided validator function. */
diff --git a/types/coinbase/tsconfig.json b/types/coinbase/tsconfig.json
index 6f8b261d27..6868f0e3cf 100644
--- a/types/coinbase/tsconfig.json
+++ b/types/coinbase/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "coinbase-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/color-namer/color-namer-tests.ts b/types/color-namer/color-namer-tests.ts
new file mode 100644
index 0000000000..1328d67221
--- /dev/null
+++ b/types/color-namer/color-namer-tests.ts
@@ -0,0 +1,24 @@
+import namer = require('color-namer');
+
+const colors1 = namer('#ffffff');
+
+colors1.basic[0].distance;
+colors1.basic[0].hex;
+colors1.basic[0].name;
+colors1.html;
+colors1.ntc;
+colors1.pantone;
+colors1.roygbiv;
+colors1.x11;
+
+const colors2 = namer('#ffffff', { pick: ['basic', 'html', 'ntc'] });
+
+colors2.basic;
+colors2.html;
+colors2.ntc;
+
+const colors3 = namer('#ffffff', { omit: ['basic', 'html', 'ntc'] });
+
+colors3.pantone;
+colors3.roygbiv;
+colors3.x11;
diff --git a/types/color-namer/index.d.ts b/types/color-namer/index.d.ts
new file mode 100644
index 0000000000..f7e9276392
--- /dev/null
+++ b/types/color-namer/index.d.ts
@@ -0,0 +1,25 @@
+// Type definitions for color-namer 1.3
+// Project: https://github.com/zeke/color-namer
+// Definitions by: Dmitriy Serdtsev <https://github.com/in19farkt>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+export = ColorNamer;
+export as namespace ColorNamer;
+
+declare function ColorNamer<T extends ColorNamer.Palette>(color: string, options?: { pick: T[] }): ColorNamer.Colors<T>;
+declare function ColorNamer<T extends ColorNamer.Palette>(color: string, options?: { omit: T[] }): ColorNamer.Colors<Diff<ColorNamer.Palette, T>>;
+
+type Diff<T extends string, U extends string> = ({[P in T]: P} & {[P in U]: never } & { [x: string]: never })[T];
+
+declare namespace ColorNamer {
+    type Colors<T extends Palette> = Record<T, Color[]>;
+
+    type Palette = 'roygbiv' | 'basic' | 'html' | 'x11' | 'pantone' | 'ntc';
+
+    interface Color {
+        name: string;
+        hex: string;
+        distance: number;
+    }
+}
diff --git a/types/color-namer/tsconfig.json b/types/color-namer/tsconfig.json
new file mode 100644
index 0000000000..a70b1dc9ae
--- /dev/null
+++ b/types/color-namer/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",
+        "color-namer-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/color-namer/tslint.json b/types/color-namer/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/color-namer/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/color/v2/tsconfig.json b/types/color/v2/tsconfig.json
index 8216dc0b05..a0192bdcaa 100644
--- a/types/color/v2/tsconfig.json
+++ b/types/color/v2/tsconfig.json
@@ -25,4 +25,4 @@
         "index.d.ts",
         "color-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/combined-stream/combined-stream-tests.ts b/types/combined-stream/combined-stream-tests.ts
index 776e530e63..ffdc0eaac7 100644
--- a/types/combined-stream/combined-stream-tests.ts
+++ b/types/combined-stream/combined-stream-tests.ts
@@ -1,4 +1,4 @@
-import * as CombinedStream from "combined-stream";
+import CombinedStream = require("combined-stream");
 import { createReadStream, createWriteStream } from "fs";
 
 const stream1 = new CombinedStream();
diff --git a/types/comment-json/comment-json-tests.ts b/types/comment-json/comment-json-tests.ts
index af91ff422f..56aa8453fe 100644
--- a/types/comment-json/comment-json-tests.ts
+++ b/types/comment-json/comment-json-tests.ts
@@ -14,3 +14,11 @@ const result = commentJson.parse(`
 // comment at the bottom
 `);
 const str = commentJson.stringify(result);
+
+const numericallyIndexed = commentJson.stringify(result, (key, value) => {
+return key && Number.isInteger(Number(key))
+    ? value
+    : undefined;
+});
+
+const whiteListed = commentJson.stringify(result, ['a', 1]);
diff --git a/types/comment-json/index.d.ts b/types/comment-json/index.d.ts
index 9c2652f34e..0aad1934ff 100644
--- a/types/comment-json/index.d.ts
+++ b/types/comment-json/index.d.ts
@@ -4,5 +4,20 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 export type Reviver = (k: number | string, v: any) => any;
+
+/**
+ * Converts a JavaScript Object Notation (JSON) string into an object.
+ * @param json A valid JSON string.
+ * @param reviver A function that transforms the results. This function is called for each member of the object.
+ * @param removes_comments If true, the comments won't be maintained, which is often used when we want to get a clean object.
+ * If a member contains nested objects, the nested objects are transformed before the parent object is.
+ */
 export function parse(json: string, reviver?: Reviver, removes_comments?: boolean): any;
-export function stringify(value: any, replacer?: any, space?: string | number): string;
+
+/**
+ * Converts a JavaScript value to a JavaScript Object Notation (JSON) string.
+ * @param value A JavaScript value, usually an object or array, to be converted.
+ * @param replacer A function that transforms the results or an array of strings and numbers that acts as a approved list for selecting the object properties that will be stringified.
+ * @param space Adds indentation, white space, and line break characters to the return-value JSON text to make it easier to read.
+ */
+export function stringify(value: any, replacer?: ((key: string, value: any) => any) | Array<number | string> | null, space?: string | number): string;
diff --git a/types/compression-webpack-plugin/index.d.ts b/types/compression-webpack-plugin/index.d.ts
index 8fddd72daf..bfb769ed2f 100644
--- a/types/compression-webpack-plugin/index.d.ts
+++ b/types/compression-webpack-plugin/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/webpack-contrib/compression-webpack-plugin
 // Definitions by: Anton Kandybo <https://github.com/dublicator>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 import { Plugin } from 'webpack';
 
diff --git a/types/compute-stdev/tsconfig.json b/types/compute-stdev/tsconfig.json
index f622c386a3..3bb4070ae7 100644
--- a/types/compute-stdev/tsconfig.json
+++ b/types/compute-stdev/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "compute-stdev-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/config/index.d.ts b/types/config/index.d.ts
index ea5e5a940a..a18e765012 100644
--- a/types/config/index.d.ts
+++ b/types/config/index.d.ts
@@ -3,6 +3,7 @@
 // Definitions by: Roman Korneev <https://github.com/RWander>
 //                 Forrest Bice <https://github.com/forrestbice>
 //                 James Donald <https://github.com/jndonald3>
+//                 Alberto Vasquez <https://github.com/albertovasquez>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 
@@ -39,6 +40,9 @@ declare namespace c {
 
         // Return the sources for the configurations
         getConfigSources(): IConfigSource[];
+        
+        // Returns a new deep copy of the current config object, or any part of the config if provided.
+        toObject(config?: any): any;
 
         /**
          * This allows module developers to attach their configurations onto
diff --git a/types/connect-busboy/connect-busboy-tests.ts b/types/connect-busboy/connect-busboy-tests.ts
index 2bbb832070..2db8cd45d7 100644
--- a/types/connect-busboy/connect-busboy-tests.ts
+++ b/types/connect-busboy/connect-busboy-tests.ts
@@ -1,4 +1,4 @@
-import * as connectBusboy from 'connect-busboy';
+import connectBusboy = require('connect-busboy');
 
 import * as express from 'express';
 
diff --git a/types/connect-busboy/tsconfig.json b/types/connect-busboy/tsconfig.json
index 112c160f2b..cc3365d6d9 100644
--- a/types/connect-busboy/tsconfig.json
+++ b/types/connect-busboy/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "connect-busboy-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/connect-history-api-fallback/connect-history-api-fallback-tests.ts b/types/connect-history-api-fallback/connect-history-api-fallback-tests.ts
index 6095d2fecb..dc53a3b86f 100644
--- a/types/connect-history-api-fallback/connect-history-api-fallback-tests.ts
+++ b/types/connect-history-api-fallback/connect-history-api-fallback-tests.ts
@@ -1,6 +1,5 @@
-import * as historyApiFallback from 'connect-history-api-fallback';
-
-import * as express from "express";
+import historyApiFallback = require('connect-history-api-fallback');
+import express = require('express');
 
 const app = express();
 app.use(historyApiFallback());
diff --git a/types/connect-livereload/connect-livereload-tests.ts b/types/connect-livereload/connect-livereload-tests.ts
index 26a09a2983..9049fa147c 100644
--- a/types/connect-livereload/connect-livereload-tests.ts
+++ b/types/connect-livereload/connect-livereload-tests.ts
@@ -1,6 +1,5 @@
-
-import * as connect from "connect";
-import * as livereload from "connect-livereload";
+import connect = require("connect");
+import livereload = require("connect-livereload");
 
 const app = connect();
 
@@ -28,13 +27,13 @@ app.use(livereload({
 
 	// include all urls by default
 	include: [/.*/],
-	
+
 	// this function is used to determine if the content of `res.write` or `res.end` is html.
 	html: function (str) {
 		if (!str) return false;
 		return /<[:_-\w\s\!\/\=\"\']+>/i.test(str);
 	},
-	
+
 	// rules are provided to find the place where the snippet should be inserted.
 	// the main problem is that on the server side it can be tricky to determine if a string will be valid html on the client.
 	// the function `fn` of the first `match` is executed like this `body.replace(rule.match, rule.fn);`
@@ -49,13 +48,13 @@ app.use(livereload({
 		match: /<\!DOCTYPE.+?>/i,
 		fn: append
 	}],
-	
+
 	// port where the script is loaded
 	port: 35729,
-	
+
 	// location where the script is provided (not by connect-livereload). Change this e.g. when serving livereload with a proxy.
 	src: "http://localhost:35729/livereload.js?snipver=1",
-	
+
 	// Set this option to `true` to set `req.headers['accept-encoding']` to 'identity' (disabling compression)
 	disableCompression: false
 }));
diff --git a/types/connect-mongo/connect-mongo-tests.ts b/types/connect-mongo/connect-mongo-tests.ts
index 67caed7c27..351975d84c 100644
--- a/types/connect-mongo/connect-mongo-tests.ts
+++ b/types/connect-mongo/connect-mongo-tests.ts
@@ -1,8 +1,7 @@
-
-import * as express from 'express';
+import express = require('express');
 import * as mongoose from 'mongoose';
-import * as session from 'express-session';
-import * as connectMongo from 'connect-mongo';
+import session = require('express-session');
+import connectMongo = require('connect-mongo');
 import * as mongodb from 'mongodb';
 
 var app = express();
diff --git a/types/connect-pg-simple/connect-pg-simple-tests.ts b/types/connect-pg-simple/connect-pg-simple-tests.ts
index 1e90c9b4e5..6f7d629a59 100644
--- a/types/connect-pg-simple/connect-pg-simple-tests.ts
+++ b/types/connect-pg-simple/connect-pg-simple-tests.ts
@@ -1,7 +1,7 @@
 import connectPgSimple = require("connect-pg-simple");
-import * as session from "express-session";
+import session = require("express-session");
 import * as pg from "pg";
-import * as express from "express";
+import express = require('express');
 
 const pgSession = connectPgSimple(session);
 
diff --git a/types/connect-redis/connect-redis-tests.ts b/types/connect-redis/connect-redis-tests.ts
index 11cd583a74..a312ffd3ca 100644
--- a/types/connect-redis/connect-redis-tests.ts
+++ b/types/connect-redis/connect-redis-tests.ts
@@ -1,5 +1,5 @@
-import * as connectRedis from "connect-redis";
-import * as session from "express-session";
+import connectRedis = require("connect-redis");
+import session = require("express-session");
 
 let RedisStore = connectRedis(session);
 const store = new RedisStore({
diff --git a/types/connect-timeout/connect-timeout-tests.ts b/types/connect-timeout/connect-timeout-tests.ts
index aa93ea179e..31342d7491 100644
--- a/types/connect-timeout/connect-timeout-tests.ts
+++ b/types/connect-timeout/connect-timeout-tests.ts
@@ -1,9 +1,7 @@
-
-
-import * as express from "express";
-import * as timeout from "connect-timeout";
-import * as bodyParser from "body-parser";
-import * as cookieParser from "cookie-parser";
+import express = require("express");
+import timeout = require("connect-timeout");
+import bodyParser = require("body-parser");
+import cookieParser = require("cookie-parser");
 
 // example of using this top-level; note the use of haltOnTimedout
 // after every middleware; it will stop the request flow on a timeout
diff --git a/types/connect/connect-tests.ts b/types/connect/connect-tests.ts
index 627017a7e4..5a7590a9a0 100644
--- a/types/connect/connect-tests.ts
+++ b/types/connect/connect-tests.ts
@@ -1,6 +1,5 @@
-
 import * as http from "http";
-import * as connect from "connect";
+import connect = require("connect");
 
 const app = connect();
 
@@ -15,7 +14,7 @@ app.use((err: Error, req: http.IncomingMessage, res: http.ServerResponse, next:
     if (err) {
         return res.end(`Error: ${err}`);
     }
-    
+
     next();
 });
 
diff --git a/types/consul/consul-tests.ts b/types/consul/consul-tests.ts
index f749ef0a5d..988890766d 100644
--- a/types/consul/consul-tests.ts
+++ b/types/consul/consul-tests.ts
@@ -1,5 +1,4 @@
-
-import * as Consul from "consul";
+import Consul = require("consul");
 
 let ConsulStatic: Consul.ConsulStatic;
 let AclStatic: Consul.AclStatic = ConsulStatic.Acl;
diff --git a/types/cookies/cookies-tests.ts b/types/cookies/cookies-tests.ts
index 2f78f8ad49..cd46e0987b 100644
--- a/types/cookies/cookies-tests.ts
+++ b/types/cookies/cookies-tests.ts
@@ -1,8 +1,8 @@
-import * as Cookies from 'cookies';
+import Cookies = require('cookies');
 import * as http from 'http';
-import * as Keygrip from 'keygrip';
-import * as express from 'express';
-import * as connect from 'connect';
+import Keygrip = require('keygrip');
+import express = require('express');
+import connect = require('connect');
 
 const server = http.createServer((req, res) => {
     const cookies = new Cookies(req, res);
diff --git a/types/copy-webpack-plugin/copy-webpack-plugin-tests.ts b/types/copy-webpack-plugin/copy-webpack-plugin-tests.ts
index 022a734261..b58b242fc2 100644
--- a/types/copy-webpack-plugin/copy-webpack-plugin-tests.ts
+++ b/types/copy-webpack-plugin/copy-webpack-plugin-tests.ts
@@ -1,27 +1,27 @@
 import { Configuration } from 'webpack'
-import * as CopyWebpackPlugin from 'copy-webpack-plugin'
+import CopyWebpackPlugin = require('copy-webpack-plugin');
 
 const c: Configuration = {
 	plugins: [
 		new CopyWebpackPlugin([
 			// {output}/file.txt
 			{ from: 'from/file.txt' },
-			
+
 			// {output}/to/file.txt
 			{ from: 'from/file.txt', to: 'to/file.txt' },
-			
+
 			// {output}/to/directory/file.txt
 			{ from: 'from/file.txt', to: 'to/directory' },
-			
+
 			// Copy directory contents to {output}/
 			{ from: 'from/directory' },
-			
+
 			// Copy directory contents to {output}/to/directory/
 			{ from: 'from/directory', to: 'to/directory' },
-			
+
 			// Copy glob results to /absolute/path/
 			{ from: 'from/directory/**/*', to: '/absolute/path' },
-			
+
 			// Copy glob results (with dot files) to /absolute/path/
 			{
 				from: {
@@ -30,21 +30,21 @@ const c: Configuration = {
 				},
 				to: '/absolute/path'
 			},
-			
+
 			// Copy glob results, relative to context
 			{
 				context: 'from/directory',
 				from: '**/*',
 				to: '/absolute/path'
 			},
-			
+
 			// {output}/file/without/extension
 			{
 				from: 'path/to/file.txt',
 				to: 'file/without/extension',
 				toType: 'file'
 			},
-			
+
 			// {output}/directory/with/extension.ext/file.txt
 			{
 				from: 'path/to/file.txt',
@@ -53,16 +53,16 @@ const c: Configuration = {
 			},
 		], {
 			ignore: [
-				// Doesn't copy any files with a txt extension	
+				// Doesn't copy any files with a txt extension
 				'*.txt',
-				
+
 				// Doesn't copy any file, even if they start with a dot
 				'**/*',
-				
+
 				// Doesn't copy any file, except if they start with a dot
 				{ glob: '**/*', dot: false }
 			],
-			
+
 			// By default, we only copy modified files during
 			// a watch or webpack-dev-server build. Setting this
 			// to `true` copies all files.
diff --git a/types/copy-webpack-plugin/index.d.ts b/types/copy-webpack-plugin/index.d.ts
index 8bfae1e0ed..1190adcf91 100644
--- a/types/copy-webpack-plugin/index.d.ts
+++ b/types/copy-webpack-plugin/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/kevlened/copy-webpack-plugin
 // Definitions by: flying-sheep <https://github.com/flying-sheep>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 import { Plugin } from 'webpack'
 import { IOptions } from 'minimatch'
@@ -30,7 +31,7 @@ interface CopyPattern {
 	context?: string
 	/**
 	 * Removes all directory references and only copies file names.
-	 * 
+	 *
 	 * If files have the same name, the result is non-deterministic. (default: `false`)
 	 */
 	flatten?: boolean
diff --git a/types/cordova-universal-links-plugin/tsconfig.json b/types/cordova-universal-links-plugin/tsconfig.json
index 69322a9265..066b757235 100644
--- a/types/cordova-universal-links-plugin/tsconfig.json
+++ b/types/cordova-universal-links-plugin/tsconfig.json
@@ -21,4 +21,4 @@
         "index.d.ts",
         "cordova-universal-links-plugin-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/coverup/tsconfig.json b/types/coverup/tsconfig.json
index 6102ad61b3..de9e5868b7 100644
--- a/types/coverup/tsconfig.json
+++ b/types/coverup/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "coverup-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/cpx/tsconfig.json b/types/cpx/tsconfig.json
index d22546d432..26e3595fbf 100644
--- a/types/cpx/tsconfig.json
+++ b/types/cpx/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "cpx-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/cqrs-domain/tsconfig.json b/types/cqrs-domain/tsconfig.json
index 7ea1caa8ec..e6b7a8677c 100644
--- a/types/cqrs-domain/tsconfig.json
+++ b/types/cqrs-domain/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "cqrs-domain-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/create-react-class/create-react-class-tests.ts b/types/create-react-class/create-react-class-tests.ts
index ae62233135..b8025b23f0 100644
--- a/types/create-react-class/create-react-class-tests.ts
+++ b/types/create-react-class/create-react-class-tests.ts
@@ -1,7 +1,7 @@
 import * as React from "react";
 import * as ReactDOM from "react-dom";
 import * as DOM from "react-dom-factories";
-import * as createReactClass from "create-react-class";
+import createReactClass = require("create-react-class");
 
 interface Props {
     foo: string;
diff --git a/types/create-react-class/index.d.ts b/types/create-react-class/index.d.ts
index 211474ac16..9a1b0b12b5 100644
--- a/types/create-react-class/index.d.ts
+++ b/types/create-react-class/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://facebook.github.io/react/
 // Definitions by: John Gozde <https://github.com/jgoz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import { ComponentSpec, ClassicComponentClass } from "react";
 
diff --git a/types/create-react-class/tsconfig.json b/types/create-react-class/tsconfig.json
index b003c69e53..8efa535580 100644
--- a/types/create-react-class/tsconfig.json
+++ b/types/create-react-class/tsconfig.json
@@ -22,4 +22,4 @@
         "index.d.ts",
         "create-react-class-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/cross-spawn/cross-spawn-tests.ts b/types/cross-spawn/cross-spawn-tests.ts
index 2f2fe11cd5..6cb36510d8 100644
--- a/types/cross-spawn/cross-spawn-tests.ts
+++ b/types/cross-spawn/cross-spawn-tests.ts
@@ -1,4 +1,4 @@
-import * as spawn from 'cross-spawn';
+import spawn = require('cross-spawn');
 import * as cp from 'child_process';
 
 const p1: cp.ChildProcess = spawn('my-cmd', ['foo', 'bar']);
diff --git a/types/cross-spawn/tsconfig.json b/types/cross-spawn/tsconfig.json
index 12426c3479..4ea02ed0df 100644
--- a/types/cross-spawn/tsconfig.json
+++ b/types/cross-spawn/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "cross-spawn-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/csvrow/tsconfig.json b/types/csvrow/tsconfig.json
index 7fc1637725..8de28c4466 100644
--- a/types/csvrow/tsconfig.json
+++ b/types/csvrow/tsconfig.json
@@ -14,10 +14,10 @@
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true,
-        "strictFunctionTypes" : true
+        "strictFunctionTypes": true
     },
     "files": [
         "index.d.ts",
         "csvrow-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/cucumber/index.d.ts b/types/cucumber/index.d.ts
index c222ad567a..d0fc9085fd 100644
--- a/types/cucumber/index.d.ts
+++ b/types/cucumber/index.d.ts
@@ -60,6 +60,7 @@ export function BeforeAll(options: HookOptions | string, code: GlobalHookCode):
 
 export function defineParameterType(transform: Transform): void;
 export function defineStep(pattern: RegExp | string, code: StepDefinitionCode): void;
+export function defineStep(pattern: RegExp | string, options: StepDefinitionOptions, code: StepDefinitionCode): void;
 
 export function Given(pattern: RegExp | string, code: StepDefinitionCode): void;
 export function Given(pattern: RegExp | string, options: StepDefinitionOptions, code: StepDefinitionCode): void;
diff --git a/types/cwise-compiler/cwise-compiler-tests.ts b/types/cwise-compiler/cwise-compiler-tests.ts
index 38e19de886..10d43f1930 100644
--- a/types/cwise-compiler/cwise-compiler-tests.ts
+++ b/types/cwise-compiler/cwise-compiler-tests.ts
@@ -1,9 +1,7 @@
-/// <reference types='node' />
-
-import * as parse from 'cwise-parser';
-import * as ndarray from 'ndarray';
-import * as compile from 'cwise-compiler';
-import * as tape from 'tape';
+import parse = require('cwise-parser');
+import ndarray = require('ndarray');
+import compile = require('cwise-compiler');
+import tape = require('tape');
 
 tape("block tests", (t) => {
 	const ops = require('ndarray-ops');
diff --git a/types/cwise-parser/cwise-parser-tests.ts b/types/cwise-parser/cwise-parser-tests.ts
index c50b9be06a..5ee5138a6e 100644
--- a/types/cwise-parser/cwise-parser-tests.ts
+++ b/types/cwise-parser/cwise-parser-tests.ts
@@ -1,6 +1,5 @@
-import * as parser from "cwise-parser";
-// import parser = require("cwise-parser");
-import * as tape from "tape";
+import parser = require("cwise-parser");
+import tape = require("tape");
 
 tape("basic tests", (t) => {
 	const parsed = parser((a: number, b: number, c: number) => {
diff --git a/types/cwise/cwise-tests.ts b/types/cwise/cwise-tests.ts
index b759fb1a0c..3d88ee40fd 100644
--- a/types/cwise/cwise-tests.ts
+++ b/types/cwise/cwise-tests.ts
@@ -1,6 +1,6 @@
-import * as cwise from 'cwise';
-import * as ndarray from 'ndarray';
-import * as tape from 'tape';
+import cwise = require('cwise');
+import ndarray = require('ndarray');
+import tape = require('tape');
 
 // basic
 tape("only allow same shape", (t) => {
@@ -150,8 +150,7 @@ tape("binary", (t) => {
 	t.end();
 });
 
-// browserify
-import * as browserify from "browserify";
+import browserify = require("browserify");
 import * as vm from 'vm';
 import * as path from 'path';
 
diff --git a/types/d3-dsv/tsconfig.json b/types/d3-dsv/tsconfig.json
index 400095c38d..af657464cf 100644
--- a/types/d3-dsv/tsconfig.json
+++ b/types/d3-dsv/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "d3-dsv-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/d3-fetch/d3-fetch-tests.ts b/types/d3-fetch/d3-fetch-tests.ts
index 24c6783997..941955c996 100644
--- a/types/d3-fetch/d3-fetch-tests.ts
+++ b/types/d3-fetch/d3-fetch-tests.ts
@@ -11,28 +11,41 @@ const init: RequestInit = {};
 
 let p1: Promise<Blob> = d3Fetch.blob(url);
 p1 = d3Fetch.blob(url, init);
+
 let p2: Promise<ArrayBuffer> = d3Fetch.buffer(url);
 p2 = d3Fetch.buffer(url, init);
+
 let p3: Promise<HTMLImageElement> = d3Fetch.image(url);
-p3 = d3Fetch.image(url, init);
+const imageProperties = {
+    width: '300px',
+    height: '500px'
+};
+p3 = d3Fetch.image(url, imageProperties);
+
 let p4: Promise<any> = d3Fetch.json(url);
 p4 = d3Fetch.json(url, init);
+let p5: Promise<MyType> = d3Fetch.json<MyType>(url);
+p5 = d3Fetch.json<MyType>(url, init);
 
 let myString: Promise<string>;
 myString = d3Fetch.text(url);
 myString = d3Fetch.text(url, init);
 
-const parseRow = (d: {}) => {
-    const myType: MyType = { foo: 'foo' };
+const parseRow = (rawRow: DSVRowString, index: number, columns: string[]): (MyType | undefined | null) => {
+    const myType: MyType | null = rawRow['foo'] ? { foo: rawRow['foo'] + '+ bar' } : null;
     return myType;
 };
+let promise1: Promise<DSVParsedArray<DSVRowString>>;
 let promise2: Promise<DSVParsedArray<MyType>>;
-promise2 = d3Fetch.csv<MyType>(url);
-promise2 = d3Fetch.csv<MyType>(url, init);
+promise1 = d3Fetch.csv(url);
+promise1 = d3Fetch.csv(url, init);
+promise2 = d3Fetch.csv<MyType>(url, parseRow);
 promise2 = d3Fetch.csv<MyType>(url, init, parseRow);
-promise2 = d3Fetch.dsv<MyType>(';', url);
-promise2 = d3Fetch.dsv<MyType>(';', url, init);
+promise1 = d3Fetch.dsv(';', url);
+promise1 = d3Fetch.dsv(';', url, init);
+promise2 = d3Fetch.dsv<MyType>(';', url, parseRow);
 promise2 = d3Fetch.dsv<MyType>(';', url, init, parseRow);
-promise2 = d3Fetch.tsv<MyType>(url);
-promise2 = d3Fetch.tsv<MyType>(url, init);
+promise1 = d3Fetch.tsv(url);
+promise1 = d3Fetch.tsv(url, init);
+promise2 = d3Fetch.tsv<MyType>(url, parseRow);
 promise2 = d3Fetch.tsv<MyType>(url, init, parseRow);
diff --git a/types/d3-fetch/index.d.ts b/types/d3-fetch/index.d.ts
index 9fd19fe8ed..3eb11ce48a 100644
--- a/types/d3-fetch/index.d.ts
+++ b/types/d3-fetch/index.d.ts
@@ -3,40 +3,234 @@
 // Definitions by: Hugues Stefanski <https://github.com/ledragon>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
+
+// Last module patch version validated against: 1.0.1
+
 import { DSVParsedArray, DSVRowString, DSVRowAny } from 'd3-dsv';
 
-/** Fetches the binary file at the specified input URL as a Blob. If init is specified, it is passed along to the underlying call to fetch. */
+/**
+ * Fetches the binary file at the specified input URL and returns it as a Promise of a Blob.
+ * If init is specified, it is passed along to the underlying call to fetch.
+ *
+ * @param url A valid URL string.
+ * @param init An optional request initialization object.
+ */
 export function blob(url: string, init?: RequestInit): Promise<Blob>;
-/** Fetches the binary file at the specified input URL as an ArrayBuffer. If init is specified, it is passed along to the underlying call to fetch. */
+
+/**
+ * Fetches the binary file at the specified input URL and returns it as a Promise of an ArrayBuffer.
+ * If init is specified, it is passed along to the underlying call to fetch.
+ *
+ * @param url A valid URL string.
+ * @param init An optional request initialization object.
+ */
 export function buffer(url: string, init?: RequestInit): Promise<ArrayBuffer>;
 
-/** Equivalent to d3.dsv with the comma character as the delimiter. */
-export function csv<ParsedRow extends DSVRowAny>(
+/**
+ * Fetches the CSV file at the specified input URL and returns
+ * a promise of an array of objects representing the parsed rows. The values of the properties of the parsed row
+ * objects are represented as strings.
+ *
+ * If init is specified, it is passed along to the underlying call to fetch.
+ *
+ * @param url A valid URL string.
+ * @param init An optional request initialization object.
+ */
+export function csv(
     url: string,
     init?: RequestInit,
-    row?: (d: DSVRowAny) => ParsedRow
+): Promise<DSVParsedArray<DSVRowString>>;
+/**
+ * Fetches the CSV file at the specified input URL and returns
+ * a promise of an array of objects representing the parsed rows.
+ *
+ * The specified row conversion function is used to map and filter row objects to a more-specific representation;
+ * see dsv.csvParse for details.
+ *
+ * The generic parameter describes the type of the object representation of a parsed row.
+ *
+ * @param url A valid URL string.
+ * @param row A row conversion function which is invoked for each row, being passed an object representing the current row (d),
+ * the index (i) starting at zero for the first non-header row, and the array of column names. If the returned value is null or undefined,
+ * the row is skipped and will be ommitted from the array returned by dsv.csvParse; otherwise, the returned value defines the corresponding row object.
+ * In effect, row is similar to applying a map and filter operator to the returned rows.
+ */
+export function csv<ParsedRow extends DSVRowAny>(
+    url: string,
+    row: (rawRow: DSVRowString, index: number, columns: string[]) => ParsedRow | undefined | null
+): Promise<DSVParsedArray<ParsedRow>>;
+/**
+ * Fetches the CSV file at the specified input URL and returns
+ * a promise of an array of objects representing the parsed rows.
+ *
+ * The init object is passed along to the underlying call to fetch.
+ *
+ * The specified row conversion function is used to map and filter row objects to a more-specific representation;
+ * see dsv.csvParse for details.
+ *
+ * The generic parameter describes the type of the object representation of a parsed row.
+ *
+ * @param url A valid URL string.
+ * @param init An request initialization object.
+ * @param row A row conversion function which is invoked for each row, being passed an object representing the current row (d),
+ * the index (i) starting at zero for the first non-header row, and the array of column names. If the returned value is null or undefined,
+ * the row is skipped and will be ommitted from the array returned by dsv.csvParse; otherwise, the returned value defines the corresponding row object.
+ * In effect, row is similar to applying a map and filter operator to the returned rows.
+ */
+export function csv<ParsedRow extends DSVRowAny>(
+    url: string,
+    init: RequestInit,
+    row: (rawRow: DSVRowString, index: number, columns: string[]) => ParsedRow | undefined | null
 ): Promise<DSVParsedArray<ParsedRow>>;
 
-/** Fetches the DSV file at the specified input URL. */
-export function dsv<ParsedRow extends DSVRowAny>(
+/**
+ * Fetches the DSV file with the specified delimiter character at the specified input URL and returns
+ * a promise of an array of objects representing the parsed rows. The values of the properties of the parsed row
+ * objects are represented as strings.
+ *
+ * If init is specified, it is passed along to the underlying call to fetch.
+ *
+ * @param delimiter The delimiter character used in the DSV file to be fetched.
+ * @param url A valid URL string.
+ * @param init An optional request initialization object.
+ */
+export function dsv(
     delimiter: string,
     url: string,
     init?: RequestInit,
-    row?: (d: DSVRowAny) => ParsedRow
+): Promise<DSVParsedArray<DSVRowString>>;
+/**
+ * Fetches the DSV file with the specified delimiter character at the specified input URL and returns
+ * a promise of an array of objects representing the parsed rows.
+ *
+ * The specified row conversion function is used to map and filter row objects to a more-specific representation;
+ * see dsv.parse for details.
+ *
+ * The generic parameter describes the type of the object representation of a parsed row.
+ *
+ * @param delimiter The delimiter character used in the DSV file to be fetched.
+ * @param url A valid URL string.
+ * @param row A row conversion function which is invoked for each row, being passed an object representing the current row (d),
+ * the index (i) starting at zero for the first non-header row, and the array of column names. If the returned value is null or undefined,
+ * the row is skipped and will be ommitted from the array returned by dsv.parse; otherwise, the returned value defines the corresponding row object.
+ * In effect, row is similar to applying a map and filter operator to the returned rows.
+ */
+export function dsv<ParsedRow extends DSVRowAny>(
+    delimiter: string,
+    url: string,
+    row: (rawRow: DSVRowString, index: number, columns: string[]) => ParsedRow | undefined | null
+): Promise<DSVParsedArray<ParsedRow>>;
+/**
+ * Fetches the DSV file with the specified delimiter character at the specified input URL and returns
+ * a promise of an array of objects representing the parsed rows.
+ *
+ * The init object is passed along to the underlying call to fetch.
+ *
+ * The specified row conversion function is used to map and filter row objects to a more-specific representation;
+ * see dsv.parse for details.
+ *
+ * The generic parameter describes the type of the object representation of a parsed row.
+ *
+ * @param delimiter The delimiter character used in the DSV file to be fetched.
+ * @param url A valid URL string.
+ * @param init An request initialization object.
+ * @param row A row conversion function which is invoked for each row, being passed an object representing the current row (d),
+ * the index (i) starting at zero for the first non-header row, and the array of column names. If the returned value is null or undefined,
+ * the row is skipped and will be ommitted from the array returned by dsv.parse; otherwise, the returned value defines the corresponding row object.
+ * In effect, row is similar to applying a map and filter operator to the returned rows.
+ */
+export function dsv<ParsedRow extends DSVRowAny>(
+    delimiter: string,
+    url: string,
+    init: RequestInit,
+    row: (rawRow: DSVRowString, index: number, columns: string[]) => ParsedRow | undefined | null
 ): Promise<DSVParsedArray<ParsedRow>>;
 
-/** Fetches the image at the specified input URL. If init is specified, it is passed along to the underlying call to fetch. */
-export function image(url: string, init?: RequestInit): Promise<HTMLImageElement>;
+/**
+ * Fetches the image at the specified input URL and returns a promise of an HTML image element.
+ *
+ * If init is specified, sets any additional properties on the image before loading.
+ *
+ * @param url A valid URL string.
+ * @param init An optional object of image properties to set.
+ */
+export function image(url: string, init?: {[key: string]: any}): Promise<HTMLImageElement>;
 
-/** Fetches the json file at the specified input URL. If init is specified, it is passed along to the underlying call to fetch. */
-export function json(url: string, init?: RequestInit): Promise<{}>;
+/**
+ * Fetches the json file at the specified input URL and returns it as a Promise of a parsed JSON object.
+ *
+ * If init is specified, it is passed along to the underlying call to fetch.
+ *
+ * The generic parameter describes the type of the object parsed from the returned JSON.
+ *
+ * @param url A valid URL string.
+ * @param init An optional request initialization object.
+ */
+export function json<ParsedJSONObject extends any>(url: string, init?: RequestInit): Promise<ParsedJSONObject>;
 
-/** Fetches the text file at the specified input URL. If init is specified, it is passed along to the underlying call to fetch. */
+/**
+ * Fetches the text file at the specified input URL and returns it as a Promise of a string.
+ *
+ * If init is specified, it is passed along to the underlying call to fetch.
+ *
+ * @param url A valid URL string.
+ * @param init An optional request initialization object.
+ */
 export function text(url: string, init?: RequestInit): Promise<string>;
 
-/** Equivalent to d3.dsv with the tab character as the delimiter. */
-export function tsv<ParsedRow extends DSVRowAny>(
+/**
+ * Fetches the TSV file at the specified input URL and returns
+ * a promise of an array of objects representing the parsed rows.
+ *
+ * If init is specified, it is passed along to the underlying call to fetch.
+ *
+ * @param url A valid URL string.
+ * @param init An optional request initialization object.
+ */
+export function tsv(
     url: string,
     init?: RequestInit,
-    row?: (d: DSVRowAny) => ParsedRow
+): Promise<DSVParsedArray<DSVRowString>>;
+/**
+ * Fetches the TSV file at the specified input URL and returns
+ * a promise of an array of objects representing the parsed rows. The values of the properties of the parsed row
+ * objects are represented as strings.
+ *
+ * The specified row conversion function is used to map and filter row objects to a more-specific representation;
+ * see dsv.tsvParse for details.
+ *
+ * The generic parameter describes the type of the object representation of a parsed row.
+ *
+ * @param url A valid URL string.
+ * @param row A row conversion function which is invoked for each row, being passed an object representing the current row (d),
+ * the index (i) starting at zero for the first non-header row, and the array of column names. If the returned value is null or undefined,
+ * the row is skipped and will be ommitted from the array returned by dsv.tsvParse; otherwise, the returned value defines the corresponding row object.
+ * In effect, row is similar to applying a map and filter operator to the returned rows.
+ */
+export function tsv<ParsedRow extends DSVRowAny>(
+    url: string,
+    row: (rawRow: DSVRowString, index: number, columns: string[]) => ParsedRow | undefined | null
+): Promise<DSVParsedArray<ParsedRow>>;
+/**
+ * Fetches the TSV file at the specified input URL and returns
+ * a promise of an array of objects representing the parsed rows.
+ *
+ * The init object is passed along to the underlying call to fetch.
+ *
+ * The specified row conversion function is used to map and filter row objects to a more-specific representation;
+ * see dsv.tsvParse for details.
+ *
+ * The generic parameter describes the type of the object representation of a parsed row.
+ *
+ * @param url A valid URL string.
+ * @param init An request initialization object.
+ * @param row A row conversion function which is invoked for each row, being passed an object representing the current row (d),
+ * the index (i) starting at zero for the first non-header row, and the array of column names. If the returned value is null or undefined,
+ * the row is skipped and will be ommitted from the array returned by dsv.tsvParse; otherwise, the returned value defines the corresponding row object.
+ * In effect, row is similar to applying a map and filter operator to the returned rows.
+ */
+export function tsv<ParsedRow extends DSVRowAny>(
+    url: string,
+    init: RequestInit,
+    row: (rawRow: DSVRowString, index: number, columns: string[]) => ParsedRow | undefined | null
 ): Promise<DSVParsedArray<ParsedRow>>;
diff --git a/types/d3-fetch/tsconfig.json b/types/d3-fetch/tsconfig.json
index f9b9d190dd..8151f587a2 100644
--- a/types/d3-fetch/tsconfig.json
+++ b/types/d3-fetch/tsconfig.json
@@ -21,4 +21,4 @@
         "index.d.ts",
         "d3-fetch-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/d3-fetch/tslint.json b/types/d3-fetch/tslint.json
index 3db14f85ea..54efb0b84e 100644
--- a/types/d3-fetch/tslint.json
+++ b/types/d3-fetch/tslint.json
@@ -1 +1,7 @@
-{ "extends": "dtslint/dt.json" }
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "unified-signatures": false,
+        "no-unnecessary-generics": false
+    }
+}
diff --git a/types/d3-scale-chromatic/d3-scale-chromatic-tests.ts b/types/d3-scale-chromatic/d3-scale-chromatic-tests.ts
index ccf736d43b..c6ff839994 100644
--- a/types/d3-scale-chromatic/d3-scale-chromatic-tests.ts
+++ b/types/d3-scale-chromatic/d3-scale-chromatic-tests.ts
@@ -8,9 +8,29 @@
 
 import * as d3ScaleChromatic from 'd3-scale-chromatic';
 
+// -----------------------------------------------------------------------
+// Preparatory Steps
+// -----------------------------------------------------------------------
+
+let colorInterpolator: ((t: number) => string);
+let simpleScheme: ReadonlyArray<string>;
+let nestedScheme: ReadonlyArray<ReadonlyArray<string>>;
+
 // -----------------------------------------------------------------------
 // Categorical
 // -----------------------------------------------------------------------
+
+simpleScheme = d3ScaleChromatic.schemeCategory10;
+simpleScheme = d3ScaleChromatic.schemeAccent;
+simpleScheme = d3ScaleChromatic.schemeDark2;
+simpleScheme = d3ScaleChromatic.schemePaired;
+simpleScheme = d3ScaleChromatic.schemePastel1;
+simpleScheme = d3ScaleChromatic.schemePastel2;
+simpleScheme = d3ScaleChromatic.schemeSet1;
+simpleScheme = d3ScaleChromatic.schemeSet2;
+simpleScheme = d3ScaleChromatic.schemeSet3;
+
+const category10: string = d3ScaleChromatic.schemeCategory10[0]; // #1f77b4
 const accent: string = d3ScaleChromatic.schemeAccent[0]; // #7fc97f
 const dark: string = d3ScaleChromatic.schemeDark2[0]; // #1b9e77
 const paired: string = d3ScaleChromatic.schemePaired[0]; // #a6cee3
@@ -23,6 +43,17 @@ const set3: string = d3ScaleChromatic.schemeSet3[0]; // #8dd3c7
 // -----------------------------------------------------------------------
 // Diverging
 // -----------------------------------------------------------------------
+
+colorInterpolator = d3ScaleChromatic.interpolateBrBG;
+colorInterpolator = d3ScaleChromatic.interpolatePRGn;
+colorInterpolator = d3ScaleChromatic.interpolatePiYG;
+colorInterpolator = d3ScaleChromatic.interpolatePuOr;
+colorInterpolator = d3ScaleChromatic.interpolateRdBu;
+colorInterpolator = d3ScaleChromatic.interpolateRdGy;
+colorInterpolator = d3ScaleChromatic.interpolateRdYlBu;
+colorInterpolator = d3ScaleChromatic.interpolateRdYlGn;
+colorInterpolator = d3ScaleChromatic.interpolateSpectral;
+
 const BrBG: string = d3ScaleChromatic.interpolateBrBG(0); // rgb(84, 48, 5)
 const PRGn: string = d3ScaleChromatic.interpolatePRGn(0); // rgb(64, 0, 75)
 const PiYG: string = d3ScaleChromatic.interpolatePiYG(0); // rgb(142, 1, 82)
@@ -33,6 +64,16 @@ const RdYlBu: string = d3ScaleChromatic.interpolateRdYlBu(0); // rgb(103, 0, 31)
 const RdYlGn: string = d3ScaleChromatic.interpolateRdYlGn(0); // rgb(103, 0, 31)
 const Spectral: string = d3ScaleChromatic.interpolateSpectral(0); // rgb(158, 1, 66)
 
+nestedScheme = d3ScaleChromatic.schemeBrBG;
+nestedScheme = d3ScaleChromatic.schemePRGn;
+nestedScheme = d3ScaleChromatic.schemePiYG;
+nestedScheme = d3ScaleChromatic.schemePuOr;
+nestedScheme = d3ScaleChromatic.schemeRdBu;
+nestedScheme = d3ScaleChromatic.schemeRdGy;
+nestedScheme = d3ScaleChromatic.schemeRdYlBu;
+nestedScheme = d3ScaleChromatic.schemeRdYlGn;
+nestedScheme = d3ScaleChromatic.schemeSpectral;
+
 const schemeBrBG: string = d3ScaleChromatic.schemeBrBG[3][0]; // #d8b365
 const schemePRGn: string = d3ScaleChromatic.schemePRGn[3][0]; // #af8dc3
 const schemePiYG: string = d3ScaleChromatic.schemePiYG[3][0]; // #e9a3c9
@@ -46,6 +87,14 @@ const schemeSpectral: string = d3ScaleChromatic.schemeSpectral[3][0]; // #fc8d59
 // -----------------------------------------------------------------------
 // Sequential
 // -----------------------------------------------------------------------
+
+colorInterpolator = d3ScaleChromatic.interpolateBlues;
+colorInterpolator = d3ScaleChromatic.interpolateGreens;
+colorInterpolator = d3ScaleChromatic.interpolateGreys;
+colorInterpolator = d3ScaleChromatic.interpolateOranges;
+colorInterpolator = d3ScaleChromatic.interpolatePurples;
+colorInterpolator = d3ScaleChromatic.interpolateReds;
+
 const Blue: string = d3ScaleChromatic.interpolateBlues(1); // rgb(8, 48, 107)
 const Green: string = d3ScaleChromatic.interpolateGreens(1); // rgb(0, 68, 27)
 const Grey: string = d3ScaleChromatic.interpolateGreys(1); // rgb(0, 0, 0)
@@ -53,6 +102,13 @@ const Orange: string = d3ScaleChromatic.interpolateOranges(1); // rgb(127, 39, 4
 const Purple: string = d3ScaleChromatic.interpolatePurples(1); // rgb(63, 0, 125)
 const Red: string = d3ScaleChromatic.interpolateReds(1); // rgb(103, 0, 13)
 
+nestedScheme = d3ScaleChromatic.schemeBlues;
+nestedScheme = d3ScaleChromatic.schemeGreens;
+nestedScheme = d3ScaleChromatic.schemeGreys;
+nestedScheme = d3ScaleChromatic.schemeOranges;
+nestedScheme = d3ScaleChromatic.schemePurples;
+nestedScheme = d3ScaleChromatic.schemeReds;
+
 const schemeBlues: string = d3ScaleChromatic.schemeBlues[3][0]; // #deebf7
 const schemeGreens: string = d3ScaleChromatic.schemeGreens[3][0]; // #e5f5e0
 const schemeGreys: string = d3ScaleChromatic.schemeGreys[3][0]; // #f0f0f0
@@ -63,6 +119,28 @@ const schemeReds: string = d3ScaleChromatic.schemeReds[3][0]; // #fee0d2
 // -----------------------------------------------------------------------
 // Sequential(Multi-Hue)
 // -----------------------------------------------------------------------
+
+colorInterpolator = d3ScaleChromatic.interpolateViridis;
+colorInterpolator = d3ScaleChromatic.interpolateMagma;
+colorInterpolator = d3ScaleChromatic.interpolateInferno;
+colorInterpolator = d3ScaleChromatic.interpolatePlasma;
+colorInterpolator = d3ScaleChromatic.interpolateRainbow;
+colorInterpolator = d3ScaleChromatic.interpolateWarm;
+colorInterpolator = d3ScaleChromatic.interpolateCool;
+colorInterpolator = d3ScaleChromatic.interpolateCubehelixDefault;
+colorInterpolator = d3ScaleChromatic.interpolateBuGn;
+colorInterpolator = d3ScaleChromatic.interpolateBuPu;
+colorInterpolator = d3ScaleChromatic.interpolateGnBu;
+colorInterpolator = d3ScaleChromatic.interpolateOrRd;
+colorInterpolator = d3ScaleChromatic.interpolatePuBuGn;
+colorInterpolator = d3ScaleChromatic.interpolatePuBu;
+colorInterpolator = d3ScaleChromatic.interpolatePuRd;
+colorInterpolator = d3ScaleChromatic.interpolateRdPu;
+colorInterpolator = d3ScaleChromatic.interpolateYlGnBu;
+colorInterpolator = d3ScaleChromatic.interpolateYlGn;
+colorInterpolator = d3ScaleChromatic.interpolateYlOrBr;
+colorInterpolator = d3ScaleChromatic.interpolateYlOrRd;
+
 const BuGn: string = d3ScaleChromatic.interpolateBuGn(1); // rgb(0, 68, 27)
 const BuPu: string = d3ScaleChromatic.interpolateBuPu(1); // rgb(77, 0, 75)
 const GnBu: string = d3ScaleChromatic.interpolateGnBu(1); // rgb(8, 64, 129)
@@ -76,6 +154,19 @@ const YlGn: string = d3ScaleChromatic.interpolateYlGn(1); // rgb(0, 69, 41)
 const YlOrBr: string = d3ScaleChromatic.interpolateYlOrBr(1); // rgb(102, 37, 6)
 const YlOrRd: string = d3ScaleChromatic.interpolateYlOrRd(1); // rgb(128, 0, 38)
 
+nestedScheme = d3ScaleChromatic.schemeBuGn;
+nestedScheme = d3ScaleChromatic.schemeBuPu;
+nestedScheme = d3ScaleChromatic.schemeGnBu;
+nestedScheme = d3ScaleChromatic.schemeOrRd;
+nestedScheme = d3ScaleChromatic.schemePuBuGn;
+nestedScheme = d3ScaleChromatic.schemePuBu;
+nestedScheme = d3ScaleChromatic.schemePuRd;
+nestedScheme = d3ScaleChromatic.schemeRdPu;
+nestedScheme = d3ScaleChromatic.schemeYlGnBu;
+nestedScheme = d3ScaleChromatic.schemeYlGn;
+nestedScheme = d3ScaleChromatic.schemeYlOrBr;
+nestedScheme = d3ScaleChromatic.schemeYlOrRd;
+
 const schemeBuGn: string = d3ScaleChromatic.schemeBuGn[3][0]; // #e5f5f9
 const schemeBuPu: string = d3ScaleChromatic.schemeBuPu[3][0]; // #e0ecf4
 const schemeGnBu: string = d3ScaleChromatic.schemeGnBu[3][0]; // #e0f3db
diff --git a/types/d3-scale-chromatic/index.d.ts b/types/d3-scale-chromatic/index.d.ts
index 1345371e2a..93c0285a17 100644
--- a/types/d3-scale-chromatic/index.d.ts
+++ b/types/d3-scale-chromatic/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for D3JS d3-scale-chromatic module 1.1
+// Type definitions for D3JS d3-scale-chromatic module 1.2
 // Project: https://github.com/d3/d3-scale-chromatic/
 // Definitions by: Hugues Stefanski <https://github.com/Ledragon>,
 //                 Alex Ford <https://github.com/gustavderdrache>,
@@ -6,11 +6,15 @@
 //                 Henrique Machado <https://github.com/henriquefm>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-// Last module patch version validated against: 1.0.2
+// Last module patch version validated against: 1.2.0
 
 // -----------------------------------------------------------------------
 // Categorical
 // -----------------------------------------------------------------------
+/**
+ * An array of ten categorical colors represented as RGB hexadecimal strings.
+ */
+export const schemeCategory10: ReadonlyArray<string>;
 /**
  * An array of eight categorical colors represented as RGB hexadecimal strings.
  */
@@ -48,11 +52,11 @@ export const schemeSet3: ReadonlyArray<string>;
 // Diverging
 // -----------------------------------------------------------------------
 /**
- * Given a number value in the range [0,1], returns the corresponding color from the “BrBG” diverging color scheme represented as an RGB string.
+ * Given a number t in the range [0,1], returns the corresponding color from the “BrBG” diverging color scheme represented as an RGB string.
  *
- * @param value Number in the range [0, 1].
+ * @param t Number in the range [0, 1].
  */
-export function interpolateBrBG(value: number): string;
+export function interpolateBrBG(t: number): string;
 
 /**
  * An array of arrays of hexadecimal color strings from the “BrBG” diverging color scheme. The kth element of this array contains
@@ -64,9 +68,9 @@ export const schemeBrBG: ReadonlyArray<ReadonlyArray<string>>;
 /**
  * Given a number t in the range [0,1], returns the corresponding color from the “PRGn” diverging color scheme represented as an RGB string.
  *
- * @param value Number in the range [0, 1].
+ * @param t Number in the range [0, 1].
  */
-export function interpolatePRGn(value: number): string;
+export function interpolatePRGn(t: number): string;
 
 /**
  * An array of arrays of hexadecimal color strings from the “PRGn” diverging color scheme. The kth element of this array contains
@@ -78,9 +82,9 @@ export const schemePRGn: ReadonlyArray<ReadonlyArray<string>>;
 /**
  * Given a number t in the range [0,1], returns the corresponding color from the “PiYG” diverging color scheme represented as an RGB string.
  *
- * @param value Number in the range [0, 1].
+ * @param t Number in the range [0, 1].
  */
-export function interpolatePiYG(value: number): string;
+export function interpolatePiYG(t: number): string;
 
 /**
  * An array of arrays of hexadecimal color strings from the “PiYG” diverging color scheme. The kth element of this array contains
@@ -92,9 +96,9 @@ export const schemePiYG: ReadonlyArray<ReadonlyArray<string>>;
 /**
  * Given a number t in the range [0,1], returns the corresponding color from the “PuOr” diverging color scheme represented as an RGB string.
  *
- * @param value Number in the range [0, 1].
+ * @param t Number in the range [0, 1].
  */
-export function interpolatePuOr(value: number): string;
+export function interpolatePuOr(t: number): string;
 
 /**
  * An array of arrays of hexadecimal color strings from the “PuOr” diverging color scheme. The kth element of this array contains
@@ -106,9 +110,9 @@ export const schemePuOr: ReadonlyArray<ReadonlyArray<string>>;
 /**
  * Given a number t in the range [0,1], returns the corresponding color from the “RdBu” diverging color scheme represented as an RGB string.
  *
- * @param value Number in the range [0, 1].
+ * @param t Number in the range [0, 1].
  */
-export function interpolateRdBu(value: number): string;
+export function interpolateRdBu(t: number): string;
 
 /**
  * An array of arrays of hexadecimal color strings from the “RdBu” diverging color scheme. The kth element of this array contains
@@ -120,9 +124,9 @@ export const schemeRdBu: ReadonlyArray<ReadonlyArray<string>>;
 /**
  * Given a number t in the range [0,1], returns the corresponding color from the “RdGy” diverging color scheme represented as an RGB string.
  *
- * @param value Number in the range [0, 1].
+ * @param t Number in the range [0, 1].
  */
-export function interpolateRdGy(value: number): string;
+export function interpolateRdGy(t: number): string;
 
 /**
  * An array of arrays of hexadecimal color strings from the “RdGy” diverging color scheme. The kth element of this array contains
@@ -134,9 +138,9 @@ export const schemeRdGy: ReadonlyArray<ReadonlyArray<string>>;
 /**
  * Given a number t in the range [0,1], returns the corresponding color from the “RdYlBu” diverging color scheme represented as an RGB string.
  *
- * @param value Number in the range [0, 1].
+ * @param t Number in the range [0, 1].
  */
-export function interpolateRdYlBu(value: number): string;
+export function interpolateRdYlBu(t: number): string;
 
 /**
  * An array of arrays of hexadecimal color strings from the “RdYlBu” diverging color scheme. The kth element of this array contains
@@ -148,9 +152,9 @@ export const schemeRdYlBu: ReadonlyArray<ReadonlyArray<string>>;
 /**
  * Given a number t in the range [0,1], returns the corresponding color from the “RdYlGn” diverging color scheme represented as an RGB string.
  *
- * @param value Number in the range [0, 1].
+ * @param t Number in the range [0, 1].
  */
-export function interpolateRdYlGn(value: number): string;
+export function interpolateRdYlGn(t: number): string;
 
 /**
  * An array of arrays of hexadecimal color strings from the “RdYlGn” diverging color scheme. The kth element of this array contains
@@ -162,9 +166,9 @@ export const schemeRdYlGn: ReadonlyArray<ReadonlyArray<string>>;
 /**
  * Given a number t in the range [0,1], returns the corresponding color from the “Spectral” diverging color scheme represented as an RGB string.
  *
- * @param value Number in the range [0, 1].
+ * @param t Number in the range [0, 1].
  */
-export function interpolateSpectral(value: number): string;
+export function interpolateSpectral(t: number): string;
 
 /**
  * An array of arrays of hexadecimal color strings from the “Spectral” diverging color scheme. The kth element of this array contains
@@ -179,9 +183,9 @@ export const schemeSpectral: ReadonlyArray<ReadonlyArray<string>>;
 /**
  * Given a number t in the range [0,1], returns the corresponding color from the “Blues” sequential color scheme represented as an RGB string.
  *
- * @param value Number in the range [0, 1].
+ * @param t Number in the range [0, 1].
  */
-export function interpolateBlues(value: number): string;
+export function interpolateBlues(t: number): string;
 
 /**
  * An array of arrays of hexadecimal color strings from the “Blues” sequential color scheme. The kth element of this array contains
@@ -193,9 +197,9 @@ export const schemeBlues: ReadonlyArray<ReadonlyArray<string>>;
 /**
  * Given a number t in the range [0,1], returns the corresponding color from the “Greens” sequential color scheme represented as an RGB string.
  *
- * @param value Number in the range [0, 1].
+ * @param t Number in the range [0, 1].
  */
-export function interpolateGreens(value: number): string;
+export function interpolateGreens(t: number): string;
 
 /**
  * An array of arrays of hexadecimal color strings from the “Greens” sequential color scheme. The kth element of this array contains
@@ -207,9 +211,9 @@ export const schemeGreens: ReadonlyArray<ReadonlyArray<string>>;
 /**
  * Given a number t in the range [0,1], returns the corresponding color from the “Greys” sequential color scheme represented as an RGB string.
  *
- * @param value Number in the range [0, 1].
+ * @param t Number in the range [0, 1].
  */
-export function interpolateGreys(value: number): string;
+export function interpolateGreys(t: number): string;
 
 /**
  * An array of arrays of hexadecimal color strings from the “Greys” sequential color scheme. The kth element of this array contains
@@ -221,9 +225,9 @@ export const schemeGreys: ReadonlyArray<ReadonlyArray<string>>;
 /**
  * Given a number t in the range [0,1], returns the corresponding color from the “Oranges” sequential color scheme represented as an RGB string.
  *
- * @param value Number in the range [0, 1].
+ * @param t Number in the range [0, 1].
  */
-export function interpolateOranges(value: number): string;
+export function interpolateOranges(t: number): string;
 
 /**
  * An array of arrays of hexadecimal color strings from the “Oranges” sequential color scheme. The kth element of this array contains
@@ -235,9 +239,9 @@ export const schemeOranges: ReadonlyArray<ReadonlyArray<string>>;
 /**
  * Given a number t in the range [0,1], returns the corresponding color from the “Purples” sequential color scheme represented as an RGB string.
  *
- * @param value Number in the range [0, 1].
+ * @param t Number in the range [0, 1].
  */
-export function interpolatePurples(value: number): string;
+export function interpolatePurples(t: number): string;
 
 /**
  * An array of arrays of hexadecimal color strings from the “Purples” sequential color scheme. The kth element of this array contains
@@ -249,9 +253,9 @@ export const schemePurples: ReadonlyArray<ReadonlyArray<string>>;
 /**
  * Given a number t in the range [0,1], returns the corresponding color from the “Reds” sequential color scheme represented as an RGB string.
  *
- * @param value Number in the range [0, 1].
+ * @param t Number in the range [0, 1].
  */
-export function interpolateReds(value: number): string;
+export function interpolateReds(t: number): string;
 
 /**
  * An array of arrays of hexadecimal color strings from the “Reds” sequential color scheme. The kth element of this array contains
@@ -264,12 +268,73 @@ export const schemeReds: ReadonlyArray<ReadonlyArray<string>>;
 // Sequential(Multi-Hue)
 // -----------------------------------------------------------------------
 
+/**
+ * Given a number t in the range [0,1], returns the corresponding color from the “viridis” perceptually-uniform color scheme designed by van der Walt, Smith and Firing for matplotlib,
+ * represented as an RGB string.
+ *
+ * @param t A number in the interval [0, 1].
+ */
+export function interpolateViridis(t: number): string;
+
+/**
+ * Given a number t in the range [0,1], returns the corresponding color from the “inferno” perceptually-uniform color scheme designed by van der Walt and Smith for matplotlib,
+ * represented as an RGB string.
+ *
+ * @param t A number in the interval [0, 1].
+ */
+export function interpolateInferno(t: number): string;
+
+/**
+ * Given a number t in the range [0,1], returns the corresponding color from the “magma” perceptually-uniform color scheme designed by van der Walt and Smith for matplotlib,
+ * represented as an RGB string.
+ *
+ * @param t A number in the interval [0, 1].
+ */
+export function interpolateMagma(t: number): string;
+
+/**
+ * Given a number t in the range [0,1], returns the corresponding color from the “plasma” perceptually-uniform color scheme designed by van der Walt and Smith for matplotlib,
+ * represented as an RGB string.
+ *
+ * @param t A number in the interval [0, 1].
+ */
+export function interpolatePlasma(t: number): string;
+
+/**
+ * Given a number t in the range [0,1], returns the corresponding color from a 180° rotation of Niccoli’s perceptual rainbow, represented as an RGB string.
+ *
+ * @param t A number in the interval [0, 1].
+ */
+export function interpolateWarm(t: number): string;
+
+/**
+ * Given a number t in the range [0,1], returns the corresponding color from Niccoli’s perceptual rainbow, represented as an RGB string.
+ *
+ * @param t A number in the interval [0, 1].
+ */
+export function interpolateCool(t: number): string;
+
+/**
+ * Given a number t in the range [0,1], returns the corresponding color from d3.interpolateWarm scale from [0.0, 0.5] followed by the d3.interpolateCool scale from [0.5, 1.0],
+ * thus implementing the cyclical less-angry rainbow color scheme.
+ *
+ * @param t A number in the interval [0, 1].
+ */
+export function interpolateRainbow(t: number): string;
+
+/**
+ * Given a number t in the range [0,1], returns the corresponding color from Green’s default Cubehelix represented as an RGB string.
+ *
+ * @param t A number in the interval [0, 1].
+ */
+export function interpolateCubehelixDefault(t: number): string;
+
 /**
  * Given a number t in the range [0,1], returns the corresponding color from the “BuGn” sequential color scheme represented as an RGB string.
  *
- * @param value Number in the range [0, 1].
+ * @param t Number in the range [0, 1].
  */
-export function interpolateBuGn(value: number): string;
+export function interpolateBuGn(t: number): string;
 
 /**
  * An array of arrays of hexadecimal color strings from the “BuGn” sequential color scheme. The kth element of this array contains
@@ -281,9 +346,9 @@ export const schemeBuGn: ReadonlyArray<ReadonlyArray<string>>;
 /**
  * Given a number t in the range [0,1], returns the corresponding color from the “BuPu” sequential color scheme represented as an RGB string.
  *
- * @param value Number in the range [0, 1].
+ * @param t Number in the range [0, 1].
  */
-export function interpolateBuPu(value: number): string;
+export function interpolateBuPu(t: number): string;
 
 /**
  * An array of arrays of hexadecimal color strings from the “BuPu” sequential color scheme. The kth element of this array contains
@@ -295,9 +360,9 @@ export const schemeBuPu: ReadonlyArray<ReadonlyArray<string>>;
 /**
  * Given a number t in the range [0,1], returns the corresponding color from the “GnBu” sequential color scheme represented as an RGB string.
  *
- * @param value Number in the range [0, 1].
+ * @param t Number in the range [0, 1].
  */
-export function interpolateGnBu(value: number): string;
+export function interpolateGnBu(t: number): string;
 
 /**
  * An array of arrays of hexadecimal color strings from the “GnBu” sequential color scheme. The kth element of this array contains
@@ -309,9 +374,9 @@ export const schemeGnBu: ReadonlyArray<ReadonlyArray<string>>;
 /**
  * Given a number t in the range [0,1], returns the corresponding color from the “OrRd” sequential color scheme represented as an RGB string.
  *
- * @param value Number in the range [0, 1].
+ * @param t Number in the range [0, 1].
  */
-export function interpolateOrRd(value: number): string;
+export function interpolateOrRd(t: number): string;
 
 /**
  * An array of arrays of hexadecimal color strings from the “OrRd” sequential color scheme. The kth element of this array contains
@@ -323,9 +388,9 @@ export const schemeOrRd: ReadonlyArray<ReadonlyArray<string>>;
 /**
  * Given a number t in the range [0,1], returns the corresponding color from the “PuBuGn” sequential color scheme represented as an RGB string.
  *
- * @param value Number in the range [0, 1].
+ * @param t Number in the range [0, 1].
  */
-export function interpolatePuBuGn(value: number): string;
+export function interpolatePuBuGn(t: number): string;
 
 /**
  * An array of arrays of hexadecimal color strings from the “PuBuGn” sequential color scheme. The kth element of this array contains
@@ -337,9 +402,9 @@ export const schemePuBuGn: ReadonlyArray<ReadonlyArray<string>>;
 /**
  * Given a number t in the range [0,1], returns the corresponding color from the “PuBu” sequential color scheme represented as an RGB string.
  *
- * @param value Number in the range [0, 1].
+ * @param t Number in the range [0, 1].
  */
-export function interpolatePuBu(value: number): string;
+export function interpolatePuBu(t: number): string;
 
 /**
  * An array of arrays of hexadecimal color strings from the “PuBu” sequential color scheme. The kth element of this array contains
@@ -351,9 +416,9 @@ export const schemePuBu: ReadonlyArray<ReadonlyArray<string>>;
 /**
  * Given a number t in the range [0,1], returns the corresponding color from the “PuRd” sequential color scheme represented as an RGB string.
  *
- * @param value Number in the range [0, 1].
+ * @param t Number in the range [0, 1].
  */
-export function interpolatePuRd(value: number): string;
+export function interpolatePuRd(t: number): string;
 
 /**
  * An array of arrays of hexadecimal color strings from the “PuRd” sequential color scheme. The kth element of this array contains
@@ -365,9 +430,9 @@ export const schemePuRd: ReadonlyArray<ReadonlyArray<string>>;
 /**
  * Given a number t in the range [0,1], returns the corresponding color from the “RdPu” sequential color scheme represented as an RGB string.
  *
- * @param value Number in the range [0, 1].
+ * @param t Number in the range [0, 1].
  */
-export function interpolateRdPu(value: number): string;
+export function interpolateRdPu(t: number): string;
 
 /**
  * An array of arrays of hexadecimal color strings from the “RdPu” sequential color scheme. The kth element of this array contains
@@ -379,9 +444,9 @@ export const schemeRdPu: ReadonlyArray<ReadonlyArray<string>>;
 /**
  * Given a number t in the range [0,1], returns the corresponding color from the “YlGnBu” sequential color scheme represented as an RGB string.
  *
- * @param value Number in the range [0, 1].
+ * @param t Number in the range [0, 1].
  */
-export function interpolateYlGnBu(value: number): string;
+export function interpolateYlGnBu(t: number): string;
 
 /**
  * An array of arrays of hexadecimal color strings from the “YlGnBu” sequential color scheme. The kth element of this array contains
@@ -393,9 +458,9 @@ export const schemeYlGnBu: ReadonlyArray<ReadonlyArray<string>>;
 /**
  * Given a number t in the range [0,1], returns the corresponding color from the “YlGn” sequential color scheme represented as an RGB string.
  *
- * @param value Number in the range [0, 1].
+ * @param t Number in the range [0, 1].
  */
-export function interpolateYlGn(value: number): string;
+export function interpolateYlGn(t: number): string;
 
 /**
  * An array of arrays of hexadecimal color strings from the “YlGn” sequential color scheme. The kth element of this array contains
@@ -407,9 +472,9 @@ export const schemeYlGn: ReadonlyArray<ReadonlyArray<string>>;
 /**
  * Given a number t in the range [0,1], returns the corresponding color from the “YlOrBr” sequential color scheme represented as an RGB string.
  *
- * @param value Number in the range [0, 1].
+ * @param t Number in the range [0, 1].
  */
-export function interpolateYlOrBr(value: number): string;
+export function interpolateYlOrBr(t: number): string;
 
 /**
  * An array of arrays of hexadecimal color strings from the “YlOrBr” sequential color scheme. The kth element of this array contains
@@ -421,9 +486,9 @@ export const schemeYlOrBr: ReadonlyArray<ReadonlyArray<string>>;
 /**
  * Given a number t in the range [0,1], returns the corresponding color from the “YlOrRd” sequential color scheme represented as an RGB string.
  *
- * @param value Number in the range [0, 1].
+ * @param t Number in the range [0, 1].
  */
-export function interpolateYlOrRd(value: number): string;
+export function interpolateYlOrRd(t: number): string;
 
 /**
  * An array of arrays of hexadecimal color strings from the “YlOrRd” sequential color scheme. The kth element of this array contains
diff --git a/types/d3-scale-chromatic/tsconfig.json b/types/d3-scale-chromatic/tsconfig.json
index 6dda07c981..f17bd93eb5 100644
--- a/types/d3-scale-chromatic/tsconfig.json
+++ b/types/d3-scale-chromatic/tsconfig.json
@@ -6,7 +6,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
diff --git a/types/d3-scale/d3-scale-tests.ts b/types/d3-scale/d3-scale-tests.ts
index f317e342ec..8fa070d992 100644
--- a/types/d3-scale/d3-scale-tests.ts
+++ b/types/d3-scale/d3-scale-tests.ts
@@ -9,6 +9,12 @@
 import * as d3Scale from 'd3-scale';
 import { interpolateCubehelix } from 'd3-interpolate';
 import { timeHour } from 'd3-time';
+import {
+    schemePuRd,
+    interpolateRainbow,
+    interpolateCool,
+    interpolateInferno
+} from 'd3-scale-chromatic';
 
 // -------------------------------------------------------------------------------
 // Preparatory Steps
@@ -549,8 +555,8 @@ const copiedTimeScale: d3Scale.ScaleTime<number, string> = localTimeScaleNumStri
 
 let sequentialScaleColorString: d3Scale.ScaleSequential<string>;
 
-sequentialScaleColorString = d3Scale.scaleSequential<string>(d3Scale.interpolateRainbow);
-sequentialScaleColorString = d3Scale.scaleSequential(d3Scale.interpolateCool); // inferred Output type string
+sequentialScaleColorString = d3Scale.scaleSequential<string>(interpolateRainbow);
+sequentialScaleColorString = d3Scale.scaleSequential(interpolateCool); // inferred Output type string
 
 // ScaleSequential Interface ========================================================
 
@@ -567,7 +573,7 @@ clampFlag = sequentialScaleColorString.clamp();
 
 // interpolate(...) -----------------------------------------------------------------
 
-sequentialScaleColorString = sequentialScaleColorString.interpolator(d3Scale.interpolateInferno);
+sequentialScaleColorString = sequentialScaleColorString.interpolator(interpolateInferno);
 
 let sequentialInterpolator: (t: number) => string;
 sequentialInterpolator = sequentialScaleColorString.interpolator();
@@ -580,28 +586,6 @@ outputString = sequentialScaleColorString(10);
 
 const copiedSequentialScale: d3Scale.ScaleSequential<string> = sequentialScaleColorString.copy();
 
-// -------------------------------------------------------------------------------
-// Color Interpolators for Sequential Scale Factory
-// -------------------------------------------------------------------------------
-
-let colorInterpolator: ((t: number) => string);
-
-colorInterpolator = d3Scale.interpolateViridis;
-
-colorInterpolator = d3Scale.interpolateMagma;
-
-colorInterpolator = d3Scale.interpolateInferno;
-
-colorInterpolator = d3Scale.interpolatePlasma;
-
-colorInterpolator = d3Scale.interpolateRainbow;
-
-colorInterpolator = d3Scale.interpolateWarm;
-
-colorInterpolator = d3Scale.interpolateCool;
-
-colorInterpolator = d3Scale.interpolateCubehelixDefault;
-
 // -------------------------------------------------------------------------------
 // Quantize Scale Factory
 // -------------------------------------------------------------------------------
@@ -764,7 +748,9 @@ let ordinalScaleStringString: d3Scale.ScaleOrdinal<string, string>;
 let ordinalScaleStringNumber: d3Scale.ScaleOrdinal<string, number>;
 
 ordinalScaleStringString = d3Scale.scaleOrdinal<string>();
+ordinalScaleStringString = d3Scale.scaleOrdinal<string>(schemePuRd[3]);
 ordinalScaleStringNumber = d3Scale.scaleOrdinal<string, number>();
+ordinalScaleStringString = d3Scale.scaleOrdinal<string, string>(schemePuRd[3]);
 
 // ScaleOrdinal Interface ========================================================
 
@@ -778,6 +764,7 @@ ordinalScaleStringNumber = ordinalScaleStringNumber.domain(['negative', 'neutral
 // range(...) -----------------------------------------------------------------
 
 ordinalScaleStringString = ordinalScaleStringString.range(['crimson', 'midnightblue', 'seagreen']);
+ordinalScaleStringString = ordinalScaleStringString.range(schemePuRd[3]);
 rangeStrings = ordinalScaleStringString.range();
 
 ordinalScaleStringNumber = ordinalScaleStringNumber.range([-1, 0, 1]);
@@ -950,17 +937,3 @@ outputNumberMaybe = pointScaleCoercible(new StringCoercible('negative'));
 // copy(...) -----------------------------------------------------------------
 
 const copiedPointScale: d3Scale.ScalePoint<StringCoercible> = pointScaleCoercible.copy();
-
-// -------------------------------------------------------------------------------
-// Categorical Color Schemas for Ordinal Scales
-// -------------------------------------------------------------------------------
-
-let colorStrings: string[];
-
-colorStrings = d3Scale.schemeCategory10;
-
-colorStrings = d3Scale.schemeCategory20;
-
-colorStrings = d3Scale.schemeCategory20b;
-
-colorStrings = d3Scale.schemeCategory20c;
diff --git a/types/d3-scale/index.d.ts b/types/d3-scale/index.d.ts
index d6cccdedfc..b3ca4114e2 100644
--- a/types/d3-scale/index.d.ts
+++ b/types/d3-scale/index.d.ts
@@ -1,9 +1,9 @@
-// Type definitions for D3JS d3-scale module 1.0
+// Type definitions for D3JS d3-scale module 2.0
 // Project: https://github.com/d3/d3-scale/
 // 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.0.4
+// Last module patch version validated against: 2.0.0
 
 import { CountableTimeInterval, TimeInterval } from 'd3-time';
 
@@ -87,7 +87,7 @@ export interface ScaleContinuousNumeric<Range, Output> {
      *
      * @param range Array of range values.
      */
-    range(range: Range[]): this;
+    range(range: ReadonlyArray<Range>): this;
 
     /**
      * Sets the scale’s range to the specified array of values while also setting the scale’s interpolator to interpolateRound.
@@ -756,7 +756,7 @@ export interface ScaleTime<Range, Output> {
      *
      * @param range Array of range values.
      */
-    range(range: Range[]): this;
+    range(range: ReadonlyArray<Range>): this;
 
     /**
      * Sets the scale’s range to the specified array of values while also setting the scale’s interpolator to interpolateRound.
@@ -1081,71 +1081,6 @@ export interface ScaleSequential<Output> {
  */
 export function scaleSequential<Output>(interpolator: ((t: number) => Output)): ScaleSequential<Output>;
 
-// -------------------------------------------------------------------------------
-// Color Interpolators for Sequential Scale Factory
-// -------------------------------------------------------------------------------
-
-/**
- * Given a number t in the range [0,1], returns the corresponding color from the “viridis” perceptually-uniform color scheme designed by van der Walt, Smith and Firing for matplotlib,
- * represented as an RGB string.
- *
- * @param t A number in the interval [0, 1].
- */
-export function interpolateViridis(t: number): string;
-
-/**
- * Given a number t in the range [0,1], returns the corresponding color from the “inferno” perceptually-uniform color scheme designed by van der Walt and Smith for matplotlib,
- * represented as an RGB string.
- *
- * @param t A number in the interval [0, 1].
- */
-export function interpolateInferno(t: number): string;
-
-/**
- * Given a number t in the range [0,1], returns the corresponding color from the “magma” perceptually-uniform color scheme designed by van der Walt and Smith for matplotlib,
- * represented as an RGB string.
- *
- * @param t A number in the interval [0, 1].
- */
-export function interpolateMagma(t: number): string;
-
-/**
- * Given a number t in the range [0,1], returns the corresponding color from the “plasma” perceptually-uniform color scheme designed by van der Walt and Smith for matplotlib,
- * represented as an RGB string.
- *
- * @param t A number in the interval [0, 1].
- */
-export function interpolatePlasma(t: number): string;
-
-/**
- * Given a number t in the range [0,1], returns the corresponding color from a 180° rotation of Niccoli’s perceptual rainbow, represented as an RGB string.
- *
- * @param t A number in the interval [0, 1].
- */
-export function interpolateWarm(t: number): string;
-
-/**
- * Given a number t in the range [0,1], returns the corresponding color from Niccoli’s perceptual rainbow, represented as an RGB string.
- *
- * @param t A number in the interval [0, 1].
- */
-export function interpolateCool(t: number): string;
-
-/**
- * Given a number t in the range [0,1], returns the corresponding color from d3.interpolateWarm scale from [0.0, 0.5] followed by the d3.interpolateCool scale from [0.5, 1.0],
- * thus implementing the cyclical less-angry rainbow color scheme.
- *
- * @param t A number in the interval [0, 1].
- */
-export function interpolateRainbow(t: number): string;
-
-/**
- * Given a number t in the range [0,1], returns the corresponding color from Green’s default Cubehelix represented as an RGB string.
- *
- * @param t A number in the interval [0, 1].
- */
-export function interpolateCubehelixDefault(t: number): string;
-
 // -------------------------------------------------------------------------------
 // Quantize Scale Factory
 // -------------------------------------------------------------------------------
@@ -1195,7 +1130,7 @@ export interface ScaleQuantize<Range> {
      *
      * @param range Array of range values.
      */
-    range(range: Range[]): this;
+    range(range: ReadonlyArray<Range>): this;
 
     /**
      * Returns approximately count representative values from the scale’s domain.
@@ -1311,7 +1246,7 @@ export interface ScaleQuantile<Range> {
      *
      * @param range Array of range values.
      */
-    range(range: Range[]): this;
+    range(range: ReadonlyArray<Range>): this;
 
     /**
      * Returns the quantile thresholds. If the range contains n discrete values, the returned array will contain n - 1 thresholds.
@@ -1385,7 +1320,7 @@ export interface ScaleThreshold<Domain extends number | string | Date, Range> {
      *
      * @param domain Array of domain values.
      */
-    domain(domain: Domain[]): this;
+    domain(domain: ReadonlyArray<Domain>): this;
 
     /**
      * Returns the scale’s current range.
@@ -1398,7 +1333,7 @@ export interface ScaleThreshold<Domain extends number | string | Date, Range> {
      *
      * @param range Array of range values.
      */
-    range(range: Range[]): this;
+    range(range: ReadonlyArray<Range>): this;
 
     /**
      * Returns an exact copy of this scale. Changes to this scale will not affect the returned scale, and vice versa.
@@ -1463,7 +1398,7 @@ export interface ScaleOrdinal<Domain extends { toString(): string }, Range> {
      *
      * @param domain Array of domain values.
      */
-    domain(domain: Domain[]): this;
+    domain(domain: ReadonlyArray<Domain>): this;
 
     /**
      * Returns the scale's current range.
@@ -1478,7 +1413,7 @@ export interface ScaleOrdinal<Domain extends { toString(): string }, Range> {
      *
      * @param range Array of range values.
      */
-    range(range: Range[]): this;
+    range(range: ReadonlyArray<Range>): this;
 
     /**
      * Returns the current unknown value, which defaults to "implicit".
@@ -1509,7 +1444,7 @@ export interface ScaleOrdinal<Domain extends { toString(): string }, Range> {
  *
  * @parm range An optional array of range values to initialize the scale with.
  */
-export function scaleOrdinal<Range>(range?: Range[]): ScaleOrdinal<string, Range>;
+export function scaleOrdinal<Range>(range?: ReadonlyArray<Range>): ScaleOrdinal<string, Range>;
 /**
  * Constructs a new ordinal scale with an empty domain and the specified range.
  * If a range is not specified, it defaults to the empty array; an ordinal scale always returns undefined until a non-empty range is defined.
@@ -1522,7 +1457,7 @@ export function scaleOrdinal<Range>(range?: Range[]): ScaleOrdinal<string, Range
  *
  * @parm range An optional array of range values to initialize the scale with.
  */
-export function scaleOrdinal<Domain extends { toString(): string }, Range>(range?: Range[]): ScaleOrdinal<Domain, Range>;
+export function scaleOrdinal<Domain extends { toString(): string }, Range>(range?: ReadonlyArray<Range>): ScaleOrdinal<Domain, Range>;
 
 /**
  * A special value for ordinal.unknown that enables implicit domain construction: unknown values are implicitly added to the domain.
@@ -1561,7 +1496,7 @@ export interface ScaleBand<Domain extends { toString(): string }> {
      *
      * @param domain Array of domain values.
      */
-    domain(domain: Domain[]): this;
+    domain(domain: ReadonlyArray<Domain>): this;
 
     /**
      * Returns the scale’s current range, which defaults to [0, 1].
@@ -1713,7 +1648,7 @@ export interface ScalePoint<Domain extends { toString(): string }> {
      *
      * @param domain Array of domain values.
      */
-    domain(domain: Domain[]): this;
+    domain(domain: ReadonlyArray<Domain>): this;
 
     /**
      * Returns the scale’s current range, which defaults to [0, 1].
@@ -1813,28 +1748,3 @@ export function scalePoint(): ScalePoint<string>;
  * The generic corresponds to the data type of domain elements.
  */
 export function scalePoint<Domain extends { toString(): string }>(): ScalePoint<Domain>;
-
-// -------------------------------------------------------------------------------
-// Categorical Color Schemas for Ordinal Scales
-// -------------------------------------------------------------------------------
-
-/**
- * An array of ten categorical colors represented as RGB hexadecimal strings.
- */
-export const schemeCategory10: string[];
-
-/**
- * An array of twenty categorical colors represented as RGB hexadecimal strings.
- */
-export const schemeCategory20: string[];
-
-/**
- * An array of twenty categorical colors represented as RGB hexadecimal strings.
- */
-export const schemeCategory20b: string[];
-
-/**
- * An array of twenty categorical colors represented as RGB hexadecimal strings.
- * This color scale includes color specifications and designs developed by Cynthia Brewer (colorbrewer2.org).
- */
-export const schemeCategory20c: string[];
diff --git a/types/d3-scale/v1/d3-scale-tests.ts b/types/d3-scale/v1/d3-scale-tests.ts
new file mode 100644
index 0000000000..749b45894b
--- /dev/null
+++ b/types/d3-scale/v1/d3-scale-tests.ts
@@ -0,0 +1,970 @@
+/**
+ * Typescript definition tests for d3/d3-scale module
+ *
+ * Note: These tests are intended to test the definitions only
+ * in the sense of typing and call signature consistency. They
+ * are not intended as functional tests.
+ */
+
+import * as d3Scale from 'd3-scale';
+import { interpolateCubehelix } from 'd3-interpolate';
+import { timeHour } from 'd3-time';
+import { schemePuRd } from 'd3-scale-chromatic';
+
+// -------------------------------------------------------------------------------
+// Preparatory Steps
+// -------------------------------------------------------------------------------
+
+class NumCoercible {
+    a: number;
+
+    constructor(a: number) {
+        this.a = a;
+    }
+    valueOf() {
+        return this.a;
+    }
+}
+
+class StringCoercible {
+    txt: string;
+
+    constructor(txt: string) {
+        this.txt = txt;
+    }
+    toString() {
+        return this.txt;
+    }
+}
+
+let num: number;
+let date: Date;
+
+let clampFlag: boolean;
+
+let outputNumber: number;
+let outputString: string;
+
+let domainNumbers: number[] = [1, 100];
+const domainNumeric: NumCoercible[] = [new NumCoercible(0), new NumCoercible(100)];
+let domainStrings: string[];
+let domainDates: Date[] = [new Date(2016, 0, 15), new Date(2016, 5, 15)];
+
+let ticksNumbers: number[];
+let ticksDates: Date[];
+
+let tickFormatNumberFn: ((d: number | { valueOf(): number }) => string);
+let tickFormatDateFn: ((d: Date) => string);
+
+let rangeNumbers: number[] = [2, 200];
+let rangeStrings: string[] = ['2px', '200px'];
+
+let numExtent: [number, number];
+let numOrUndefinedExtent: [number | undefined, number | undefined];
+
+let outputNumberMaybe: number | undefined;
+// -------------------------------------------------------------------------------
+// Linear Scale Factory
+// -------------------------------------------------------------------------------
+
+// scaleLinear() -----------------------------------------------------------------
+
+let linearScaleNumber: d3Scale.ScaleLinear<number, number>;
+let linearScaleString: d3Scale.ScaleLinear<string, string>;
+let linearScaleNumString: d3Scale.ScaleLinear<number, string>;
+
+linearScaleNumber = d3Scale.scaleLinear();
+linearScaleString = d3Scale.scaleLinear<string>();
+linearScaleNumString = d3Scale.scaleLinear<number, string>();
+
+// ScaleLinear Interface ========================================================
+
+// domain(...) -----------------------------------------------------------------
+
+linearScaleNumber = linearScaleNumber.domain(domainNumeric);
+linearScaleNumber = linearScaleNumber.domain(domainNumbers);
+domainNumbers = linearScaleNumber.domain();
+
+linearScaleString = linearScaleString.domain(domainNumeric);
+linearScaleString = linearScaleString.domain([10, 100]);
+domainNumbers = linearScaleString.domain();
+
+linearScaleNumString = linearScaleNumString.domain(domainNumeric);
+linearScaleNumString = linearScaleNumString.domain(domainNumbers);
+domainNumbers = linearScaleNumString.domain();
+
+// range(...) -----------------------------------------------------------------
+
+linearScaleNumber = linearScaleNumber.range(rangeNumbers);
+rangeNumbers = linearScaleNumber.range();
+
+linearScaleString = linearScaleString.range(['steelblue', 'brown']);
+rangeStrings = linearScaleString.range();
+
+linearScaleNumString = linearScaleNumString.range(rangeNumbers);
+rangeNumbers = linearScaleNumString.range();
+
+// invert(...) -----------------------------------------------------------------
+
+num = linearScaleNumber.invert(500); // has number range, so inversion is possible
+num = linearScaleNumber.invert(new NumCoercible(500)); // has number range, so inversion is possible
+
+num = linearScaleNumString.invert(500); // has number range, so inversion is possible
+num = linearScaleNumString.invert(new NumCoercible(500)); // has number range, so inversion is possible
+
+// rangeRound(...) -----------------------------------------------------------------
+
+linearScaleNumber = linearScaleNumber.rangeRound(rangeNumbers);
+
+// clamp(...) -----------------------------------------------------------------
+
+linearScaleNumber = linearScaleNumber.clamp(true);
+clampFlag = linearScaleNumber.clamp();
+
+// interpolate(...) -----------------------------------------------------------------
+
+linearScaleString = linearScaleString.interpolate(interpolateCubehelix.gamma(3));
+
+linearScaleNumString = linearScaleNumString.interpolate((a, b) => {
+    // take two numbers
+    return (t: number) => (a * (1 - t) + b * t) + 'px'; // a and b are numbers based on Range Type, return value of interpolator is string based on Output type
+});
+
+// Changes scale output type (inferred generic)
+linearScaleNumString = linearScaleNumber.interpolate((a, b) => {
+    // take two numbers
+    return (t: number) => (a * (1 - t) + b * t) + 'px'; // a and b are numbers based on Range Type, return value of interpolator is string based on Output type
+});
+
+// nice(...) -----------------------------------------------------------------------
+
+// chainable
+linearScaleNumber = linearScaleNumber.nice();
+linearScaleNumber = linearScaleNumber.nice(5);
+
+// ticks(...) -----------------------------------------------------------------
+
+ticksNumbers = linearScaleNumber.ticks();
+ticksNumbers = linearScaleNumber.ticks(5);
+
+// tickFormat(...) -----------------------------------------------------------------
+
+tickFormatNumberFn = linearScaleNumber.tickFormat();
+tickFormatNumberFn = linearScaleNumber.tickFormat(5);
+tickFormatNumberFn = linearScaleNumber.tickFormat(5, '+%');
+
+// (...) value mapping from domain to output -----------------------------------
+
+outputNumber = linearScaleNumber(10);
+
+outputString = linearScaleString(10);
+
+outputString = linearScaleNumString(10);
+
+// copy(...) -----------------------------------------------------------------
+
+const copiedLinearScale: d3Scale.ScaleLinear<number, string> = linearScaleNumString.copy();
+
+// -------------------------------------------------------------------------------
+// Power Scale Factories
+// -------------------------------------------------------------------------------
+
+// scalePow() and scaleSqrt() ----------------------------------------------------
+
+let powerScaleNumber: d3Scale.ScalePower<number, number>;
+let powerScaleString: d3Scale.ScalePower<string, string>;
+let powerScaleNumString: d3Scale.ScalePower<number, string>;
+
+powerScaleNumber = d3Scale.scalePow();
+powerScaleString = d3Scale.scalePow<string>();
+powerScaleNumString = d3Scale.scalePow<number, string>();
+
+let squarerootScaleNumber: d3Scale.ScalePower<number, number>;
+let squarerootScaleString: d3Scale.ScalePower<string, string>;
+let squarerootScaleNumString: d3Scale.ScalePower<number, string>;
+
+squarerootScaleNumber = d3Scale.scaleSqrt();
+squarerootScaleString = d3Scale.scaleSqrt<string>();
+squarerootScaleNumString = d3Scale.scaleSqrt<number, string>();
+
+// ScalePower Interface ========================================================
+
+// exponent --------------------------------------------------------------------
+
+const exponent: number = squarerootScaleNumber.exponent();
+
+powerScaleNumber = powerScaleNumber.exponent(5);
+
+// domain(...) -----------------------------------------------------------------
+
+powerScaleNumber = powerScaleNumber.domain(domainNumeric);
+powerScaleNumber = powerScaleNumber.domain(domainNumbers);
+domainNumbers = powerScaleNumber.domain();
+
+powerScaleString = powerScaleString.domain(domainNumeric);
+powerScaleString = powerScaleString.domain([10, 100]);
+domainNumbers = powerScaleString.domain();
+
+powerScaleNumString = powerScaleNumString.domain(domainNumeric);
+powerScaleNumString = powerScaleNumString.domain(domainNumbers);
+domainNumbers = powerScaleNumString.domain();
+
+// range(...) -----------------------------------------------------------------
+
+powerScaleNumber = powerScaleNumber.range(rangeNumbers);
+rangeNumbers = powerScaleNumber.range();
+
+powerScaleString = powerScaleString.range(['steelblue', 'brown']);
+rangeStrings = powerScaleString.range();
+
+powerScaleNumString = powerScaleNumString.range(rangeNumbers);
+rangeNumbers = powerScaleNumString.range();
+
+// invert(...) -----------------------------------------------------------------
+
+num = powerScaleNumber.invert(500); // has number range, so inversion is possible
+num = powerScaleNumber.invert(new NumCoercible(500)); // has number range, so inversion is possible
+
+num = powerScaleNumString.invert(500); // has number range, so inversion is possible
+num = powerScaleNumString.invert(new NumCoercible(500)); // has number range, so inversion is possible
+
+// rangeRound(...) -----------------------------------------------------------------
+
+powerScaleNumber = powerScaleNumber.rangeRound(rangeNumbers);
+
+// clamp(...) -----------------------------------------------------------------
+
+powerScaleNumber = powerScaleNumber.clamp(true);
+clampFlag = powerScaleNumber.clamp();
+
+// interpolate(...) -----------------------------------------------------------------
+
+powerScaleString = powerScaleString.interpolate(interpolateCubehelix.gamma(3));
+
+powerScaleNumString = powerScaleNumString.interpolate((a, b) => {
+    // take two numbers
+    return (t: number) => (a * (1 - t) + b * t) + 'px'; // a and b are numbers based on Range Type, return value of interpolator is string based on Output type
+});
+
+// nice(...) -----------------------------------------------------------------------
+
+// chainable
+powerScaleNumber = powerScaleNumber.nice();
+powerScaleNumber = powerScaleNumber.nice(5);
+
+// ticks(...) -----------------------------------------------------------------
+
+ticksNumbers = powerScaleNumber.ticks();
+ticksNumbers = powerScaleNumber.ticks(5);
+
+// tickFormat(...) -----------------------------------------------------------------
+
+tickFormatNumberFn = powerScaleNumber.tickFormat();
+tickFormatNumberFn = powerScaleNumber.tickFormat(5);
+tickFormatNumberFn = powerScaleNumber.tickFormat(5, '+%');
+
+// (...) value mapping from domain to output -----------------------------------
+
+outputNumber = powerScaleNumber(10);
+
+outputString = powerScaleString(10);
+
+outputString = powerScaleNumString(10);
+
+// copy(...) -----------------------------------------------------------------
+
+const copiedPowerScale: d3Scale.ScalePower<number, string> = powerScaleNumString.copy();
+
+// -------------------------------------------------------------------------------
+// Logarithmic Scale Factory
+// -------------------------------------------------------------------------------
+
+// scaleLog() ---------------------------------------------------------------------
+
+let logScaleNumber: d3Scale.ScaleLogarithmic<number, number>;
+let logScaleString: d3Scale.ScaleLogarithmic<string, string>;
+let logScaleNumString: d3Scale.ScaleLogarithmic<number, string>;
+
+logScaleNumber = d3Scale.scaleLog();
+logScaleString = d3Scale.scaleLog<string>();
+logScaleNumString = d3Scale.scaleLog<number, string>();
+
+// ScaleLogarithmic Interface ========================================================
+
+// base --------------------------------------------------------------------
+
+const base: number = logScaleNumber.base();
+
+logScaleNumber = logScaleNumber.base(42);
+
+// domain(...) -----------------------------------------------------------------
+
+logScaleNumber = logScaleNumber.domain(domainNumeric);
+logScaleNumber = logScaleNumber.domain(domainNumbers);
+domainNumbers = logScaleNumber.domain();
+
+logScaleString = logScaleString.domain(domainNumeric);
+logScaleString = logScaleString.domain([10, 100]);
+domainNumbers = logScaleString.domain();
+
+logScaleNumString = logScaleNumString.domain(domainNumeric);
+logScaleNumString = logScaleNumString.domain(domainNumbers);
+domainNumbers = logScaleNumString.domain();
+
+// range(...) -----------------------------------------------------------------
+
+logScaleNumber = logScaleNumber.range(rangeNumbers);
+rangeNumbers = logScaleNumber.range();
+
+logScaleString = logScaleString.range(['steelblue', 'brown']);
+rangeStrings = logScaleString.range();
+
+logScaleNumString = logScaleNumString.range(rangeNumbers);
+rangeNumbers = logScaleNumString.range();
+
+// invert(...) -----------------------------------------------------------------
+
+num = logScaleNumber.invert(500); // has number range, so inversion is possible
+num = logScaleNumber.invert(new NumCoercible(500)); // has number range, so inversion is possible
+
+num = logScaleNumString.invert(500); // has number range, so inversion is possible
+num = logScaleNumString.invert(new NumCoercible(500)); // has number range, so inversion is possible
+
+// rangeRound(...) -----------------------------------------------------------------
+
+logScaleNumber = logScaleNumber.rangeRound(rangeNumbers);
+
+// clamp(...) -----------------------------------------------------------------
+
+logScaleNumber = logScaleNumber.clamp(true);
+clampFlag = logScaleNumber.clamp();
+
+// interpolate(...) -----------------------------------------------------------------
+
+logScaleString = logScaleString.interpolate(interpolateCubehelix.gamma(3));
+
+logScaleNumString = logScaleNumString.interpolate((a, b) => {
+    // take two numbers
+    return (t: number) => (a * (1 - t) + b * t) + 'px'; // a and b are numbers based on Range Type, return value of interpolator is string based on Output type
+});
+
+// nice(...) -----------------------------------------------------------------------
+
+// chainable
+logScaleNumber = logScaleNumber.nice();
+// logScaleNumber = logScaleNumber.nice(5); // fails, logarithmic scale does not support count parameter.
+
+// ticks(...) -----------------------------------------------------------------
+
+ticksNumbers = logScaleNumber.ticks();
+ticksNumbers = logScaleNumber.ticks(5);
+
+// tickFormat(...) -----------------------------------------------------------------
+
+tickFormatNumberFn = logScaleNumber.tickFormat();
+tickFormatNumberFn = logScaleNumber.tickFormat(5);
+tickFormatNumberFn = logScaleNumber.tickFormat(5, '+%');
+
+// (...) value mapping from domain to output -----------------------------------
+
+outputNumber = logScaleNumber(10);
+
+outputString = logScaleString(10);
+
+outputString = logScaleNumString(10);
+
+// copy(...) -----------------------------------------------------------------
+
+const copiedLogScale: d3Scale.ScaleLogarithmic<number, string> = logScaleNumString.copy();
+
+// -------------------------------------------------------------------------------
+// Identity Scale Factory
+// -------------------------------------------------------------------------------
+
+// scaleIdentity -----------------------------------------------------------------
+
+let identityScale: d3Scale.ScaleIdentity;
+
+identityScale = d3Scale.scaleIdentity();
+
+// ScaleIdentity Interface ========================================================
+
+// domain(...) -----------------------------------------------------------------
+
+identityScale = identityScale.domain(domainNumeric);
+identityScale = identityScale.domain(domainNumbers);
+domainNumbers = identityScale.domain();
+
+// range(...) -----------------------------------------------------------------
+
+identityScale = identityScale.range(rangeNumbers);
+rangeNumbers = identityScale.range();
+
+// invert(...) -----------------------------------------------------------------
+
+num = identityScale.invert(500); // has number range, so inversion is possible
+num = identityScale.invert(new NumCoercible(500)); // has number range, so inversion is possible
+
+// nice(...) -----------------------------------------------------------------------
+
+// chainable
+identityScale = identityScale.nice();
+identityScale = identityScale.nice(5);
+
+// ticks(...) -----------------------------------------------------------------
+
+ticksNumbers = identityScale.ticks();
+ticksNumbers = identityScale.ticks(5);
+
+// tickFormat(...) -----------------------------------------------------------------
+
+tickFormatNumberFn = identityScale.tickFormat();
+tickFormatNumberFn = identityScale.tickFormat(5);
+tickFormatNumberFn = identityScale.tickFormat(5, '+%');
+
+// (...) value mapping from domain to output -----------------------------------
+
+outputNumber = identityScale(10);
+
+// copy(...) -----------------------------------------------------------------
+
+const copiedIdentityScale: d3Scale.ScaleIdentity = identityScale.copy();
+
+// -------------------------------------------------------------------------------
+// Time Scale Factories
+// -------------------------------------------------------------------------------
+
+// scaleTime() and scaleUtc() ----------------------------------------------------
+
+let localTimeScaleNumber: d3Scale.ScaleTime<number, number>;
+let localTimeScaleString: d3Scale.ScaleTime<string, string>;
+let localTimeScaleNumString: d3Scale.ScaleTime<number, string>;
+
+localTimeScaleNumber = d3Scale.scaleTime();
+localTimeScaleString = d3Scale.scaleTime<string>();
+localTimeScaleNumString = d3Scale.scaleTime<number, string>();
+
+let utcScaleNumber: d3Scale.ScaleTime<number, number>;
+let utcScaleString: d3Scale.ScaleTime<string, string>;
+let utcScaleNumString: d3Scale.ScaleTime<number, string>;
+
+utcScaleNumber = d3Scale.scaleUtc();
+utcScaleString = d3Scale.scaleUtc<string>();
+utcScaleNumString = d3Scale.scaleUtc<number, string>();
+
+// domain(...) -----------------------------------------------------------------
+
+localTimeScaleNumber = localTimeScaleNumber.domain(domainDates);
+
+domainDates = localTimeScaleNumber.domain();
+
+localTimeScaleString = localTimeScaleString.domain([new Date(2016, 6, 1), Date.now()]);
+domainDates = localTimeScaleString.domain();
+
+localTimeScaleNumString = localTimeScaleNumString.domain(domainDates);
+domainDates = localTimeScaleNumString.domain();
+
+// range(...) -----------------------------------------------------------------
+
+localTimeScaleNumber = localTimeScaleNumber.range(rangeNumbers);
+rangeNumbers = localTimeScaleNumber.range();
+
+localTimeScaleString = localTimeScaleString.range(['steelblue', 'brown']);
+rangeStrings = localTimeScaleString.range();
+
+localTimeScaleNumString = localTimeScaleNumString.range(rangeNumbers);
+rangeNumbers = localTimeScaleNumString.range();
+
+// invert(...) -----------------------------------------------------------------
+
+date = localTimeScaleNumber.invert(500); // has number range, so inversion is possible
+date = localTimeScaleNumber.invert(new NumCoercible(500)); // has number range, so inversion is possible
+
+date = localTimeScaleNumString.invert(500); // has number range, so inversion is possible
+date = localTimeScaleNumString.invert(new NumCoercible(500)); // has number range, so inversion is possible
+
+// rangeRound(...) -----------------------------------------------------------------
+
+localTimeScaleNumber = localTimeScaleNumber.rangeRound(rangeNumbers);
+
+// clamp(...) -----------------------------------------------------------------
+
+localTimeScaleNumber = localTimeScaleNumber.clamp(true);
+clampFlag = localTimeScaleNumber.clamp();
+
+// interpolate(...) -----------------------------------------------------------------
+
+localTimeScaleString = localTimeScaleString.interpolate(interpolateCubehelix.gamma(3));
+
+localTimeScaleNumString = localTimeScaleNumString.interpolate((a, b) => {
+    // take two numbers
+    return (t: number) => (a * (1 - t) + b * t) + 'px'; // a and b are numbers based on Range Type, return value of interpolator is string based on Output type
+});
+
+// nice(...) -----------------------------------------------------------------------
+
+// chainable
+localTimeScaleNumber = localTimeScaleNumber.nice();
+localTimeScaleNumber = localTimeScaleNumber.nice(5);
+localTimeScaleNumber = localTimeScaleNumber.nice(timeHour);
+localTimeScaleNumber = localTimeScaleNumber.nice(timeHour, 5);
+
+// localTimeScaleNumber = localTimeScaleNumber.nice(timeHour.every(5)); // fails, requires CountableTimeInterval
+
+// ticks(...) -----------------------------------------------------------------
+
+const timeInterval = timeHour.every(5);
+
+ticksDates = localTimeScaleNumber.ticks();
+ticksDates = localTimeScaleNumber.ticks(50);
+
+if (timeInterval !== null) {
+    ticksDates = localTimeScaleNumString.ticks(timeInterval);
+}
+
+// tickFormat(...) -----------------------------------------------------------------
+
+tickFormatDateFn = localTimeScaleNumber.tickFormat();
+tickFormatDateFn = localTimeScaleNumber.tickFormat(50, '%I %p');
+if (timeInterval !== null) {
+    tickFormatDateFn = localTimeScaleNumber.tickFormat(timeInterval, '%I %p');
+}
+
+// (...) value mapping from domain to output -----------------------------------
+
+outputNumber = localTimeScaleNumber(new Date(2016, 6, 4));
+
+outputString = localTimeScaleString(new Date(2016, 6, 4));
+
+outputString = localTimeScaleNumString(new Date(2016, 6, 4));
+
+// copy(...) -----------------------------------------------------------------
+
+const copiedTimeScale: d3Scale.ScaleTime<number, string> = localTimeScaleNumString.copy();
+
+// -------------------------------------------------------------------------------
+// Sequential Scale Factory
+// -------------------------------------------------------------------------------
+
+// scaleSequential() -----------------------------------------------------------------
+
+let sequentialScaleColorString: d3Scale.ScaleSequential<string>;
+
+sequentialScaleColorString = d3Scale.scaleSequential<string>(d3Scale.interpolateRainbow);
+sequentialScaleColorString = d3Scale.scaleSequential(d3Scale.interpolateCool); // inferred Output type string
+
+// ScaleSequential Interface ========================================================
+
+// domain(...) -----------------------------------------------------------------
+
+sequentialScaleColorString = sequentialScaleColorString.domain([0, 1]);
+sequentialScaleColorString = sequentialScaleColorString.domain([new NumCoercible(0), new NumCoercible(100)]);
+const domainSequential: [number, number] = sequentialScaleColorString.domain();
+
+// clamp(...) -----------------------------------------------------------------
+
+sequentialScaleColorString = sequentialScaleColorString.clamp(true);
+clampFlag = sequentialScaleColorString.clamp();
+
+// interpolate(...) -----------------------------------------------------------------
+
+sequentialScaleColorString = sequentialScaleColorString.interpolator(d3Scale.interpolateInferno);
+
+let sequentialInterpolator: (t: number) => string;
+sequentialInterpolator = sequentialScaleColorString.interpolator();
+
+// (...) value mapping from domain to output -----------------------------------
+
+outputString = sequentialScaleColorString(10);
+
+// copy(...) -----------------------------------------------------------------
+
+const copiedSequentialScale: d3Scale.ScaleSequential<string> = sequentialScaleColorString.copy();
+
+// -------------------------------------------------------------------------------
+// Color Interpolators for Sequential Scale Factory
+// -------------------------------------------------------------------------------
+
+let colorInterpolator: ((t: number) => string);
+
+colorInterpolator = d3Scale.interpolateViridis;
+
+colorInterpolator = d3Scale.interpolateMagma;
+
+colorInterpolator = d3Scale.interpolateInferno;
+
+colorInterpolator = d3Scale.interpolatePlasma;
+
+colorInterpolator = d3Scale.interpolateRainbow;
+
+colorInterpolator = d3Scale.interpolateWarm;
+
+colorInterpolator = d3Scale.interpolateCool;
+
+colorInterpolator = d3Scale.interpolateCubehelixDefault;
+
+// -------------------------------------------------------------------------------
+// Quantize Scale Factory
+// -------------------------------------------------------------------------------
+
+// scaleQuantize() -----------------------------------------------------------------
+
+let quantizeScaleNumber: d3Scale.ScaleQuantize<number>;
+let quantizeScaleString: d3Scale.ScaleQuantize<string>;
+
+quantizeScaleNumber = d3Scale.scaleQuantize();
+quantizeScaleString = d3Scale.scaleQuantize<string>();
+
+// ScaleQuantize Interface ========================================================
+
+// domain(...) -----------------------------------------------------------------
+
+quantizeScaleNumber = quantizeScaleNumber.domain([0, 1]);
+quantizeScaleNumber = quantizeScaleNumber.domain([new NumCoercible(0), new NumCoercible(100)]);
+const domainQuantize: [number, number] = quantizeScaleNumber.domain();
+
+// range(...) -----------------------------------------------------------------
+
+quantizeScaleNumber = quantizeScaleNumber.range(rangeNumbers);
+rangeNumbers = quantizeScaleNumber.range();
+
+quantizeScaleString = quantizeScaleString.range(['steelblue', 'brown']);
+rangeStrings = quantizeScaleString.range();
+
+// invertExtent(...) -----------------------------------------------------------------
+
+numExtent = quantizeScaleNumber.invertExtent(500);
+
+numExtent = quantizeScaleString.invertExtent('steelblue');
+
+// nice(...) -----------------------------------------------------------------------
+
+// chainable
+quantizeScaleNumber = quantizeScaleNumber.nice();
+quantizeScaleNumber = quantizeScaleNumber.nice(5);
+
+// ticks(...) -----------------------------------------------------------------
+
+ticksNumbers = quantizeScaleNumber.ticks();
+ticksNumbers = quantizeScaleNumber.ticks(5);
+
+// tickFormat(...) -----------------------------------------------------------------
+
+tickFormatNumberFn = quantizeScaleNumber.tickFormat();
+tickFormatNumberFn = quantizeScaleNumber.tickFormat(5);
+tickFormatNumberFn = quantizeScaleNumber.tickFormat(5, '+%');
+
+// (...) value mapping from domain to output -----------------------------------
+
+outputNumber = quantizeScaleNumber(0.51);
+
+// copy(...) -----------------------------------------------------------------
+
+const copiedQuantizeScale: d3Scale.ScaleQuantize<number> = quantizeScaleNumber.copy();
+
+// -------------------------------------------------------------------------------
+// Quantile Scale Factory
+// -------------------------------------------------------------------------------
+
+// scaleQuantile() -----------------------------------------------------------------
+
+let quantileScaleNumber: d3Scale.ScaleQuantile<number>;
+let quantileScaleString: d3Scale.ScaleQuantile<string>;
+
+quantileScaleNumber = d3Scale.scaleQuantile();
+quantileScaleString = d3Scale.scaleQuantile<string>();
+
+// ScaleQuantile Interface ========================================================
+
+// domain(...) -----------------------------------------------------------------
+
+quantileScaleNumber = quantileScaleNumber.domain(domainNumbers);
+
+domainNumbers = quantileScaleNumber.domain();
+
+quantileScaleString = quantileScaleString.domain(domainNumeric);
+
+// range(...) -----------------------------------------------------------------
+
+quantileScaleNumber = quantileScaleNumber.range([1, 2, 3, 4]);
+rangeNumbers = quantileScaleNumber.range();
+
+quantileScaleString = quantileScaleString.range(['q25', 'q50', 'q75']);
+rangeStrings = quantileScaleString.range();
+
+// invertExtent(...) -----------------------------------------------------------------
+
+numExtent = quantileScaleNumber.invertExtent(2);
+
+numExtent = quantileScaleString.invertExtent('q50');
+
+// quantile() -----------------------------------------------------------------------
+
+const quantiles: number[] = quantileScaleNumber.quantiles();
+
+// (...) value mapping from domain to output -----------------------------------
+
+outputNumber = quantileScaleNumber(0.51);
+
+// copy(...) -----------------------------------------------------------------
+
+const copiedQuantileScale: d3Scale.ScaleQuantile<number> = quantileScaleNumber.copy();
+
+// -------------------------------------------------------------------------------
+// Threshold Scale Factory
+// -------------------------------------------------------------------------------
+
+// scaleThreshold() -----------------------------------------------------------------
+
+let thresholdScaleNumberNumber: d3Scale.ScaleThreshold<number, number>;
+let thresholdScaleNumberString: d3Scale.ScaleThreshold<number, string>;
+
+thresholdScaleNumberNumber = d3Scale.scaleThreshold();
+thresholdScaleNumberString = d3Scale.scaleThreshold<number, string>();
+
+// ScaleThreshold Interface ========================================================
+
+// domain(...) -----------------------------------------------------------------
+
+thresholdScaleNumberNumber = thresholdScaleNumberNumber.domain([0.5]);
+domainNumbers = thresholdScaleNumberNumber.domain();
+
+thresholdScaleNumberString = thresholdScaleNumberString.domain([0.2, 0.8]);
+
+// range(...) -----------------------------------------------------------------
+
+thresholdScaleNumberNumber = thresholdScaleNumberNumber.range([100, 200]);
+rangeNumbers = thresholdScaleNumberNumber.range();
+
+thresholdScaleNumberString = thresholdScaleNumberString.range(['steelblue', 'seagreen', 'brown']);
+rangeStrings = thresholdScaleNumberString.range();
+
+// invertExtent(...) -----------------------------------------------------------------
+
+numOrUndefinedExtent = thresholdScaleNumberNumber.invertExtent(100);
+
+numOrUndefinedExtent = thresholdScaleNumberString.invertExtent('seagreen');
+
+// (...) value mapping from domain to output -----------------------------------
+
+outputNumber = thresholdScaleNumberNumber(0.51);
+
+outputString = thresholdScaleNumberString(0.9);
+
+// copy(...) -----------------------------------------------------------------
+
+const copiedThresholdScale: d3Scale.ScaleThreshold<number, string> = thresholdScaleNumberString.copy();
+
+// -------------------------------------------------------------------------------
+// Ordinal Scale Factory
+// -------------------------------------------------------------------------------
+
+// scaleOrdinal() -----------------------------------------------------------------
+
+let ordinalScaleStringString: d3Scale.ScaleOrdinal<string, string>;
+let ordinalScaleStringNumber: d3Scale.ScaleOrdinal<string, number>;
+
+ordinalScaleStringString = d3Scale.scaleOrdinal<string>();
+ordinalScaleStringString = d3Scale.scaleOrdinal<string>(schemePuRd[3]);
+ordinalScaleStringNumber = d3Scale.scaleOrdinal<string, number>();
+ordinalScaleStringString = d3Scale.scaleOrdinal<string, string>(schemePuRd[3]);
+
+// ScaleOrdinal Interface ========================================================
+
+// domain(...) -----------------------------------------------------------------
+
+ordinalScaleStringString = ordinalScaleStringString.domain(['negative', 'neutral', 'positive']);
+domainStrings = ordinalScaleStringString.domain();
+
+ordinalScaleStringNumber = ordinalScaleStringNumber.domain(['negative', 'neutral', 'positive']);
+
+// range(...) -----------------------------------------------------------------
+
+ordinalScaleStringString = ordinalScaleStringString.range(['crimson', 'midnightblue', 'seagreen']);
+ordinalScaleStringString = ordinalScaleStringString.range(schemePuRd[3]);
+rangeStrings = ordinalScaleStringString.range();
+
+ordinalScaleStringNumber = ordinalScaleStringNumber.range([-1, 0, 1]);
+rangeNumbers = ordinalScaleStringNumber.range();
+
+// unknown(...) and d3Scale.scaleImplicit --------------------------------------
+
+const implicit: { name: 'implicit' } = d3Scale.scaleImplicit;
+
+ordinalScaleStringString = ordinalScaleStringString.unknown(d3Scale.scaleImplicit);
+
+ordinalScaleStringNumber = ordinalScaleStringNumber.unknown(0);
+
+const unknownValue: string | { name: 'implicit' } = ordinalScaleStringString.unknown();
+
+if (typeof unknownValue === 'string') {
+    console.log(unknownValue);
+} else {
+    console.log(unknownValue.name);
+}
+
+// (...) value mapping from domain to output -----------------------------------
+
+outputString = ordinalScaleStringString('neutral');
+
+outputNumber = ordinalScaleStringNumber('negative');
+
+// copy(...) -----------------------------------------------------------------
+
+const copiedOrdinalScale: d3Scale.ScaleOrdinal<string, number> = ordinalScaleStringNumber.copy();
+
+// -------------------------------------------------------------------------------
+// Band Scale Factory
+// -------------------------------------------------------------------------------
+
+// scaleBand() -----------------------------------------------------------------
+
+let bandScaleString: d3Scale.ScaleBand<string>;
+let bandScaleCoercible: d3Scale.ScaleBand<StringCoercible>;
+
+bandScaleString = d3Scale.scaleBand();
+bandScaleCoercible = d3Scale.scaleBand<StringCoercible>();
+
+// ScaleBand Interface ========================================================
+
+// domain(...) -----------------------------------------------------------------
+
+bandScaleString = bandScaleString.domain(['negative', 'neutral', 'positive']);
+domainStrings = bandScaleString.domain();
+
+bandScaleCoercible = bandScaleCoercible.domain([new StringCoercible('negative'), new StringCoercible('neutral'), new StringCoercible('positive')]);
+
+// range(...) -----------------------------------------------------------------
+
+bandScaleString = bandScaleString.range([0, 300]);
+let rangeExtent: [number, number] = bandScaleString.range();
+
+bandScaleCoercible = bandScaleCoercible.range([0, 300]);
+rangeExtent = bandScaleCoercible.range();
+
+// rangeRound(...) -----------------------------------------------------------------
+
+bandScaleString = bandScaleString.rangeRound([0, 300]);
+
+// round(...) -----------------------------------------------------------------
+
+bandScaleCoercible = bandScaleCoercible.round(true);
+let roundingFlag: boolean = bandScaleCoercible.round();
+
+// paddingInner(...) -----------------------------------------------------------------
+
+bandScaleString = bandScaleString.paddingInner(0.1);
+num = bandScaleString.paddingInner();
+
+// paddingOuter(...) -----------------------------------------------------------------
+
+bandScaleString = bandScaleString.paddingOuter(0.1);
+num = bandScaleString.paddingOuter();
+
+// padding(...) -----------------------------------------------------------------
+
+bandScaleString = bandScaleString.padding(0.1);
+num = bandScaleString.padding();
+
+// align(...) -----------------------------------------------------------------
+
+bandScaleString = bandScaleString.align(0.5);
+num = bandScaleString.align();
+
+// bandwidth(...) -----------------------------------------------------------------
+
+num = bandScaleString.bandwidth();
+
+// step(...) -----------------------------------------------------------------
+
+num = bandScaleString.step();
+
+// (...) value mapping from domain to output -----------------------------------
+
+outputNumberMaybe = bandScaleString('neutral');
+
+outputNumberMaybe = bandScaleCoercible(new StringCoercible('negative'));
+
+// copy(...) -----------------------------------------------------------------
+
+const copiedBandScale: d3Scale.ScaleBand<StringCoercible> = bandScaleCoercible.copy();
+
+// -------------------------------------------------------------------------------
+// Point Scale Factory
+// -------------------------------------------------------------------------------
+
+// scalePoint() -----------------------------------------------------------------
+
+let pointScaleString: d3Scale.ScalePoint<string>;
+let pointScaleCoercible: d3Scale.ScalePoint<StringCoercible>;
+
+pointScaleString = d3Scale.scalePoint();
+pointScaleCoercible = d3Scale.scalePoint<StringCoercible>();
+
+// ScalePoint Interface ========================================================
+
+// domain(...) -----------------------------------------------------------------
+
+pointScaleString = pointScaleString.domain(['negative', 'neutral', 'positive']);
+domainStrings = pointScaleString.domain();
+
+pointScaleCoercible = pointScaleCoercible.domain([new StringCoercible('negative'), new StringCoercible('neutral'), new StringCoercible('positive')]);
+
+// range(...) -----------------------------------------------------------------
+
+pointScaleString = pointScaleString.range([0, 300]);
+rangeExtent = pointScaleString.range();
+
+pointScaleCoercible = pointScaleCoercible.range([0, 300]);
+rangeExtent = pointScaleCoercible.range();
+
+// rangeRound(...) -----------------------------------------------------------------
+
+pointScaleString = pointScaleString.rangeRound([0, 300]);
+
+// round(...) -----------------------------------------------------------------
+
+pointScaleCoercible = pointScaleCoercible.round(true);
+roundingFlag = pointScaleCoercible.round();
+
+// padding(...) -----------------------------------------------------------------
+
+pointScaleString = pointScaleString.padding(0.1);
+num = pointScaleString.padding();
+
+// align(...) -----------------------------------------------------------------
+
+pointScaleString = pointScaleString.align(0.5);
+num = pointScaleString.align();
+
+// bandwidth(...) -----------------------------------------------------------------
+
+num = pointScaleString.bandwidth();
+
+// step(...) -----------------------------------------------------------------
+
+num = pointScaleString.step();
+
+// (...) value mapping from domain to output -----------------------------------
+
+outputNumberMaybe = pointScaleString('neutral');
+
+outputNumberMaybe = pointScaleCoercible(new StringCoercible('negative'));
+
+// copy(...) -----------------------------------------------------------------
+
+const copiedPointScale: d3Scale.ScalePoint<StringCoercible> = pointScaleCoercible.copy();
+
+// -------------------------------------------------------------------------------
+// Categorical Color Schemas for Ordinal Scales
+// -------------------------------------------------------------------------------
+
+let colorStrings: string[];
+
+colorStrings = d3Scale.schemeCategory10;
+
+colorStrings = d3Scale.schemeCategory20;
+
+colorStrings = d3Scale.schemeCategory20b;
+
+colorStrings = d3Scale.schemeCategory20c;
diff --git a/types/d3-scale/v1/index.d.ts b/types/d3-scale/v1/index.d.ts
new file mode 100644
index 0000000000..a9843d9547
--- /dev/null
+++ b/types/d3-scale/v1/index.d.ts
@@ -0,0 +1,1840 @@
+// Type definitions for D3JS d3-scale module 1.0
+// Project: https://github.com/d3/d3-scale/
+// 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.0.7
+
+import { CountableTimeInterval, TimeInterval } from 'd3-time';
+
+// -------------------------------------------------------------------------------
+// Shared Types and Interfaces
+// -------------------------------------------------------------------------------
+
+/**
+ * An Interpolator factory returns an interpolator function.
+ *
+ * The first generic correponds to the data type of the interpolation boundaries.
+ * The second generic corresponds to the data type of the return type of the interpolator.
+ */
+export interface InterpolatorFactory<T, U> {
+    /**
+     * Construct a new interpolator function, based on the provided interpolation boundaries.
+     *
+     * @param a Start boundary of the interpolation interval.
+     * @param b End boundary of the interpolation interval.
+     */
+    (a: T, b: T): ((t: number) => U);
+}
+
+/**
+ * A helper interface for a continuous scale defined over a numeric domain.
+ */
+export interface ScaleContinuousNumeric<Range, Output> {
+    /**
+     * Given a value from the domain, returns the corresponding value from the range, subject to interpolation, if any.
+     *
+     * If the given value is outside the domain, and clamping is not enabled, the mapping may be extrapolated such that the returned value is outside the range.
+     *
+     * Note: The interpolation function applied by the scale may change the output type from the range type as part of the interpolation.
+     *
+     * @param value A numeric value from the domain.
+     */
+    (value: number | { valueOf(): number }): Output;
+
+    /**
+     * Given a value from the range, returns the corresponding value from the domain. Inversion is useful for interaction,
+     * say to determine the data value corresponding to the position of the mouse.
+     *
+     * If the given value is outside the range, and clamping is not enabled, the mapping may be extrapolated such that the returned value is outside the domain.
+     *
+     * IMPORTANT: This method is only supported if the range is numeric. If the range is not numeric, returns NaN.
+     *
+     * For a valid value y in the range, continuous(continuous.invert(y)) approximately equals y;
+     * similarly, for a valid value x in the domain, continuous.invert(continuous(x)) approximately equals x.
+     * The scale and its inverse may not be exact due to the limitations of floating point precision.
+     *
+     * @param value A numeric value from the range.
+     */
+    invert(value: number | { valueOf(): number }): number;
+
+    /**
+     * Returns a copy of the scale’s current domain.
+     */
+    domain(): number[];
+    /**
+     * Sets the scale’s domain to the specified array of numbers. The array must contain two or more elements.
+     * If the elements in the given array are not numbers, they will be coerced to numbers
+     *
+     * Although continuous scales typically have two values each in their domain and range, specifying more than two values produces a piecewise scale.
+     *
+     * Internally, a piecewise scale performs a binary search for the range interpolator corresponding to the given domain value.
+     * Thus, the domain must be in ascending or descending order. If the domain and range have different lengths N and M, only the first min(N,M) elements in each are observed.
+     *
+     * @param domain Array of numeric domain values.
+     */
+    domain(domain: Array<number | { valueOf(): number }>): this;
+
+    /**
+     * Returns a copy of the scale’s current range.
+     */
+    range(): Range[];
+    /**
+     * Sets the scale’s range to the specified array of values.
+     *
+     * The array must contain two or more elements. Unlike the domain, elements in the given array need not be numbers;
+     * any value that is supported by the underlying interpolator will work, though note that numeric ranges are required for invert.
+     *
+     * @param range Array of range values.
+     */
+    range(range: ReadonlyArray<Range>): this;
+
+    /**
+     * Sets the scale’s range to the specified array of values while also setting the scale’s interpolator to interpolateRound.
+     *
+     * The rounding interpolator is sometimes useful for avoiding antialiasing artifacts,
+     * though also consider the shape-rendering “crispEdges” styles. Note that this interpolator can only be used with numeric ranges.
+     *
+     * The array must contain two or more elements. Unlike the domain, elements in the given array need not be numbers;
+     * any value that is supported by the underlying interpolator will work, though note that numeric ranges are required for invert.
+     *
+     * @param range Array of range values.
+     */
+    rangeRound(range: Array<number | { valueOf(): number }>): this;
+
+    /**
+     * Returns whether or not the scale currently clamps values to within the range.
+     */
+    clamp(): boolean;
+    /**
+     * Enables or disables clamping, respectively. If clamping is disabled and the scale is passed a value outside the domain,
+     * the scale may return a value outside the range through extrapolation.
+     *
+     * If clamping is enabled, the return value of the scale is always within the scale’s range. Clamping similarly applies to the "invert" method.
+     *
+     * @param clamp A flag to enable (true) or disable (false) clamping.
+     */
+    clamp(clamp: boolean): this;
+
+    /**
+     * Returns approximately count representative values from the scale’s domain.
+     *
+     * If count is not specified, it defaults to 10.
+     *
+     * The returned tick values are uniformly spaced, have human-readable values (such as multiples of powers of 10),
+     * and are guaranteed to be within the extent of the domain. Ticks are often used to display reference lines, or tick marks, in conjunction with the visualized data.
+     * The specified count is only a hint; the scale may return more or fewer values depending on the domain. See also d3-array’s ticks.
+     *
+     * @param count Optional approximate number of ticks to be returned. If count is not specified, it defaults to 10.
+     */
+    ticks(count?: number): number[];
+
+    /**
+     * Returns a number format function suitable for displaying a tick value, automatically computing the appropriate precision based on the fixed interval between tick values.
+     * The specified count should have the same value as the count that is used to generate the tick values.
+     *
+     * @param count Approximate number of ticks to be used when calculating precision for the number format function.
+     * @param specifier An optional valid format specifier string which allows a custom format where the precision of the format is automatically set by the scale as appropriate for the tick interval.
+     * If specifier uses the format type "s", the scale will return a SI-prefix format based on the largest value in the domain.
+     * If the specifier already specifies a precision, this method is equivalent to locale.format.
+     */
+    tickFormat(count?: number, specifier?: string): ((d: number | { valueOf(): number }) => string);
+
+    /**
+     * Extends the domain so that it starts and ends on nice round values.
+     * This method typically modifies the scale’s domain, and may only extend the bounds to the nearest round value.
+     * An optional tick count argument allows greater control over the step size used to extend the bounds,
+     * guaranteeing that the returned ticks will exactly cover the domain.
+     * Nicing is useful if the domain is computed from data, say using extent, and may be irregular.
+     * For example, for a domain of [0.201479…, 0.996679…], a nice domain might be [0.2, 1.0].
+     * If the domain has more than two values, nicing the domain only affects the first and last value.
+     *
+     * Nicing a scale only modifies the current domain; it does not automatically nice domains that are subsequently set using continuous.domain.
+     * You must re-nice the scale after setting the new domain, if desired.
+     *
+     * @param count An optional number of ticks expected to be used.
+     */
+    nice(count?: number): this;
+
+    /**
+     * Returns an exact copy of this scale. Changes to this scale will not affect the returned scale, and vice versa.
+     */
+    copy(): this;
+}
+
+// -------------------------------------------------------------------------------
+// Linear Scale Factory
+// -------------------------------------------------------------------------------
+
+/**
+ * A linear continuous scale defined over a numeric domain.
+ *
+ * Continuous scales map a continuous, quantitative input domain to a continuous output range.
+ * Each range value y can be expressed as a function of the domain value x: y = mx + b.
+ *
+ * If the range is also numeric, the mapping may be inverted.
+ *
+ * Note that the data types of the range and output of the scale must be compatible with the interpolator applied by the scale.
+ *
+ * The first generic corresponds to the data type of the range elements.
+ *
+ * The second generic corresponds to the data type of the output elements generated by the scale.
+ *
+ * If range element and output element type differ, the interpolator factory used with the scale must match this behaviour and
+ * convert the interpolated range element to a corresponding output element.
+ */
+export interface ScaleLinear<Range, Output> extends ScaleContinuousNumeric<Range, Output> {
+    /**
+     * Returns the scale’s current interpolator factory, which defaults to interpolate.
+     */
+    interpolate(): InterpolatorFactory<any, any>;
+
+    /**
+     * Sets the scale’s range interpolator factory. This interpolator factory is used to create interpolators for each adjacent pair of values from the range;
+     * these interpolators then map a normalized domain parameter t in [0, 1] to the corresponding value in the range.
+     *
+     * Note: the default interpolator may reuse return values. For example, if the range values are objects, then the value interpolator always returns the same object, modifying it in-place.
+     * If the scale is used to set an attribute or style, this is typically acceptable (and desirable for performance);
+     * however, if you need to store the scale’s return value, you must specify your own interpolator or make a copy as appropriate.
+     *
+     * As part of the interpolation process the interpotaled value from the range may be converted to a corresponding output value.
+     *
+     * @param interpolate An interpolation factory. The generics for Range and Output of the scale must correpond to the interpolation factory applied to the scale.
+     */
+    interpolate(interpolate: InterpolatorFactory<Range, Output>): this;
+    /**
+     * Sets the scale’s range interpolator factory. This interpolator factory is used to create interpolators for each adjacent pair of values from the range;
+     * these interpolators then map a normalized domain parameter t in [0, 1] to the corresponding value in the range.
+     *
+     * Note: the default interpolator may reuse return values. For example, if the range values are objects, then the value interpolator always returns the same object, modifying it in-place.
+     * If the scale is used to set an attribute or style, this is typically acceptable (and desirable for performance);
+     * however, if you need to store the scale’s return value, you must specify your own interpolator or make a copy as appropriate.
+     *
+     * As part of the interpolation process the interpotaled value from the range may be converted to a corresponding output value.
+     *
+     * The generic "NewOutput" can be used to change the scale to have a different output element type corresponding to the new interpolation factory.
+     *
+     * @param interpolate An interpolation factory. The generics for Range and Output of the scale must correpond to the interpolation factory applied to the scale.
+     */
+    interpolate<NewOutput>(interpolate: InterpolatorFactory<Range, NewOutput>): ScaleLinear<Range, NewOutput>;
+}
+
+/**
+ * Constructs a new continuous linear scale with the unit domain [0, 1], the unit range [0, 1], the default interpolator and clamping disabled.
+ *
+ * The scale will have range and output of data type number.
+ */
+export function scaleLinear(): ScaleLinear<number, number>;
+/**
+ * Constructs a new continuous linear scale with the unit domain [0, 1], the default interpolator and clamping disabled.
+ *
+ * The generic correponds to the data type of the range and output elements to be used.
+ *
+ * As range type and output type are the same, the interpolator factory used with the scale must match this behaviour.
+ * The range must be set in accordance with the range element type.
+ *
+ * The interpolator factory may be set using the interpolate(...) method of the scale.
+ */
+export function scaleLinear<Output>(): ScaleLinear<Output, Output>;
+/**
+ * Constructs a new continuous linear scale with the unit domain [0, 1], the default interpolator and clamping disabled.
+ *
+ * The first generic corresponds to the data type of the range elements.
+ * The second generic corresponds to the data type of the output elements generated by the scale.
+ *
+ * If range element and output element type differ, the interpolator factory used with the scale must match this behaviour and
+ * convert the interpolated range element to a corresponding output element.
+ *
+ * The range must be set in accordance with the range element type.
+ *
+ * The interpolator factory may be set using the interpolate(...) method of the scale.
+ */
+export function scaleLinear<Range, Output>(): ScaleLinear<Range, Output>;
+
+// -------------------------------------------------------------------------------
+// Power Scale Factories
+// -------------------------------------------------------------------------------
+
+/**
+ * A continuous power scale defined over a numeric domain.
+ *
+ * Continuous scales map a continuous, quantitative input domain to a continuous output range.
+ *
+ * Each range value y can be expressed as a function of the domain value x: y = mx^k + b, where k is the exponent value.
+ * Power scales also support negative domain values, in which case the input value and the resulting output value are multiplied by -1.
+ *
+ * If the range is also numeric, the mapping may be inverted.
+ *
+ * Note that the data types of the range and output of the scale must be compatible with the interpolator applied by the scale.
+ *
+ * The first generic corresponds to the data type of the range elements.
+ *
+ * The second generic corresponds to the data type of the output elements generated by the scale.
+ *
+ * If range element and output element type differ, the interpolator factory used with the scale must match this behaviour and
+ * convert the interpolated range element to a corresponding output element.
+ */
+export interface ScalePower<Range, Output> extends ScaleContinuousNumeric<Range, Output> {
+    /**
+     * Returns the scale’s current interpolator factory, which defaults to interpolate.
+     */
+    interpolate(): InterpolatorFactory<any, any>;
+
+    /**
+     * Sets the scale’s range interpolator factory. This interpolator factory is used to create interpolators for each adjacent pair of values from the range;
+     * these interpolators then map a normalized domain parameter t in [0, 1] to the corresponding value in the range.
+     *
+     * Note: the default interpolator may reuse return values. For example, if the range values are objects, then the value interpolator always returns the same object, modifying it in-place.
+     * If the scale is used to set an attribute or style, this is typically acceptable (and desirable for performance);
+     * however, if you need to store the scale’s return value, you must specify your own interpolator or make a copy as appropriate.
+     *
+     * As part of the interpolation process the interpotaled value from the range may be converted to a corresponding output value.
+     *
+     * @param interpolate An interpolation factory. The generics for Range and Output of the scale must correpond to the interpolation factory applied to the scale.
+     */
+    interpolate(interpolate: InterpolatorFactory<Range, Output>): this;
+    /**
+     * Sets the scale’s range interpolator factory. This interpolator factory is used to create interpolators for each adjacent pair of values from the range;
+     * these interpolators then map a normalized domain parameter t in [0, 1] to the corresponding value in the range.
+     *
+     * Note: the default interpolator may reuse return values. For example, if the range values are objects, then the value interpolator always returns the same object, modifying it in-place.
+     * If the scale is used to set an attribute or style, this is typically acceptable (and desirable for performance);
+     * however, if you need to store the scale’s return value, you must specify your own interpolator or make a copy as appropriate.
+     *
+     * As part of the interpolation process the interpotaled value from the range may be converted to a corresponding output value.
+     *
+     * The generic "NewOutput" can be used to change the scale to have a different output element type corresponding to the new interpolation factory.
+     *
+     * @param interpolate An interpolation factory. The generics for Range and Output of the scale must correpond to the interpolation factory applied to the scale.
+     */
+    interpolate<NewOutput>(interpolate: InterpolatorFactory<Range, NewOutput>): ScalePower<Range, NewOutput>;
+
+    /**
+     * If exponent is not specified, returns the current exponent, which defaults to 1.
+     * (Note that this is effectively a linear scale until you set a different exponent.)
+     */
+    exponent(): number;
+    /**
+     * Sets the current exponent to the given numeric value.
+     * (Note that this is effectively a linear scale until you set a different exponent.)
+     */
+    exponent(exponent: number): this;
+}
+
+/**
+ * Constructs a new continuous power scale with the unit domain [0, 1], the unit range [0, 1], the exponent 1, the default interpolator and clamping disabled.
+ * (Note that this is effectively a linear scale until you set a different exponent.)
+ *
+ * The scale will have range and output of data type number.
+ */
+export function scalePow(): ScalePower<number, number>;
+/**
+ * Constructs a new continuous power scale with the unit domain [0, 1], the exponent 1, the default interpolator and clamping disabled.
+ * (Note that this is effectively a linear scale until you set a different exponent.)
+ *
+ * The generic correponds to the data type of the range and output elements to be used.
+ *
+ * As range type and output type are the same, the interpolator factory used with the scale must match this behaviour.
+ *
+ * The range must be set in accordance with the range element type.
+ *
+ * The interpolator factory may be set using the interpolate(...) method of the scale.
+ */
+export function scalePow<Output>(): ScalePower<Output, Output>;
+/**
+ * Constructs a new continuous power scale with the unit domain [0, 1], the exponent 1, the default interpolator and clamping disabled.
+ * (Note that this is effectively a linear scale until you set a different exponent.)
+ *
+ * The first generic corresponds to the data type of the range elements.
+ * The second generic corresponds to the data type of the output elements generated by the scale.
+ *
+ * If range element and output element type differ, the interpolator factory used with the scale must match this behaviour and
+ * convert the interpolated range element to a corresponding output element.
+ *
+ * The range must be set in accordance with the range element type.
+ *
+ * The interpolator factory may be set using the interpolate(...) method of the scale.
+ */
+export function scalePow<Range, Output>(): ScalePower<Range, Output>;
+
+/**
+ * Constructs a new continuous power scale with the unit domain [0, 1], the unit range [0, 1], the exponent 0.5, the default interpolator and clamping disabled.
+ * This is a convenience method equivalent to d3.scalePow().exponent(0.5).
+ *
+ * The scale will have range and output of data type number.
+ */
+export function scaleSqrt(): ScalePower<number, number>;
+/**
+ * Constructs a new continuous power scale with the unit domain [0, 1], the exponent 0.5, the default interpolator and clamping disabled.
+ * This is a convenience method equivalent to d3.scalePow().exponent(0.5).
+ *
+ * The generic correponds to the data type of the range and output elements to be used.
+ *
+ * As range type and output type are the same, the interpolator factory used with the scale must match this behaviour.
+ *
+ * The range must be set in accordance with the range element type.
+ *
+ * The interpolator factory may be set using the interpolate(...) method of the scale.
+ */
+export function scaleSqrt<Output>(): ScalePower<Output, Output>;
+/**
+ * Constructs a new continuous power scale with the unit domain [0, 1], the exponent 0.5, the default interpolator and clamping disabled.
+ * This is a convenience method equivalent to d3.scalePow().exponent(0.5).
+ *
+ * The first generic corresponds to the data type of the range elements.
+ * The second generic corresponds to the data type of the output elements generated by the scale.
+ *
+ * If range element and output element type differ, the interpolator factory used with the scale must match this behaviour and
+ * convert the interpolated range element to a corresponding output element.
+ *
+ * The range must be set in accordance with the range element type.
+ *
+ * The interpolator factory may be set using the interpolate(...) method of the scale.
+ */
+export function scaleSqrt<Range, Output>(): ScalePower<Range, Output>;
+
+// -------------------------------------------------------------------------------
+// Logarithmic Scale Factory
+// -------------------------------------------------------------------------------
+
+/**
+ * A continuous logarithmic scale defined over a numeric domain.
+ *
+ * Continuous scales map a continuous, quantitative input domain to a continuous output range.
+ *
+ * The mapping to the range value y can be expressed as a function of the domain value x: y = m log(x) + b.
+ *
+ * As log(0) = -∞, a log scale domain must be strictly-positive or strictly-negative; the domain must not include or cross zero.
+ * A log scale with a positive domain has a well-defined behavior for positive values, and a log scale with a negative domain has a well-defined behavior for negative values.
+ * (For a negative domain, input and output values are implicitly multiplied by -1.)
+ * The behavior of the scale is undefined if you pass a negative value to a log scale with a positive domain or vice versa.
+ *
+ * If the range is also numeric, the mapping may be inverted.
+ *
+ * Note that the data types of the range and output of the scale must be compatible with the interpolator applied by the scale.
+ *
+ * The first generic corresponds to the data type of the range elements.
+ *
+ * The second generic corresponds to the data type of the output elements generated by the scale.
+ *
+ * If range element and output element type differ, the interpolator factory used with the scale must match this behaviour and
+ * convert the interpolated range element to a corresponding output element.
+ */
+export interface ScaleLogarithmic<Range, Output> extends ScaleContinuousNumeric<Range, Output> {
+    /**
+     * Returns a copy of the scale’s current domain.
+     */
+    domain(): number[];
+    /**
+     * Sets the scale’s domain to the specified array of numbers. The array must contain two or more elements.
+     * If the elements in the given array are not numbers, they will be coerced to numbers
+     *
+     * As log(0) = -∞, a log scale domain must be strictly-positive or strictly-negative; the domain must not include or cross zero.
+     * A log scale with a positive domain has a well-defined behavior for positive values, and a log scale with a negative domain has a well-defined behavior for negative values.
+     * (For a negative domain, input and output values are implicitly multiplied by -1.)
+     * The behavior of the scale is undefined if you pass a negative value to a log scale with a positive domain or vice versa.
+     *
+     * Although continuous scales typically have two values each in their domain and range, specifying more than two values produces a piecewise scale.
+     *
+     * Internally, a piecewise scale performs a binary search for the range interpolator corresponding to the given domain value.
+     * Thus, the domain must be in ascending or descending order. If the domain and range have different lengths N and M, only the first min(N,M) elements in each are observed.
+     *
+     * @param domain Array of numeric domain values.
+     */
+    domain(domain: Array<number | { valueOf(): number }>): this;
+
+    /**
+     * Returns the scale’s current interpolator factory, which defaults to interpolate.
+     */
+    interpolate(): InterpolatorFactory<any, any>;
+
+    /**
+     * Sets the scale’s range interpolator factory. This interpolator factory is used to create interpolators for each adjacent pair of values from the range;
+     * these interpolators then map a normalized domain parameter t in [0, 1] to the corresponding value in the range.
+     *
+     * Note: the default interpolator may reuse return values. For example, if the range values are objects, then the value interpolator always returns the same object, modifying it in-place.
+     * If the scale is used to set an attribute or style, this is typically acceptable (and desirable for performance);
+     * however, if you need to store the scale’s return value, you must specify your own interpolator or make a copy as appropriate.
+     *
+     * As part of the interpolation process the interpotaled value from the range may be converted to a corresponding output value.
+     *
+     * @param interpolate An interpolation factory. The generics for Range and Output of the scale must correpond to the interpolation factory applied to the scale.
+     */
+    interpolate(interpolate: InterpolatorFactory<Range, Output>): this;
+    /**
+     * Sets the scale’s range interpolator factory. This interpolator factory is used to create interpolators for each adjacent pair of values from the range;
+     * these interpolators then map a normalized domain parameter t in [0, 1] to the corresponding value in the range.
+     *
+     * Note: the default interpolator may reuse return values. For example, if the range values are objects, then the value interpolator always returns the same object, modifying it in-place.
+     * If the scale is used to set an attribute or style, this is typically acceptable (and desirable for performance);
+     * however, if you need to store the scale’s return value, you must specify your own interpolator or make a copy as appropriate.
+     *
+     * As part of the interpolation process the interpotaled value from the range may be converted to a corresponding output value.
+     *
+     * The generic "NewOutput" can be used to change the scale to have a different output element type corresponding to the new interpolation factory.
+     *
+     * @param interpolate An interpolation factory. The generics for Range and Output of the scale must correpond to the interpolation factory applied to the scale.
+     */
+    interpolate<NewOutput>(interpolate: InterpolatorFactory<Range, NewOutput>): ScaleLogarithmic<Range, NewOutput>;
+
+    /**
+     * Returns approximately count representative values from the scale’s domain.
+     *
+     * If count is not specified, it defaults to 10.
+     *
+     * If the base is an integer, the returned ticks are uniformly spaced within each integer power of base; otherwise, one tick per power of base is returned.
+     * The returned ticks are guaranteed to be within the extent of the domain. If the orders of magnitude in the domain is greater than count, then at most one tick per power is returned.
+     * Otherwise, the tick values are unfiltered, but note that you can use log.tickFormat to filter the display of tick labels.
+     *
+     * @param count Optional approximate number of ticks to be returned. If count is not specified, it defaults to 10.
+     */
+    ticks(count?: number): number[];
+
+    /**
+     * Returns a number format function suitable for displaying a tick value, automatically computing the appropriate precision based on the fixed interval between tick values.
+     *
+     * The specified count typically has the same value as the count that is used to generate the tick values.
+     * If there are too many ticks, the formatter may return the empty string for some of the tick labels;
+     * however, note that the ticks are still shown.
+     * To disable filtering, specify a count of Infinity. When specifying a count, you may also provide a format specifier or format function.
+     * For example, to get a tick formatter that will display 20 ticks of a currency, say log.tickFormat(20, "$,f").
+     * If the specifier does not have a defined precision, the precision will be set automatically by the scale, returning the appropriate format.
+     * This provides a convenient way of specifying a format whose precision will be automatically set by the scale.
+     *
+     * @param count Approximate number of ticks to be used when calculating precision for the number format function.
+     * @param specifier An optional valid format specifier string which allows a custom format where the precision of the format is automatically set by the scale as appropriate for the tick interval.
+     * For example, to get a tick formatter that will display 20 ticks of a currency, say log.tickFormat(20, "$,f").
+     * If the specifier does not have a defined precision, the precision will be set automatically by the scale, returning the appropriate format.
+     * This provides a convenient way of specifying a format whose precision will be automatically set by the scale.
+     */
+    tickFormat(count?: number, specifier?: string): ((d: number | { valueOf(): number }) => string);
+
+    /**
+     * Extends the domain to integer powers of base. For example, for a domain of [0.201479…, 0.996679…], and base 10, the nice domain is [0.1, 1].
+     * If the domain has more than two values, nicing the domain only affects the first and last value.
+     *
+     * Nicing a scale only modifies the current domain; it does not automatically nice domains that are subsequently set using continuous.domain.
+     * You must re-nice the scale after setting the new domain, if desired.
+     */
+    nice(): this;
+
+    /**
+     * Returns the current base, which defaults to 10.
+     */
+    base(): number;
+    /**
+     * Sets the base for this logarithmic scale to the specified value.
+     */
+    base(base: number): this;
+}
+
+/**
+ * Constructs a new continuous logarithmic scale with the domain [1, 10], the unit range [0, 1], the base 10, the default interpolator and clamping disabled.
+ *
+ * The scale will have range and output of data type number.
+ */
+export function scaleLog(): ScaleLogarithmic<number, number>;
+/**
+ * Constructs a new continuous logarithmic scale with the domain [1, 10], the base 10, the default interpolator and clamping disabled.
+ *
+ * The generic correponds to the data type of the range and output elements to be used.
+ *
+ * As range type and output type are the same, the interpolator factory used with the scale must match this behaviour.
+ *
+ * The range must be set in accordance with the range element type.
+ *
+ * The interpolator factory may be set using the interpolate(...) method of the scale.
+ */
+export function scaleLog<Output>(): ScaleLogarithmic<Output, Output>;
+/**
+ * Constructs a new continuous logarithmic scale with the domain [1, 10], the base 10, the default interpolator and clamping disabled.
+ *
+ * The first generic corresponds to the data type of the range elements.
+ * The second generic corresponds to the data type of the output elements generated by the scale.
+ *
+ * If range element and output element type differ, the interpolator factory used with the scale must match this behaviour and
+ * convert the interpolated range element to a corresponding output element.
+ *
+ * The range must be set in accordance with the range element type.
+ *
+ * The interpolator factory may be set using the interpolate(...) method of the scale.
+ */
+export function scaleLog<Range, Output>(): ScaleLogarithmic<Range, Output>;
+
+// -------------------------------------------------------------------------------
+// Identity Scale Factory
+// -------------------------------------------------------------------------------
+
+/**
+ * Identity scales are a special case of linear scales where the domain and range are identical; the scale and its invert method are thus the identity function.
+ * These scales are occasionally useful when working with pixel coordinates, say in conjunction with an axis or brush.
+ */
+export interface ScaleIdentity {
+    /**
+     * Given a value from the domain, returns the corresponding value from the range, subject to interpolation, if any.
+     *
+     * If the given value is outside the domain, and clamping is not enabled, the mapping may be extrapolated such that the returned value is outside the range.
+     *
+     * Note: The interpolation function applied by the scale may change the output type from the range type as part of the interpolation.
+     *
+     * @param value A numeric value from the domain.
+     */
+    (value: number | { valueOf(): number }): number;
+
+    /**
+     * Given a value from the range, returns the corresponding value from the domain. Inversion is useful for interaction,
+     * say to determine the data value corresponding to the position of the mouse.
+     *
+     * If the given value is outside the range, and clamping is not enabled, the mapping may be extrapolated such that the returned value is outside the domain.
+     *
+     * IMPORTANT: This method is only supported if the range is numeric. If the range is not numeric, returns NaN.
+     *
+     * For a valid value y in the range, continuous(continuous.invert(y)) approximately equals y;
+     * similarly, for a valid value x in the domain, continuous.invert(continuous(x)) approximately equals x.
+     * The scale and its inverse may not be exact due to the limitations of floating point precision.
+     *
+     * @param value A numeric value from the range.
+     */
+    invert(value: number | { valueOf(): number }): number;
+
+    /**
+     * Returns a copy of the scale’s current domain.
+     */
+    domain(): number[];
+    /**
+     * Sets the scale’s domain to the specified array of numbers. The array must contain two or more elements.
+     * If the elements in the given array are not numbers, they will be coerced to numbers
+     *
+     * Although continuous scales typically have two values each in their domain and range, specifying more than two values produces a piecewise scale.
+     *
+     * Internally, a piecewise scale performs a binary search for the range interpolator corresponding to the given domain value.
+     * Thus, the domain must be in ascending or descending order. If the domain and range have different lengths N and M, only the first min(N,M) elements in each are observed.
+     *
+     * @param domain Array of numeric domain values.
+     */
+    domain(domain: Array<number | { valueOf(): number }>): this;
+
+    /**
+     * Returns a copy of the scale’s current range.
+     */
+    range(): number[];
+    /**
+     * Sets the scale’s range to the specified array of values.
+     *
+     * The array must contain two or more elements. Unlike the domain, elements in the given array need not be numbers;
+     * any value that is supported by the underlying interpolator will work, though note that numeric ranges are required for invert.
+     *
+     * @param range Array of range values.
+     */
+    range(range: Array<number | { valueOf(): number }>): this;
+
+    /**
+     * Returns approximately count representative values from the scale’s domain.
+     *
+     * If count is not specified, it defaults to 10.
+     *
+     * The returned tick values are uniformly spaced, have human-readable values (such as multiples of powers of 10),
+     * and are guaranteed to be within the extent of the domain. Ticks are often used to display reference lines, or tick marks, in conjunction with the visualized data.
+     * The specified count is only a hint; the scale may return more or fewer values depending on the domain. See also d3-array’s ticks.
+     *
+     * @param count Optional approximate number of ticks to be returned. If count is not specified, it defaults to 10.
+     */
+    ticks(count?: number): number[];
+
+    /**
+     * Returns a number format function suitable for displaying a tick value, automatically computing the appropriate precision based on the fixed interval between tick values.
+     * The specified count should have the same value as the count that is used to generate the tick values.
+     *
+     * @param count Approximate number of ticks to be used when calculating precision for the number format function.
+     * @param specifier An optional valid format specifier string which allows a custom format where the precision of the format is automatically set by the scale as appropriate for the tick interval.
+     * If specifier uses the format type "s", the scale will return a SI-prefix format based on the largest value in the domain.
+     * If the specifier already specifies a precision, this method is equivalent to locale.format.
+     */
+    tickFormat(count?: number, specifier?: string): ((d: number | { valueOf(): number }) => string);
+
+    /**
+     * Extends the domain so that it starts and ends on nice round values.
+     * This method typically modifies the scale’s domain, and may only extend the bounds to the nearest round value.
+     * An optional tick count argument allows greater control over the step size used to extend the bounds,
+     * guaranteeing that the returned ticks will exactly cover the domain.
+     * Nicing is useful if the domain is computed from data, say using extent, and may be irregular.
+     * For example, for a domain of [0.201479…, 0.996679…], a nice domain might be [0.2, 1.0].
+     * If the domain has more than two values, nicing the domain only affects the first and last value.
+     *
+     * Nicing a scale only modifies the current domain; it does not automatically nice domains that are subsequently set using continuous.domain.
+     * You must re-nice the scale after setting the new domain, if desired.
+     *
+     * @param count An optional number of ticks expected to be used.
+     */
+    nice(count?: number): this;
+
+    /**
+     * Returns an exact copy of this scale. Changes to this scale will not affect the returned scale, and vice versa.
+     */
+    copy(): ScaleIdentity;
+}
+
+/**
+ * Constructs a new identity scale with the unit domain [0, 1] and the unit range [0, 1].
+ */
+export function scaleIdentity(): ScaleIdentity;
+
+// -------------------------------------------------------------------------------
+// Time Scale Factories
+// -------------------------------------------------------------------------------
+
+/**
+ * A linear scale defined over a temporal domain.
+ *
+ * Time scales implement ticks based on calendar intervals, taking the pain out of generating axes for temporal domains.
+ *
+ * If the range is numeric, the mapping may be inverted to return a date.
+ *
+ * Note that the data types of the range and output of the scale must be compatible with the interpolator applied by the scale.
+ *
+ * The first generic corresponds to the data type of the range elements.
+ *
+ * The second generic corresponds to the data type of the output elements generated by the scale.
+ *
+ * If range element and output element type differ, the interpolator factory used with the scale must match this behaviour and
+ * convert the interpolated range element to a corresponding output element.
+ */
+export interface ScaleTime<Range, Output> {
+    /**
+     * Given a value from the domain, returns the corresponding value from the range, subject to interpolation, if any.
+     *
+     * If the given value is outside the domain, and clamping is not enabled, the mapping may be extrapolated such that the returned value is outside the range.
+     *
+     * Note: The interpolation function applied by the scale may change the output type from the range type as part of the interpolation.
+     *
+     * @param value A temporal value from the domain. If the value is not a Date, it will be coerced to Date.
+     */
+    (value: Date | number | { valueOf(): number }): Output;
+
+    /**
+     * Given a value from the range, returns the corresponding value from the domain. Inversion is useful for interaction,
+     * say to determine the data value corresponding to the position of the mouse.
+     *
+     * If the given value is outside the range, and clamping is not enabled, the mapping may be extrapolated such that the returned value is outside the domain.
+     *
+     * IMPORTANT: This method is only supported if the range is numeric. If the range is not numeric, returns Invalid Date.
+     *
+     * For a valid value y in the range, time(time.invert(y)) equals y; similarly, for a valid value x in the domain, time.invert(time(x)) equals x.
+     * The invert method is useful for interaction, say to determine the value in the domain that corresponds to the pixel location under the mouse.
+     *
+     * @param value A numeric value from the range.
+     */
+    invert(value: number | { valueOf(): number }): Date;
+
+    /**
+     * Returns a copy of the scale’s current domain.
+     */
+    domain(): Date[];
+
+    /**
+     * Sets the scale’s domain to the specified array of temporal domain values. The array must contain two or more elements.
+     * If the elements in the given array are not dates, they will be coerced to dates.
+     *
+     * Although continuous scales typically have two values each in their domain and range, specifying more than two values produces a piecewise scale.
+     *
+     * Internally, a piecewise scale performs a binary search for the range interpolator corresponding to the given domain value.
+     * Thus, the domain must be in ascending or descending order. If the domain and range have different lengths N and M, only the first min(N,M) elements in each are observed.
+     *
+     * @param domain Array of temporal domain values. Numeric values will be coerced to dates.
+     */
+    domain(domain: Array<Date | number | { valueOf(): number }>): this;
+
+    /**
+     * Returns a copy of the scale’s current range.
+     */
+    range(): Range[];
+    /**
+     * Sets the scale’s range to the specified array of values.
+     *
+     * The array must contain two or more elements. Unlike the domain, elements in the given array need not be temporal domain values;
+     * any value that is supported by the underlying interpolator will work, though note that numeric ranges are required for invert.
+     *
+     * @param range Array of range values.
+     */
+    range(range: ReadonlyArray<Range>): this;
+
+    /**
+     * Sets the scale’s range to the specified array of values while also setting the scale’s interpolator to interpolateRound.
+     *
+     * The rounding interpolator is sometimes useful for avoiding antialiasing artifacts,
+     * though also consider the shape-rendering “crispEdges” styles. Note that this interpolator can only be used with numeric ranges.
+     *
+     * The array must contain two or more elements. Unlike the domain, elements in the given array need not be temporal domain values;
+     * any value that is supported by the underlying interpolator will work, though note that numeric ranges are required for invert.
+     *
+     * @param range Array of range values.
+     */
+    rangeRound(range: Array<number | { valueOf(): number }>): this;
+
+    /**
+     * Returns whether or not the scale currently clamps values to within the range.
+     */
+    clamp(): boolean;
+    /**
+     * Enables or disables clamping, respectively. If clamping is disabled and the scale is passed a value outside the domain,
+     * the scale may return a value outside the range through extrapolation.
+     *
+     * If clamping is enabled, the return value of the scale is always within the scale’s range. Clamping similarly applies to the "invert" method.
+     *
+     * @param clamp A flag to enable (true) or disable (false) clamping.
+     */
+    clamp(clamp: boolean): this;
+
+    /**
+     * Returns the scale’s current interpolator factory, which defaults to interpolate.
+     */
+    interpolate(): InterpolatorFactory<any, any>;
+
+    /**
+     * Sets the scale’s range interpolator factory. This interpolator factory is used to create interpolators for each adjacent pair of values from the range;
+     * these interpolators then map a normalized domain parameter t in [0, 1] to the corresponding value in the range.
+     *
+     * Note: the default interpolator may reuse return values. For example, if the range values are objects, then the value interpolator always returns the same object, modifying it in-place.
+     * If the scale is used to set an attribute or style, this is typically acceptable (and desirable for performance);
+     * however, if you need to store the scale’s return value, you must specify your own interpolator or make a copy as appropriate.
+     *
+     * As part of the interpolation process the interpotaled value from the range may be converted to a corresponding output value.
+     *
+     * @param interpolate An interpolation factory. The generics for Range and Output of the scale must correpond to the interpolation factory applied to the scale.
+     */
+    interpolate(interpolate: InterpolatorFactory<Range, Output>): this;
+    /**
+     * Sets the scale’s range interpolator factory. This interpolator factory is used to create interpolators for each adjacent pair of values from the range;
+     * these interpolators then map a normalized domain parameter t in [0, 1] to the corresponding value in the range.
+     *
+     * Note: the default interpolator may reuse return values. For example, if the range values are objects, then the value interpolator always returns the same object, modifying it in-place.
+     * If the scale is used to set an attribute or style, this is typically acceptable (and desirable for performance);
+     * however, if you need to store the scale’s return value, you must specify your own interpolator or make a copy as appropriate.
+     *
+     * As part of the interpolation process the interpotaled value from the range may be converted to a corresponding output value.
+     *
+     * The generic "NewOutput" can be used to change the scale to have a different output element type corresponding to the new interpolation factory.
+     *
+     * @param interpolate An interpolation factory. The generics for Range and Output of the scale must correpond to the interpolation factory applied to the scale.
+     */
+    interpolate<NewOutput>(interpolate: InterpolatorFactory<Range, NewOutput>): ScaleTime<Range, NewOutput>;
+
+    /**
+     * Returns representative dates from the scale’s domain. The returned tick values are uniformly-spaced (mostly),
+     * have sensible values (such as every day at midnight), and are guaranteed to be within the extent of the domain.
+     * Ticks are often used to display reference lines, or tick marks, in conjunction with the visualized data.
+     *
+     * Without specifying a count or time interval to control the number of ticks returned, a default count of 10 is used.
+     * The specified count is only a hint; the scale may return more or fewer values depending on the domain.
+     */
+    ticks(): Date[];
+    /**
+     * Returns representative dates from the scale’s domain. The returned tick values are uniformly-spaced (mostly),
+     * have sensible values (such as every day at midnight), and are guaranteed to be within the extent of the domain.
+     * Ticks are often used to display reference lines, or tick marks, in conjunction with the visualized data.
+     *
+     * The specified count controls the number of ticks to be returned. The specified count is only a hint;
+     * the scale may return more or fewer values depending on the domain.
+     *
+     * @param count Expected number of ticks.
+     */
+    ticks(count: number): Date[];
+    /**
+     * Returns representative dates from the scale’s domain. The returned tick values are uniformly-spaced (mostly),
+     * have sensible values (such as every day at midnight), and are guaranteed to be within the extent of the domain.
+     * Ticks are often used to display reference lines, or tick marks, in conjunction with the visualized data.
+     *
+     * The specified time interval controls the ticks generated and returned. To prune the generated ticks for a given time interval,
+     * use interval.every(...) or interval.filter(...).
+     *
+     * @param interval A time interval to specify the expected ticks.
+     */
+    ticks(interval: TimeInterval): Date[];
+
+    /**
+     * Returns a time format function suitable for displaying tick values.
+     *
+     * The default multi-scale time format chooses a human-readable representation based on the specified date as follows:
+     *
+     *  - %Y - for year boundaries, such as 2011.
+     *  - %B - for month boundaries, such as February.
+     *  - %b %d - for week boundaries, such as Feb 06.
+     *  - %a %d - for day boundaries, such as Mon 07.
+     *  - %I %p - for hour boundaries, such as 01 AM.
+     *  - %I:%M - for minute boundaries, such as 01:23.
+     *  - :%S - for second boundaries, such as :45.
+     *  - .%L - milliseconds for all other times, such as .012.
+     *
+     * Although somewhat unusual, this default behavior has the benefit of providing both local and global context:
+     * for example, formatting a sequence of ticks as [11 PM, Mon 07, 01 AM] reveals information about hours, dates, and day simultaneously,
+     * rather than just the hours [11 PM, 12 AM, 01 AM].
+     */
+    tickFormat(): ((d: Date) => string);
+    /**
+     * Returns a time format function suitable for displaying tick values.
+     *
+     * The specified count is currently ignored, but is accepted for consistency with other scales such as continuous.tickFormat.
+     *
+     * @param count Expected number of ticks. (Currently ignored)
+     * @param specifier An optional valid date format specifier string (see d3-time-format).
+     */
+    tickFormat(count: number, specifier?: string): ((d: Date) => string);
+    /**
+     * Returns a time format function suitable for displaying tick values.
+     *
+     * The specified time interval is currently ignored, but is accepted for consistency with other scales such as continuous.tickFormat.
+     *
+     * @param interval A time interval to specify the expected ticks. (Currently ignored)
+     * @param specifier An optional valid date format specifier string (see d3-time-format).
+     */
+    tickFormat(interval: TimeInterval, specifier?: string): ((d: Date) => string);
+
+    /**
+     * Extends the domain so that it starts and ends on nice round values.
+     * This method typically modifies the scale’s domain, and may only extend the bounds to the nearest round value.
+     *
+     * Nicing is useful if the domain is computed from data, say using extent, and may be irregular.
+     * For example, for a domain of [2009-07-13T00:02, 2009-07-13T23:48], the nice domain is [2009-07-13, 2009-07-14].
+     * If the domain has more than two values, nicing the domain only affects the first and last value.
+     */
+    nice(): this;
+    /**
+     * Extends the domain so that it starts and ends on nice round values.
+     * This method typically modifies the scale’s domain, and may only extend the bounds to the nearest round value.
+     *
+     * A tick count argument allows greater control over the step size used to extend the bounds, guaranteeing that the returned ticks will exactly cover the domain.
+     *
+     * Nicing is useful if the domain is computed from data, say using extent, and may be irregular.
+     * For example, for a domain of [2009-07-13T00:02, 2009-07-13T23:48], the nice domain is [2009-07-13, 2009-07-14].
+     * If the domain has more than two values, nicing the domain only affects the first and last value.
+     *
+     * @param count Expected number of ticks.
+     */
+    nice(count: number): this;
+    /**
+     * Extends the domain so that it starts and ends on nice round values.
+     * This method typically modifies the scale’s domain, and may only extend the bounds to the nearest round value.
+     *
+     * a time interval may be specified to explicitly set the ticks. If an interval is specified, an optional step may also be specified to skip some ticks.
+     * For example, time.nice(d3.timeSecond, 10) will extend the domain to an even ten seconds (0, 10, 20, etc.).
+     *
+     * Nicing is useful if the domain is computed from data, say using extent, and may be irregular.
+     * For example, for a domain of [2009-07-13T00:02, 2009-07-13T23:48], the nice domain is [2009-07-13, 2009-07-14].
+     * If the domain has more than two values, nicing the domain only affects the first and last value.
+     *
+     * @param interval A time interval to specify the expected ticks.
+     * @param step An optional step number to be applied to the time interval when considering ticks.
+     */
+    nice(interval: CountableTimeInterval, step?: number): this;
+
+    /**
+     * Returns an exact copy of this scale. Changes to this scale will not affect the returned scale, and vice versa.
+     */
+    copy(): this;
+}
+
+/**
+ * Constructs a new time scale using local time with the domain [2000-01-01, 2000-01-02], the unit range [0, 1], the default interpolator and clamping disabled.
+ *
+ * The scale will have range and output of data type number.
+ */
+export function scaleTime(): ScaleTime<number, number>;
+/**
+ * Constructs a new time scale using local time with the domain [2000-01-01, 2000-01-02], the default interpolator and clamping disabled.
+ *
+ * The generic correponds to the data type of the range and output elements to be used.
+ *
+ * As range type and output type are the same, the interpolator factory used with the scale must match this behaviour.
+ *
+ * The range must be set in accordance with the range element type.
+ *
+ * The interpolator factory may be set using the interpolate(...) method of the scale.
+ */
+export function scaleTime<Output>(): ScaleTime<Output, Output>;
+/**
+ * Constructs a new time scale using local time with the domain [2000-01-01, 2000-01-02], the default interpolator and clamping disabled.
+ *
+ * The first generic corresponds to the data type of the range elements.
+ * The second generic corresponds to the data type of the output elements generated by the scale.
+ *
+ * If range element and output element type differ, the interpolator factory used with the scale must match this behaviour and
+ * convert the interpolated range element to a corresponding output element.
+ *
+ * The range must be set in accordance with the range element type.
+ *
+ * The interpolator factory may be set using the interpolate(...) method of the scale.
+ */
+export function scaleTime<Range, Output>(): ScaleTime<Range, Output>;
+
+/**
+ * Constructs a new time scale using Coordinated Universal Time (UTC) with the domain [2000-01-01, 2000-01-02], the unit range [0, 1], the default interpolator and clamping disabled.
+ *
+ * The scale will have range and output of data type number.
+ */
+export function scaleUtc(): ScaleTime<number, number>;
+/**
+ * Constructs a new time scale using Coordinated Universal Time (UTC) with the domain [2000-01-01, 2000-01-02], the default interpolator and clamping disabled.
+ *
+ * The generic correponds to the data type of the range and output elements to be used.
+ *
+ * As range type and output type are the same, the interpolator factory used with the scale must match this behaviour.
+ *
+ * The range must be set in accordance with the range element type.
+ *
+ * The interpolator factory may be set using the interpolate(...) method of the scale.
+ */
+export function scaleUtc<Output>(): ScaleTime<Output, Output>;
+/**
+ * Constructs a new time scale using Coordinated Universal Time (UTC) with the domain [2000-01-01, 2000-01-02], the default interpolator and clamping disabled.
+ *
+ * The first generic corresponds to the data type of the range elements.
+ * The second generic corresponds to the data type of the output elements generated by the scale.
+ *
+ * If range element and output element type differ, the interpolator factory used with the scale must match this behaviour and
+ * convert the interpolated range element to a corresponding output element.
+ *
+ * The range must be set in accordance with the range element type.
+ *
+ * The interpolator factory may be set using the interpolate(...) method of the scale.
+ */
+export function scaleUtc<Range, Output>(): ScaleTime<Range, Output>;
+
+// -------------------------------------------------------------------------------
+// Sequential Scale Factory
+// -------------------------------------------------------------------------------
+
+/**
+ * Sequential scales are similar to continuous scales in that they map a continuous,
+ * numeric input domain to a continuous output range. However, unlike continuous scales,
+ * the output range of a sequential scale is fixed by its interpolator and not configurable.
+ *
+ * The generic corresponds to the data type of the output of the interpolator underlying the scale.
+ */
+export interface ScaleSequential<Output> {
+    /**
+     * Given a value from the domain, returns the corresponding value from the output range, subject to interpolation.
+     *
+     * If the given value is outside the domain, and clamping is not enabled, the mapping may be extrapolated such that the returned value is outside the range.
+     *
+     * @param value A numeric value from the domain.
+     */
+    (value: number | { valueOf(): number }): Output;
+
+    /**
+     * Returns a copy of the scale’s current domain.
+     */
+    domain(): [number, number];
+    /**
+     * Sets the scale’s domain to the specified array of numbers. The array must contain exactly two elements.
+     * If the elements in the given array are not numbers, they will be coerced to numbers
+     *
+     * @param domain A two-element array of numeric domain values.
+     */
+    domain(domain: [number | { valueOf(): number }, number | { valueOf(): number }]): this;
+
+    /**
+     * Returns whether or not the scale currently clamps values to within the range.
+     */
+    clamp(): boolean;
+    /**
+     * Enables or disables clamping, respectively. If clamping is disabled and the scale is passed a value outside the domain,
+     * the scale may return a value outside the range through extrapolation.
+     *
+     * If clamping is enabled, the return value of the scale is always within the scale’s range. Clamping similarly applies to the "invert" method.
+     *
+     * @param clamp A flag to enable (true) or disable (false) clamping.
+     */
+    clamp(clamp: boolean): this;
+
+    /**
+     * Returns the current interpolator underlying the scale.
+     */
+    interpolator(): ((t: number) => Output);
+    /**
+     * Sets the scale’s interpolator to the specified function.
+     *
+     * @param interpolator An interpolator function mapping a value from the [0, 1] interval to an output value.
+     */
+    interpolator(interpolator: ((t: number) => Output)): this;
+    /**
+     * Sets the scale’s interpolator to the specified function.
+     *
+     * The generic corresponds to a the new output type of the scale. The output type of the scale is determined by the output type of the interpolator function.
+     *
+     * @param interpolator An interpolator function mapping a value from the [0, 1] interval to an output value.
+     */
+    interpolator<NewOutput>(interpolator: ((t: number) => NewOutput)): ScaleSequential<NewOutput>;
+
+    /**
+     * Returns an exact copy of this scale. Changes to this scale will not affect the returned scale, and vice versa.
+     */
+    copy(): ScaleSequential<Output>;
+}
+
+/**
+ * Constructs a new sequential scale with the given interpolator function. When the scale is applied, the interpolator will be invoked with a value typically in the range [0, 1],
+ * where 0 represents the start of the domain, and 1 represents the end of the domain.
+ *
+ * The generic corresponds to the data type of the output of the interpolator underlying the scale.
+ *
+ * @param interpolator The interpolator function to be used with the scale.
+ */
+export function scaleSequential<Output>(interpolator: ((t: number) => Output)): ScaleSequential<Output>;
+
+// -------------------------------------------------------------------------------
+// Color Interpolators for Sequential Scale Factory
+// -------------------------------------------------------------------------------
+
+/**
+ * Given a number t in the range [0,1], returns the corresponding color from the “viridis” perceptually-uniform color scheme designed by van der Walt, Smith and Firing for matplotlib,
+ * represented as an RGB string.
+ *
+ * @param t A number in the interval [0, 1].
+ */
+export function interpolateViridis(t: number): string;
+
+/**
+ * Given a number t in the range [0,1], returns the corresponding color from the “inferno” perceptually-uniform color scheme designed by van der Walt and Smith for matplotlib,
+ * represented as an RGB string.
+ *
+ * @param t A number in the interval [0, 1].
+ */
+export function interpolateInferno(t: number): string;
+
+/**
+ * Given a number t in the range [0,1], returns the corresponding color from the “magma” perceptually-uniform color scheme designed by van der Walt and Smith for matplotlib,
+ * represented as an RGB string.
+ *
+ * @param t A number in the interval [0, 1].
+ */
+export function interpolateMagma(t: number): string;
+
+/**
+ * Given a number t in the range [0,1], returns the corresponding color from the “plasma” perceptually-uniform color scheme designed by van der Walt and Smith for matplotlib,
+ * represented as an RGB string.
+ *
+ * @param t A number in the interval [0, 1].
+ */
+export function interpolatePlasma(t: number): string;
+
+/**
+ * Given a number t in the range [0,1], returns the corresponding color from a 180° rotation of Niccoli’s perceptual rainbow, represented as an RGB string.
+ *
+ * @param t A number in the interval [0, 1].
+ */
+export function interpolateWarm(t: number): string;
+
+/**
+ * Given a number t in the range [0,1], returns the corresponding color from Niccoli’s perceptual rainbow, represented as an RGB string.
+ *
+ * @param t A number in the interval [0, 1].
+ */
+export function interpolateCool(t: number): string;
+
+/**
+ * Given a number t in the range [0,1], returns the corresponding color from d3.interpolateWarm scale from [0.0, 0.5] followed by the d3.interpolateCool scale from [0.5, 1.0],
+ * thus implementing the cyclical less-angry rainbow color scheme.
+ *
+ * @param t A number in the interval [0, 1].
+ */
+export function interpolateRainbow(t: number): string;
+
+/**
+ * Given a number t in the range [0,1], returns the corresponding color from Green’s default Cubehelix represented as an RGB string.
+ *
+ * @param t A number in the interval [0, 1].
+ */
+export function interpolateCubehelixDefault(t: number): string;
+
+// -------------------------------------------------------------------------------
+// Quantize Scale Factory
+// -------------------------------------------------------------------------------
+
+/**
+ * Quantize scales are similar to linear scales, except they use a discrete rather than continuous range.
+ * The continuous input domain is divided into uniform segments based on the number of values in (i.e., the cardinality of) the output range.
+ *
+ * Each range value y can be expressed as a quantized linear function of the domain value x: y = m round(x) + b.
+ *
+ * The generic corresponds to the data type of the range elements.
+ */
+export interface ScaleQuantize<Range> {
+    /**
+     * Given a value in the input domain, returns the corresponding value in the output range.
+     */
+    (value: number | { valueOf(): number }): Range;
+    /**
+     * Returns the extent of values in the domain [x0, x1] for the corresponding value in the range: the inverse of quantize.
+     * This method is useful for interaction, say to determine the value in the domain that corresponds to the pixel location under the mouse.
+     *
+     * If an invalid range value is entered, returns [NaN, NaN].
+     *
+     * @param value A value from the range.
+     */
+    invertExtent(value: Range): [number, number];
+
+    /**
+     * Returns the scale’s current domain.
+     */
+    domain(): [number, number];
+
+    /**
+     * Sets the scale’s domain to the specified two-element array of numbers.
+     * If the elements in the given array are not numbers, they will be coerced to numbers.
+     *
+     * @param domain A two-element array of numeric values defining the domain.
+     */
+    domain(domain: [number | { valueOf(): number }, number | { valueOf(): number }]): this;
+
+    /**
+     * Returns the scale’s current range.
+     */
+    range(): Range[];
+    /**
+     * Sets the scale’s range to the specified array of values. The array may contain any number of discrete values.
+     *
+     * @param range Array of range values.
+     */
+    range(range: ReadonlyArray<Range>): this;
+
+    /**
+     * Returns approximately count representative values from the scale’s domain.
+     *
+     * If count is not specified, it defaults to 10.
+     *
+     * The returned tick values are uniformly spaced, have human-readable values (such as multiples of powers of 10),
+     * and are guaranteed to be within the extent of the domain. Ticks are often used to display reference lines, or tick marks, in conjunction with the visualized data.
+     * The specified count is only a hint; the scale may return more or fewer values depending on the domain. See also d3-array’s ticks.
+     *
+     * @param count Optional approximate number of ticks to be returned. If count is not specified, it defaults to 10.
+     */
+    ticks(count?: number): number[];
+
+    /**
+     * Returns a number format function suitable for displaying a tick value, automatically computing the appropriate precision based on the fixed interval between tick values.
+     * The specified count should have the same value as the count that is used to generate the tick values.
+     *
+     * @param count Approximate number of ticks to be used when calculating precision for the number format function.
+     * @param specifier An optional valid format specifier string which allows a custom format where the precision of the format is automatically set by the scale as appropriate for the tick interval.
+     * If specifier uses the format type "s", the scale will return a SI-prefix format based on the largest value in the domain.
+     * If the specifier already specifies a precision, this method is equivalent to locale.format.
+     */
+    tickFormat(count?: number, specifier?: string): ((d: number | { valueOf(): number }) => string);
+
+    /**
+     * Extends the domain so that it starts and ends on nice round values.
+     * This method typically modifies the scale’s domain, and may only extend the bounds to the nearest round value.
+     *
+     * Nicing is useful if the domain is computed from data, say using extent, and may be irregular.
+     * For example, for a domain of [0.201479…, 0.996679…], a nice domain might be [0.2, 1.0].
+     *
+     * Nicing a scale only modifies the current domain; it does not automatically nice domains that are subsequently set using continuous.domain.
+     * You must re-nice the scale after setting the new domain, if desired.
+     *
+     * @param count An optional number of ticks expected to be used.
+     */
+    nice(count?: number): this;
+
+    /**
+     * Returns an exact copy of this scale. Changes to this scale will not affect the returned scale, and vice versa.
+     */
+    copy(): this;
+}
+
+/**
+ * Constructs a new quantize scale with the unit domain [0, 1] and the unit range [0, 1].
+ * Thus, the default quantize scale is equivalent to the Math.round function.
+ */
+export function scaleQuantize(): ScaleQuantize<number>;
+
+/**
+ * Constructs a new quantize scale with the unit domain [0, 1].
+ *
+ * The range must be set corresponding to the type of the range elements.
+ *
+ * The generic corresponds to the data type of the range elements.
+ */
+export function scaleQuantize<Range>(): ScaleQuantize<Range>;
+
+// -------------------------------------------------------------------------------
+// Quantile Scale Factory
+// -------------------------------------------------------------------------------
+
+/**
+ * Quantile scales map a sampled input domain to a discrete range.
+ * The domain is considered continuous and thus the scale will accept any reasonable input value;
+ * however, the domain is specified as a discrete set of sample values.
+ * The number of values in (the cardinality of) the output range determines the number of quantiles that will be computed from the domain.
+ * To compute the quantiles, the domain is sorted, and treated as a population of discrete values; see d3-array’s quantile.
+ *
+ * The generic correponds to the data type of range elements.
+ */
+export interface ScaleQuantile<Range> {
+    /**
+     * Given a value in the input domain, returns the corresponding value in the output range.
+     *
+     * @param value A numeric value in the input domain.
+     */
+    (value: number | { valueOf(): number }): Range;
+
+    /**
+     * Returns the extent of values in the domain [x0, x1] for the corresponding value in the range: the inverse of quantile.
+     * This method is useful for interaction, say to determine the value in the domain that corresponds to the pixel location under the mouse.
+     *
+     * @param value A value from the range.
+     */
+    invertExtent(value: Range): [number, number];
+
+    /**
+     * Returns the scale’s current domain.
+     */
+    domain(): number[];
+    /**
+     * Sets the domain of the quantile scale to the specified set of discrete numeric values.
+     * The array must not be empty, and must contain at least one numeric value; NaN, null and undefined values are ignored and not considered part of the sample population.
+     *
+     * If the elements in the given array are not numbers, they will be coerced to numbers. A copy of the input array is sorted and stored internally.
+     *
+     * @param domain Array of domain values.
+     */
+    domain(domain: Array<number | { valueOf(): number } | null | undefined >): this;
+
+    /**
+     * Returns the current range.
+     */
+    range(): Range[];
+    /**
+     * Sets the discrete values in the range. The array must not be empty.
+     * The number of values in (the cardinality, or length, of) the range array determines the number of quantiles that are computed.
+     *
+     * For example, to compute quartiles, range must be an array of four elements such as [0, 1, 2, 3].
+     *
+     * @param range Array of range values.
+     */
+    range(range: ReadonlyArray<Range>): this;
+
+    /**
+     * Returns the quantile thresholds. If the range contains n discrete values, the returned array will contain n - 1 thresholds.
+     * Values less than the first threshold are considered in the first quantile;
+     * values greater than or equal to the first threshold but less than the second threshold are in the second quantile, and so on.
+     * Internally, the thresholds array is used with bisect to find the output quantile associated with the given input value.
+     */
+    quantiles(): number[];
+
+    /**
+     * Returns an exact copy of this scale. Changes to this scale will not affect the returned scale, and vice versa.
+     */
+    copy(): this;
+}
+
+/**
+ * Constructs a new quantile scale with an empty domain and an empty range.
+ * The quantile scale is invalid until both a domain and range are specified.
+ */
+export function scaleQuantile(): ScaleQuantile<number>;
+
+/**
+ * Constructs a new quantile scale with an empty domain and an empty range.
+ * The quantile scale is invalid until both a domain and range are specified.
+ *
+ * The generic correponds to the data type of range elements.
+ */
+export function scaleQuantile<Range>(): ScaleQuantile<Range>;
+
+// -------------------------------------------------------------------------------
+// Threshold Scale Factory
+// -------------------------------------------------------------------------------
+
+/**
+ * Threshold scales are similar to quantize scales, except they allow you to map arbitrary subsets of the domain to discrete values in the range.
+ * The input domain is still continuous, and divided into slices based on a set of threshold values.
+ *
+ * If the number of values in the scale’s range is N+1, the number of values in the scale’s domain must be N.
+ * If there are fewer than N elements in the domain, the additional values in the range are ignored.
+ * If there are more than N elements in the domain, the scale may return undefined for some inputs.
+ *
+ * The first generic corresponds to the data type of domain values.
+ * The second generic corresponds to the data type of range values.
+ */
+export interface ScaleThreshold<Domain extends number | string | Date, Range> {
+    /**
+     * Given a value in the input domain, returns the corresponding value in the output range.
+     *
+     * @param value A domain value.
+     */
+    (value: Domain): Range;
+
+    /**
+     * Returns the extent of values in the domain [x0, x1] for the corresponding value in the range, representing the inverse mapping from range to domain.
+     * This method is useful for interaction, say to determine the value in the domain that corresponds to the pixel location under the mouse.
+     *
+     * @param value A range value.
+     */
+    invertExtent(value: Range): [Domain | undefined, Domain | undefined];
+
+    /**
+     * Returns the scale’s current domain.
+     */
+    domain(): Domain[];
+    /**
+     * Sets the scale’s domain to the specified array of values. The values must be in sorted ascending order, or the behavior of the scale is undefined.
+     * The values are typically numbers, but any naturally ordered values (such as strings) will work; a threshold scale can be used to encode any type that is ordered.
+     * If the number of values in the scale’s range is N+1, the number of values in the scale’s domain must be N.
+     * If there are fewer than N elements in the domain, the additional values in the range are ignored.
+     * If there are more than N elements in the domain, the scale may return undefined for some inputs.
+     *
+     * @param domain Array of domain values.
+     */
+    domain(domain: ReadonlyArray<Domain>): this;
+
+    /**
+     * Returns the scale’s current range.
+     */
+    range(): Range[];
+    /**
+     * Sets the scale’s range to the specified array of values. If the number of values in the scale’s domain is N, the number of values in the scale’s range must be N+1.
+     * If there are fewer than N+1 elements in the range, the scale may return undefined for some inputs.
+     * If there are more than N+1 elements in the range, the additional values are ignored.
+     *
+     * @param range Array of range values.
+     */
+    range(range: ReadonlyArray<Range>): this;
+
+    /**
+     * Returns an exact copy of this scale. Changes to this scale will not affect the returned scale, and vice versa.
+     */
+    copy(): this;
+}
+
+/**
+ * Constructs a new threshold scale with the default domain [0.5] and the default range [0, 1].
+ * Thus, the default threshold scale is equivalent to the Math.round function for numbers; for example threshold(0.49) returns 0, and threshold(0.51) returns 1.
+ */
+export function scaleThreshold(): ScaleThreshold<number, number>;
+/**
+ * Constructs a new threshold scale. The domain and range must be set corresponding to the type of the corresponding generic.
+ *
+ * The first generic corresponds to the data type of domain values.
+ * The second generic corresponds to the data type of range values.
+ */
+export function scaleThreshold<Domain extends number | string | Date, Range>(): ScaleThreshold<Domain, Range>;
+
+// -------------------------------------------------------------------------------
+// Ordinal Scale Factory
+// -------------------------------------------------------------------------------
+
+/**
+ * Unlike continuous scales, ordinal scales have a discrete domain and range. For example, an ordinal scale might map a set of named categories to a set of colors,
+ * or determine the horizontal positions of columns in a column chart.
+ *
+ * The first element in the domain will be mapped to the first element in range, the second domain value to the second range value, and so on.
+ * If there are fewer elements in the range than in the domain, the scale will reuse values from the start of the range.
+ *
+ * The first generic corresponds to the data type of domain values.
+ * The second generic corresponds to the data type of range values.
+ */
+export interface ScaleOrdinal<Domain extends { toString(): string }, Range> {
+    /**
+     * Given a value in the input domain, returns the corresponding value in the output range.
+     * If the given value is not in the scale’s domain, returns the unknown; or, if the unknown value is implicit (the default),
+     * then the value is implicitly added to the domain and the next-available value in the range is assigned to value,
+     * such that this and subsequent invocations of the scale given the same input value return the same output value.
+     *
+     * @param x A value from the domain.
+     */
+    (x: Domain): Range;
+
+    /**
+     * Returns the scale's current domain.
+     */
+    domain(): Domain[];
+    /**
+     * Sets the domain to the specified array of values.
+     *
+     * The first element in domain will be mapped to the first element in the range,
+     * the second domain value to the second range value, and so on.
+     *
+     * Domain values are stored internally in a map from stringified value to index; the resulting index is then used to retrieve a value from the range.
+     * Thus, an ordinal scale’s values must be coercible to a string, and the stringified version of the domain value uniquely identifies the corresponding range value.
+     *
+     * Setting the domain on an ordinal scale is optional if the unknown value is implicit (the default).
+     * In this case, the domain will be inferred implicitly from usage by assigning each unique value passed to the scale a new value from the range.
+     * Note that an explicit domain is recommended to ensure deterministic behavior, as inferring the domain from usage will be dependent on ordering.
+     *
+     * @param domain Array of domain values.
+     */
+    domain(domain: ReadonlyArray<Domain>): this;
+
+    /**
+     * Returns the scale's current range.
+     */
+    range(): Range[];
+    /**
+     * Sets the range of the ordinal scale to the specified array of values.
+     *
+     * The first element in the domain will be mapped to the first element in range, the second domain value to the second range value, and so on.
+     *
+     * If there are fewer elements in the range than in the domain, the scale will reuse values from the start of the range.
+     *
+     * @param range Array of range values.
+     */
+    range(range: ReadonlyArray<Range>): this;
+
+    /**
+     * Returns the current unknown value, which defaults to "implicit".
+     */
+    unknown(): Range | { name: 'implicit' };
+    /**
+     * Sets the output value of the scale for unknown input values and returns this scale.
+     * The implicit value enables implicit domain construction. scaleImplicit can be used as a convenience to set the implicit value.
+     *
+     * @param value Unknown value to be used or scaleImplicit to set implicit scale generation.
+     */
+    unknown(value: Range | { name: 'implicit' }): this;
+
+    /**
+     * Returns an exact copy of this ordinal scale. Changes to this scale will not affect the returned scale, and vice versa.
+     */
+    copy(): this;
+}
+
+/**
+ * Constructs a new ordinal scale with an empty domain and the specified range.
+ * If a range is not specified, it defaults to the empty array; an ordinal scale always returns undefined until a non-empty range is defined.
+ *
+ * By default, the domain is configured to generate implicitly, if the scale is invoked with an unknown value.
+ * See the "unknown(...)" method of the scale to change this behavior.
+ *
+ * The generic corresponds to the data type of range elements.
+ *
+ * @parm range An optional array of range values to initialize the scale with.
+ */
+export function scaleOrdinal<Range>(range?: ReadonlyArray<Range>): ScaleOrdinal<string, Range>;
+/**
+ * Constructs a new ordinal scale with an empty domain and the specified range.
+ * If a range is not specified, it defaults to the empty array; an ordinal scale always returns undefined until a non-empty range is defined.
+ *
+ * By default, the domain is configured to generate implicitly, if the scale is invoked with an unknown value.
+ * See the "unknown(...)" method of the scale to change this behavior.
+ *
+ * The first generic corresponds to the data type of domain elements.
+ * The second generic corresponds to the data type of range elements.
+ *
+ * @parm range An optional array of range values to initialize the scale with.
+ */
+export function scaleOrdinal<Domain extends { toString(): string }, Range>(range?: ReadonlyArray<Range>): ScaleOrdinal<Domain, Range>;
+
+/**
+ * A special value for ordinal.unknown that enables implicit domain construction: unknown values are implicitly added to the domain.
+ */
+export const scaleImplicit: { name: 'implicit' };
+
+// -------------------------------------------------------------------------------
+// Band Scale Factory
+// -------------------------------------------------------------------------------
+
+/**
+ * Band scales are like ordinal scales except the output range is continuous and numeric.
+ * Discrete output values are automatically computed by the scale by dividing the continuous range into uniform bands.
+ * Band scales are typically used for bar charts with an ordinal or categorical dimension.
+ * The unknown value of a band scale is effectively undefined: they do not allow implicit domain construction.
+ *
+ * The generic corresponds to the data type of domain elements.
+ */
+export interface ScaleBand<Domain extends { toString(): string }> {
+    /**
+     * Given a value in the input domain, returns the start of the corresponding band derived from the output range.
+     * If the given value is not in the scale’s domain, returns undefined.
+     *
+     * @param x  A value from the domain.
+     */
+    (x: Domain): number | undefined;
+
+    /**
+     * Returns to scale's current domain
+     */
+    domain(): Domain[];
+    /**
+     * Sets the domain to the specified array of values. The first element in domain will be mapped to the first band, the second domain value to the second band, and so on.
+     * Domain values are stored internally in a map from stringified value to index; the resulting index is then used to determine the band.
+     * Thus, a band scale’s values must be coercible to a string, and the stringified version of the domain value uniquely identifies the corresponding band.
+     *
+     * @param domain Array of domain values.
+     */
+    domain(domain: ReadonlyArray<Domain>): this;
+
+    /**
+     * Returns the scale’s current range, which defaults to [0, 1].
+     */
+    range(): [number, number];
+    /**
+     * Sets the scale’s range to the specified two-element array of numbers. If the elements in the given array are not numbers, they will be coerced to numbers.
+     * The default range is [0, 1].
+     *
+     * @param range A two-element array of numeric values.
+     */
+    range(range: [number | { valueOf(): number }, number | { valueOf(): number }]): this;
+
+    /**
+     * Sets the scale’s range to the specified two-element array of numbers while also enabling rounding.
+     * If the elements in the given array are not numbers, they will be coerced to numbers.
+     *
+     * Rounding is sometimes useful for avoiding antialiasing artifacts, though also consider the shape-rendering “crispEdges” styles.
+     *
+     * @param range A two-element array of numeric values.
+     */
+    rangeRound(range: [number | { valueOf(): number }, number | { valueOf(): number }]): this;
+
+    /**
+     * Returns the current rounding status for the scale: enabled (= true) or disabled (= false).
+     */
+    round(): boolean;
+    /**
+     * Enables or disables rounding accordingly. If rounding is enabled, the start and stop of each band will be integers.
+     * Rounding is sometimes useful for avoiding antialiasing artifacts, though also consider the shape-rendering “crispEdges” styles.
+     * Note that if the width of the domain is not a multiple of the cardinality of the range, there may be leftover unused space, even without padding!
+     * Use band.align to specify how the leftover space is distributed.
+     *
+     * @param round Enable rounding (= true), disable rounding (= false).
+     */
+    round(round: boolean): this;
+
+    /**
+     * Returns the current inner padding which defaults to 0.
+     */
+    paddingInner(): number;
+    /**
+     * Sets the inner padding to the specified value which must be in the range [0, 1].
+     * The inner padding determines the ratio of the range that is reserved for blank space between bands.
+     *
+     * The default setting is 0.
+     *
+     * @param padding Value for inner padding in [0, 1] interval.
+     */
+    paddingInner(padding: number): this;
+
+    /**
+     * Returns the current outer padding which defaults to 0.
+     */
+    paddingOuter(): number;
+    /**
+     * Sets the outer padding to the specified value which must be in the range [0, 1].
+     * The outer padding determines the ratio of the range that is reserved for blank space before the first band and after the last band.
+     *
+     * The default setting is 0.
+     *
+     * @param padding Value for outer padding in [0, 1] interval.
+     */
+    paddingOuter(padding: number): this;
+
+    /**
+     * Returns the inner padding.
+     */
+    padding(): number;
+    /**
+     * A convenience method for setting the inner and outer padding to the same padding value.
+     *
+     * @param padding Value for inner and outer padding in [0, 1] interval.
+     */
+    padding(padding: number): this;
+
+    /**
+     * Returns the current alignment which defaults to 0.5.
+     */
+    align(): number;
+    /**
+     * Sets the alignment to the specified value which must be in the range [0, 1].
+     *
+     * The default is 0.5.
+     *
+     * The alignment determines how any leftover unused space in the range is distributed.
+     * A value of 0.5 indicates that the leftover space should be equally distributed before the first band and after the last band;
+     * i.e., the bands should be centered within the range. A value of 0 or 1 may be used to shift the bands to one side, say to position them adjacent to an axis.
+     *
+     * @param align Value for alignment setting in [0, 1] interval.
+     */
+    align(align: number): this;
+
+    /**
+     * Returns the width of each band.
+     */
+    bandwidth(): number;
+
+    /**
+     * Returns the distance between the starts of adjacent bands.
+     */
+    step(): number;
+
+    /**
+     * Returns an exact copy of this scale. Changes to this scale will not affect the returned scale, and vice versa.
+     */
+    copy(): this;
+}
+
+/**
+ * Constructs a new band scale with the empty domain, the unit range [0, 1], no padding, no rounding and center alignment.
+ */
+export function scaleBand(): ScaleBand<string>;
+/**
+ * Constructs a new band scale with the empty domain, the unit range [0, 1], no padding, no rounding and center alignment.
+ *
+ * The generic correponds to the data type of domain elements.
+ */
+export function scaleBand<Domain extends { toString(): string }>(): ScaleBand<Domain>;
+
+// -------------------------------------------------------------------------------
+// Point Scale Factory
+// -------------------------------------------------------------------------------
+
+/**
+ * Point scales are a variant of band scales with the bandwidth fixed to zero.
+ * Point scales are typically used for scatterplots with an ordinal or categorical dimension.
+ * The unknown value of a point scale is always undefined: they do not allow implicit domain construction.
+ *
+ * The generic corresponds to the data type of domain elements.
+ */
+export interface ScalePoint<Domain extends { toString(): string }> {
+    /**
+     * Given a value in the input domain, returns the corresponding point derived from the output range.
+     * If the given value is not in the scale’s domain, returns undefined.
+     *
+     * @param x  A value from the domain.
+     */
+    (x: Domain): number | undefined;
+
+    /**
+     * Returns the scale's current domain.
+     */
+    domain(): Domain[];
+    /**
+     * Sets the domain to the specified array of values. The first element in domain will be mapped to the first point, the second domain value to the second point, and so on.
+     * Domain values are stored internally in a map from stringified value to index; the resulting index is then used to determine the point.
+     * Thus, a point scale’s values must be coercible to a string, and the stringified version of the domain value uniquely identifies the corresponding point.
+     *
+     * @param domain Array of domain values.
+     */
+    domain(domain: ReadonlyArray<Domain>): this;
+
+    /**
+     * Returns the scale’s current range, which defaults to [0, 1].
+     */
+    range(): [number, number];
+    /**
+     * Sets the scale’s range to the specified two-element array of numbers.
+     * If the elements in the given array are not numbers, they will be coerced to numbers.
+     * The default range is [0, 1].
+     *
+     * @param range A two-element array of numeric values.
+     */
+    range(range: [number | { valueOf(): number }, number | { valueOf(): number }]): this;
+
+    /**
+     * Sets the scale’s range to the specified two-element array of numbers while also enabling rounding.
+     * If the elements in the given array are not numbers, they will be coerced to numbers.
+     *
+     * Rounding is sometimes useful for avoiding antialiasing artifacts, though also consider the shape-rendering “crispEdges” styles.
+     *
+     * @param range A two-element array of numeric values.
+     */
+    rangeRound(range: [number | { valueOf(): number }, number | { valueOf(): number }]): this;
+
+    /**
+     * Returns the current rounding status for the scale: enabled (= true) or disabled (= false).
+     */
+    round(): boolean;
+    /**
+     * Enables or disables rounding accordingly. If rounding is enabled, the position of each point will be integers.
+     * Rounding is sometimes useful for avoiding antialiasing artifacts, though also consider the shape-rendering “crispEdges” styles.
+     * Note that if the width of the domain is not a multiple of the cardinality of the range, there may be leftover unused space, even without padding!
+     * Use point.align to specify how the leftover space is distributed.
+     *
+     * @param round Enable rounding (= true), disable rounding (= false).
+     */
+    round(round: boolean): this;
+
+    /**
+     * Returns the current outer padding which defaults to 0.
+     * The outer padding determines the ratio of the range that is reserved for blank space
+     * before the first point and after the last point.
+     *
+     */
+    padding(): number;
+    /**
+     * Sets the outer padding to the specified value which must be in the range [0, 1].
+     * The outer padding determines the ratio of the range that is reserved for blank space
+     * before the first point and after the last point.
+     *
+     * The default is 0.
+     *
+     * @param padding Value for outer padding in [0, 1] interval.
+     */
+    padding(padding: number): this;
+
+    /**
+     * Returns the current alignment which defaults to 0.5.
+     */
+    align(): number;
+    /**
+     * Sets the alignment to the specified value which must be in the range [0, 1].
+     *
+     * The alignment determines how any leftover unused space in the range is distributed.
+     * A value of 0.5 indicates that the leftover space should be equally distributed before the first point and after the last point;
+     * i.e., the points should be centered within the range. A value of 0 or 1 may be used to shift the points to one side, say to position them adjacent to an axis.
+     *
+     * The default value is 0.5.
+     *
+     * @param align Value for alignment setting in [0, 1] interval.
+     */
+    align(align: number): this;
+
+    /**
+     * Return 0.
+     */
+    bandwidth(): number;
+
+    /**
+     * Returns the distance between the starts of adjacent points.
+     */
+    step(): number;
+
+    /**
+     * Returns an exact copy of this scale. Changes to this scale will not affect the returned scale, and vice versa.
+     */
+    copy(): this;
+}
+
+/**
+ * Constructs a new point scale with the empty domain, the unit range [0, 1], no padding, no rounding and center alignment.
+ */
+export function scalePoint(): ScalePoint<string>;
+/**
+ * Constructs a new point scale with the empty domain, the unit range [0, 1], no padding, no rounding and center alignment.
+ *
+ * The generic corresponds to the data type of domain elements.
+ */
+export function scalePoint<Domain extends { toString(): string }>(): ScalePoint<Domain>;
+
+// -------------------------------------------------------------------------------
+// Categorical Color Schemas for Ordinal Scales
+// -------------------------------------------------------------------------------
+
+/**
+ * An array of ten categorical colors represented as RGB hexadecimal strings.
+ */
+export const schemeCategory10: string[];
+
+/**
+ * An array of twenty categorical colors represented as RGB hexadecimal strings.
+ */
+export const schemeCategory20: string[];
+
+/**
+ * An array of twenty categorical colors represented as RGB hexadecimal strings.
+ */
+export const schemeCategory20b: string[];
+
+/**
+ * An array of twenty categorical colors represented as RGB hexadecimal strings.
+ * This color scale includes color specifications and designs developed by Cynthia Brewer (colorbrewer2.org).
+ */
+export const schemeCategory20c: string[];
diff --git a/types/d3-scale/v1/tsconfig.json b/types/d3-scale/v1/tsconfig.json
new file mode 100644
index 0000000000..dda3239a94
--- /dev/null
+++ b/types/d3-scale/v1/tsconfig.json
@@ -0,0 +1,29 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../../",
+        "typeRoots": [
+            "../../"
+        ],
+        "paths": {
+            "d3-scale": [
+                "d3-scale/v1"
+            ]
+        },
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "d3-scale-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/d3-scale/v1/tslint.json b/types/d3-scale/v1/tslint.json
new file mode 100644
index 0000000000..9846c79a4d
--- /dev/null
+++ b/types/d3-scale/v1/tslint.json
@@ -0,0 +1,8 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "unified-signatures": false,
+        "callable-types": false,
+        "no-unnecessary-generics": false
+    }
+}
diff --git a/types/d3-selection/d3-selection-tests.ts b/types/d3-selection/d3-selection-tests.ts
index 6019084be2..e4f50c89e4 100644
--- a/types/d3-selection/d3-selection-tests.ts
+++ b/types/d3-selection/d3-selection-tests.ts
@@ -89,10 +89,11 @@ const body5: d3Selection.Selection<HTMLBodyElement, BodyDatum, null, undefined>
 // d3Selection.select<HTMLBodyElement, BodyDatum>(baseTypeEl.node()!); // fails as baseTypeEl.node() is not of type HTMLBodyElement
 
 // test, when it is not certain, whether an element of the type to be selected exists
-let maybeSVG1: d3Selection.Selection<SVGSVGElement | null, any, HTMLElement, undefined> = d3Selection.select<SVGSVGElement, any>('svg');
+let maybeSVG1: d3Selection.Selection<SVGSVGElement | null, any, HTMLElement, undefined>;
 maybeSVG1 = d3Selection.select<SVGSVGElement | null, any>('svg');
 
 let maybeSVG2: d3Selection.Selection<SVGSVGElement | null, any, null, undefined>;
+// maybeSVG2 = d3Selection.select<SVGSVGElement, any>(maybeSVG1.node()); // fails with strict function types
 maybeSVG2 = d3Selection.select<SVGSVGElement | null, any>(maybeSVG1.node());
 
 // fails, as node type mismatches selection type
@@ -144,8 +145,7 @@ const xSVGCircleElementList: NodeListOf<SVGCircleElement> = document.querySelect
 const circleSelection: d3Selection.Selection<SVGCircleElement, any, null, undefined> = d3Selection.selectAll(xSVGCircleElementList);
 
 // selectAll(...) accepts HTMLCollection, HTMLCollectionOf<...> argument
-
-const documentLinks: d3Selection.Selection<HTMLAnchorElement | HTMLAreaElement, any, null, undefined> = d3Selection.selectAll(document.links);
+const documentLinks: d3Selection.Selection<HTMLAnchorElement | HTMLAreaElement, any, null, undefined> = d3Selection.selectAll<HTMLAnchorElement | HTMLAreaElement, any>(document.links);
 
 // ---------------------------------------------------------------------------------------
 // Tests of Sub-Selection Functions
@@ -166,12 +166,13 @@ let firstG: d3Selection.Selection<SVGGElement, SVGDatum, HTMLElement, any> = svg
 // firstG = svgEl.select<SVGSVGElement>('svg'); // fails, element type of SVGSVGElement provided, but SVGGElement expexted on left-hand side (silly test to begin with)
 
 // test, when it is not certain, whether an element of the type to be selected exists
-let maybeG: d3Selection.Selection<SVGGElement | null, SVGDatum, HTMLElement, any> = svgEl.select<SVGGElement>('g');
+let maybeG: d3Selection.Selection<SVGGElement | null, SVGDatum, HTMLElement, any>;
+// maybeG = svgEl.select<SVGGElement>('g'); // fails, with strictFunctionTypes
 maybeG = svgEl.select<SVGGElement | null>('g');
 
 // Using select(...) sub-selection with a selector function argument.
 
-function svgGroupSelector(this: SVGSVGElement, d: SVGDatum, i: number, groups: SVGSVGElement[]): SVGGElement {
+function svgGroupSelector(this: SVGSVGElement, d: SVGDatum, i: number, groups: SVGSVGElement[] | ArrayLike<SVGSVGElement>): SVGGElement {
     return this.querySelector('g')!; // this-type compatible with group element-type to which the selector function will be appplied
 }
 
@@ -215,13 +216,14 @@ emptySubSelection = svgEl.selectAll(undefined);
 
 // Using selectAll(...) sub-selection with a string argument.
 
-let elementsUnknownData: d3Selection.Selection<d3Selection.BaseType, any, SVGSVGElement, SVGDatum> = svgEl.selectAll('g');
+let elementsUnknownData: d3Selection.Selection<SVGGElement, any, SVGSVGElement, SVGDatum> = svgEl.selectAll<SVGGElement, any>('g');
+// let elementsAndDataUnknown: d3Selection.Selection<d3Selection.BaseType, any, SVGSVGElement, SVGDatum> = svgEl.selectAll('g'); // fails with strictFunctionTypes
 let gElementsOldData: d3Selection.Selection<SVGGElement, CircleDatum, SVGSVGElement, SVGDatum> = svgEl.selectAll<SVGGElement, CircleDatum>('g');
 // gElementsOldData = svgEl.selectAll('g'); // fails default type parameters of selectAll for group element type and datum type do not match
 
 // Using selectAll(...) sub-selection with a selector function argument.
 
-function svgGroupSelectorAll(this: SVGSVGElement, d: SVGDatum, i: number, groups: SVGSVGElement[]): NodeListOf<SVGGElement> {
+function svgGroupSelectorAll(this: SVGSVGElement, d: SVGDatum, i: number, groups: SVGSVGElement[] | d3Selection.ArrayLike<SVGSVGElement>): NodeListOf<SVGGElement> {
     return this.querySelectorAll('g'); // this-type compatible with group element-type to which the selector function will be appplied
 }
 
@@ -774,7 +776,7 @@ nRow = td2.data(); // flattened matrix (Array[16] of number)
 // Tests of Alternative DOM Manipulation
 // ---------------------------------------------------------------------------------------
 
-// append(...) and creator(...) ----------------------------------------------------------
+// append(...), creator(...) and create(...) ---------------------------------------------
 
 // without append<...> typing returned selection has group element of type BaseType
 let newDiv: d3Selection.Selection<d3Selection.BaseType, BodyDatum, HTMLElement, any>;
@@ -805,6 +807,12 @@ newDiv2 = body.append(function(d, i, g) {
 //     return this.ownerDocument.createElement('a'); // fails, HTMLDivElement expected by inference, HTMLAnchorElement returned
 // });
 
+// create a detached element
+
+let detachedDiv: d3Selection.Selection<HTMLDivElement, undefined, null, undefined>;
+
+detachedDiv = d3Selection.create<HTMLDivElement>('div');
+
 // insert(...) ---------------------------------------------------------------------------
 
 // without insert<...> typing returned selection has group element of type BaseType
@@ -847,6 +855,18 @@ newParagraph2 = body.insert(typeValueFunction, 'p.second-paragraph');
 newParagraph2 = body.insert(typeValueFunction, beforeValueFunction);
 newParagraph2 = body.insert(typeValueFunction);
 
+// clone(...) ----------------------------------------------------------------------------
+
+let clonedParagraph: d3Selection.Selection<HTMLParagraphElement, BodyDatum, HTMLElement, any>;
+
+// shallow clone
+clonedParagraph = newParagraph2.clone();
+
+// deep clone
+
+newParagraph.append('span');
+clonedParagraph = newParagraph2.clone(true);
+
 // sort(...) -----------------------------------------------------------------------------
 
 // NB: Return new selection of same type
@@ -925,14 +945,14 @@ circles = circles.call(enforceMinRadius, 40); // check chaining return type by r
 
 // on(...) -------------------------------------------------------------------------------
 
-let listener: undefined | ((this: HTMLBodyElement, datum: BodyDatum, index: number, group: HTMLBodyElement[] | ArrayLike<HTMLBodyElement>) => void);
+let listener: undefined | ((this: HTMLBodyElement, datum: BodyDatum, index: number, group: HTMLBodyElement[] | d3Selection.ArrayLike<HTMLBodyElement>) => void);
 
 body = body.on('click', function(d, i, g) {
     const that: HTMLBodyElement = this;
     // const that2: SVGElement  = this; // fails, type mismatch
     const datum: BodyDatum = d;
     const index: number = i;
-    const group: HTMLBodyElement[] | ArrayLike<HTMLBodyElement> = g;
+    const group: HTMLBodyElement[] | d3Selection.ArrayLike<HTMLBodyElement> = g;
     console.log('onclick print body background color: ', this.bgColor); // HTMLBodyElement
     console.log('onclick print "foo" datum property: ', d.foo); // BodyDatum type
 });
@@ -988,13 +1008,11 @@ interface SuccessEvent {
 }
 const successEvent = { type: 'wonEuro2016', team: 'Island' };
 
-let customListener: (this: HTMLBodyElement, finalOpponent: string) => string;
-
-customListener = finalOpponent => {
+function customListener(this: HTMLBodyElement | null, finalOpponent: string): string {
     const e = <SuccessEvent> d3Selection.event;
 
     return `${e.team} defeated ${finalOpponent} in the EURO 2016 Cup. Who would have thought!!!`;
-};
+}
 
 const resultText: string = d3Selection.customEvent(successEvent, customListener, body.node(), 'Wales');
 
diff --git a/types/d3-selection/index.d.ts b/types/d3-selection/index.d.ts
index b5231f37c2..7e23c4aaeb 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.2
+// Type definitions for D3JS d3-selection module 1.3
 // 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.2.0
+// Last module patch version validated against: 1.3.0
 
 // --------------------------------------------------------------------------
 // Shared Type Definitions and Interfaces
@@ -532,6 +532,15 @@ export interface Selection<GElement extends BaseType, Datum, PElement extends Ba
      */
     remove(): this;
 
+    /**
+     * Inserts clones of the selected elements immediately following the selected elements and returns a selection of the newly
+     * added clones. If deep is true, the descendant nodes of the selected elements will be cloned as well. Otherwise, only the elements
+     * themselves will be cloned.
+     *
+     * @param deep Perform deep cloning if this flag is set to true.
+     */
+    clone(deep?: boolean): Selection<GElement, Datum, PElement, PDatum>;
+
     /**
      * Returns a new selection merging this selection with the specified other selection.
      * The returned selection has the same number of groups and the same parents as this selection.
@@ -1103,6 +1112,15 @@ export function window(DOMNode: Window | Document | Element): Window;
 // for explicit bound-context dependent use
 // ---------------------------------------------------------------------------
 
+/**
+ * Given the specified element name, returns a single-element selection containing
+ * a detached element of the given name in the current document.
+ *
+ * @param name Tag name of the element to be added. See "namespace" for details on supported namespace prefixes,
+ * such as for SVG elements.
+ */
+export function create<NewGElement extends Element>(name: string): Selection<NewGElement, undefined, null, undefined>;
+
 /**
  * Given the specified element name, returns a function which creates an element of the given name,
  * assuming that "this" is the parent element.
diff --git a/types/d3-selection/tsconfig.json b/types/d3-selection/tsconfig.json
index 9dea0e1226..c76fd0532c 100644
--- a/types/d3-selection/tsconfig.json
+++ b/types/d3-selection/tsconfig.json
@@ -8,7 +8,7 @@
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
-        "strictFunctionTypes": false,
+        "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"
diff --git a/types/d3-time-format/tsconfig.json b/types/d3-time-format/tsconfig.json
index 782a3ab291..93e1519c0f 100644
--- a/types/d3-time-format/tsconfig.json
+++ b/types/d3-time-format/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "d3-time-format-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/d3/index.d.ts b/types/d3/index.d.ts
index de522828ff..8b44deac1a 100644
--- a/types/d3/index.d.ts
+++ b/types/d3/index.d.ts
@@ -1,9 +1,14 @@
-// Type definitions for D3JS d3 standard bundle 4.12
+// Type definitions for D3JS d3 standard bundle 5.0
 // 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
 // TypeScript Version: 2.3
 
+// Last module patch version validated against: 5.0.0 RC3
+
+// NOTE TO MAINTAINERS: Review D3 v4.x module dependencies (see v4 sub-folder) and update its path-mappings in tsconfig (v4 folder),
+// if new MAJOR version of D3 v4 modules are released!!!
+
 export as namespace d3;
 
 export const version: string;
@@ -13,10 +18,12 @@ export * from 'd3-brush';
 export * from 'd3-chord';
 export * from 'd3-collection';
 export * from 'd3-color';
+export * from 'd3-contour';
 export * from 'd3-dispatch';
 export * from 'd3-drag';
 export * from 'd3-dsv';
 export * from 'd3-ease';
+export * from 'd3-fetch';
 export * from 'd3-force';
 export * from 'd3-format';
 export * from 'd3-geo';
@@ -25,10 +32,9 @@ export * from 'd3-interpolate';
 export * from 'd3-path';
 export * from 'd3-polygon';
 export * from 'd3-quadtree';
-export * from 'd3-queue';
 export * from 'd3-random';
-export * from 'd3-request';
 export * from 'd3-scale';
+export * from 'd3-scale-chromatic';
 export * from 'd3-selection';
 export * from 'd3-shape';
 export * from 'd3-time';
diff --git a/types/d3/v4/d3-tests.ts b/types/d3/v4/d3-tests.ts
new file mode 100644
index 0000000000..3942256a76
--- /dev/null
+++ b/types/d3/v4/d3-tests.ts
@@ -0,0 +1,7 @@
+import * as d3 from 'd3';
+
+const version: string = d3.version;
+
+// NOTE: Tests for all re-exports of consituent D3 modules are omitted as excessive.
+// The standard bundle definition is a straightforward pass-through with the exception of the
+// above tested "version" property.
diff --git a/types/d3/v4/index.d.ts b/types/d3/v4/index.d.ts
new file mode 100644
index 0000000000..b4b784884b
--- /dev/null
+++ b/types/d3/v4/index.d.ts
@@ -0,0 +1,41 @@
+// Type definitions for D3JS d3 standard bundle 4.13
+// 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
+// TypeScript Version: 2.3
+
+// NOTE TO MAINTAINERS: Review and update path-mappings in tsconfig, if new major version of D3 v4 modules are released!!!
+
+export as namespace d3;
+
+export const version: string;
+export * from 'd3-array';
+export * from 'd3-axis';
+export * from 'd3-brush';
+export * from 'd3-chord';
+export * from 'd3-collection';
+export * from 'd3-color';
+export * from 'd3-dispatch';
+export * from 'd3-drag';
+export * from 'd3-dsv';
+export * from 'd3-ease';
+export * from 'd3-force';
+export * from 'd3-format';
+export * from 'd3-geo';
+export * from 'd3-hierarchy';
+export * from 'd3-interpolate';
+export * from 'd3-path';
+export * from 'd3-polygon';
+export * from 'd3-quadtree';
+export * from 'd3-queue';
+export * from 'd3-random';
+export * from 'd3-request';
+export * from 'd3-scale';
+export * from 'd3-selection';
+export * from 'd3-shape';
+export * from 'd3-time';
+export * from 'd3-time-format';
+export * from 'd3-timer';
+export * from 'd3-transition';
+export * from 'd3-voronoi';
+export * from 'd3-zoom';
diff --git a/types/d3/v4/tsconfig.json b/types/d3/v4/tsconfig.json
new file mode 100644
index 0000000000..d4341019c7
--- /dev/null
+++ b/types/d3/v4/tsconfig.json
@@ -0,0 +1,32 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": false,
+        "strictFunctionTypes": true,
+        "baseUrl": "../../",
+        "typeRoots": [
+            "../../"
+        ],
+        "paths": {
+            "d3-scale": [
+                "d3-scale/v1"
+            ],
+            "d3": [
+                "d3/v4"
+            ]
+        },
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "d3-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/d3/v4/tslint.json b/types/d3/v4/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/d3/v4/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/datatables.net-rowgroup/tsconfig.json b/types/datatables.net-rowgroup/tsconfig.json
index c4550cded1..09e77d7042 100644
--- a/types/datatables.net-rowgroup/tsconfig.json
+++ b/types/datatables.net-rowgroup/tsconfig.json
@@ -1,24 +1,24 @@
 {
-	"compilerOptions": {
-		"module": "commonjs",
-		"lib": [
-			"es6",
-			"dom"
-		],
-		"noImplicitAny": true,
-		"noImplicitThis": true,
-		"strictNullChecks": true,
-		"strictFunctionTypes": true,
-		"baseUrl": "../",
-		"typeRoots": [
-			"../"
-		],
-		"types": [],
-		"noEmit": true,
-		"forceConsistentCasingInFileNames": true
-	},
-	"files": [
-		"index.d.ts",
-		"datatables.net-rowgroup-tests.ts"
-	]
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "datatables.net-rowgroup-tests.ts"
+    ]
 }
\ No newline at end of file
diff --git a/types/decompress/tsconfig.json b/types/decompress/tsconfig.json
index 33c7a8c5e8..3ddd8e5cd5 100644
--- a/types/decompress/tsconfig.json
+++ b/types/decompress/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "decompress-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/defer-promise/tsconfig.json b/types/defer-promise/tsconfig.json
index 1aaa667626..354e3ad6fc 100644
--- a/types/defer-promise/tsconfig.json
+++ b/types/defer-promise/tsconfig.json
@@ -21,4 +21,4 @@
         "index.d.ts",
         "defer-promise-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/depcheck/tsconfig.json b/types/depcheck/tsconfig.json
index f3a0a7df65..490d7cc2bb 100644
--- a/types/depcheck/tsconfig.json
+++ b/types/depcheck/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "depcheck-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/diff2html/index.d.ts b/types/diff2html/index.d.ts
index ce2522d444..1b75f1e3df 100644
--- a/types/diff2html/index.d.ts
+++ b/types/diff2html/index.d.ts
@@ -4,7 +4,7 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare namespace Diff2Html {
-    
+
     export interface Options {
         inputFormat?: string;
         outputFormat?: string;
@@ -53,10 +53,11 @@ declare namespace Diff2Html {
         checksumAfter?: string;
         mode?: string;
     }
-    
+
     export interface Diff2Html {
-        getJsonFromDiff(input: string, configuration?: Options): Result;
+        getJsonFromDiff(input: string, configuration?: Options): Result[];
         getPrettyHtml(input: any, configuration?: Options): string;
+        getPrettyHtmlFromJson(input: Result[], configuration?: Options): string;
     }
 }
 
diff --git a/types/dockerode/dockerode-tests.ts b/types/dockerode/dockerode-tests.ts
index 458134917b..f53f0d2ad4 100644
--- a/types/dockerode/dockerode-tests.ts
+++ b/types/dockerode/dockerode-tests.ts
@@ -1,4 +1,4 @@
-import * as Docker from 'dockerode';
+import Docker = require('dockerode');
 import * as fs from 'fs';
 
 // Code samples from Dockerode 'Getting started'
diff --git a/types/documentdb-server/index.d.ts b/types/documentdb-server/index.d.ts
index dad0bad292..96934ad4b6 100644
--- a/types/documentdb-server/index.d.ts
+++ b/types/documentdb-server/index.d.ts
@@ -490,6 +490,10 @@ interface IRequest {
 	 */
     getBody(): Object;
     getBody<T>(): T;
+    /**
+     * Gets the OperationType for the request with a pre-trigger or post-trigger.
+     */
+    getOperationType(): "Create" | "Replace" | "Upsert" | "Delete";
 	/**
 	 * Gets a specified request header value.
 	 * @param key the name of the header to retrieve
diff --git a/types/dojo/tsconfig.json b/types/dojo/tsconfig.json
index 140f764554..983ded2a9c 100644
--- a/types/dojo/tsconfig.json
+++ b/types/dojo/tsconfig.json
@@ -83,5 +83,4 @@
         "dojox.widget.d.ts",
         "dojox.xml.d.ts"
     ]
-}
-
+}
\ No newline at end of file
diff --git a/types/dotdir-regex/tsconfig.json b/types/dotdir-regex/tsconfig.json
index 48f516abd8..54d5ea00f8 100644
--- a/types/dotdir-regex/tsconfig.json
+++ b/types/dotdir-regex/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "dotdir-regex-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/dotfile-regex/tsconfig.json b/types/dotfile-regex/tsconfig.json
index 899be54b3b..045d02db37 100644
--- a/types/dotfile-regex/tsconfig.json
+++ b/types/dotfile-regex/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "dotfile-regex-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/double-ended-queue/tsconfig.json b/types/double-ended-queue/tsconfig.json
index 5477379341..4c2f67fbe4 100644
--- a/types/double-ended-queue/tsconfig.json
+++ b/types/double-ended-queue/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "double-ended-queue-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/download/download-tests.ts b/types/download/download-tests.ts
index 34d56d763b..7a498ef0dd 100644
--- a/types/download/download-tests.ts
+++ b/types/download/download-tests.ts
@@ -28,8 +28,3 @@ download('unicorn.com/foo.jpg', 'dest', {
 	},
 	useElectronNet: true
 });
-
-import * as download2 from 'download';
-
-let downloadFunction = download;
-downloadFunction = download2;
diff --git a/types/download/tsconfig.json b/types/download/tsconfig.json
index 634ae5ab32..edb8b7f471 100644
--- a/types/download/tsconfig.json
+++ b/types/download/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "download-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/draft-js/index.d.ts b/types/draft-js/index.d.ts
index 7913e81d55..e545fa347d 100644
--- a/types/draft-js/index.d.ts
+++ b/types/draft-js/index.d.ts
@@ -8,7 +8,7 @@
 //                 Willis Plummer <https://github.com/willisplummer>
 //                 Santiago Vilar <https://github.com/smvilar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from 'react';
 import * as Immutable from 'immutable';
diff --git a/types/duplicate-package-checker-webpack-plugin/index.d.ts b/types/duplicate-package-checker-webpack-plugin/index.d.ts
index 88d8ccd54c..fd2906aa46 100644
--- a/types/duplicate-package-checker-webpack-plugin/index.d.ts
+++ b/types/duplicate-package-checker-webpack-plugin/index.d.ts
@@ -2,12 +2,13 @@
 // Project: https://github.com/darrenscerri/duplicate-package-checker-webpack-plugin#readme
 // Definitions by: Matt Traynham <https://github.com/mtraynham>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
-import webpack = require('webpack');
+import { Plugin } from 'webpack';
 
 export = DuplicatePackageCheckerWebpackPlugin;
 
-declare class DuplicatePackageCheckerWebpackPlugin extends webpack.Plugin {
+declare class DuplicatePackageCheckerWebpackPlugin extends Plugin {
     constructor(options?: DuplicatePackageCheckerWebpackPlugin.Options);
 }
 
diff --git a/types/dvtng-jss/tsconfig.json b/types/dvtng-jss/tsconfig.json
index 3d47f98d9f..24d96dad5a 100644
--- a/types/dvtng-jss/tsconfig.json
+++ b/types/dvtng-jss/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "dvtng-jss-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/dwt/index.d.ts b/types/dwt/index.d.ts
index d72fab058f..b19980603e 100644
--- a/types/dwt/index.d.ts
+++ b/types/dwt/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for dwt 13.1
+// Type definitions for dwt 13.3
 // Project: http://www.dynamsoft.com/Products/WebTWAIN_Overview.aspx
 // Definitions by: Xiao Ling <https://github.com/yushulx>
 //                 Josh Hall <https://github.com/jbh>
@@ -12,9 +12,66 @@
 *
 * Copyright 2017, Dynamsoft Corporation
 * Author: Dynamsoft Support Team
-* Version: 13
+* Version: 13.3
 */
 
+/**
+ * Dynamsoft WebTwain Addon PDF
+ */
+declare enum EnumDWT_ConverMode {
+    CM_DEFAULT = 0,
+    TWPT_CM_RENDERALLGRAY = 1
+}
+
+/**
+ * @class
+ */
+interface PDF {
+    /**
+     * Download and install pdf rasterizer add-on on the local system. 
+     * @method Dynamsoft.WebTwain#Download 
+     * @param {string} remoteFile specifies the value of which frame to get.
+     * @param {function} optionalAsyncSuccessFunc optional. The function to call when the download succeeds. Please refer to the function prototype OnSuccess.
+     * @param {function} optionalAsyncFailureFunc optional. The function to call when the download fails. Please refer to the function prototype OnFailure.
+     * @return {bool}
+     */
+    Download(remoteFile: string, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
+
+    /**
+     *  Input the password to decrypt PDF files using PDF Rasterizer add-on. 
+     * @method Dynamsoft.WebTwain#SetPassword 
+     * @param {string} password Specifies the PDF password.
+     * @return {bool}
+     */
+    SetPassword(password: string): boolean;
+
+    /**
+     *  Set the image convert mode for PDF Rasterizer in Dynamic Web TWAIN. 
+     * @method Dynamsoft.WebTwain#SetConvertMode 
+     * @param {EnumDWT_ConverMode} convertMode Specifies the image convert mode.
+     * @return {bool}
+     */
+    SetConvertMode(convertMode: EnumDWT_ConverMode): boolean;
+
+    /**
+     *  Set the output resolution for the PDF Rasterizer in Dynamic Web TWAIN.
+     * @method Dynamsoft.WebTwain#ReadRect 
+     * @param {float} fResolution Specifies the resolution for convert image from PDF file.
+     * @return {bool}
+     */
+    SetResolution(fResolution: number): boolean;
+
+    /**
+     * Judges whether the local PDF is text-based or not.
+     * @method Dynamsoft.WebTwain#ReadRect 
+     * @param {string} localFile specifies the local path of the target PDF.
+     * @return {bool}
+     */
+    IsTextBasedPDF(localFile: string): boolean;
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////////////////
+
 /**
  * @namespace Dynamsoft
  */
@@ -1261,11 +1318,21 @@ interface Container {
     Height: string | number;
 }
 
+interface WebTwainAddon {
+    PDF: PDF;
+}
+
 /**
  * @class
  */
 // properties (get/set) / sync functions
 interface WebTwain {
+    /**
+     * Returns addon.
+     * @type {WebTwainAddon}
+     */
+    Addon: WebTwainAddon;
+
     /**
      * Returns or sets whether multi-page selection is supported.
      * @type {bool}
diff --git a/types/earcut/tsconfig.json b/types/earcut/tsconfig.json
index 5dca6eec84..51a94956f3 100644
--- a/types/earcut/tsconfig.json
+++ b/types/earcut/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "earcut-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/echarts/index.d.ts b/types/echarts/index.d.ts
index 1f42f8030c..b217be12eb 100644
--- a/types/echarts/index.d.ts
+++ b/types/echarts/index.d.ts
@@ -24,7 +24,7 @@ declare namespace echarts {
 
     function dispose(target: ECharts | HTMLDivElement | HTMLCanvasElement): void;
 
-    function getInstanceByDom(target: HTMLDivElement | HTMLCanvasElement): void;
+    function getInstanceByDom(target: HTMLDivElement | HTMLCanvasElement): ECharts;
 
     function registerMap(mapName: string, geoJson: Object, specialAreas?: Object): void;
 
diff --git a/types/ed25519/tsconfig.json b/types/ed25519/tsconfig.json
index 98fa33a4b1..51dbef3590 100644
--- a/types/ed25519/tsconfig.json
+++ b/types/ed25519/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "ed25519-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/ed2curve/index.d.ts b/types/ed2curve/index.d.ts
index 6b27ee56e4..272220b831 100644
--- a/types/ed2curve/index.d.ts
+++ b/types/ed2curve/index.d.ts
@@ -15,7 +15,7 @@ export as namespace ed2curve;
 export function convertPublicKey(publicKey: SignKeyPair["publicKey"]): BoxKeyPair["publicKey"] | null;
 
 /** Converts Ed25519 secret key to Curve25519 secret key. */
-export function convertSecretKey(secretKey: SignKeyPair["secretKey"]): BoxKeyPair["secretKey"] | null;
+export function convertSecretKey(secretKey: SignKeyPair["secretKey"]): BoxKeyPair["secretKey"];
 
 /** Converts Ed25519 key pair to Curve25519 key pair. */
-export function convertKeyPair(keyPair: SignKeyPair): BoxKeyPair;
+export function convertKeyPair(keyPair: SignKeyPair): BoxKeyPair | null;
diff --git a/types/ed2curve/tsconfig.json b/types/ed2curve/tsconfig.json
index 38f4c49228..e6d5e9bc62 100644
--- a/types/ed2curve/tsconfig.json
+++ b/types/ed2curve/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "ed2curve-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/elasticsearch/tsconfig.json b/types/elasticsearch/tsconfig.json
index 21ac20d7e9..e595648732 100644
--- a/types/elasticsearch/tsconfig.json
+++ b/types/elasticsearch/tsconfig.json
@@ -21,4 +21,4 @@
         "index.d.ts",
         "elasticsearch-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/electron-packager/electron-packager-tests.ts b/types/electron-packager/electron-packager-tests.ts
index 4b87704a38..f956910b78 100644
--- a/types/electron-packager/electron-packager-tests.ts
+++ b/types/electron-packager/electron-packager-tests.ts
@@ -1,4 +1,4 @@
-import * as packager from "electron-packager";
+import packager = require("electron-packager");
 
 function callback(err: Error, appPaths: string[]) {
 	const msg = err.message;
diff --git a/types/electron-spellchecker/tsconfig.json b/types/electron-spellchecker/tsconfig.json
index 539cc30156..cc5add76a0 100644
--- a/types/electron-spellchecker/tsconfig.json
+++ b/types/electron-spellchecker/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "electron-spellchecker-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/electron-util/tsconfig.json b/types/electron-util/tsconfig.json
index c65e02a5c7..8ec587ccdf 100644
--- a/types/electron-util/tsconfig.json
+++ b/types/electron-util/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "electron-util-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/element-resize-detector/tsconfig.json b/types/element-resize-detector/tsconfig.json
index 9400053488..460cefc43e 100644
--- a/types/element-resize-detector/tsconfig.json
+++ b/types/element-resize-detector/tsconfig.json
@@ -21,4 +21,4 @@
         "index.d.ts",
         "element-resize-detector-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/ember-data/index.d.ts b/types/ember-data/index.d.ts
index a59ab4de97..bc3e120fb3 100644
--- a/types/ember-data/index.d.ts
+++ b/types/ember-data/index.d.ts
@@ -2,12 +2,18 @@
 // Project: https://github.com/emberjs/data
 // Definitions by: Derek Wickern <https://github.com/dwickern>
 //                 Mike North <https://github.com/mike-north>
+//                 Chris Krycho <https://github.com/chriskrycho>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
 
-declare module "ember-data" {
-    import Ember from "ember";
+declare module 'ember-data' {
+    import Ember from 'ember';
     import RSVP from 'rsvp';
+
+    export interface ModelRegistry {}
+    export interface AdapterRegistry {}
+    export interface SerializerRegistry {}
+
     namespace DS {
         /**
          * Convert an hash of errors into an array with errors in JSON-API format.
@@ -21,47 +27,47 @@ declare module "ember-data" {
          * `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,
+        function belongsTo<K extends keyof ModelRegistry>(
+            modelName: K,
             options: {
                 async: false;
                 inverse?: string | null;
                 polymorphic?: boolean;
             }
-        ): Ember.ComputedProperty<T>;
-        function belongsTo<T extends Model>(
-            modelName: string,
+        ): Ember.ComputedProperty<ModelRegistry[K]>;
+        function belongsTo<K extends keyof ModelRegistry>(
+            modelName: K,
             options?: {
                 async?: true;
                 inverse?: string | null;
                 polymorphic?: boolean;
             }
-        ): Ember.ComputedProperty<T & PromiseObject<T>>;
+        ): Ember.ComputedProperty<ModelRegistry[K] & PromiseObject<ModelRegistry[K]>>;
         /**
          * `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,
+        function hasMany<K extends keyof ModelRegistry>(
+            type: K,
             options: {
                 async: false;
                 inverse?: string | null;
                 polymorphic?: boolean;
             }
-        ): Ember.ComputedProperty<ManyArray<T>>;
-        function hasMany<T extends Model>(
-            type: string,
+        ): Ember.ComputedProperty<ManyArray<ModelRegistry[K]>>;
+        function hasMany<K extends keyof ModelRegistry>(
+            type: K,
             options?: {
                 async?: true;
                 inverse?: string | null;
                 polymorphic?: boolean;
             }
-        ): Ember.ComputedProperty<PromiseManyArray<T>>;
+        ): Ember.ComputedProperty<PromiseManyArray<ModelRegistry[K]>>;
         /**
          * This method normalizes a modelName into the format Ember Data uses
          * internally.
          */
-        function normalizeModelName(modelName: string): string;
+        function normalizeModelName<K extends keyof ModelRegistry>(modelName: K): string;
         const VERSION: string;
 
         interface AttrOptions<T = any> {
@@ -77,19 +83,19 @@ declare module "ember-data" {
          * [DS.Transform](/api/data/classes/DS.Transform.html).
          */
         function attr(
-            type: "string",
+            type: 'string',
             options?: AttrOptions<string>
         ): Ember.ComputedProperty<string>;
         function attr(
-            type: "boolean",
+            type: 'boolean',
             options?: AttrOptions<boolean>
         ): Ember.ComputedProperty<boolean>;
         function attr(
-            type: "number",
+            type: 'number',
             options?: AttrOptions<number>
         ): Ember.ComputedProperty<number>;
         function attr(
-            type: "date",
+            type: 'date',
             options?: AttrOptions<Date>
         ): Ember.ComputedProperty<Date>;
         function attr<T>(
@@ -118,89 +124,89 @@ declare module "ember-data" {
             /**
              * Builds a URL for a given type and optional ID.
              */
-            buildURL(
-                modelName?: string,
+            buildURL<K extends keyof ModelRegistry>(
+                modelName?: K,
                 id?: string | any[] | {} | null,
-                snapshot?: Snapshot | any[] | null,
+                snapshot?: Snapshot<K> | any[] | null,
                 requestType?: string,
                 query?: {}
             ): string;
             /**
              * Builds a URL for a `store.findRecord(type, id)` call.
              */
-            urlForFindRecord(
+            urlForFindRecord<K extends keyof ModelRegistry>(
                 id: string,
-                modelName: string,
-                snapshot: Snapshot
+                modelName: K,
+                snapshot: Snapshot<K>
             ): string;
             /**
              * Builds a URL for a `store.findAll(type)` call.
              */
-            urlForFindAll(
-                modelName: string,
-                snapshot: SnapshotRecordArray
+            urlForFindAll<K extends keyof ModelRegistry>(
+                modelName: K,
+                snapshot: SnapshotRecordArray<K>
             ): string;
             /**
              * Builds a URL for a `store.query(type, query)` call.
              */
-            urlForQuery(query: {}, modelName: string): string;
+            urlForQuery<K extends keyof ModelRegistry>(query: {}, modelName: K): string;
             /**
              * Builds a URL for a `store.queryRecord(type, query)` call.
              */
-            urlForQueryRecord(query: {}, modelName: string): string;
+            urlForQueryRecord<K extends keyof ModelRegistry>(query: {}, modelName: K): string;
             /**
              * Builds a URL for coalesceing multiple `store.findRecord(type, id)`
              * records into 1 request when the adapter's `coalesceFindRequests`
              * property is true.
              */
-            urlForFindMany(
+            urlForFindMany<K extends keyof ModelRegistry>(
                 ids: any[],
-                modelName: string,
+                modelName: K,
                 snapshots: any[]
             ): string;
             /**
              * Builds a URL for fetching a async hasMany relationship when a url
              * is not provided by the server.
              */
-            urlForFindHasMany(
+            urlForFindHasMany<K extends keyof ModelRegistry>(
                 id: string,
-                modelName: string,
-                snapshot: Snapshot
+                modelName: K,
+                snapshot: Snapshot<K>
             ): string;
             /**
              * Builds a URL for fetching a async belongsTo relationship when a url
              * is not provided by the server.
              */
-            urlForFindBelongsTo(
+            urlForFindBelongsTo<K extends keyof ModelRegistry>(
                 id: string,
-                modelName: string,
-                snapshot: Snapshot
+                modelName: K,
+                snapshot: Snapshot<K>
             ): string;
             /**
              * Builds a URL for a `record.save()` call when the record was created
              * locally using `store.createRecord()`.
              */
-            urlForCreateRecord(modelName: string, snapshot: Snapshot): string;
+            urlForCreateRecord<K extends keyof ModelRegistry>(modelName: K, snapshot: Snapshot<K>): string;
             /**
              * Builds a URL for a `record.save()` call when the record has been update locally.
              */
-            urlForUpdateRecord(
+            urlForUpdateRecord<K extends keyof ModelRegistry>(
                 id: string,
-                modelName: string,
-                snapshot: Snapshot
+                modelName: K,
+                snapshot: Snapshot<K>
             ): string;
             /**
              * Builds a URL for a `record.save()` call when the record has been deleted locally.
              */
-            urlForDeleteRecord(
+            urlForDeleteRecord<K extends keyof ModelRegistry>(
                 id: string,
-                modelName: string,
-                snapshot: Snapshot
+                modelName: K,
+                snapshot: Snapshot<K>
             ): string;
             /**
              * Determines the pathname for a given type.
              */
-            pathForType(modelName: string): string;
+            pathForType<K extends keyof ModelRegistry>(modelName: K): string;
         }
         /**
          * A `DS.AdapterError` is used by an adapter to signal that an error occurred
@@ -502,11 +508,11 @@ declare module "ember-data" {
             /**
              * Get the reference for the specified belongsTo relationship.
              */
-            belongsTo(name: string): BelongsToReference;
+            belongsTo(name: keyof ModelRegistry): BelongsToReference;
             /**
              * Get the reference for the specified hasMany relationship.
              */
-            hasMany(name: string): HasManyReference<any>;
+            hasMany(name: keyof ModelRegistry): 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
@@ -517,15 +523,15 @@ declare module "ember-data" {
              * 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;
+            static modelName: keyof ModelRegistry;
             /**
              * For a given relationship name, returns the model type of the relationship.
              */
-            static typeForRelationship(name: string, store: Store): Model;
+            static typeForRelationship<K extends keyof ModelRegistry>(name: K, store: Store): ModelRegistry[K];
             /**
              * Find the relationship which is the inverse of the one asked for.
              */
-            static inverseFor(name: string, store: Store): {};
+            static inverseFor<K extends keyof ModelRegistry>(name: K, 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
@@ -854,7 +860,7 @@ declare module "ember-data" {
          */
         interface PromiseArray<T>
             extends Ember.ArrayProxy<T>,
-        Ember.PromiseProxyMixin<PromiseArray<T>> {}
+                Ember.PromiseProxyMixin<PromiseArray<T>> {}
         class PromiseArray<T> {}
         /**
          * A `PromiseObject` is an object that acts like both an `Ember.Object`
@@ -865,7 +871,7 @@ declare module "ember-data" {
          */
         interface PromiseObject<T>
             extends Ember.ObjectProxy,
-        Ember.PromiseProxyMixin<T & PromiseObject<T>> {}
+                Ember.PromiseProxyMixin<T & PromiseObject<T>> {}
         class PromiseObject<T> {}
         /**
          * A PromiseManyArray is a PromiseArray that also proxies certain method calls
@@ -885,7 +891,7 @@ declare module "ember-data" {
              */
             createRecord(inputProperties?: {}): T;
         }
-        class SnapshotRecordArray {
+        class SnapshotRecordArray<K extends keyof ModelRegistry> {
             /**
              * Number of records in the array
              */
@@ -905,18 +911,18 @@ declare module "ember-data" {
             /**
              * The type of the underlying records for the snapshots in the array, as a DS.Model
              */
-            type: Model;
+            type: ModelRegistry[K];
             /**
              * Get snapshots of the underlying record array
              */
             snapshots(): any[];
         }
-        class Snapshot {
+        class Snapshot<K extends keyof ModelRegistry = any> {
             /**
              * The underlying record for this snapshot. Can be used to access methods and
              * properties defined on the record.
              */
-            record: Model;
+            record: ModelRegistry[K];
             /**
              * The id of the snapshot's underlying record
              */
@@ -928,15 +934,15 @@ declare module "ember-data" {
             /**
              * The name of the type of the underlying record for this snapshot, as a string.
              */
-            modelName: string;
+            modelName: K;
             /**
              * The type of the underlying record for this snapshot, as a DS.Model.
              */
-            type: Model;
+            type: ModelRegistry[K];
             /**
              * Returns the value of an attribute.
              */
-            attr(keyName: string): {};
+            attr<L extends keyof ModelRegistry[K]>(keyName: L): {};
             /**
              * Returns all attributes and their corresponding values.
              */
@@ -948,14 +954,14 @@ declare module "ember-data" {
             /**
              * Returns the current value of a belongsTo relationship.
              */
-            belongsTo(
-                keyName: string,
+            belongsTo<L extends keyof ModelRegistry[K]>(
+                keyName: L,
                 options?: {}
-            ): Snapshot | string | null | undefined;
+            ): Snapshot<K> | string | null | undefined;
             /**
              * Returns the current value of a hasMany relationship.
              */
-            hasMany(keyName: string, options?: {}): any[] | undefined;
+            hasMany<L extends keyof ModelRegistry[K]>(keyName: L, options?: {}): any[] | undefined;
             /**
              * Iterates through all the attributes of the model, calling the passed
              * function on each attribute.
@@ -971,6 +977,7 @@ declare module "ember-data" {
              */
             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
@@ -988,10 +995,10 @@ declare module "ember-data" {
              * 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,
+            createRecord<K extends keyof ModelRegistry>(
+                modelName: K,
                 inputProperties?: {}
-            ): T;
+            ): ModelRegistry[K];
             /**
              * For symmetry, a record can be deleted via the store.
              */
@@ -1004,83 +1011,86 @@ declare module "ember-data" {
             /**
              * This method returns a record for a given type and id combination.
              */
-            findRecord<T extends Model>(
-                modelName: string,
+            findRecord<K extends keyof ModelRegistry>(
+                modelName: K,
                 id: string | number,
                 options?: {}
-            ): PromiseObject<T> & T;
+            ): PromiseObject<ModelRegistry[K]> & ModelRegistry[K];
             /**
              * Get the reference for the specified record.
              */
-            getReference<T extends Model>(
-                modelName: string,
+            getReference<K extends keyof ModelRegistry>(
+                modelName: K,
                 id: string | number
-            ): RecordReference<T>;
+            ): RecordReference<ModelRegistry[K]>;
             /**
              * Get a record by a given type and ID without triggering a fetch.
              */
-            peekRecord<T extends Model>(
-                modelName: string,
+            peekRecord<K extends keyof ModelRegistry>(
+                modelName: K,
                 id: string | number
-            ): T | null;
+            ): ModelRegistry[K] | 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;
+            hasRecordForId<K extends keyof ModelRegistry>(
+                modelName: K,
+                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<K extends keyof ModelRegistry>(
+                modelName: K,
                 query: any
-            ): AdapterPopulatedRecordArray<T> & PromiseArray<T>;
+            ): AdapterPopulatedRecordArray<ModelRegistry[K]> & PromiseArray<ModelRegistry[K]>;
             /**
              * 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,
+            queryRecord<K extends keyof ModelRegistry>(
+                modelName: K,
                 query: any
-            ): RSVP.Promise<T>;
+            ): RSVP.Promise<ModelRegistry[K]>;
             /**
              * `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,
+            findAll<K extends keyof ModelRegistry>(
+                modelName: K,
                 options?: {
                     reload?: boolean;
                     backgroundReload?: boolean;
                     include?: string;
                     adapterOptions?: any;
                 }
-            ): PromiseArray<T>;
+            ): PromiseArray<ModelRegistry[K]>;
             /**
              * 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>;
+            peekAll<K extends keyof ModelRegistry>(modelName: K): RecordArray<ModelRegistry[K]>;
             /**
              * This method unloads all records in the store.
              * It schedules unloading to happen during the next run loop.
              */
-            unloadAll(modelName: string): void;
+            unloadAll<K extends keyof ModelRegistry>(modelName: K): 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;
+            recordIsLoaded<K extends keyof ModelRegistry>(modelName: K, id: string): boolean;
             /**
              * Returns the model class for the particular `modelName`.
              */
-            modelFor<M extends Model>(modelName: string): M;
+            modelFor<K extends keyof ModelRegistry>(modelName: K): ModelRegistry[K];
             /**
              * Push some data for a given type into the store.
              */
@@ -1088,25 +1098,25 @@ declare module "ember-data" {
             /**
              * Push some raw data into the store.
              */
-            pushPayload(modelName: string, inputPayload: {}): any;
+            pushPayload<K extends keyof ModelRegistry>(modelName: K, inputPayload: {}): any;
             pushPayload(inputPayload: {}): any;
             /**
              * `normalize` converts a json payload into the normalized form that
              * [push](#method_push) expects.
              */
-            normalize(modelName: string, payload: {}): {};
+            normalize<K extends keyof ModelRegistry>(modelName: K, payload: {}): {};
             /**
              * Returns an instance of the adapter for a given type. For
              * example, `adapterFor('person')` will return an instance of
              * `App.PersonAdapter`.
              */
-            adapterFor<A extends Adapter>(modelName: string): A;
+            adapterFor<K extends keyof AdapterRegistry>(modelName: K): AdapterRegistry[K];
             /**
              * Returns an instance of the serializer for a given type. For
              * example, `serializerFor('person')` will return an instance of
              * `App.PersonSerializer`.
              */
-            serializerFor<S extends Serializer>(modelName: string): S;
+            serializerFor<K extends keyof SerializerRegistry>(modelName: K): SerializerRegistry[K];
         }
         /**
          * The `JSONAPIAdapter` is the default adapter used by Ember Data. It
@@ -1132,7 +1142,11 @@ declare module "ember-data" {
             /**
              * Takes a URL, an HTTP method and a hash of data, and makes an HTTP request.
              */
-            ajax(url: string, type: string, options?: object): RSVP.Promise<any>;
+            ajax(
+                url: string,
+                type: string,
+                options?: object
+            ): RSVP.Promise<any>;
             /**
              * Generate ajax options
              */
@@ -1170,38 +1184,42 @@ declare module "ember-data" {
              * Called by the store in order to fetch the JSON for a given
              * type and ID.
              */
-            findRecord(
+            findRecord<K extends keyof ModelRegistry>(
                 store: Store,
-                type: Model,
+                type: ModelRegistry[K],
                 id: string,
-                snapshot: Snapshot
+                snapshot: Snapshot<K>
             ): RSVP.Promise<any>;
             /**
              * Called by the store in order to fetch a JSON array for all
              * of the records for a given type.
              */
-            findAll(
+            findAll<K extends keyof ModelRegistry>(
                 store: Store,
-                type: Model,
+                type: ModelRegistry[K],
                 sinceToken: string,
-                snapshotRecordArray: SnapshotRecordArray
+                snapshotRecordArray: SnapshotRecordArray<K>
             ): RSVP.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: {}): RSVP.Promise<any>;
+            query<K extends keyof ModelRegistry>(store: Store, type: ModelRegistry[K], query: {}): RSVP.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: {}): RSVP.Promise<any>;
+            queryRecord<K extends keyof ModelRegistry>(
+                store: Store,
+                type: ModelRegistry[K],
+                query: {}
+            ): RSVP.Promise<any>;
             /**
              * Called by the store in order to fetch several records together if `coalesceFindRequests` is true
              */
-            findMany(
+            findMany<K extends keyof ModelRegistry>(
                 store: Store,
-                type: Model,
+                type: ModelRegistry[K],
                 ids: any[],
                 snapshots: any[]
             ): RSVP.Promise<any>;
@@ -1210,9 +1228,9 @@ declare module "ember-data" {
              * the unloaded records in a has-many relationship that were originally
              * specified as a URL (inside of `links`).
              */
-            findHasMany(
+            findHasMany<K extends keyof ModelRegistry>(
                 store: Store,
-                snapshot: Snapshot,
+                snapshot: Snapshot<K>,
                 url: string,
                 relationship: {}
             ): RSVP.Promise<any>;
@@ -1221,36 +1239,36 @@ declare module "ember-data" {
              * belongs-to relationship that was originally specified as a URL (inside of
              * `links`).
              */
-            findBelongsTo(
+            findBelongsTo<K extends keyof ModelRegistry>(
                 store: Store,
-                snapshot: Snapshot,
+                snapshot: Snapshot<K>,
                 url: string
             ): RSVP.Promise<any>;
             /**
              * Called by the store when a newly created record is
              * saved via the `save` method on a model record instance.
              */
-            createRecord(
+            createRecord<K extends keyof ModelRegistry>(
                 store: Store,
-                type: Model,
-                snapshot: Snapshot
+                type: ModelRegistry[K],
+                snapshot: Snapshot<K>
             ): RSVP.Promise<any>;
             /**
              * Called by the store when an existing record is saved
              * via the `save` method on a model record instance.
              */
-            updateRecord(
+            updateRecord<K extends keyof ModelRegistry>(
                 store: Store,
-                type: Model,
-                snapshot: Snapshot
+                type: ModelRegistry[K],
+                snapshot: Snapshot<K>
             ): RSVP.Promise<any>;
             /**
              * Called by the store when a record is deleted.
              */
-            deleteRecord(
+            deleteRecord<K extends keyof ModelRegistry>(
                 store: Store,
-                type: Model,
-                snapshot: Snapshot
+                type: ModelRegistry[K],
+                snapshot: Snapshot<K>
             ): RSVP.Promise<any>;
             /**
              * Organize records into groups, each of which is to be passed to separate
@@ -1295,89 +1313,89 @@ declare module "ember-data" {
             /**
              * Builds a URL for a given type and optional ID.
              */
-            buildURL(
-                modelName?: string,
+            buildURL<K extends keyof ModelRegistry>(
+                modelName?: K,
                 id?: string | any[] | {} | null,
-                snapshot?: Snapshot | any[] | null,
+                snapshot?: Snapshot<K> | any[] | null,
                 requestType?: string,
                 query?: {}
             ): string;
             /**
              * Builds a URL for a `store.findRecord(type, id)` call.
              */
-            urlForFindRecord(
+            urlForFindRecord<K extends keyof ModelRegistry>(
                 id: string,
-                modelName: string,
-                snapshot: Snapshot
+                modelName: K,
+                snapshot: Snapshot<K>
             ): string;
             /**
              * Builds a URL for a `store.findAll(type)` call.
              */
-            urlForFindAll(
-                modelName: string,
-                snapshot: SnapshotRecordArray
+            urlForFindAll<K extends keyof ModelRegistry>(
+                modelName: K,
+                snapshot: SnapshotRecordArray<K>
             ): string;
             /**
              * Builds a URL for a `store.query(type, query)` call.
              */
-            urlForQuery(query: {}, modelName: string): string;
+            urlForQuery<K extends keyof ModelRegistry>(query: {}, modelName: K): string;
             /**
              * Builds a URL for a `store.queryRecord(type, query)` call.
              */
-            urlForQueryRecord(query: {}, modelName: string): string;
+            urlForQueryRecord<K extends keyof ModelRegistry>(query: {}, modelName: K): string;
             /**
              * Builds a URL for coalesceing multiple `store.findRecord(type, id)`
              * records into 1 request when the adapter's `coalesceFindRequests`
              * property is true.
              */
-            urlForFindMany(
+            urlForFindMany<K extends keyof ModelRegistry>(
                 ids: any[],
-                modelName: string,
+                modelName: K,
                 snapshots: any[]
             ): string;
             /**
              * Builds a URL for fetching a async hasMany relationship when a url
              * is not provided by the server.
              */
-            urlForFindHasMany(
+            urlForFindHasMany<K extends keyof ModelRegistry>(
                 id: string,
-                modelName: string,
-                snapshot: Snapshot
+                modelName: K,
+                snapshot: Snapshot<K>
             ): string;
             /**
              * Builds a URL for fetching a async belongsTo relationship when a url
              * is not provided by the server.
              */
-            urlForFindBelongsTo(
+            urlForFindBelongsTo<K extends keyof ModelRegistry>(
                 id: string,
-                modelName: string,
-                snapshot: Snapshot
+                modelName: K,
+                snapshot: Snapshot<K>
             ): string;
             /**
              * Builds a URL for a `record.save()` call when the record was created
              * locally using `store.createRecord()`.
              */
-            urlForCreateRecord(modelName: string, snapshot: Snapshot): string;
+            urlForCreateRecord<K extends keyof ModelRegistry>(modelName: K, snapshot: Snapshot<K>): string;
             /**
              * Builds a URL for a `record.save()` call when the record has been update locally.
              */
-            urlForUpdateRecord(
+            urlForUpdateRecord<K extends keyof ModelRegistry>(
                 id: string,
-                modelName: string,
-                snapshot: Snapshot
+                modelName: K,
+                snapshot: Snapshot<K>
             ): string;
             /**
              * Builds a URL for a `record.save()` call when the record has been deleted locally.
              */
-            urlForDeleteRecord(
+            urlForDeleteRecord<K extends keyof ModelRegistry>(
                 id: string,
-                modelName: string,
-                snapshot: Snapshot
+                modelName: K,
+                snapshot: Snapshot<K>
             ): string;
             /**
              * Determines the pathname for a given type.
              */
-            pathForType(modelName: string): string;
+            pathForType<K extends keyof ModelRegistry>(modelName: K): string;
         }
         /**
          * ## Using Embedded Records
@@ -1391,16 +1409,16 @@ declare module "ember-data" {
             /**
              * Serialize `belongsTo` relationship when it is configured as an embedded object.
              */
-            serializeBelongsTo(
-                snapshot: Snapshot,
+            serializeBelongsTo<K extends keyof ModelRegistry>(
+                snapshot: Snapshot<K>,
                 json: {},
                 relationship: {}
             ): any;
             /**
              * Serializes `hasMany` relationships when it is configured as embedded objects.
              */
-            serializeHasMany(
-                snapshot: Snapshot,
+            serializeHasMany<K extends keyof ModelRegistry>(
+                snapshot: Snapshot<K>,
                 json: {},
                 relationship: {}
             ): any;
@@ -1408,9 +1426,9 @@ declare module "ember-data" {
              * 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,
+            removeEmbeddedForeignKey<K extends keyof ModelRegistry>(
+                snapshot: Snapshot<K>,
+                embeddedSnapshot: Snapshot<K>,
                 relationship: {},
                 json: {}
             ): any;
@@ -1428,7 +1446,7 @@ declare module "ember-data" {
             /**
              * Converts the model name to a pluralized version of the model name.
              */
-            payloadKeyFromModelName(modelName: string): string;
+            payloadKeyFromModelName<K extends keyof ModelRegistry>(modelName: K): string;
             /**
              * `keyForAttribute` can be used to define rules for how to convert an
              * attribute name in your model to a key in your JSON.
@@ -1458,7 +1476,7 @@ declare module "ember-data" {
              * `payloadTypeFromModelName` can be used to change the mapping for the type in
              * the payload, taken from the model name.
              */
-            payloadTypeFromModelName(modelname: string): string;
+            payloadTypeFromModelName<K extends keyof ModelRegistry>(modelName: K): string;
         }
         /**
          * Ember Data 2.0 Serializer:
@@ -1620,8 +1638,8 @@ declare module "ember-data" {
             /**
              * Check if the given hasMany relationship should be serialized
              */
-            shouldSerializeHasMany(
-                snapshot: Snapshot,
+            shouldSerializeHasMany<K extends keyof ModelRegistry>(
+                snapshot: Snapshot<K>,
                 key: string,
                 relationshipType: string
             ): boolean;
@@ -1629,7 +1647,7 @@ declare module "ember-data" {
              * Called when a record is saved in order to convert the
              * record into JSON.
              */
-            serialize(snapshot: Snapshot, options: {}): {};
+            serialize<K extends keyof ModelRegistry>(snapshot: Snapshot<K>, 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
@@ -1638,18 +1656,18 @@ declare module "ember-data" {
              * 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(
+            serializeIntoHash<K extends keyof ModelRegistry>(
                 hash: {},
-                typeClass: Model,
-                snapshot: Snapshot,
+                typeClass: ModelRegistry[K],
+                snapshot: Snapshot<K>,
                 options?: {}
             ): any;
             /**
              * `serializeAttribute` can be used to customize how `DS.attr`
              * properties are serialized
              */
-            serializeAttribute(
-                snapshot: Snapshot,
+            serializeAttribute<K extends keyof ModelRegistry>(
+                snapshot: Snapshot<K>,
                 json: {},
                 key: string,
                 attribute: {}
@@ -1658,8 +1676,8 @@ declare module "ember-data" {
              * `serializeBelongsTo` can be used to customize how `DS.belongsTo`
              * properties are serialized.
              */
-            serializeBelongsTo(
-                snapshot: Snapshot,
+            serializeBelongsTo<K extends keyof ModelRegistry>(
+                snapshot: Snapshot<K>,
                 json: {},
                 relationship: {}
             ): any;
@@ -1667,8 +1685,8 @@ declare module "ember-data" {
              * `serializeHasMany` can be used to customize how `DS.hasMany`
              * properties are serialized.
              */
-            serializeHasMany(
-                snapshot: Snapshot,
+            serializeHasMany<K extends keyof ModelRegistry>(
+                snapshot: Snapshot<K>,
                 json: {},
                 relationship: {}
             ): any;
@@ -1678,8 +1696,8 @@ declare module "ember-data" {
              * `{ polymorphic: true }` is pass as the second argument to the
              * `DS.belongsTo` function.
              */
-            serializePolymorphicType(
-                snapshot: Snapshot,
+            serializePolymorphicType<K extends keyof ModelRegistry>(
+                snapshot: Snapshot<K>,
                 json: {},
                 relationship: {}
             ): any;
@@ -1726,7 +1744,7 @@ declare module "ember-data" {
              * 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;
+            serializeId<K extends keyof ModelRegistry>(snapshot: Snapshot<K>, json: {}, primaryKey: string): any;
         }
         /**
          * Normally, applications will use the `RESTSerializer` by implementing
@@ -1764,17 +1782,17 @@ declare module "ember-data" {
              * Called when a record is saved in order to convert the
              * record into JSON.
              */
-            serialize(snapshot: Snapshot, options: {}): {};
+            serialize<K extends keyof ModelRegistry>(snapshot: Snapshot<K>, 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(
+            serializeIntoHash<K extends keyof ModelRegistry>(
                 hash: {},
                 typeClass: Model,
-                snapshot: Snapshot,
+                snapshot: Snapshot<K>,
                 options?: {}
             ): any;
             /**
@@ -1782,14 +1800,14 @@ declare module "ember-data" {
              * request. By default, the RESTSerializer returns a camelized version of the
              * model's name.
              */
-            payloadKeyFromModelName(modelName: string): string;
+            payloadKeyFromModelName<K extends keyof ModelRegistry>(modelName: K): 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,
+            serializePolymorphicType<K extends keyof ModelRegistry>(
+                snapshot: Snapshot<K>,
                 json: {},
                 relationship: {}
             ): any;
@@ -1811,7 +1829,7 @@ declare module "ember-data" {
              * `payloadTypeFromModelName` can be used to change the mapping for the type in
              * the payload, taken from the model name.
              */
-            payloadTypeFromModelName(modelName: string): string;
+            payloadTypeFromModelName<K extends keyof ModelRegistry>(modelName: K): string;
         }
         /**
          * The `DS.BooleanTransform` class is used to serialize and deserialize
@@ -1883,27 +1901,27 @@ declare module "ember-data" {
              * method should return a promise that will resolve to a JavaScript object that will be
              * normalized by the serializer.
              */
-            findRecord(
+            findRecord<K extends keyof ModelRegistry>(
                 store: Store,
-                type: Model,
+                type: ModelRegistry[K],
                 id: string,
-                snapshot: Snapshot
+                snapshot: Snapshot<K>
             ): RSVP.Promise<any>;
             /**
              * The `findAll()` method is used to retrieve all records for a given type.
              */
-            findAll(
+            findAll<K extends keyof ModelRegistry>(
                 store: Store,
-                type: Model,
+                type: ModelRegistry[K],
                 sinceToken: string,
-                snapshotRecordArray: SnapshotRecordArray
+                snapshotRecordArray: SnapshotRecordArray<K>
             ): RSVP.Promise<any>;
             /**
              * This method is called when you call `query` on the store.
              */
-            query(
+            query<K extends keyof ModelRegistry>(
                 store: Store,
-                type: Model,
+                type: ModelRegistry[K],
                 query: {},
                 recordArray: AdapterPopulatedRecordArray<any>
             ): RSVP.Promise<any>;
@@ -1911,48 +1929,52 @@ declare module "ember-data" {
              * The `queryRecord()` method is invoked when the store is asked for a single
              * record through a query object.
              */
-            queryRecord(store: Store, type: Model, query: {}): RSVP.Promise<any>;
+            queryRecord<K extends keyof ModelRegistry>(
+                store: Store,
+                type: ModelRegistry[K],
+                query: {}
+            ): RSVP.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(
+            generateIdForRecord<K extends keyof ModelRegistry>(
                 store: Store,
-                type: Model,
+                type: ModelRegistry[K],
                 inputProperties: {}
             ): string | number;
             /**
              * Proxies to the serializer's `serialize` method.
              */
-            serialize(snapshot: Snapshot, options: {}): {};
+            serialize<K extends keyof ModelRegistry>(snapshot: Snapshot<K>, options: {}): {};
             /**
              * Implement this method in a subclass to handle the creation of
              * new records.
              */
-            createRecord(
+            createRecord<K extends keyof ModelRegistry>(
                 store: Store,
-                type: Model,
-                snapshot: Snapshot
+                type: ModelRegistry[K],
+                snapshot: Snapshot<K>
             ): RSVP.Promise<any>;
             /**
              * Implement this method in a subclass to handle the updating of
              * a record.
              */
-            updateRecord(
+            updateRecord<K extends keyof ModelRegistry>(
                 store: Store,
-                type: Model,
-                snapshot: Snapshot
+                type: ModelRegistry[K],
+                snapshot: Snapshot<K>
             ): RSVP.Promise<any>;
             /**
              * Implement this method in a subclass to handle the deletion of
              * a record.
              */
-            deleteRecord(
+            deleteRecord<K extends keyof ModelRegistry>(
                 store: Store,
-                type: Model,
-                snapshot: Snapshot
+                type: ModelRegistry[K],
+                snapshot: Snapshot<K>
             ): RSVP.Promise<any>;
             /**
              * By default the store will try to coalesce all `fetchRecord` calls within the same runloop
@@ -1966,9 +1988,9 @@ declare module "ember-data" {
              * requests to find multiple records at once if coalesceFindRequests
              * is true.
              */
-            findMany(
+            findMany<K extends keyof ModelRegistry>(
                 store: Store,
-                type: Model,
+                type: ModelRegistry[K],
                 ids: any[],
                 snapshots: any[]
             ): RSVP.Promise<any>;
@@ -1982,33 +2004,33 @@ declare module "ember-data" {
              * reload a record from the adapter when a record is requested by
              * `store.findRecord`.
              */
-            shouldReloadRecord(store: Store, snapshot: Snapshot): boolean;
+            shouldReloadRecord<K extends keyof ModelRegistry>(store: Store, snapshot: Snapshot<K>): 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(
+            shouldReloadAll<K extends keyof ModelRegistry>(
                 store: Store,
-                snapshotRecordArray: SnapshotRecordArray
+                snapshotRecordArray: SnapshotRecordArray<K>
             ): 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(
+            shouldBackgroundReloadRecord<K extends keyof ModelRegistry>(
                 store: Store,
-                snapshot: Snapshot
+                snapshot: Snapshot<K>
             ): 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(
+            shouldBackgroundReloadAll<K extends keyof ModelRegistry>(
                 store: Store,
-                snapshotRecordArray: SnapshotRecordArray
+                snapshotRecordArray: SnapshotRecordArray<K>
             ): boolean;
         }
         /**
@@ -2038,7 +2060,7 @@ declare module "ember-data" {
              * 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: {}): {};
+            serialize<K extends keyof ModelRegistry>(snapshot: Snapshot<K>, options: {}): {};
             /**
              * The `normalize` method is used to convert a payload received from your
              * external data source into the normalized form `store.push()` expects. You
@@ -2048,11 +2070,12 @@ declare module "ember-data" {
             normalize(typeClass: Model, hash: {}): {};
         }
     }
+
     export default DS;
 }
 
-declare module "ember" {
-    import DS from "ember-data";
+declare module 'ember' {
+    import DS from 'ember-data';
     namespace Ember {
         /*
 		* The store is automatically injected into these objects
@@ -2069,91 +2092,107 @@ declare module "ember" {
             store: DS.Store;
         }
     }
+
+    // It is also available to inject anywhere
+    module '@ember/service' {
+        interface Registry {
+            'store': DS.Store;
+        }
+    }
+}
+declare module 'ember-test-helpers' {
+    import DS from 'ember-data';
+    interface TestContext {
+        store: DS.Store;
+    }
 }
 declare module 'ember-data/adapter' {
-	import DS from 'ember-data';
-	export default DS.Adapter;
+    import DS from 'ember-data';
+    export default DS.Adapter;
+    export { AdapterRegistry } from 'ember-data';
 }
 declare module 'ember-data/adapters/errors' {
-	import DS from 'ember-data';
-	const AdapterError: typeof DS.AdapterError;
-	const InvalidError: typeof DS.InvalidError;
-	const UnauthorizedError: typeof DS.UnauthorizedError;
-	const ForbiddenError: typeof DS.ForbiddenError;
-	const NotFoundError: typeof DS.NotFoundError;
-	const ConflictError: typeof DS.ConflictError;
-	const ServerError: typeof DS.ServerError;
-	const TimeoutError: typeof DS.TimeoutError;
-	const AbortError: typeof DS.AbortError;
-	const errorsHashToArray: typeof DS.errorsHashToArray;
-	const errorsArrayToHash: typeof DS.errorsArrayToHash;
+    import DS from 'ember-data';
+    const AdapterError: typeof DS.AdapterError;
+    const InvalidError: typeof DS.InvalidError;
+    const UnauthorizedError: typeof DS.UnauthorizedError;
+    const ForbiddenError: typeof DS.ForbiddenError;
+    const NotFoundError: typeof DS.NotFoundError;
+    const ConflictError: typeof DS.ConflictError;
+    const ServerError: typeof DS.ServerError;
+    const TimeoutError: typeof DS.TimeoutError;
+    const AbortError: typeof DS.AbortError;
+    const errorsHashToArray: typeof DS.errorsHashToArray;
+    const errorsArrayToHash: typeof DS.errorsArrayToHash;
 }
 declare module 'ember-data/adapters/json-api' {
-	import DS from 'ember-data';
-	export default DS.JSONAPIAdapter;
+    import DS from 'ember-data';
+    export default DS.JSONAPIAdapter;
 }
 declare module 'ember-data/adapters/rest' {
-	import DS from 'ember-data';
-	export default DS.RESTAdapter;
+    import DS from 'ember-data';
+    export default DS.RESTAdapter;
 }
 declare module 'ember-data/attr' {
-	import DS from 'ember-data';
-	export default DS.attr;
+    import DS from 'ember-data';
+    export default DS.attr;
 }
 declare module 'ember-data/model' {
-	import DS from 'ember-data';
-	export default DS.Model;
+    import DS from 'ember-data';
+    export default DS.Model;
+    export { ModelRegistry } from 'ember-data';
 }
 declare module 'ember-data/relationships' {
-	import DS from 'ember-data';
-	const hasMany: typeof DS.hasMany;
-	const belongsTo: typeof DS.belongsTo;
+    import DS from 'ember-data';
+    const hasMany: typeof DS.hasMany;
+    const belongsTo: typeof DS.belongsTo;
 }
 declare module 'ember-data/serializer' {
-	import DS from 'ember-data';
-	export default DS.Serializer;
+    import DS from 'ember-data';
+    export default DS.Serializer;
+    export { SerializerRegistry } from 'ember-data';
 }
 declare module 'ember-data/serializers/embedded-records-mixin' {
-	import DS from 'ember-data';
-	export default DS.EmbeddedRecordsMixin;
+    import DS from 'ember-data';
+    export default DS.EmbeddedRecordsMixin;
 }
 declare module 'ember-data/serializers/json-api' {
-	import DS from 'ember-data';
-	export default DS.JSONAPISerializer;
+    import DS from 'ember-data';
+    export default DS.JSONAPISerializer;
 }
 declare module 'ember-data/serializers/json' {
-	import DS from 'ember-data';
-	export default DS.JSONSerializer;
+    import DS from 'ember-data';
+    export default DS.JSONSerializer;
 }
 declare module 'ember-data/serializers/rest' {
-	import DS from 'ember-data';
-	export default DS.RESTSerializer;
+    import DS from 'ember-data';
+    export default DS.RESTSerializer;
 }
-declare module "ember-data/store" {
-    import DS from "ember-data";
+declare module 'ember-data/store' {
+    import DS from 'ember-data';
     export default DS.Store;
 }
-declare module "ember-data/transform" {
-    import DS from "ember-data";
+declare module 'ember-data/transform' {
+    import DS from 'ember-data';
     export default DS.Transform;
 }
-declare module "ember-data/transforms/boolean" {
-    import DS from "ember-data";
+declare module 'ember-data/transforms/boolean' {
+    import DS from 'ember-data';
     export default DS.BooleanTransform;
 }
-declare module "ember-data/transforms/date" {
-    import DS from "ember-data";
+declare module 'ember-data/transforms/date' {
+    import DS from 'ember-data';
     export default DS.DateTransform;
 }
-declare module "ember-data/transforms/number" {
-    import DS from "ember-data";
+declare module 'ember-data/transforms/number' {
+    import DS from 'ember-data';
     export default DS.NumberTransform;
 }
-declare module "ember-data/transforms/string" {
-    import DS from "ember-data";
+declare module 'ember-data/transforms/string' {
+    import DS from 'ember-data';
     export default DS.StringTransform;
 }
-declare module "ember-data/transforms/transform" {
-    import DS from "ember-data";
+declare module 'ember-data/transforms/transform' {
+    import DS from 'ember-data';
     export default DS.Transform;
 }
diff --git a/types/ember-data/test/adapter.ts b/types/ember-data/test/adapter.ts
index 17f69bcd9c..101ac3e42f 100644
--- a/types/ember-data/test/adapter.ts
+++ b/types/ember-data/test/adapter.ts
@@ -1,6 +1,11 @@
 import Ember from 'ember';
 import DS from 'ember-data';
 
+class Session extends Ember.Service {}
+declare module '@ember/service' {
+    interface Registry { 'session': Session; }
+}
+
 const JsonApi = DS.JSONAPIAdapter.extend({
     // Application specific overrides go here
 });
@@ -55,6 +60,13 @@ const UseAjaxOptionsWithOptionalThirdParams = DS.JSONAPIAdapter.extend({
     }
 });
 
+declare module 'ember-data' {
+    interface ModelRegistry {
+        'rootModel': any;
+        'super-user': any;
+    }
+}
+
 // https://github.com/emberjs/data/blob/c9d8212c857ca78218ad98d11621819b38dba98f/tests/unit/adapters/build-url-mixin/build-url-test.js
 const BuildURLAdapter = DS.RESTAdapter.extend({
     worksWithOnlyModelNameAndId() {
diff --git a/types/ember-data/test/belongs-to.ts b/types/ember-data/test/belongs-to.ts
index 9e59aa6128..bd1037a65e 100644
--- a/types/ember-data/test/belongs-to.ts
+++ b/types/ember-data/test/belongs-to.ts
@@ -3,8 +3,14 @@ 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' });
+    children = DS.hasMany('folder', { inverse: 'parent' });
+    parent = DS.belongsTo('folder', { inverse: 'children' });
+}
+
+declare module 'ember-data' {
+    interface ModelRegistry {
+        folder: Folder;
+    }
 }
 
 const folder = Folder.create();
diff --git a/types/ember-data/test/has-many.ts b/types/ember-data/test/has-many.ts
index 7fb586ff4a..e24fb1b814 100644
--- a/types/ember-data/test/has-many.ts
+++ b/types/ember-data/test/has-many.ts
@@ -1,43 +1,56 @@
 import DS from 'ember-data';
 import { assertType } from './lib/assert';
 
-class Comment extends DS.Model {
+class BlogComment extends DS.Model {
     text = DS.attr('string');
 }
 
+declare module 'ember-data' {
+    interface ModelRegistry {
+        'blog-comment': BlogComment;
+    }
+}
+
 class BlogPost extends DS.Model {
     title = DS.attr('string');
-    commentsAsync = DS.hasMany<Comment>('comment');
-    commentsSync = DS.hasMany<Comment>('comment', { async: false });
+    commentsAsync = DS.hasMany('blog-comment');
+    commentsSync = DS.hasMany('blog-comment', { async: false });
 }
 
-const post = BlogPost.create();
+const blogPost = BlogPost.create();
 
-assertType<DS.PromiseArray<Comment>>(post.get('commentsSync').reload());
-assertType<Comment>(post.get('commentsSync').createRecord());
+assertType<DS.PromiseArray<BlogComment>>(blogPost.get('commentsSync').reload());
+assertType<BlogComment>(blogPost.get('commentsSync').createRecord());
 
-const comment = post.get('commentsSync').get('firstObject');
-assertType<Comment | undefined>(comment);
+const comment = blogPost.get('commentsSync').get('firstObject');
+assertType<BlogComment | 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'));
+assertType<DS.PromiseArray<BlogComment>>(blogPost.get('commentsAsync').reload());
+assertType<BlogComment>(blogPost.get('commentsAsync').createRecord());
+assertType<BlogComment | undefined>(blogPost.get('commentsAsync').get('firstObject'));
 
-const commentAsync = post.get('commentsAsync').get('firstObject');
-assertType<Comment | undefined>(commentAsync);
+const commentAsync = blogPost.get('commentsAsync').get('firstObject');
+assertType<BlogComment | undefined>(commentAsync);
 if (commentAsync) {
     assertType<string>(commentAsync.get('text'));
 }
-assertType<boolean>(post.get('commentsAsync').get('isFulfilled'));
+assertType<boolean>(blogPost.get('commentsAsync').get('isFulfilled'));
 
-post.get('commentsAsync').then(comments => {
-    assertType<Comment | undefined>(comments.get('firstObject'));
+blogPost.get('commentsAsync').then(comments => {
+    assertType<BlogComment | undefined>(comments.get('firstObject'));
     assertType<string>(comments.get('firstObject')!.get('text'));
 });
 
+class PaymentMethod extends DS.Model {}
+declare module 'ember-data' {
+    interface ModelRegistry {
+        'payment-method': PaymentMethod;
+    }
+}
+
 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
index 4c0a6e4e6b..3e32a2b805 100644
--- a/types/ember-data/test/injections.ts
+++ b/types/ember-data/test/injections.ts
@@ -1,6 +1,14 @@
 import Ember from 'ember';
 import DS from 'ember-data';
 
+class MyModel extends DS.Model {}
+
+declare module 'ember-data' {
+    interface ModelRegistry {
+        'my-model': MyModel;
+    }
+}
+
 Ember.Route.extend({
     model(): any {
         return this.store.findAll('my-model');
diff --git a/types/ember-data/test/record-reference.ts b/types/ember-data/test/record-reference.ts
index bb4fda42d4..f5bf973402 100644
--- a/types/ember-data/test/record-reference.ts
+++ b/types/ember-data/test/record-reference.ts
@@ -7,7 +7,13 @@ class User extends DS.Model {
     username = DS.attr('string');
 }
 
-let userRef = store.getReference<User>('user', 1);
+declare module 'ember-data' {
+    interface ModelRegistry {
+        user: User;
+    }
+}
+
+let userRef = store.getReference('user', 1);
 
 // get the record of the reference (null if not yet available)
 let user = userRef.value();
diff --git a/types/ember-data/test/relationships.ts b/types/ember-data/test/relationships.ts
index a878428bc4..fb89d4410c 100644
--- a/types/ember-data/test/relationships.ts
+++ b/types/ember-data/test/relationships.ts
@@ -16,14 +16,21 @@ class Comment extends DS.Model {
     author = DS.attr('string');
 }
 
-class BlogPost extends DS.Model {
+class RelationalPost extends DS.Model {
     title = DS.attr('string');
     tag = DS.attr('string');
-    comments = DS.hasMany<Comment>('comment', { async: true });
+    comments = DS.hasMany('comment', { async: true });
     relatedPosts = DS.hasMany('post');
 }
 
-let blogPost = store.peekRecord<BlogPost>('blog-post', 1);
+declare module 'ember-data' {
+    interface ModelRegistry {
+        'relational-post': RelationalPost;
+        comment: Comment;
+    }
+}
+
+let blogPost = store.peekRecord('relational-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
index 986020144f..baaa65ae9e 100644
--- a/types/ember-data/test/serializer.ts
+++ b/types/ember-data/test/serializer.ts
@@ -4,7 +4,8 @@ import DS from 'ember-data';
 const JsonApi = DS.JSONAPISerializer.extend({});
 
 const Customized = DS.JSONAPISerializer.extend({
-    serialize(snapshot: DS.Snapshot, options: {}) {
+    serialize(snapshot: DS.Snapshot<'user'>, options: {}) {
+        const lookup = snapshot.belongsTo('username');
         let json: any = this._super(...Array.from(arguments));
 
         json.data.attributes.cost = {
diff --git a/types/ember-data/test/store.ts b/types/ember-data/test/store.ts
index 46b0987981..0a9a615d27 100644
--- a/types/ember-data/test/store.ts
+++ b/types/ember-data/test/store.ts
@@ -1,24 +1,30 @@
 import Ember from 'ember';
 import DS from 'ember-data';
-import { assertType } from "./lib/assert";
+import { assertType } from './lib/assert';
 
 declare const store: DS.Store;
 
 class Post extends DS.Model {
-  title = DS.attr('string');
+    title = DS.attr('string');
 }
 
-let post = store.createRecord<Post>('post', {
+declare module 'ember-data' {
+    interface ModelRegistry {
+        post: Post;
+    }
+}
+
+let post = store.createRecord('post', {
     title: 'Rails is Omakase',
-    body: 'Lorem ipsum'
+    body: 'Lorem ipsum',
 });
 
 post.save(); // => POST to '/posts'
-post.save().then((saved) => {
+post.save().then(saved => {
     assertType<Post>(saved);
 });
 
-store.findRecord<Post>('post', 1).then(function(post) {
+store.findRecord('post', 1).then(function(post) {
     post.get('title'); // => "Rails is Omakase"
     post.set('title', 'A new post');
     post.save(); // => PATCH to '/posts/1'
@@ -28,21 +34,30 @@ class User extends DS.Model {
     username = DS.attr('string');
 }
 
-store.queryRecord<User>('user', {}).then(function(user) {
+class Author extends User {}
+
+declare module 'ember-data' {
+    interface ModelRegistry {
+        'user': User;
+        'author': Author;
+    }
+}
+
+store.queryRecord('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('post'); // => GET /blog-posts
 store.findAll('author', { reload: true }).then(function(authors) {
     authors.getEach('id'); // ['first', 'second']
 });
 store.findAll('post', {
-    adapterOptions: { subscribe: false }
+    adapterOptions: { subscribe: false },
 });
 store.findAll('post', { include: 'comments,comments.author' });
 
-store.peekAll('blog-post'); // => no network request
+store.peekAll('post'); // => no network request
 
 if (store.hasRecordForId('post', 1)) {
     let maybePost = store.peekRecord('post', 1);
@@ -52,16 +67,22 @@ if (store.hasRecordForId('post', 1)) {
 }
 
 class Message extends DS.Model {
-  hasBeenSeen = DS.attr('boolean');
+    hasBeenSeen = DS.attr('boolean');
 }
 
-const messages = store.peekAll<Message>('message');
+declare module 'ember-data' {
+    interface ModelRegistry {
+        message: Message;
+    }
+}
+
+const messages = store.peekAll('message');
 messages.forEach(function(message) {
     message.set('hasBeenSeen', true);
 });
 messages.save();
 
-const people = store.peekAll('person');
+const people = store.peekAll('user');
 people.get('isUpdating'); // false
 people.update().then(function() {
     people.get('isUpdating'); // false
@@ -70,53 +91,84 @@ 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'});
+        return this.store.findRecord('post', params.post_id, {
+            include: 'comments,comments.author',
+        });
+    },
+});
+
+// Store is injectable via `inject` and resolves to `DS.Store`.
+const SomeComponent = Ember.Component.extend({
+    store: Ember.inject.service('store'),
+
+    lookUpUsers() {
+        assertType<User>(this.get('store').findRecord('user', 123));
+        assertType<DS.PromiseArray<User>>(this.get('store').findAll('user'));
     }
 });
 
 // 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");
-});
+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
+    console.log(admins.get('length')); // 42
 });
 admins.update().then(function() {
     admins.get('isUpdating'); // false
-    console.log(admins.get("length")); // 123
+    console.log(admins.get('length')); // 123
 });
 
 store.push({
-    data: [{
-        id: 1,
-        type: 'album',
-        attributes: {
-            title: 'Fewer Moving Parts',
-            artist: 'David Bazan',
-            songCount: 10
+    data: [
+        {
+            id: 1,
+            type: 'album',
+            attributes: {
+                title: 'Fewer Moving Parts',
+                artist: 'David Bazan',
+                songCount: 10,
+            },
+            relationships: {},
         },
-        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
+        {
+            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: {},
         },
-        relationships: {}
-    }]
+    ],
 });
 
-class UserAdapter extends DS.Adapter { }
-class UserSerializer extends DS.Serializer { }
+class UserAdapter extends DS.Adapter {
+    thisAdapterOnlyMethod(): void {}
+}
+class UserSerializer extends DS.Serializer {
+    thisSerializerOnlyMethod(): void {}
+}
 
-assertType<UserAdapter>(store.adapterFor<UserAdapter>('user'));
-assertType<UserSerializer>(store.serializerFor<UserSerializer>('user'));
+declare module 'ember-data' {
+    interface AdapterRegistry {
+        user: UserAdapter;
+    }
+
+    interface SerializerRegistry {
+        user: UserSerializer;
+    }
+}
+
+assertType<UserAdapter>(store.adapterFor('user'));
+assertType<UserSerializer>(store.serializerFor('user'));
diff --git a/types/ember-data/tsconfig.json b/types/ember-data/tsconfig.json
index 15f77391aa..bbcd08ef8a 100644
--- a/types/ember-data/tsconfig.json
+++ b/types/ember-data/tsconfig.json
@@ -10,7 +10,9 @@
         "strictNullChecks": true,
         "strictFunctionTypes": false,
         "baseUrl": "../",
-        "typeRoots": ["../"],
+        "typeRoots": [
+            "../"
+        ],
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
@@ -31,4 +33,4 @@
         "test/injections.ts",
         "test/error.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/ember-data/tslint.json b/types/ember-data/tslint.json
index 6d765664cf..2389d09a3b 100644
--- a/types/ember-data/tslint.json
+++ b/types/ember-data/tslint.json
@@ -1,6 +1,7 @@
 {
     "extends": "dtslint/dt.json",
     "rules": {
+        "strict-export-declare-modifiers": false,
         // Heavy use of Function type in this older package.
         "ban-types": false,
         "jsdoc-format": false,
diff --git a/types/ember-feature-flags/tsconfig.json b/types/ember-feature-flags/tsconfig.json
index 9481eddeb5..af809bcdbe 100644
--- a/types/ember-feature-flags/tsconfig.json
+++ b/types/ember-feature-flags/tsconfig.json
@@ -22,4 +22,4 @@
         "tests/helpers/with-feature.d.ts",
         "ember-feature-flags-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/ember-mocha/tsconfig.json b/types/ember-mocha/tsconfig.json
index e9fdedfe7f..6c99518050 100644
--- a/types/ember-mocha/tsconfig.json
+++ b/types/ember-mocha/tsconfig.json
@@ -9,7 +9,9 @@
         "strictNullChecks": true,
         "strictFunctionTypes": false,
         "baseUrl": "../",
-        "typeRoots": ["../"],
+        "typeRoots": [
+            "../"
+        ],
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
@@ -18,4 +20,4 @@
         "index.d.ts",
         "ember-mocha-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/ember-modal-dialog/tsconfig.json b/types/ember-modal-dialog/tsconfig.json
index 8834a9ae3d..c17fe35445 100644
--- a/types/ember-modal-dialog/tsconfig.json
+++ b/types/ember-modal-dialog/tsconfig.json
@@ -21,4 +21,4 @@
         "index.d.ts",
         "ember-modal-dialog-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/ember-qunit/tsconfig.json b/types/ember-qunit/tsconfig.json
index 1f9e626103..f7f3923136 100644
--- a/types/ember-qunit/tsconfig.json
+++ b/types/ember-qunit/tsconfig.json
@@ -10,7 +10,9 @@
         "strictNullChecks": true,
         "strictFunctionTypes": false,
         "baseUrl": "../",
-        "typeRoots": ["../"],
+        "typeRoots": [
+            "../"
+        ],
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
@@ -19,4 +21,4 @@
         "index.d.ts",
         "ember-qunit-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/ember-qunit/v2/tsconfig.json b/types/ember-qunit/v2/tsconfig.json
index e173bc0d73..1a71d59c4a 100644
--- a/types/ember-qunit/v2/tsconfig.json
+++ b/types/ember-qunit/v2/tsconfig.json
@@ -10,9 +10,13 @@
         "strictNullChecks": true,
         "strictFunctionTypes": false,
         "baseUrl": "../../",
-        "typeRoots": ["../../"],
+        "typeRoots": [
+            "../../"
+        ],
         "paths": {
-            "ember-qunit": ["ember-qunit/v2"]
+            "ember-qunit": [
+                "ember-qunit/v2"
+            ]
         },
         "types": [],
         "noEmit": true,
@@ -22,4 +26,4 @@
         "index.d.ts",
         "ember-qunit-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/ember-test-helpers/index.d.ts b/types/ember-test-helpers/index.d.ts
index f098c49a84..c0d5947aba 100644
--- a/types/ember-test-helpers/index.d.ts
+++ b/types/ember-test-helpers/index.d.ts
@@ -8,7 +8,6 @@
 
 declare module 'ember-test-helpers' {
     import Ember from 'ember';
-    import DS from 'ember-data';
     import { TemplateFactory } from 'htmlbars-inline-precompile';
     import RSVP from "rsvp";
 
@@ -40,7 +39,6 @@ declare module 'ember-test-helpers' {
         container: Ember.Container;
         dispatcher: Ember.EventDispatcher;
         application: Ember.Application;
-        store: DS.Store;
         register(fullName: string, factory: any): void;
         factory(fullName: string): any;
         inject: {
diff --git a/types/ember-test-helpers/tsconfig.json b/types/ember-test-helpers/tsconfig.json
index dc9c583d1c..78ca69344a 100644
--- a/types/ember-test-helpers/tsconfig.json
+++ b/types/ember-test-helpers/tsconfig.json
@@ -10,7 +10,9 @@
         "strictNullChecks": true,
         "strictFunctionTypes": false,
         "baseUrl": "../",
-        "typeRoots": ["../"],
+        "typeRoots": [
+            "../"
+        ],
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
@@ -19,4 +21,4 @@
         "index.d.ts",
         "ember-test-helpers-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/ember-testing-helpers/tsconfig.json b/types/ember-testing-helpers/tsconfig.json
index 622d4d1584..725957a948 100644
--- a/types/ember-testing-helpers/tsconfig.json
+++ b/types/ember-testing-helpers/tsconfig.json
@@ -10,7 +10,9 @@
         "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
-        "typeRoots": ["../"],
+        "typeRoots": [
+            "../"
+        ],
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/types/ember/index.d.ts b/types/ember/index.d.ts
index 22ff839774..4a3d7d45d1 100755
--- a/types/ember/index.d.ts
+++ b/types/ember/index.d.ts
@@ -18,6 +18,9 @@ declare module 'ember' {
     import Rsvp from 'rsvp';
     import { TemplateFactory } from 'htmlbars-inline-precompile';
 
+    import { Registry as ServiceRegistry } from '@ember/service';
+    import { Registry as ControllerRegistry } from '@ember/controller';
+
     // Get an alias to the global Array type to use in inner scope below.
     type GlobalArray<T> = T[];
 
@@ -1816,7 +1819,7 @@ declare module 'ember' {
              * The controller instance must already have been created, either through entering the
              * associated route or using `generateController`.
              */
-            controllerFor(name: string): Controller;
+            controllerFor<K extends keyof ControllerRegistry>(name: K): ControllerRegistry[K];
 
             /**
              * Disconnects a view that has been rendered into an outlet.
@@ -2303,12 +2306,18 @@ declare module 'ember' {
              * Creates a property that lazily looks up another controller in the container.
              * Can only be used when defining another controller.
              */
-            function controller(name?: string): ComputedProperty<Controller>;
+            function controller(): ComputedProperty<Ember.Controller>;
+            function controller<K extends keyof ControllerRegistry>(
+                name: K
+            ): ComputedProperty<ControllerRegistry[K]>;
             /**
              * Creates a property that lazily looks up a service in the container. There
              * are no restrictions as to what objects a service can be injected into.
              */
-            function service(name?: string): ComputedProperty<Service>;
+            function service(): ComputedProperty<Ember.Service>;
+            function service<K extends keyof ServiceRegistry>(
+                name: K
+            ): ComputedProperty<ServiceRegistry[K]>;
         }
         namespace ENV {
             const EXTEND_PROTOTYPES: typeof Ember.EXTEND_PROTOTYPES;
@@ -3279,6 +3288,84 @@ declare module 'ember' {
         function expandProperties(pattern: string, callback: (expanded: string) => void): void;
     }
 
+    type RouteModel = object | string | number;
+    // https://emberjs.com/api/ember/2.18/classes/RouterService
+    /**
+     * The Router service is the public API that provides component/view layer access to the router.
+     */
+    class RouterService extends Ember.Service {
+        //
+        /**
+         * Determines whether a route is active.
+         *
+         * @param routeName the name of the route
+         * @param models    the model(s) or identifier(s) to be used while
+         *                  transitioning to the route
+         * @param options   optional hash with a queryParams property containing a
+         *                  mapping of query parameters
+         */
+        isActive(routeName: string, models: RouteModel, options?: { queryParams: object }): boolean;
+        isActive(routeName: string, modelsA: RouteModel, modelsB: RouteModel, options?: { queryParams: object }): boolean;
+        isActive(routeName: string, modelsA: RouteModel, modelsB: RouteModel, modelsC: RouteModel, options?: { queryParams: object }): boolean;
+        isActive(routeName: string, modelsA: RouteModel, modelsB: RouteModel, modelsC: RouteModel, modelsD: RouteModel, options?: { queryParams: object }): boolean;
+
+        // https://emberjs.com/api/ember/2.18/classes/RouterService/methods/isActive?anchor=replaceWith
+        /**
+         * Transition into another route while replacing the current URL, if
+         * possible. The route may be either a single route or route path.
+         *
+         * @param routeNameOrUrl the name of the route or a URL
+         * @param models         the model(s) or identifier(s) to be used while
+         *                       transitioning to the route.
+         * @param options        optional hash with a queryParams property
+         *                       containing a mapping of query parameters
+         * @returns              the Transition object associated with this attempted transition
+         */
+        replaceWith(routeNameOrUrl: string, models: RouteModel, options?: { queryParams: object }): Ember.Transition;
+        replaceWith(routeNameOrUrl: string, modelsA: RouteModel, modelsB: RouteModel, options?: { queryParams: object }): Ember.Transition;
+        replaceWith(routeNameOrUrl: string, modelsA: RouteModel, modelsB: RouteModel, modelsC: RouteModel, options?: { queryParams: object }): Ember.Transition;
+        replaceWith(routeNameOrUrl: string, modelsA: RouteModel, modelsB: RouteModel, modelsC: RouteModel, modelsD: RouteModel, options?: { queryParams: object }): Ember.Transition;
+
+        // https://emberjs.com/api/ember/2.18/classes/RouterService/methods/isActive?anchor=transitionTo
+        /**
+         * Transition the application into another route. The route may be
+         * either a single route or route path
+         *
+         * @param routeNameOrUrl the name of the route or a URL
+         * @param models         the model(s) or identifier(s) to be used while
+         *                       transitioning to the route.
+         * @param options        optional hash with a queryParams property
+         *                       containing a mapping of query parameters
+         * @returns              the Transition object associated with this attempted transition
+         */
+        transitionTo(routeNameOrUrl: string, models: RouteModel, options?: { queryParams: object }): Ember.Transition;
+        transitionTo(routeNameOrUrl: string, modelsA: RouteModel, modelsB: RouteModel, options?: { queryParams: object }): Ember.Transition;
+        transitionTo(routeNameOrUrl: string, modelsA: RouteModel, modelsB: RouteModel, modelsC: RouteModel, options?: { queryParams: object }): Ember.Transition;
+        transitionTo(routeNameOrUrl: string, modelsA: RouteModel, modelsB: RouteModel, modelsC: RouteModel, modelsD: RouteModel, options?: { queryParams: object }): Ember.Transition;
+
+        // https://emberjs.com/api/ember/2.18/classes/RouterService/methods/isActive?anchor=urlFor
+        /**
+         * Generate a URL based on the supplied route name.
+         *
+         * @param routeName the name of the route or a URL
+         * @param models    the model(s) or identifier(s) to be used while
+         *                  transitioning to the route.
+         * @param options   optional hash with a queryParams property containing
+         *                  a mapping of query parameters
+         * @returns         the string representing the generated URL
+         */
+        urlFor(routeName: string, models: RouteModel, options?: { queryParams: object }): string;
+        urlFor(routeName: string, modelsA: RouteModel, modelsB: RouteModel, options?: { queryParams: object }): string;
+        urlFor(routeName: string, modelsA: RouteModel, modelsB: RouteModel, modelsC: RouteModel, options?: { queryParams: object }): string;
+        urlFor(routeName: string, modelsA: RouteModel, modelsB: RouteModel, modelsC: RouteModel, modelsD: RouteModel, options?: { queryParams: object }): string;
+    }
+
+    module '@ember/service' {
+        interface Registry {
+            'router': RouterService;
+        }
+    }
+
     export default Ember;
 }
 
@@ -3362,6 +3449,10 @@ declare module '@ember/controller' {
     import Ember from 'ember';
     export default class Controller extends Ember.Controller { }
     export const inject: typeof Ember.inject.controller;
+
+    // A type registry for Ember `Controller`s. Meant to be declaration-merged
+    // so string lookups resolve to the correct type.
+    export interface Registry {}
 }
 
 declare module '@ember/debug' {
@@ -3501,8 +3592,7 @@ declare module '@ember/object/internals' {
 
 declare module '@ember/object/mixin' {
     import Ember from 'ember';
-    const Mixin: typeof Ember.Mixin;
-    export default Mixin;
+    export default class Mixin<T, Base = Ember.Object> extends Ember.Mixin<T, Base> {}
 }
 
 declare module '@ember/object/observable' {
@@ -3599,6 +3689,10 @@ declare module '@ember/service' {
     import Ember from 'ember';
     export default class Service extends Ember.Service { }
     export const inject: typeof Ember.inject.service;
+
+    // A type registry for Ember `Service`s. Meant to be declaration-merged so
+    // string lookups resolve to the correct type.
+    interface Registry {}
 }
 
 declare module '@ember/string' {
diff --git a/types/ember/test/inject.ts b/types/ember/test/inject.ts
index dd628f6d2a..3ea0176ea6 100755
--- a/types/ember/test/inject.ts
+++ b/types/ember/test/inject.ts
@@ -5,16 +5,55 @@ class AuthService extends Ember.Service {
 }
 
 class ApplicationController extends Ember.Controller {
+    model: {};
+    string: string;
     transitionToLogin() {}
 }
 
+declare module '@ember/service' {
+    interface Registry {
+        'auth': AuthService;
+    }
+}
+
+declare module '@ember/controller' {
+    interface Registry {
+        'application': ApplicationController;
+    }
+}
+
 class LoginRoute extends Ember.Route {
-    auth = Ember.inject.service('authentication') as Ember.ComputedProperty<AuthService>;
-    application = Ember.inject.controller() as Ember.ComputedProperty<ApplicationController>;
+    auth = Ember.inject.service('auth');
+    application = Ember.inject.controller('application');
 
     didTransition() {
         if (!this.get('auth').get('isAuthenticated')) {
             this.get('application').transitionToLogin();
         }
     }
+
+    anyOldMethod() {
+        this.controllerFor('application').set('string', 'must be a string');
+    }
+}
+
+// New module injection style.
+import Controller, { inject as controller } from '@ember/controller';
+import Service, { inject as service } from '@ember/service';
+import { assertType } from './lib/assert';
+
+class ComponentInjection extends Ember.Component {
+    applicationController = controller('application');
+    auth = service('auth');
+    router = service('router');
+    misc = service();
+
+    testem() {
+        assertType<Ember.Service>(this.get('misc'));
+        const url = this.get('router').urlFor('some-route', 1, 2, 3, { queryParams: { seriously: 'yes' } });
+        assertType<string>(url);
+        if (!this.get('auth').isAuthenticated) {
+            this.get('applicationController').transitionToLogin();
+        }
+    }
 }
diff --git a/types/ember/tsconfig.json b/types/ember/tsconfig.json
index 98d2623024..19c8cf4b50 100755
--- a/types/ember/tsconfig.json
+++ b/types/ember/tsconfig.json
@@ -11,7 +11,9 @@
         "strictNullChecks": true,
         "strictFunctionTypes": false,
         "baseUrl": "../",
-        "typeRoots": ["../"],
+        "typeRoots": [
+            "../"
+        ],
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
@@ -47,4 +49,4 @@
         "test/route.ts",
         "test/view-utils.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/emoji-mart/index.d.ts b/types/emoji-mart/index.d.ts
index 1116d6eb6f..6a8ed65632 100644
--- a/types/emoji-mart/index.d.ts
+++ b/types/emoji-mart/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/missive/emoji-mart
 // Definitions by: Diogo Franco <https://github.com/Kovensky>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.4
+// TypeScript Version: 2.6
 
 // These definitions should work with 2.3, but the tests doesn't pass on 2.3.
 
diff --git a/types/emoji-mart/tsconfig.json b/types/emoji-mart/tsconfig.json
index fb776e9a21..6ecc944e77 100644
--- a/types/emoji-mart/tsconfig.json
+++ b/types/emoji-mart/tsconfig.json
@@ -29,4 +29,4 @@
         "dist-es/index.d.ts",
         "emoji-mart-tests.tsx"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/end-of-stream/end-of-stream-tests.ts b/types/end-of-stream/end-of-stream-tests.ts
index 211c6f5196..829a177d5c 100644
--- a/types/end-of-stream/end-of-stream-tests.ts
+++ b/types/end-of-stream/end-of-stream-tests.ts
@@ -1,4 +1,4 @@
-import * as eos from "end-of-stream";
+import eos = require("end-of-stream");
 
 declare const readableStream: NodeJS.ReadableStream;
 declare const writableStream: NodeJS.WritableStream;
diff --git a/types/enzyme-adapter-react-15.4/enzyme-adapter-react-15.4-tests.ts b/types/enzyme-adapter-react-15.4/enzyme-adapter-react-15.4-tests.ts
index 603c7634b3..af26532174 100644
--- a/types/enzyme-adapter-react-15.4/enzyme-adapter-react-15.4-tests.ts
+++ b/types/enzyme-adapter-react-15.4/enzyme-adapter-react-15.4-tests.ts
@@ -1,4 +1,4 @@
 import { configure } from 'enzyme';
-import * as Adapter from 'enzyme-adapter-react-15.4';
+import Adapter = require('enzyme-adapter-react-15.4');
 
 configure({ adapter: new Adapter() });
diff --git a/types/enzyme-adapter-react-15.4/index.d.ts b/types/enzyme-adapter-react-15.4/index.d.ts
index 115f8de677..570cc22e99 100644
--- a/types/enzyme-adapter-react-15.4/index.d.ts
+++ b/types/enzyme-adapter-react-15.4/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://airbnb.io/enzyme/
 // Definitions by: Nabeelah Ali <https://github.com/nali>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import { EnzymeAdapter } from 'enzyme';
 
diff --git a/types/enzyme-adapter-react-15.4/tsconfig.json b/types/enzyme-adapter-react-15.4/tsconfig.json
index 804fe8ee07..dd18c943b6 100644
--- a/types/enzyme-adapter-react-15.4/tsconfig.json
+++ b/types/enzyme-adapter-react-15.4/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "enzyme-adapter-react-15.4-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/enzyme-adapter-react-15/enzyme-adapter-react-15-tests.ts b/types/enzyme-adapter-react-15/enzyme-adapter-react-15-tests.ts
index 9be474c2d8..fa3c9a357a 100644
--- a/types/enzyme-adapter-react-15/enzyme-adapter-react-15-tests.ts
+++ b/types/enzyme-adapter-react-15/enzyme-adapter-react-15-tests.ts
@@ -1,4 +1,4 @@
 import { configure } from 'enzyme';
-import * as Adapter from 'enzyme-adapter-react-15';
+import Adapter = require('enzyme-adapter-react-15');
 
 configure({ adapter: new Adapter() });
diff --git a/types/enzyme-adapter-react-15/index.d.ts b/types/enzyme-adapter-react-15/index.d.ts
index 01307da953..90149cae55 100644
--- a/types/enzyme-adapter-react-15/index.d.ts
+++ b/types/enzyme-adapter-react-15/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/airbnb/enzyme
 // Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import { EnzymeAdapter } from 'enzyme';
 
diff --git a/types/enzyme-adapter-react-15/tsconfig.json b/types/enzyme-adapter-react-15/tsconfig.json
index 23f0d0d292..97eb2c66a1 100644
--- a/types/enzyme-adapter-react-15/tsconfig.json
+++ b/types/enzyme-adapter-react-15/tsconfig.json
@@ -1,21 +1,26 @@
 {
-  "compilerOptions": {
-    "baseUrl": "../",
-    "typeRoots": ["../"],
-    "types": [],
-    "module": "commonjs",
-    "lib": ["es6", "dom"],
-    "noUnusedLocals": true,
-    "noUnusedParameters": true,
-    "noImplicitAny": true,
-    "noImplicitThis": true,
-    "strictNullChecks": true,
-    "strictFunctionTypes": true,
-    "forceConsistentCasingInFileNames": true,
-    "noEmit": true
-  },
-  "files": [
-    "index.d.ts",
-    "enzyme-adapter-react-15-tests.ts"
-  ]
-}
+    "compilerOptions": {
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noUnusedLocals": true,
+        "noUnusedParameters": true,
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "forceConsistentCasingInFileNames": true,
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "enzyme-adapter-react-15-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/enzyme-adapter-react-16/enzyme-adapter-react-16-tests.ts b/types/enzyme-adapter-react-16/enzyme-adapter-react-16-tests.ts
index b8acf7f719..8b53ed9dc7 100644
--- a/types/enzyme-adapter-react-16/enzyme-adapter-react-16-tests.ts
+++ b/types/enzyme-adapter-react-16/enzyme-adapter-react-16-tests.ts
@@ -1,4 +1,4 @@
 import { configure } from 'enzyme';
-import * as Adapter from 'enzyme-adapter-react-16';
+import Adapter = require('enzyme-adapter-react-16');
 
 configure({ adapter: new Adapter() });
diff --git a/types/enzyme-adapter-react-16/index.d.ts b/types/enzyme-adapter-react-16/index.d.ts
index 82927b03e5..53f97ccce6 100644
--- a/types/enzyme-adapter-react-16/index.d.ts
+++ b/types/enzyme-adapter-react-16/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/airbnb/enzyme
 // Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import { EnzymeAdapter } from 'enzyme';
 
diff --git a/types/enzyme-adapter-react-16/tsconfig.json b/types/enzyme-adapter-react-16/tsconfig.json
index 1c1c8e15f9..202f19500d 100644
--- a/types/enzyme-adapter-react-16/tsconfig.json
+++ b/types/enzyme-adapter-react-16/tsconfig.json
@@ -1,21 +1,26 @@
 {
-  "compilerOptions": {
-    "baseUrl": "../",
-    "typeRoots": ["../"],
-    "types": [],
-    "module": "commonjs",
-    "lib": ["es6", "dom"],
-    "noUnusedLocals": true,
-    "noUnusedParameters": true,
-    "noImplicitAny": true,
-    "noImplicitThis": true,
-    "strictNullChecks": true,
-    "strictFunctionTypes": true,
-    "forceConsistentCasingInFileNames": true,
-    "noEmit": true
-  },
-  "files": [
-    "index.d.ts",
-    "enzyme-adapter-react-16-tests.ts"
-  ]
-}
+    "compilerOptions": {
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noUnusedLocals": true,
+        "noUnusedParameters": true,
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "forceConsistentCasingInFileNames": true,
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "enzyme-adapter-react-16-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/enzyme-to-json/index.d.ts b/types/enzyme-to-json/index.d.ts
index cba4561649..d2ba70fc8f 100644
--- a/types/enzyme-to-json/index.d.ts
+++ b/types/enzyme-to-json/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/adriantoine/enzyme-to-json#readme
 // Definitions by: Joscha Feth <https://github.com/joscha>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import { ReactWrapper, ShallowWrapper } from 'enzyme';
 
diff --git a/types/enzyme/index.d.ts b/types/enzyme/index.d.ts
index d23af4ab04..fbb953e167 100644
--- a/types/enzyme/index.d.ts
+++ b/types/enzyme/index.d.ts
@@ -8,7 +8,7 @@
 //                 MartynasZilinskas <https://github.com/MartynasZilinskas>
 //                 Torgeir Hovden <https://github.com/thovden>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 /// <reference types="cheerio" />
 import { ReactElement, Component, AllHTMLAttributes as ReactHTMLAttributes, SVGAttributes as ReactSVGAttributes } from "react";
diff --git a/types/epilogue/epilogue-tests.ts b/types/epilogue/epilogue-tests.ts
index 0cf40fd1e9..cff716f780 100644
--- a/types/epilogue/epilogue-tests.ts
+++ b/types/epilogue/epilogue-tests.ts
@@ -1,6 +1,6 @@
 import * as epilogue from 'epilogue';
-import * as express from 'express';
-import * as Sequelize from 'sequelize';
+import express = require('express');
+import Sequelize = require('sequelize');
 
 const database = new Sequelize({ });
 
diff --git a/types/epilogue/tsconfig.json b/types/epilogue/tsconfig.json
index 593077c6bc..9c4182c09e 100644
--- a/types/epilogue/tsconfig.json
+++ b/types/epilogue/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "epilogue-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/errorhandler/errorhandler-tests.ts b/types/errorhandler/errorhandler-tests.ts
index f6a35dd19d..3f8ada3372 100644
--- a/types/errorhandler/errorhandler-tests.ts
+++ b/types/errorhandler/errorhandler-tests.ts
@@ -1,6 +1,5 @@
-
-import * as express from 'express';
-import * as errorhandler from 'errorhandler';
+import express = require('express');
+import errorhandler = require('errorhandler');
 
 var app = express();
 
diff --git a/types/eslint/eslint-tests.ts b/types/eslint/eslint-tests.ts
new file mode 100644
index 0000000000..376cdf0a92
--- /dev/null
+++ b/types/eslint/eslint-tests.ts
@@ -0,0 +1,534 @@
+import { Comment } from 'estree';
+import { AST, SourceCode, Rule, Linter, CLIEngine, RuleTester, Scope } from 'eslint';
+
+const SOURCE = `var foo = bar;`;
+
+const AST: AST.Program = {
+    type: 'Program',
+    sourceType: 'module',
+    body: [],
+    comments: [],
+    tokens: [],
+    loc: {
+        start: { line: 0, column: 0 },
+        end: { line: 0, column: 0 }
+    },
+    range: [0, 0],
+};
+
+const TOKEN: AST.Token = {
+    type: 'Identifier',
+    value: 'foo',
+    loc: {
+        start: { line: 0, column: 0 },
+        end: { line: 0, column: 3 }
+    },
+    range: [0, 3]
+};
+
+const COMMENT: Comment = {
+    type: 'Block',
+    value: 'foo',
+    loc: {
+        start: { line: 0, column: 0 },
+        end: { line: 0, column: 0 }
+    },
+    range: [0, 0],
+};
+
+//#region SourceCode
+
+let sourceCode = new SourceCode(SOURCE, AST);
+
+SourceCode.splitLines(SOURCE);
+
+sourceCode.getText();
+sourceCode.getText(AST);
+sourceCode.getText(AST, 0);
+sourceCode.getText(AST, 0, 0);
+
+sourceCode.getLines();
+
+sourceCode.getAllComments();
+
+sourceCode.getComments(AST).leading;
+sourceCode.getComments(AST).trailing;
+
+sourceCode.getJSDocComment(AST);
+
+sourceCode.getNodeByRangeIndex(0);
+
+sourceCode.getNodeByRangeIndex(0);
+
+sourceCode.isSpaceBetweenTokens(TOKEN, TOKEN);
+
+sourceCode.getLocFromIndex(0);
+
+sourceCode.getIndexFromLoc({ line: 0, column: 0 });
+
+sourceCode.getTokenByRangeStart(0);
+sourceCode.getTokenByRangeStart(0, { includeComments: true });
+
+sourceCode.getFirstToken(AST);
+sourceCode.getFirstToken(AST, 0);
+sourceCode.getFirstToken(AST, { skip: 0 });
+sourceCode.getFirstToken(AST, t => t.type === 'Identifier');
+sourceCode.getFirstToken(AST, { filter: t => t.type === 'Identifier' });
+sourceCode.getFirstToken(AST, { skip: 0, filter: t => t.type === 'Identifier' });
+sourceCode.getFirstToken(AST, { includeComments: true });
+sourceCode.getFirstToken(AST, { includeComments: true, skip: 0 });
+sourceCode.getFirstToken(AST, { includeComments: true, skip: 0, filter: t => t.type === 'Identifier' });
+
+sourceCode.getFirstTokens(AST);
+sourceCode.getFirstTokens(AST, 0);
+sourceCode.getFirstTokens(AST, { count: 0 });
+sourceCode.getFirstTokens(AST, t => t.type === 'Identifier');
+sourceCode.getFirstTokens(AST, { filter: t => t.type === 'Identifier' });
+sourceCode.getFirstTokens(AST, { count: 0, filter: t => t.type === 'Identifier' });
+sourceCode.getFirstTokens(AST, { includeComments: true });
+sourceCode.getFirstTokens(AST, { includeComments: true, count: 0 });
+sourceCode.getFirstTokens(AST, { includeComments: true, count: 0, filter: t => t.type === 'Identifier' });
+
+sourceCode.getLastToken(AST);
+sourceCode.getLastToken(AST, 0);
+sourceCode.getLastToken(AST, { skip: 0 });
+sourceCode.getLastToken(AST, t => t.type === 'Identifier');
+sourceCode.getLastToken(AST, { filter: t => t.type === 'Identifier' });
+sourceCode.getLastToken(AST, { skip: 0, filter: t => t.type === 'Identifier' });
+sourceCode.getLastToken(AST, { includeComments: true });
+sourceCode.getLastToken(AST, { includeComments: true, skip: 0 });
+sourceCode.getLastToken(AST, { includeComments: true, skip: 0, filter: t => t.type === 'Identifier' });
+
+sourceCode.getLastTokens(AST);
+sourceCode.getLastTokens(AST, 0);
+sourceCode.getLastTokens(AST, { count: 0 });
+sourceCode.getLastTokens(AST, t => t.type === 'Identifier');
+sourceCode.getLastTokens(AST, { filter: t => t.type === 'Identifier' });
+sourceCode.getLastTokens(AST, { count: 0, filter: t => t.type === 'Identifier' });
+sourceCode.getLastTokens(AST, { includeComments: true });
+sourceCode.getLastTokens(AST, { includeComments: true, count: 0 });
+sourceCode.getLastTokens(AST, { includeComments: true, count: 0, filter: t => t.type === 'Identifier' });
+
+sourceCode.getTokenBefore(AST);
+sourceCode.getTokenBefore(AST, 0);
+sourceCode.getTokenBefore(AST, { skip: 0 });
+sourceCode.getTokenBefore(AST, t => t.type === 'Identifier');
+sourceCode.getTokenBefore(AST, { filter: t => t.type === 'Identifier' });
+sourceCode.getTokenBefore(AST, { skip: 0, filter: t => t.type === 'Identifier' });
+sourceCode.getTokenBefore(AST, { includeComments: true });
+sourceCode.getTokenBefore(AST, { includeComments: true, skip: 0 });
+sourceCode.getTokenBefore(AST, { includeComments: true, skip: 0, filter: t => t.type === 'Identifier' });
+sourceCode.getTokenBefore(TOKEN, 0);
+sourceCode.getTokenBefore(COMMENT, 0);
+
+sourceCode.getTokensBefore(AST);
+sourceCode.getTokensBefore(AST, 0);
+sourceCode.getTokensBefore(AST, { count: 0 });
+sourceCode.getTokensBefore(AST, t => t.type === 'Identifier');
+sourceCode.getTokensBefore(AST, { filter: t => t.type === 'Identifier' });
+sourceCode.getTokensBefore(AST, { count: 0, filter: t => t.type === 'Identifier' });
+sourceCode.getTokensBefore(AST, { includeComments: true });
+sourceCode.getTokensBefore(AST, { includeComments: true, count: 0 });
+sourceCode.getTokensBefore(AST, { includeComments: true, count: 0, filter: t => t.type === 'Identifier' });
+sourceCode.getTokensBefore(TOKEN, 0);
+sourceCode.getTokensBefore(COMMENT, 0);
+
+sourceCode.getTokenAfter(AST);
+sourceCode.getTokenAfter(AST, 0);
+sourceCode.getTokenAfter(AST, { skip: 0 });
+sourceCode.getTokenAfter(AST, t => t.type === 'Identifier');
+sourceCode.getTokenAfter(AST, { filter: t => t.type === 'Identifier' });
+sourceCode.getTokenAfter(AST, { skip: 0, filter: t => t.type === 'Identifier' });
+sourceCode.getTokenAfter(AST, { includeComments: true });
+sourceCode.getTokenAfter(AST, { includeComments: true, skip: 0 });
+sourceCode.getTokenAfter(AST, { includeComments: true, skip: 0, filter: t => t.type === 'Identifier' });
+sourceCode.getTokenAfter(TOKEN, 0);
+sourceCode.getTokenAfter(COMMENT, 0);
+
+sourceCode.getTokensAfter(AST);
+sourceCode.getTokensAfter(AST, 0);
+sourceCode.getTokensAfter(AST, { count: 0 });
+sourceCode.getTokensAfter(AST, t => t.type === 'Identifier');
+sourceCode.getTokensAfter(AST, { filter: t => t.type === 'Identifier' });
+sourceCode.getTokensAfter(AST, { count: 0, filter: t => t.type === 'Identifier' });
+sourceCode.getTokensAfter(AST, { includeComments: true });
+sourceCode.getTokensAfter(AST, { includeComments: true, count: 0 });
+sourceCode.getTokensAfter(AST, { includeComments: true, count: 0, filter: t => t.type === 'Identifier' });
+sourceCode.getTokensAfter(TOKEN, 0);
+sourceCode.getTokensAfter(COMMENT, 0);
+
+sourceCode.getFirstTokenBetween(AST, AST);
+sourceCode.getFirstTokenBetween(AST, AST, 0);
+sourceCode.getFirstTokenBetween(AST, AST, { skip: 0 });
+sourceCode.getFirstTokenBetween(AST, AST, t => t.type === 'Identifier');
+sourceCode.getFirstTokenBetween(AST, AST, { filter: t => t.type === 'Identifier' });
+sourceCode.getFirstTokenBetween(AST, AST, { skip: 0, filter: t => t.type === 'Identifier' });
+sourceCode.getFirstTokenBetween(AST, AST, { includeComments: true });
+sourceCode.getFirstTokenBetween(AST, AST, { includeComments: true, skip: 0 });
+sourceCode.getFirstTokenBetween(AST, AST, { includeComments: true, skip: 0, filter: t => t.type === 'Identifier' });
+
+sourceCode.getFirstTokensBetween(AST, AST);
+sourceCode.getFirstTokensBetween(AST, AST, 0);
+sourceCode.getFirstTokensBetween(AST, AST, { count: 0 });
+sourceCode.getFirstTokensBetween(AST, AST, t => t.type === 'Identifier');
+sourceCode.getFirstTokensBetween(AST, AST, { filter: t => t.type === 'Identifier' });
+sourceCode.getFirstTokensBetween(AST, AST, { count: 0, filter: t => t.type === 'Identifier' });
+sourceCode.getFirstTokensBetween(AST, AST, { includeComments: true });
+sourceCode.getFirstTokensBetween(AST, AST, { includeComments: true, count: 0 });
+sourceCode.getFirstTokensBetween(AST, AST, { includeComments: true, count: 0, filter: t => t.type === 'Identifier' });
+
+sourceCode.getLastTokenBetween(AST, AST);
+sourceCode.getLastTokenBetween(AST, AST, 0);
+sourceCode.getLastTokenBetween(AST, AST, { skip: 0 });
+sourceCode.getLastTokenBetween(AST, AST, t => t.type === 'Identifier');
+sourceCode.getLastTokenBetween(AST, AST, { filter: t => t.type === 'Identifier' });
+sourceCode.getLastTokenBetween(AST, AST, { skip: 0, filter: t => t.type === 'Identifier' });
+sourceCode.getLastTokenBetween(AST, AST, { includeComments: true });
+sourceCode.getLastTokenBetween(AST, AST, { includeComments: true, skip: 0 });
+sourceCode.getLastTokenBetween(AST, AST, { includeComments: true, skip: 0, filter: t => t.type === 'Identifier' });
+
+sourceCode.getLastTokensBetween(AST, AST);
+sourceCode.getLastTokensBetween(AST, AST, 0);
+sourceCode.getLastTokensBetween(AST, AST, { count: 0 });
+sourceCode.getLastTokensBetween(AST, AST, t => t.type === 'Identifier');
+sourceCode.getLastTokensBetween(AST, AST, { filter: t => t.type === 'Identifier' });
+sourceCode.getLastTokensBetween(AST, AST, { count: 0, filter: t => t.type === 'Identifier' });
+sourceCode.getLastTokensBetween(AST, AST, { includeComments: true });
+sourceCode.getLastTokensBetween(AST, AST, { includeComments: true, count: 0 });
+sourceCode.getLastTokensBetween(AST, AST, { includeComments: true, count: 0, filter: t => t.type === 'Identifier' });
+
+sourceCode.getTokensBetween(AST, AST);
+sourceCode.getTokensBetween(AST, AST, 0);
+
+sourceCode.getTokens(AST);
+sourceCode.getTokens(AST, 0);
+sourceCode.getTokens(AST, 0, 0);
+sourceCode.getTokens(AST, t => t.type === 'Identifier');
+sourceCode.getTokens(AST, { filter: t => t.type === 'Identifier' });
+sourceCode.getTokens(AST, { includeComments: true });
+sourceCode.getTokens(AST, { includeComments: true, filter: t => t.type === 'Identifier' });
+
+sourceCode.commentsExistBetween(AST, AST);
+sourceCode.commentsExistBetween(TOKEN, TOKEN);
+
+sourceCode.getCommentsBefore(AST);
+sourceCode.getCommentsBefore(TOKEN);
+
+sourceCode.getCommentsAfter(AST);
+sourceCode.getCommentsAfter(TOKEN);
+
+sourceCode.getCommentsInside(AST);
+
+//#endregion
+
+//#region Scope
+
+const scopeManager: Scope.ScopeManager = {
+    scopes: [],
+    globalScope: null,
+    acquire(node, inner) {
+        return scopeManager.scopes[0];
+    },
+    getDeclaredVariables() {
+        return [];
+    }
+};
+
+const scope = scopeManager.scopes[0];
+
+const variable = scope.variables[0];
+
+variable.name = 'foo';
+
+variable.identifiers[0].type = 'Identifier';
+
+variable.defs[0].name.type = 'Identifier';
+variable.defs[0].type;
+variable.defs[0].node;
+variable.defs[0].parent;
+
+const reference = scope.references[0];
+
+reference.from = scope;
+reference.identifier.type = 'Identifier';
+reference.resolved = variable;
+reference.writeExpr = AST;
+reference.init = true;
+
+reference.isRead();
+reference.isReadOnly();
+reference.isWrite();
+reference.isWriteOnly();
+reference.isReadWrite();
+
+//#endregion
+
+//#region Rule
+
+let rule: Rule.RuleModule;
+
+rule = { create(context) { return {}; } };
+rule = { create(context) { return {}; }, meta: {} };
+rule = { create(context) { return {}; }, meta: {
+    docs: {
+        description: 'disallow the use of `console`',
+        category: 'Possible Errors',
+        recommended: true,
+        url: 'https://eslint.org/docs/rules/no-console',
+    }
+}};
+rule = { create(context) { return {}; }, meta: { fixable: 'whitespace' }};
+rule = { create(context) { return {}; }, meta: { fixable: 'code' }};
+rule = { create(context) { return {}; }, meta: { schema: [{ enum: ['always', 'never'] }] }};
+rule = { create(context) { return {}; }, meta: { deprecated: true }};
+
+rule = {
+    create(context) {
+        context.getAncestors();
+
+        context.getDeclaredVariables(AST);
+
+        context.getFilename();
+
+        context.getSourceCode();
+
+        context.getScope();
+
+        context.markVariableAsUsed('foo');
+
+        context.report({ message: 'foo', node: AST });
+        context.report({ message: 'foo', loc: { line: 0, column: 0 } });
+        context.report({ message: 'foo', node: AST, data: { foo: 'bar' } });
+        context.report({ message: 'foo', node: AST, fix: () => null });
+        context.report({ message: 'foo', node: AST, fix: ruleFixer => ruleFixer.replaceText(AST, 'foo') });
+
+        context.report({
+            message: 'foo',
+            node: AST,
+            fix: ruleFixer => {
+                ruleFixer.insertTextAfter(AST, 'foo');
+                ruleFixer.insertTextAfter(TOKEN, 'foo');
+
+                ruleFixer.insertTextAfterRange([0, 0], 'foo');
+
+                ruleFixer.insertTextBefore(AST, 'foo');
+                ruleFixer.insertTextBefore(TOKEN, 'foo');
+
+                ruleFixer.insertTextBeforeRange([0, 0], 'foo');
+
+                ruleFixer.remove(AST);
+                ruleFixer.remove(TOKEN);
+
+                ruleFixer.removeRange([0, 0]);
+
+                ruleFixer.replaceText(AST, 'foo');
+                ruleFixer.replaceText(TOKEN, 'foo');
+
+                ruleFixer.replaceTextRange([0, 0], 'foo');
+
+                return null;
+            }
+        });
+
+        return {
+            onCodePathStart(codePath, node) {},
+            onCodePathEnd(codePath, node) {},
+            onCodePathSegmentStart(segment, node) {},
+            onCodePathSegmentEnd(segment, node) {},
+            onCodePathSegmentLoop(fromSegment, toSegment, node) {},
+            'Program:exit'() {},
+        };
+    },
+};
+
+//#endregion
+
+//#region Linter
+
+const linter = new Linter();
+
+linter.version;
+
+linter.verify(SOURCE, {});
+linter.verify(new SourceCode(SOURCE, AST), {});
+
+linter.verify(SOURCE, {}, 'test.js');
+linter.verify(SOURCE, {}, {});
+linter.verify(SOURCE, {}, { filename: 'test.js' });
+linter.verify(SOURCE, {}, { allowInlineConfig: false });
+linter.verify(SOURCE, {}, { reportUnusedDisableDirectives: true });
+linter.verify(SOURCE, {}, { preprocess: input => input.split(' ') });
+linter.verify(SOURCE, {}, { postprocess: problemList => problemList[0] });
+
+linter.verify(SOURCE, { parserOptions: { ecmaVersion: 6 } }, 'test.js');
+linter.verify(SOURCE, { parserOptions: { ecmaVersion: 6, ecmaFeatures: { globalReturn: true } } }, 'test.js');
+linter.verify(SOURCE, { parserOptions: { ecmaVersion: 6, ecmaFeatures: { experimentalObjectRestSpread: true } } }, 'test.js');
+linter.verify(SOURCE, { env: { node: true } }, 'test.js');
+linter.verify(SOURCE, { globals: { foo: true } }, 'test.js');
+linter.verify(SOURCE, { parser: 'custom-parser' }, 'test.js');
+linter.verify(SOURCE, { settings: { info: 'foo' } }, 'test.js');
+
+linter.verify(SOURCE, { rules: {} }, 'test.js');
+linter.verify(SOURCE, { rules: { quotes: 2 } }, 'test.js');
+linter.verify(SOURCE, { rules: { quotes: [2, 'double'] } }, 'test.js');
+linter.verify(SOURCE, { rules: { 'no-unused-vars': [2, { vars: 'all' }] } }, 'test.js');
+linter.verify(SOURCE, { rules: { 'no-console': 1 } }, 'test.js');
+linter.verify(SOURCE, { rules: { 'no-console': 0 } }, 'test.js');
+linter.verify(SOURCE, { rules: { 'no-console': 'error' } }, 'test.js');
+linter.verify(SOURCE, { rules: { 'no-console': 'warn' } }, 'test.js');
+linter.verify(SOURCE, { rules: { 'no-console': 'off' } }, 'test.js');
+
+const lintingResult = linter.verify(SOURCE, {});
+
+for (const msg of lintingResult) {
+    msg.severity = 1;
+    msg.severity = 2;
+
+    msg.ruleId = 'foo';
+
+    msg.fatal = true;
+
+    msg.line = 0;
+    msg.endLine = 0;
+    msg.column = 0;
+    msg.endColumn = 0;
+
+    msg.source = SOURCE;
+
+    if (msg.fix) {
+        msg.fix.text = 'foo';
+        msg.fix.range = [0, 0];
+    }
+}
+
+linter.verifyAndFix(SOURCE, {});
+linter.verifyAndFix(SOURCE, {}, 'test.js');
+linter.verifyAndFix(SOURCE, {}, { fix: false });
+
+const fixResult = linter.verifyAndFix(SOURCE, {});
+
+fixResult.fixed = true;
+fixResult.output = 'foo';
+
+for (const msg of fixResult.messages) {
+    msg.ruleId = 'foo';
+}
+
+sourceCode = linter.getSourceCode();
+
+linter.defineRule('test', rule);
+
+linter.defineRules({
+    foo: rule,
+    bar: rule,
+});
+
+linter.getRules();
+
+linter.defineParser('custom-parser', { parse: (src, opts) => AST });
+linter.defineParser('custom-parser', {
+    parseForESLint(src, opts) {
+        return {
+            ast: AST,
+            visitorKeys: {},
+            parserServices: {},
+            scopeManager,
+        };
+    }
+});
+
+//#endregion
+
+//#region CLIEngine
+
+let cli: CLIEngine;
+
+cli = new CLIEngine({ allowInlineConfig: false });
+cli = new CLIEngine({ baseConfig: false });
+cli = new CLIEngine({ cache: true });
+cli = new CLIEngine({ cacheFile: 'foo' });
+cli = new CLIEngine({ configFile: 'foo' });
+cli = new CLIEngine({ cwd: 'foo' });
+cli = new CLIEngine({ envs: ['browser'] });
+cli = new CLIEngine({ extensions: ['js'] });
+cli = new CLIEngine({ fix: true });
+cli = new CLIEngine({ globals: ['foo'] });
+cli = new CLIEngine({ ignore: true });
+cli = new CLIEngine({ ignorePath: 'foo' });
+cli = new CLIEngine({ ignorePattern: 'foo' });
+cli = new CLIEngine({ useEslintrc: false });
+cli = new CLIEngine({ parserOptions: {} });
+cli = new CLIEngine({ plugins: ['foo'] });
+cli = new CLIEngine({ rules: { 'test/example-rule': 1 } });
+cli = new CLIEngine({ rulePaths: ['foo'] });
+cli = new CLIEngine({ reportUnusedDisableDirectives: true });
+
+let cliReport = cli.executeOnFiles(['myfile.js', 'lib/']);
+
+cliReport = cli.executeOnText(SOURCE, 'foo');
+
+cli.resolveFileGlobPatterns(['**/*']);
+
+cli.getConfigForFile('./config.json');
+
+cli.addPlugin('my-fancy-plugin', {});
+
+cli.isPathIgnored('./dist/index.js');
+
+const formatter = cli.getFormatter('codeframe');
+
+formatter(cliReport.results);
+
+CLIEngine.getErrorResults(cliReport.results);
+
+CLIEngine.outputFixes(cliReport);
+
+cliReport.errorCount = 0;
+cliReport.warningCount = 0;
+cliReport.fixableErrorCount = 0;
+cliReport.fixableWarningCount = 0;
+
+for (const file of cliReport.results) {
+    file.filePath = 'foo.js';
+
+    file.errorCount = 0;
+    file.warningCount = 0;
+    file.fixableErrorCount = 0;
+    file.fixableWarningCount = 0;
+
+    file.source = 'foo';
+    file.output = 'foo';
+
+    for (const message of file.messages) {
+        message.ruleId = 'foo';
+    }
+}
+
+//#endregion
+
+//#region RuleTester
+
+const ruleTester = new RuleTester({ parserOptions: { ecmaVersion: 2015 } });
+
+ruleTester.run('my-rule', rule, {
+    valid: [
+        { code: 'foo' },
+        { code: 'foo', options: [{ allowFoo: true }] },
+        { code: 'foo', filename: 'test.js' },
+        { code: 'foo', parserOptions: {} },
+        { code: 'foo', settings: { foo: true } },
+        { code: 'foo', parser: 'foo' },
+        { code: 'foo', globals: { foo: true } },
+    ],
+
+    invalid: [
+        { code: 'foo', errors: 1 },
+        { code: 'foo', errors: ['foo'] },
+        { code: 'foo', errors: [{ message: 'foo' }] },
+        { code: 'foo', errors: [{ message: 'foo', type: 'foo' }] },
+        { code: 'foo', errors: [{ message: 'foo', data: { foo: true } }] },
+        { code: 'foo', errors: [{ message: 'foo', line: 0 }] },
+    ]
+});
+
+//#endregion
diff --git a/types/eslint/index.d.ts b/types/eslint/index.d.ts
new file mode 100644
index 0000000000..9e0e68af0b
--- /dev/null
+++ b/types/eslint/index.d.ts
@@ -0,0 +1,573 @@
+// Type definitions for eslint 4.16
+// Project: https://eslint.org
+// Definitions by: Pierre-Marie Dartus <https://github.com/pmdartus>
+//                 Jed Fox <https://github.com/j-f1>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+import { JSONSchema4 } from 'json-schema';
+import * as ESTree from 'estree';
+
+export namespace AST {
+    type TokenType =
+        | 'Boolean'
+        | 'Null'
+        | 'Identifier'
+        | 'Keyword'
+        | 'Punctuator'
+        | 'JSXIdentifier'
+        | 'JSXText'
+        | 'Numeric'
+        | 'String'
+        | 'RegularExpression';
+
+    interface Token {
+        type: TokenType;
+        value: string;
+        range: Range;
+        loc: SourceLocation;
+    }
+
+    interface SourceLocation {
+        start: ESTree.Position;
+        end: ESTree.Position;
+    }
+
+    type Range = [number, number];
+
+    interface Program extends ESTree.Program {
+        comments: ESTree.Comment[];
+        tokens: Token[];
+        loc: SourceLocation;
+        range: Range;
+    }
+}
+
+export namespace Scope {
+    interface ScopeManager {
+        scopes: Scope[];
+        globalScope: Scope | null;
+
+        acquire(node: ESTree.Node, inner?: boolean): Scope | null;
+
+        getDeclaredVariables(node: ESTree.Node): Variable[];
+    }
+
+    interface Scope {
+        type: 'block' | 'catch' | 'class' | 'for' | 'function' | 'function-expression-name' | 'global' | 'module' | 'switch' | 'with' | 'TDZ';
+        isStrict: boolean;
+        upper: Scope | null;
+        childScopes: Scope[];
+        variableScope: Scope;
+        block: ESTree.Node;
+        variables: Variable[];
+        set: Map<string, Variable>;
+        references: Reference[];
+        through: Reference[];
+        functionExpressionScope: boolean;
+    }
+
+    interface Variable {
+        name: string;
+        identifiers: ESTree.Identifier[];
+        references: Reference[];
+        defs: Definition[];
+    }
+
+    interface Reference {
+        identifier: ESTree.Identifier;
+        from: Scope;
+        resolved: Variable | null;
+        writeExpr: ESTree.Node | null;
+        init: boolean;
+
+        isWrite(): boolean;
+
+        isRead(): boolean;
+
+        isWriteOnly(): boolean;
+
+        isReadOnly(): boolean;
+
+        isReadWrite(): boolean;
+    }
+
+    type DefinitionType =
+        | { type: 'CatchClause', node: ESTree.CatchClause, parent: null }
+        | { type: 'ClassName', node: ESTree.ClassDeclaration | ESTree.ClassExpression, parent: null }
+        | { type: 'FunctionName', node: ESTree.FunctionDeclaration | ESTree.FunctionExpression, parent: null }
+        | { type: 'ImplicitGlobalVariable', node: ESTree.Program, parent: null }
+        | { type: 'ImportBinding', node: ESTree.ImportSpecifier | ESTree.ImportDefaultSpecifier | ESTree.ImportNamespaceSpecifier, parent: ESTree.ImportDeclaration }
+        | { type: 'Parameter', node: ESTree.FunctionDeclaration | ESTree.FunctionExpression | ESTree.ArrowFunctionExpression, parent: null }
+        | { type: 'TDZ', node: any, parent: null }
+        | { type: 'Variable', node: ESTree.VariableDeclarator, parent: ESTree.VariableDeclaration };
+
+    type Definition = DefinitionType & { name: ESTree.Identifier };
+}
+
+//#region SourceCode
+
+export class SourceCode {
+    text: string;
+    ast: AST.Program;
+    lines: string[];
+    hasBOM: boolean;
+    parserServices: SourceCode.ParserServices;
+    scopeManager: Scope.ScopeManager;
+    visitorKeys: SourceCode.VisitorKeys;
+
+    constructor(text: string, ast: AST.Program);
+    constructor(config: SourceCode.Config);
+
+    static splitLines(text: string): string[];
+
+    getText(node?: ESTree.Node, beforeCount?: number, afterCount?: number): string;
+
+    getLines(): string[];
+
+    getAllComments(): ESTree.Comment[];
+
+    getComments(node: ESTree.Node): { leading: ESTree.Comment[], trailing: ESTree.Comment[] };
+
+    getJSDocComment(node: ESTree.Node): AST.Token | null;
+
+    getNodeByRangeIndex(index: number): ESTree.Node | null;
+
+    isSpaceBetweenTokens(first: AST.Token, second: AST.Token): boolean;
+
+    getLocFromIndex(index: number): ESTree.SourceLocation;
+
+    getIndexFromLoc(location: ESTree.Position): number;
+
+    // Inherited methods from TokenStore
+    // ---------------------------------
+
+    getTokenByRangeStart(offset: number, options?: { includeComments?: boolean }): AST.Token | null;
+
+    getFirstToken(node: ESTree.Node, options?: SourceCode.CursorWithSkipOptions): AST.Token | null;
+
+    getFirstTokens(node: ESTree.Node, options?: SourceCode.CursorWithCountOptions): AST.Token[];
+
+    getLastToken(node: ESTree.Node, options?: SourceCode.CursorWithSkipOptions): AST.Token | null;
+
+    getLastTokens(node: ESTree.Node, options?: SourceCode.CursorWithCountOptions): AST.Token[];
+
+    getTokenBefore(node: ESTree.Node | AST.Token | ESTree.Comment, options?: SourceCode.CursorWithSkipOptions): AST.Token | null;
+
+    getTokensBefore(node: ESTree.Node | AST.Token | ESTree.Comment, options?: SourceCode.CursorWithCountOptions): AST.Token[];
+
+    getTokenAfter(node: ESTree.Node | AST.Token | ESTree.Comment, options?: SourceCode.CursorWithSkipOptions): AST.Token | null;
+
+    getTokensAfter(node: ESTree.Node | AST.Token | ESTree.Comment, options?: SourceCode.CursorWithCountOptions): AST.Token[];
+
+    getFirstTokenBetween(
+        left: ESTree.Node | AST.Token | ESTree.Comment,
+        right: ESTree.Node | AST.Token | ESTree.Comment,
+        options?: SourceCode.CursorWithSkipOptions
+    ): AST.Token | null;
+
+    getFirstTokensBetween(
+        left: ESTree.Node | AST.Token | ESTree.Comment,
+        right: ESTree.Node | AST.Token | ESTree.Comment,
+        options?: SourceCode.CursorWithCountOptions
+    ): AST.Token[];
+
+    getLastTokenBetween(
+        left: ESTree.Node | AST.Token | ESTree.Comment,
+        right: ESTree.Node | AST.Token | ESTree.Comment,
+        options?: SourceCode.CursorWithSkipOptions
+    ): AST.Token | null;
+
+    getLastTokensBetween(
+        left: ESTree.Node | AST.Token | ESTree.Comment,
+        right: ESTree.Node | AST.Token | ESTree.Comment,
+        options?: SourceCode.CursorWithCountOptions
+    ): AST.Token[];
+
+    getTokensBetween(
+        left: ESTree.Node | AST.Token | ESTree.Comment,
+        right: ESTree.Node | AST.Token | ESTree.Comment,
+        padding?: number | SourceCode.FilterPredicate | SourceCode.CursorWithCountOptions
+    ): AST.Token[];
+
+    getTokens(node: ESTree.Node, beforeCount?: number, afterCount?: number): AST.Token[];
+    getTokens(node: ESTree.Node, options: SourceCode.FilterPredicate | SourceCode.CursorWithCountOptions): AST.Token[];
+
+    commentsExistBetween(left: ESTree.Node | AST.Token, right: ESTree.Node | AST.Token): boolean;
+
+    getCommentsBefore(nodeOrToken: ESTree.Node | AST.Token): ESTree.Comment[];
+
+    getCommentsAfter(nodeOrToken: ESTree.Node | AST.Token): ESTree.Comment[];
+
+    getCommentsInside(node: ESTree.Node): ESTree.Comment[];
+}
+
+export namespace SourceCode {
+    interface Config {
+        text: string;
+        ast: AST.Program;
+        parserServices?: ParserServices;
+        scopeManager?: Scope.ScopeManager;
+        visitorKeys?: VisitorKeys;
+    }
+
+    type ParserServices = any;
+
+    interface VisitorKeys {
+        [nodeType: string]: string[];
+    }
+
+    type FilterPredicate = (tokenOrComment: AST.Token | ESTree.Comment) => boolean;
+
+    type CursorWithSkipOptions = number | FilterPredicate | {
+        includeComments?: boolean;
+        filter?: FilterPredicate;
+        skip?: number;
+    };
+
+    type CursorWithCountOptions = number | FilterPredicate | {
+        includeComments?: boolean;
+        filter?: FilterPredicate;
+        count?: number;
+    };
+}
+
+//#endregion
+
+export namespace Rule {
+    interface RuleModule {
+        create(context: RuleContext): RuleListener;
+        meta?: RuleMetaData;
+    }
+
+    interface RuleListener {
+        onCodePathStart?(codePath: CodePath, node: ESTree.Node): void;
+
+        onCodePathEnd?(codePath: CodePath, node: ESTree.Node): void;
+
+        onCodePathSegmentStart?(segment: CodePathSegment, node: ESTree.Node): void;
+
+        onCodePathSegmentEnd?(segment: CodePathSegment, node: ESTree.Node): void;
+
+        onCodePathSegmentLoop?(fromSegment: CodePathSegment, toSegment: CodePathSegment, node: ESTree.Node): void;
+
+        [key: string]:
+            | ((codePath: CodePath, node: ESTree.Node) => void)
+            | ((segment: CodePathSegment, node: ESTree.Node) => void)
+            | ((fromSegment: CodePathSegment, toSegment: CodePathSegment, node: ESTree.Node) => void)
+            | ((node: ESTree.Node) => void)
+            | undefined;
+    }
+
+    interface CodePath {
+        id: string;
+        initialSegment: CodePathSegment;
+        finalSegments: CodePathSegment[];
+        returnedSegments: CodePathSegment[];
+        thrownSegments: CodePathSegment[];
+        currentSegments: CodePathSegment[];
+        upper: CodePath | null;
+        childCodePaths: CodePath[];
+    }
+
+    interface CodePathSegment {
+        id: string;
+        nextSegments: CodePathSegment[];
+        prevSegments: CodePathSegment[];
+        reachable: boolean;
+    }
+
+    interface RuleMetaData {
+        docs?: {
+            description?: string;
+            category?: string;
+            recommended?: boolean;
+            url?: string;
+        };
+        messages?: { [messageId: string]: string };
+        fixable?: 'code' | 'whitespace';
+        schema?: JSONSchema4 | JSONSchema4[];
+        deprecated?: boolean;
+    }
+
+    interface RuleContext {
+        id: string;
+        options: any[];
+        settings: { [name: string]: any };
+        parserPath: string;
+        parserOptions: Linter.ParserOptions;
+        parserServices: SourceCode.ParserServices;
+
+        getAncestors(): ESTree.Node[];
+
+        getDeclaredVariables(node: ESTree.Node): Scope.Variable[];
+
+        getFilename(): string;
+
+        getScope(): Scope.Scope;
+
+        getSourceCode(): SourceCode;
+
+        markVariableAsUsed(name: string): boolean;
+
+        report(descriptor: ReportDescriptor): void;
+    }
+
+    type ReportDescriptor = ReportDescriptorMessage & ReportDescriptorLocation & ReportDescriptorOptions;
+    type ReportDescriptorMessage = { message: string } | { messageId: string };
+    type ReportDescriptorLocation = { node: ESTree.Node } | { loc: AST.SourceLocation | { line: number, column: number } };
+    interface ReportDescriptorOptions {
+        data?: { [key: string]: string };
+
+        fix?(fixer: RuleFixer): null | Fix | IterableIterator<Fix>;
+    }
+
+    interface RuleFixer {
+        insertTextAfter(nodeOrToken: ESTree.Node | AST.Token, text: string): Fix;
+
+        insertTextAfterRange(range: AST.Range, text: string): Fix;
+
+        insertTextBefore(nodeOrToken: ESTree.Node | AST.Token, text: string): Fix;
+
+        insertTextBeforeRange(range: AST.Range, text: string): Fix;
+
+        remove(nodeOrToken: ESTree.Node | AST.Token): Fix;
+
+        removeRange(range: AST.Range): Fix;
+
+        replaceText(nodeOrToken: ESTree.Node | AST.Token, text: string): Fix;
+
+        replaceTextRange(range: AST.Range, text: string): Fix;
+    }
+
+    interface Fix {
+        range: AST.Range;
+        text: string;
+    }
+}
+
+//#region Linter
+
+export class Linter {
+    version: string;
+
+    verify(code: SourceCode | string, config: Linter.Config, filename?: string): Linter.LintMessage[];
+    verify(code: SourceCode | string, config: Linter.Config, options: Linter.LintOptions): Linter.LintMessage[];
+
+    verifyAndFix(code: string, config: Linter.Config, filename?: string): Linter.FixReport;
+    verifyAndFix(code: string, config: Linter.Config, options: Linter.FixOptions): Linter.FixReport;
+
+    getSourceCode(): SourceCode;
+
+    defineRule(name: string, rule: Rule.RuleModule): void;
+
+    defineRules(rules: { [name: string]: Rule.RuleModule }): void;
+
+    getRules(): Map<string, Rule.RuleModule>;
+
+    defineParser(name: string, parser: Linter.ParserModule): void;
+}
+
+export namespace Linter {
+    type Severity = 0 | 1 | 2;
+    type RuleLevel = Severity | 'off' | 'warn' | 'error';
+
+    interface RuleLevelAndOptions extends Array<any> {
+        0: RuleLevel;
+    }
+
+    interface Config {
+        rules?: {
+            [name: string]: RuleLevel | RuleLevelAndOptions
+        };
+        parser?: string;
+        parserOptions?: ParserOptions;
+        settings?: { [name: string]: any };
+        env?: { [name: string]: boolean };
+        globals?: { [name: string]: boolean };
+    }
+
+    interface ParserOptions {
+        ecmaVersion?: 3 | 5 | 6 | 7 | 8 | 9 | 2015 | 2016 | 2017 | 2018;
+        sourceType?: 'script' | 'module';
+        ecmaFeatures?: {
+            globalReturn?: boolean;
+            impliedStrict?: boolean;
+            jsx?: boolean;
+            experimentalObjectRestSpread?: boolean;
+            [key: string]: any;
+        };
+        [key: string]: any;
+    }
+
+    interface LintOptions {
+        filename?: string;
+        preprocess?: (code: string) => string[];
+        postprocess?: (problemLists: LintMessage[][]) => LintMessage[];
+        allowInlineConfig?: boolean;
+        reportUnusedDisableDirectives?: boolean;
+    }
+
+    interface LintMessage {
+        column: number;
+        line: number;
+        endColumn?: number;
+        endLine?: number;
+        ruleId: string | null;
+        message: string;
+        nodeType: string;
+        fatal?: true;
+        severity: Severity;
+        fix?: Rule.Fix;
+        source: string | null;
+    }
+
+    interface FixOptions extends LintOptions {
+        fix?: boolean;
+    }
+
+    interface FixReport {
+        fixed: boolean;
+        output: string;
+        messages: LintMessage[];
+    }
+
+    type ParserModule = {
+        parse(text: string, options?: any): AST.Program;
+    } | {
+        parseForESLint(text: string, options?: any): ESLintParseResult;
+    };
+
+    interface ESLintParseResult {
+        ast: AST.Program;
+        parserServices?: SourceCode.ParserServices;
+        scopeManager?: Scope.ScopeManager;
+        visitorKeys?: SourceCode.VisitorKeys;
+    }
+}
+
+//#endregion
+
+//#region CLIEngine
+
+export class CLIEngine {
+    version: string;
+
+    constructor(options: CLIEngine.Options);
+
+    executeOnFiles(patterns: string[]): CLIEngine.LintReport;
+
+    resolveFileGlobPatterns(patterns: string[]): string[];
+
+    getConfigForFile(filePath: string): Linter.Config;
+
+    executeOnText(text: string, filename?: string): CLIEngine.LintReport;
+
+    addPlugin(name: string, pluginObject: any): void;
+
+    isPathIgnored(filePath: string): boolean;
+
+    getFormatter(format: string): CLIEngine.Formatter;
+
+    getRules(): Map<string, Rule.RuleModule>;
+
+    static getErrorResults(results: CLIEngine.LintResult[]): CLIEngine.LintResult[];
+
+    static outputFixes(report: CLIEngine.LintReport): void;
+}
+
+export namespace CLIEngine {
+    class Options {
+        allowInlineConfig?: boolean;
+        baseConfig?: boolean;
+        cache?: boolean;
+        cacheFile?: string;
+        cacheLocation?: string;
+        configFile?: string;
+        cwd?: string;
+        envs?: string[];
+        extensions?: string[];
+        fix?: boolean;
+        globals?: string[];
+        ignore?: boolean;
+        ignorePath?: string;
+        ignorePattern?: string;
+        useEslintrc?: boolean;
+        parser?: string;
+        parserOptions?: Linter.ParserOptions;
+        plugins?: string[];
+        rules?: {
+            [name: string]: Linter.RuleLevel | Linter.RuleLevelAndOptions;
+        };
+        rulePaths?: string[];
+        reportUnusedDisableDirectives?: boolean;
+    }
+
+    interface LintResult {
+        filePath: string;
+        messages: Linter.LintMessage[];
+        errorCount: number;
+        warningCount: number;
+        fixableErrorCount: number;
+        fixableWarningCount: number;
+        output?: string;
+        source?: string;
+    }
+
+    interface LintReport {
+        results: LintResult[];
+        errorCount: number;
+        warningCount: number;
+        fixableErrorCount: number;
+        fixableWarningCount: number;
+    }
+
+    type Formatter = (results: LintResult[]) => string;
+}
+
+//#endregion
+
+//#region RuleTester
+
+export class RuleTester {
+    constructor(config?: any);
+
+    run(
+        name: string,
+        rule: Rule.RuleModule,
+        tests: {
+            valid?: RuleTester.ValidTestCase[];
+            invalid?: RuleTester.InvalidTestCase[];
+        },
+    ): void;
+}
+
+export namespace RuleTester {
+    interface ValidTestCase {
+        code: string;
+        options?: any;
+        filename?: string;
+        parserOptions?: Linter.ParserOptions;
+        settings?: { [name: string]: any };
+        parser?: string;
+        globals?: { [name: string]: boolean };
+    }
+
+    interface InvalidTestCase extends ValidTestCase {
+        errors: number | Array<TestCaseError | string>;
+        output?: string | null;
+    }
+
+    interface TestCaseError {
+        message?: string | RegExp;
+        messageId?: string;
+        type?: string;
+        data?: any;
+        line?: number;
+        column?: number;
+        endLine?: number;
+        endColumn?: number;
+    }
+}
+
+//#endregion
diff --git a/types/eslint/tsconfig.json b/types/eslint/tsconfig.json
new file mode 100644
index 0000000000..136d08687b
--- /dev/null
+++ b/types/eslint/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",
+        "eslint-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/eslint/tslint.json b/types/eslint/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/eslint/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/espruino/tsconfig.json b/types/espruino/tsconfig.json
index 38bb3dfd03..ac560ce6db 100644
--- a/types/espruino/tsconfig.json
+++ b/types/espruino/tsconfig.json
@@ -2,8 +2,8 @@
     "compilerOptions": {
         "module": "commonjs",
         "lib": [
-          "es2015",
-          "dom"
+            "es2015",
+            "dom"
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
@@ -21,4 +21,4 @@
         "index.d.ts",
         "espruino-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/event-kit/tsconfig.json b/types/event-kit/tsconfig.json
index 0b6a81c5f8..859443e52b 100644
--- a/types/event-kit/tsconfig.json
+++ b/types/event-kit/tsconfig.json
@@ -21,4 +21,4 @@
         "index.d.ts",
         "event-kit-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/event-to-promise/event-to-promise-tests.ts b/types/event-to-promise/event-to-promise-tests.ts
index 2b99ddc62f..d8ca31f496 100644
--- a/types/event-to-promise/event-to-promise-tests.ts
+++ b/types/event-to-promise/event-to-promise-tests.ts
@@ -1,21 +1,19 @@
 import { EventEmitter } from 'events'
 
-import * as eventToPromise from 'event-to-promise'
-
+import eventToPromise = require('event-to-promise');
 
 {
 	const ee = new EventEmitter()
 	const ep = eventToPromise(ee, 'custom')
-	
+
 	ep.then(console.log)
 	ee.emit('custom')
 }
 
-
 {
 	const et = new EventTarget()
 	const tp = eventToPromise.multi(et, ['custom'])
-	
+
 	tp.then(console.log)
 	et.dispatchEvent(new Event('custom'))
 }
diff --git a/types/events/tsconfig.json b/types/events/tsconfig.json
index f43a926ad8..4b590d076b 100644
--- a/types/events/tsconfig.json
+++ b/types/events/tsconfig.json
@@ -1,25 +1,25 @@
 {
     "compilerOptions": {
-      "module": "commonjs",
-      "target": "es6",
-      "lib": [
-        "es6",
-        "dom"
-      ],
-      "noImplicitAny": true,
-      "noImplicitThis": true,
-      "strictNullChecks": true,
-      "strictFunctionTypes": true,
-      "baseUrl": "../",
-      "typeRoots": [
-        "../"
-      ],
-      "types": [],
-      "noEmit": true,
-      "forceConsistentCasingInFileNames": true
+        "module": "commonjs",
+        "target": "es6",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
     },
     "files": [
-      "index.d.ts",
-      "events-tests.ts"
+        "index.d.ts",
+        "events-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/execa/execa-tests.ts b/types/execa/execa-tests.ts
index abdbfd6dad..2525091f2a 100644
--- a/types/execa/execa-tests.ts
+++ b/types/execa/execa-tests.ts
@@ -1,5 +1,5 @@
-import * as assert from 'assert';
-import * as execa from 'execa';
+import assert = require('assert');
+import execa = require('execa');
 import { PassThrough } from "stream";
 
 execa('unicorns')
diff --git a/types/expo/index.d.ts b/types/expo/index.d.ts
index 69a56b1a56..ae7e45841d 100644
--- a/types/expo/index.d.ts
+++ b/types/expo/index.d.ts
@@ -5,7 +5,7 @@
 //                 Jan Aagaard <https://github.com/janaagaard75>
 //                 Sergio Sánchez <https://github.com/ssanchezmarc>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.4
+// TypeScript Version: 2.6
 
 import { EventSubscription } from 'fbemitter';
 import { Component, ComponentClass, Ref, ComponentType } from 'react';
diff --git a/types/expo/tsconfig.json b/types/expo/tsconfig.json
index 5d0f560837..03b9c139b1 100644
--- a/types/expo/tsconfig.json
+++ b/types/expo/tsconfig.json
@@ -21,4 +21,4 @@
         "index.d.ts",
         "expo-tests.tsx"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/expo/v23/index.d.ts b/types/expo/v23/index.d.ts
index 8aaa28bace..54154d8d6b 100644
--- a/types/expo/v23/index.d.ts
+++ b/types/expo/v23/index.d.ts
@@ -2,7 +2,7 @@
 // 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
+// TypeScript Version: 2.6
 
 import { EventSubscription } from 'fbemitter';
 import { Component, Ref } from 'react';
@@ -1200,7 +1200,7 @@ export namespace Notifications {
     type LocalNotificationId = string | number;
 
     function addListener(listener: (notification: Notification) => any): EventSubscription;
-    function getExponentPushTokenAsync(): Promise<string>;
+    function getExpoPushTokenAsync(): Promise<string>;
     function presentLocalNotificationAsync(localNotification: LocalNotification): Promise<LocalNotificationId>;
     function scheduleLocalNotificationAsync(
         localNotification: LocalNotification,
diff --git a/types/expo/v23/tsconfig.json b/types/expo/v23/tsconfig.json
index 4dbf5afca3..3d85e281ed 100644
--- a/types/expo/v23/tsconfig.json
+++ b/types/expo/v23/tsconfig.json
@@ -29,4 +29,4 @@
         "index.d.ts",
         "expo-tests.tsx"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/expo__vector-icons/index.d.ts b/types/expo__vector-icons/index.d.ts
index ccc71fc93e..864ae1d0cc 100644
--- a/types/expo__vector-icons/index.d.ts
+++ b/types/expo__vector-icons/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/expo/vector-icons
 // Definitions by: Hyeonsu Lee <https://github.com/incleaf>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from 'react';
 import { TextProperties } from 'react-native';
diff --git a/types/expo__vector-icons/tsconfig.json b/types/expo__vector-icons/tsconfig.json
index 9eb44c222f..318f7f537c 100644
--- a/types/expo__vector-icons/tsconfig.json
+++ b/types/expo__vector-icons/tsconfig.json
@@ -22,4 +22,4 @@
         "index.d.ts",
         "expo__vector-icons-tests.tsx"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/express-brute-memcached/express-brute-memcached-tests.ts b/types/express-brute-memcached/express-brute-memcached-tests.ts
index 37dadf6189..4a74da4d87 100644
--- a/types/express-brute-memcached/express-brute-memcached-tests.ts
+++ b/types/express-brute-memcached/express-brute-memcached-tests.ts
@@ -1,5 +1,5 @@
-import * as express from "express";
-import * as ExpressBrute from "express-brute";
+import express = require("express");
+import ExpressBrute = require("express-brute");
 import MemcachedStore from "express-brute-memcached";
 
 var app = express();
diff --git a/types/express-busboy/express-busboy-tests.ts b/types/express-busboy/express-busboy-tests.ts
index 512fd7f245..801ad24481 100644
--- a/types/express-busboy/express-busboy-tests.ts
+++ b/types/express-busboy/express-busboy-tests.ts
@@ -1,6 +1,5 @@
 import * as expressBusboy from 'express-busboy';
-
-import * as express from 'express';
+import express = require('express');
 
 const app: express.Application = express();
 const options: expressBusboy.ExpressBusboyOptions = {};
diff --git a/types/express-busboy/tsconfig.json b/types/express-busboy/tsconfig.json
index 1920bb9991..add893c0dd 100644
--- a/types/express-busboy/tsconfig.json
+++ b/types/express-busboy/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "express-busboy-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/express-ejs-layouts/express-ejs-layouts-tests.ts b/types/express-ejs-layouts/express-ejs-layouts-tests.ts
index 9d77105a9d..f6820c57cf 100644
--- a/types/express-ejs-layouts/express-ejs-layouts-tests.ts
+++ b/types/express-ejs-layouts/express-ejs-layouts-tests.ts
@@ -1,5 +1,5 @@
-import * as express from 'express';
-import * as expressEjsLayouts from 'express-ejs-layouts';
+import express = require('express');
+import expressEjsLayouts = require('express-ejs-layouts');
 
 function expressRequestHandlerTest() {
     const app = express()
diff --git a/types/express-ejs-layouts/tsconfig.json b/types/express-ejs-layouts/tsconfig.json
index 7ade9f8819..cdce7b38f4 100644
--- a/types/express-ejs-layouts/tsconfig.json
+++ b/types/express-ejs-layouts/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "express-ejs-layouts-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/express-fileupload/express-fileupload-tests.ts b/types/express-fileupload/express-fileupload-tests.ts
index 21115937d1..2a268fb64e 100644
--- a/types/express-fileupload/express-fileupload-tests.ts
+++ b/types/express-fileupload/express-fileupload-tests.ts
@@ -1,4 +1,4 @@
-import * as express from 'express';
+import express = require('express');
 import { RequestHandler, Request, Response, NextFunction } from 'express-serve-static-core';
 import fileUpload = require('express-fileupload');
 
diff --git a/types/express-flash-notification/tsconfig.json b/types/express-flash-notification/tsconfig.json
index 842aacf264..a586316eff 100644
--- a/types/express-flash-notification/tsconfig.json
+++ b/types/express-flash-notification/tsconfig.json
@@ -5,9 +5,9 @@
             "es6"
         ],
         "noImplicitAny": true,
-		"noImplicitThis": true,
+        "noImplicitThis": true,
         "strictNullChecks": true,
-		"strictFunctionTypes": true,
+        "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"
@@ -20,4 +20,4 @@
         "index.d.ts",
         "express-flash-notification-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/express-formidable/tsconfig.json b/types/express-formidable/tsconfig.json
index 45a7b6c12b..9deeebd96f 100644
--- a/types/express-formidable/tsconfig.json
+++ b/types/express-formidable/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "express-formidable-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/express-graphql/express-graphql-tests.ts b/types/express-graphql/express-graphql-tests.ts
index d476682104..482b15c186 100644
--- a/types/express-graphql/express-graphql-tests.ts
+++ b/types/express-graphql/express-graphql-tests.ts
@@ -1,6 +1,6 @@
-import * as express from 'express';
+import express = require('express');
 import 'express-session';
-import * as graphqlHTTP from 'express-graphql';
+import graphqlHTTP = require('express-graphql');
 
 const app = express();
 const schema = {};
@@ -10,7 +10,8 @@ const graphqlOption: graphqlHTTP.OptionsObj = {
     schema: schema,
     formatError: (error: Error) => ({
         message: error.message
-    })
+    }),
+    extensions: (args) => { }
 };
 
 const graphqlOptionRequest = (request: express.Request): graphqlHTTP.OptionsObj => ({
@@ -23,7 +24,8 @@ const graphqlOptionRequestAsync = async (request: express.Request): Promise<grap
     return {
         graphiql: true,
         schema: await Promise.resolve(schema),
-        context: request.session
+        context: request.session,
+        extensions: async (args) => { }
     };
 };
 
diff --git a/types/express-graphql/index.d.ts b/types/express-graphql/index.d.ts
index 82f988a506..166bdae6e7 100644
--- a/types/express-graphql/index.d.ts
+++ b/types/express-graphql/index.d.ts
@@ -3,6 +3,7 @@
 // Definitions by: Isman Usoh <https://github.com/isman-usoh>
 //                 Nitin Tutlani <https://github.com/nitintutlani>
 //                 Daniel Fader <https://github.com/hubel>
+//                 Ehsan Ziya <https://github.com/zya>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -48,8 +49,22 @@ declare namespace graphqlHTTP {
          * A boolean to optionally enable GraphiQL mode.
          */
         graphiql?: boolean,
+
+        /**
+         * An optional function for adding additional metadata to the GraphQL response as a key-value object.
+         * The result will be added to "extensions" field in the resulting JSON.
+         */
+        extensions?: ((args: ExtenstionsArgs) => any) | ((args: ExtenstionsArgs) => Promise<any>);
+
     };
 
+    interface ExtenstionsArgs {
+        document: object,
+        variables: object,
+        operationName: any,
+        result: object
+    }
+
     type Middleware = (request: Request, response: Response) => void;
 }
 
diff --git a/types/express-mongo-sanitize/express-mongo-sanitize-tests.ts b/types/express-mongo-sanitize/express-mongo-sanitize-tests.ts
index 21a5028b27..03074593ca 100644
--- a/types/express-mongo-sanitize/express-mongo-sanitize-tests.ts
+++ b/types/express-mongo-sanitize/express-mongo-sanitize-tests.ts
@@ -1,5 +1,5 @@
-import * as express from 'express';
-import * as mongoSanitize from 'express-mongo-sanitize';
+import express = require('express');
+import mongoSanitize = require('express-mongo-sanitize');
 
 const app: express.Express = express();
 
diff --git a/types/express-mongo-sanitize/tsconfig.json b/types/express-mongo-sanitize/tsconfig.json
index 0834820a85..236dffa3e2 100644
--- a/types/express-mongo-sanitize/tsconfig.json
+++ b/types/express-mongo-sanitize/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "express-mongo-sanitize-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/express-oauth-server/express-oauth-server-tests.ts b/types/express-oauth-server/express-oauth-server-tests.ts
index 436763b9b8..1aea48c256 100644
--- a/types/express-oauth-server/express-oauth-server-tests.ts
+++ b/types/express-oauth-server/express-oauth-server-tests.ts
@@ -1,6 +1,6 @@
 import ExpressOAuthServer = require("express-oauth-server");
 import * as OAuth2Server from "oauth2-server";
-import * as express from "express";
+import express = require("express");
 
 const oauth2Model: OAuth2Server.AuthorizationCodeModel = {
     getClient: async (clientId: string, clientSecret: string): Promise<OAuth2Server.Client | OAuth2Server.Falsey> => {
diff --git a/types/express-oauth-server/tsconfig.json b/types/express-oauth-server/tsconfig.json
index 197ec65f00..05c5c28b77 100644
--- a/types/express-oauth-server/tsconfig.json
+++ b/types/express-oauth-server/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "express-oauth-server-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/express-promise-router/tsconfig.json b/types/express-promise-router/tsconfig.json
index 1f33dd7104..fbcffb4345 100644
--- a/types/express-promise-router/tsconfig.json
+++ b/types/express-promise-router/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "express-promise-router-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/express-sanitized/express-sanitized-tests.ts b/types/express-sanitized/express-sanitized-tests.ts
index 1610ef6c91..4ff8cce13b 100644
--- a/types/express-sanitized/express-sanitized-tests.ts
+++ b/types/express-sanitized/express-sanitized-tests.ts
@@ -1,5 +1,5 @@
-import * as express from "express";
-import * as expressSanitized from "express-sanitized";
+import express = require("express");
+import expressSanitized = require("express-sanitized");
 
 const RoutingServer: express.Express = express();
 
diff --git a/types/express-session/index.d.ts b/types/express-session/index.d.ts
index 6b59efc925..d051f84df0 100644
--- a/types/express-session/index.d.ts
+++ b/types/express-session/index.d.ts
@@ -1,6 +1,9 @@
 // Type definitions for express-session 1.15
 // Project: https://www.npmjs.org/package/express-session
-// Definitions by: Hiroki Horiuchi <https://github.com/horiuchi>, Jacob Bogers <https://github.com/jacobbogers>, Naoto Yokoyama <https://github.com/builtinnya>
+// Definitions by: Hiroki Horiuchi <https://github.com/horiuchi>
+//                 Jacob Bogers <https://github.com/jacobbogers>
+//                 Naoto Yokoyama <https://github.com/builtinnya>
+//                 Ryan Cannon <https://github.com/ry7n>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
@@ -51,7 +54,7 @@ declare function session(options?: session.SessionOptions): express.RequestHandl
 
 declare namespace session {
   interface SessionOptions {
-    secret: string;
+    secret: string | string[];
     name?: string;
     store?: Store | MemoryStore;
     cookie?: express.CookieOptions;
diff --git a/types/express-to-koa/express-to-koa-tests.ts b/types/express-to-koa/express-to-koa-tests.ts
index 73b6ae480a..1329a15851 100644
--- a/types/express-to-koa/express-to-koa-tests.ts
+++ b/types/express-to-koa/express-to-koa-tests.ts
@@ -1,4 +1,4 @@
-import * as Koa from 'koa';
+import Koa = require('koa');
 import * as connect from 'connect';
 import expressToKoa = require('express-to-koa');
 
diff --git a/types/express-to-koa/tsconfig.json b/types/express-to-koa/tsconfig.json
index 9c27ef439f..cff403796c 100644
--- a/types/express-to-koa/tsconfig.json
+++ b/types/express-to-koa/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "express-to-koa-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/express-winston/express-winston-tests.ts b/types/express-winston/express-winston-tests.ts
index 7ce00c479e..297b7afc49 100644
--- a/types/express-winston/express-winston-tests.ts
+++ b/types/express-winston/express-winston-tests.ts
@@ -1,6 +1,6 @@
 import expressWinston = require('express-winston');
 import * as winston from 'winston';
-import * as express from 'express';
+import express = require('express');
 
 const app = express();
 
diff --git a/types/express-winston/tsconfig.json b/types/express-winston/tsconfig.json
index dcebd7fafb..c327b47cda 100644
--- a/types/express-winston/tsconfig.json
+++ b/types/express-winston/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "express-winston-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/express/express-tests.ts b/types/express/express-tests.ts
index 1c9220a8b5..137c70c8e8 100644
--- a/types/express/express-tests.ts
+++ b/types/express/express-tests.ts
@@ -1,4 +1,4 @@
-import * as express from 'express';
+import express = require('express');
 
 namespace express_tests {
     const app = express();
diff --git a/types/extend/extend-tests.ts b/types/extend/extend-tests.ts
index 0bf977e6e8..5ff62322b1 100644
--- a/types/extend/extend-tests.ts
+++ b/types/extend/extend-tests.ts
@@ -1,6 +1,4 @@
-/// <reference types="node" />
-import * as assert from 'assert';
-import * as extend from 'extend';
+import extend = require('extend');
 
 const objectBase = {
     test: 'base'
@@ -25,19 +23,19 @@ const objectThree = {
 
 type ExtendedType = typeof objectBase & typeof objectOne;
 const extended: ExtendedType = extend(objectBase, objectOne);
-assert(extended.test === 'one');
-assert(extended.iamone);
+extended.test === 'one';
+extended.iamone;
 
 type MoreExtendedType = typeof objectBase & typeof objectOne & typeof objectTwo;
 const moreExtended: MoreExtendedType = extend(objectBase, objectOne, objectTwo);
-assert(moreExtended.test === 2);
-assert(moreExtended.iamone);
-assert(moreExtended.iamtwo);
+moreExtended.test === 2;
+moreExtended.iamone;
+moreExtended.iamtwo;
 
 type DeepExtendedType = typeof objectBase & typeof objectOne &
   typeof objectTwo & typeof objectThree;
 const deepExtended = extend(true, objectBase, objectOne, objectTwo, objectThree);
-assert(deepExtended.iamone);
-assert(deepExtended.iamtwo);
-assert(deepExtended.iamthree);
-assert(deepExtended.depth.innerType === 'deep');
+deepExtended.iamone;
+deepExtended.iamtwo;
+deepExtended.iamthree;
+deepExtended.depth.innerType === 'deep';
diff --git a/types/extract-text-webpack-plugin/index.d.ts b/types/extract-text-webpack-plugin/index.d.ts
index 962698568a..9f17a66da0 100644
--- a/types/extract-text-webpack-plugin/index.d.ts
+++ b/types/extract-text-webpack-plugin/index.d.ts
@@ -2,8 +2,9 @@
 // Project: https://github.com/webpack-contrib/extract-text-webpack-plugin
 // Definitions by: flying-sheep <https://github.com/flying-sheep>, kayo <https://github.com/katyo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
-import webpack = require('webpack');
+import { Plugin, NewLoader, OldLoader } from 'webpack';
 
 export = ExtractTextPlugin;
 
@@ -11,13 +12,13 @@ export = ExtractTextPlugin;
  * extract-text-webpack-plugin has no support for .options instead of .query yet.
  * See https://github.com/webpack/extract-text-webpack-plugin/issues/281
  */
-type Loader = string | webpack.OldLoader | webpack.NewLoader;
+type Loader = string | OldLoader | NewLoader;
 
 /**
  * Use an `ExtractTextPlugin` instance and a loader returned by `extract` in concert to write files to disk instead of loading them into others.
  * Usage example at https://github.com/webpack/extract-text-webpack-plugin#usage-example-with-css
  */
-declare class ExtractTextPlugin extends webpack.Plugin {
+declare class ExtractTextPlugin extends Plugin {
     /** Create a plugin instance defining the extraction target file(s) for the files loaded by `extract` */
     constructor(options: string | ExtractTextPlugin.PluginOptions);
     /**
diff --git a/types/fabric/index.d.ts b/types/fabric/index.d.ts
index 2163faecef..8b7c007cd7 100644
--- a/types/fabric/index.d.ts
+++ b/types/fabric/index.d.ts
@@ -941,7 +941,7 @@ export class StaticCanvas {
 	 * Calculates canvas element offset relative to the document
 	 * This method is also attached as "resize" event handler of window
 	 */
-	calcOffset(): StaticCanvas;
+	calcOffset(): this;
 
 	/**
 	 * Sets {@link fabric.StaticCanvas#overlayImage|overlay image} for this canvas
@@ -949,7 +949,7 @@ export class StaticCanvas {
 	 * @param callback callback to invoke when image is loaded and set as an overlay
 	 * @param [options] Optional options to set for the {@link fabric.Image|overlay image}.
 	 */
-	setOverlayImage(image: Image|string, callback: Function, options?: IObjectOptions): StaticCanvas;
+	setOverlayImage(image: Image|string, callback: (img: HTMLImageElement) => void, options?: IImageOptions): this;
 
 	/**
 	 * Sets {@link fabric.StaticCanvas#backgroundImage|background image} for this canvas
@@ -957,21 +957,21 @@ export class StaticCanvas {
 	 * @param callback Callback to invoke when image is loaded and set as background
 	 * @param [options] Optional options to set for the {@link fabric.Image|background image}.
 	 */
-	setBackgroundImage(image: Image|string, callback?: Function, options?: IObjectOptions): StaticCanvas;
+	setBackgroundImage(image: Image|string, callback?: (img: HTMLImageElement) => void, options?: IImageOptions): this;
 
 	/**
 	 * Sets {@link fabric.StaticCanvas#overlayColor|background color} for this canvas
 	 * @param overlayColor Color or pattern to set background color to
 	 * @param callback Callback to invoke when background color is set
 	 */
-	setOverlayColor(overlayColor: string|Pattern, callback: Function): StaticCanvas;
+	setOverlayColor(overlayColor: string|Pattern, callback: (pattern: Pattern | undefined) => void): this;
 
 	/**
 	 * Sets {@link fabric.StaticCanvas#backgroundColor|background color} for this canvas
 	 * @param backgroundColor Color or pattern to set background color to
 	 * @param callback Callback to invoke when background color is set
 	 */
-	setBackgroundColor(backgroundColor: string|Pattern, callback: Function): StaticCanvas;
+	setBackgroundColor(backgroundColor: string|Pattern, callback: (pattern: Pattern | undefined) => void): StaticCanvas;
 
 	/**
 	 * Returns canvas width (in px)
@@ -988,21 +988,21 @@ export class StaticCanvas {
 	 * @param value                         Value to set width to
 	 * @param        [options]                     Options object
 	 */
-	setWidth(value: number|string, options?: ICanvasDimensionsOptions): StaticCanvas;
+	setWidth(value: number|string, options?: ICanvasDimensionsOptions): this;
 
 	/**
 	 * Sets height of this canvas instance
 	 * @param value                         Value to set height to
 	 * @param        [options]                     Options object
 	 */
-	setHeight(value: number|string, options?: ICanvasDimensionsOptions): StaticCanvas;
+	setHeight(value: number|string, options?: ICanvasDimensionsOptions): this;
 
 	/**
 	 * Sets dimensions (width, height) of this canvas instance. when options.cssOnly flag active you should also supply the unit of measure (px/%/em)
 	 * @param        dimensions                    Object with width/height properties
 	 * @param        [options]                     Options object
 	 */
-	setDimensions(dimensions: ICanvasDimensions, options?: ICanvasDimensionsOptions): StaticCanvas;
+	setDimensions(dimensions: ICanvasDimensions, options?: ICanvasDimensionsOptions): this;
 
 	/**
 	 * Returns canvas zoom level
@@ -1013,32 +1013,32 @@ export class StaticCanvas {
 	 * Sets viewport transform of this canvas instance
 	 * @param vpt the transform in the form of context.transform
 	 */
-	setViewportTransform(vpt: number[]): StaticCanvas;
+	setViewportTransform(vpt: number[]): this;
 
 	/**
 	 * Sets zoom level of this canvas instance, zoom centered around point
 	 * @param point to zoom with respect to
 	 * @param value to set zoom to, less than 1 zooms out
 	 */
-	zoomToPoint(point: Point, value: number): StaticCanvas;
+	zoomToPoint(point: Point, value: number): this;
 
 	/**
 	 * Sets zoom level of this canvas instance
 	 * @param value to set zoom to, less than 1 zooms out
 	 */
-	setZoom(value: number): StaticCanvas;
+	setZoom(value: number): this;
 
 	/**
 	 * Pan viewport so as to place point at top left corner of canvas
 	 * @param point to move to
 	 */
-	absolutePan(point: Point): StaticCanvas;
+	absolutePan(point: Point): this;
 
 	/**
 	 * Pans viewpoint relatively
 	 * @param point (position vector) to move by
 	 */
-	relativePan(point: Point): StaticCanvas;
+	relativePan(point: Point): this;
 
 	/**
 	 * Returns <canvas> element corresponding to this instance
@@ -1060,7 +1060,7 @@ export class StaticCanvas {
 	 * @param ctx Context to clear
 	 * @chainable
 	 */
-	clearContext(ctx: CanvasRenderingContext2D): StaticCanvas;
+	clearContext(ctx: CanvasRenderingContext2D): this;
 
 	/**
 	 * Returns context of canvas where objects are drawn
@@ -1070,14 +1070,14 @@ export class StaticCanvas {
 	/**
 	 * Clears all contexts (background, main, top) of an instance
 	 */
-	clear(): StaticCanvas;
+	clear(): this;
 
 	/**
 	 * Renders both the top canvas and the secondary container canvas.
 	 * @param [allOnTop] Whether we want to force all images to be rendered on the top canvas
 	 * @chainable
 	 */
-	renderAll(allOnTop?: boolean): StaticCanvas;
+	renderAll(allOnTop?: boolean): this;
 
 	/**
 	 * Method to render only the top canvas.
@@ -1096,21 +1096,21 @@ export class StaticCanvas {
 	 * You might need to call `setCoords` on an object after centering, to update controls area.
 	 * @param object Object to center horizontally
 	 */
-	centerObjectH(object: Object): StaticCanvas;
+	centerObjectH(object: Object): this;
 
 	/**
 	 * Centers object vertically.
 	 * You might need to call `setCoords` on an object after centering, to update controls area.
 	 * @param object Object to center vertically
 	 */
-	centerObjectV(object: Object): StaticCanvas;
+	centerObjectV(object: Object): this;
 
 	/**
 	 * Centers object vertically and horizontally.
 	 * You might need to call `setCoords` on an object after centering, to update controls area.
 	 * @param object Object to center vertically and horizontally
 	 */
-	centerObject(object: Object): StaticCanvas;
+	centerObject(object: Object): this;
 
 	/**
 	 * Returs dataless JSON representation of canvas
@@ -1148,14 +1148,14 @@ export class StaticCanvas {
 	 * @param object Object to send to back
 	 * @chainable
 	 */
-	sendToBack(object: Object): StaticCanvas;
+	sendToBack(object: Object): this;
 
 	/**
 	 * Moves an object to the top of the stack of drawn objects
 	 * @param object Object to send
 	 * @chainable
 	 */
-	bringToFront(object: Object): StaticCanvas;
+	bringToFront(object: Object): this;
 
 	/**
 	 * Moves an object down in stack of drawn objects
@@ -1163,7 +1163,7 @@ export class StaticCanvas {
 	 * @param [intersecting] If `true`, send object behind next lower intersecting object
 	 * @chainable
 	 */
-	sendBackwards(object: Object): StaticCanvas;
+	sendBackwards(object: Object): this;
 
 	/**
 	 * Moves an object up in stack of drawn objects
@@ -1171,19 +1171,19 @@ export class StaticCanvas {
 	 * @param [intersecting] If `true`, send object in front of next upper intersecting object
 	 * @chainable
 	 */
-	bringForward(object: Object): StaticCanvas;
+	bringForward(object: Object): this;
 	/**
 	 * Moves an object to specified level in stack of drawn objects
 	 * @param object Object to send
 	 * @param index Position to move to
 	 * @chainable
 	 */
-	moveTo(object: Object, index: number): StaticCanvas;
+	moveTo(object: Object, index: number): this;
 
 	/**
 	 * Clears a canvas element and removes all event listeners
 	 */
-	dispose(): StaticCanvas;
+	dispose(): this;
 
 	/**
 	 * Returns a string representation of an instance
@@ -1213,13 +1213,13 @@ export class StaticCanvas {
 	 *                            are initialized
 	 * @param [reviver] Method for further parsing of JSON elements, called after each fabric object created.
 	 */
-	loadFromJSON(json: string|any, callback: Function, reviver?: Function): Canvas;
+	loadFromJSON(json: string|any, callback: () => void, reviver?: Function): this;
 	/**
 	 * Clones canvas instance
 	 * @param [callback] Receives cloned instance as a first argument
 	 * @param [properties] Array of properties to include in the cloned canvas and children
 	 */
-	clone(callback: (canvas: StaticCanvas) => void, properties?: any[]): void;
+	clone(callback: (canvas: StaticCanvas) => void, properties?: string[]): void;
 
 	/**
 	 * Clones canvas instance without cloning existing data.
@@ -1241,13 +1241,13 @@ export class StaticCanvas {
 	 * Straightens object, then rerenders canvas
 	 * @param object Object to straighten
 	 */
-	straightenObject(object: Object): StaticCanvas;
+	straightenObject(object: Object): this;
 
 	/**
 	 * Same as straightenObject, but animated
 	 * @param object Object to straighten
 	 */
-	fxStraightenObject(object: Object): StaticCanvas;
+	fxStraightenObject(object: Object): this;
 
 	static EMPTY_JSON: string;
 	/**
@@ -1709,31 +1709,31 @@ interface IImageOptions extends IObjectOptions {
 	/**
 	 * crossOrigin value (one of "", "anonymous", "allow-credentials")
 	 */
-	crossOrigin: string;
+	crossOrigin?: string;
 
 	/**
 	 * AlignX value, part of preserveAspectRatio (one of "none", "mid", "min", "max")
 	 * This parameter defines how the picture is aligned to its viewport when image element width differs from image width.
 	 */
-	alignX: string;
+	alignX?: string;
 
 	/**
 	 * AlignY value, part of preserveAspectRatio (one of "none", "mid", "min", "max")
 	 * This parameter defines how the picture is aligned to its viewport when image element height differs from image height.
 	 */
-	alignY: string;
+	alignY?: string;
 
 	/**
 	 * meetOrSlice value, part of preserveAspectRatio  (one of "meet", "slice").
 	 * if meet the image is always fully visibile, if slice the viewport is always filled with image.
 	 * @see http://www.w3.org/TR/SVG/coords.html#PreserveAspectRatioAttribute
 	 */
-	meetOrSlice: string;
+	meetOrSlice?: string;
 
 	/**
 	 * Image filter array
 	 */
-	filters: IBaseFilter[];
+	filters?: IBaseFilter[];
 }
 interface Image extends Object, IImageOptions {}
 export class Image {
@@ -1971,11 +1971,6 @@ interface IObjectOptions {
 	 */
 	angle?: number;
 
-	/**
-	 * Size of object's controlling corners (in pixels)
-	 */
-	cornerSize?: number;
-
 	/**
 	 * When true, object's controlling corners are rendered as transparent inside (i.e. stroke instead of fill)
 	 */
@@ -2001,10 +1996,25 @@ interface IObjectOptions {
 	 */
 	cornerColor?: string;
 
+	/**
+	 * Array specifying dash pattern of an object's control (hasBorder must be true)
+	 */
+	cornerDashArray?: number[];
+
+	/**
+	 * Size of object's controlling corners (in pixels)
+	 */
+	cornerSize?: number;
+
+	/**
+	 * Color of controlling corners of an object (when it's active and transparentCorners false)
+	 */
+	cornerStrokeColor?: string;
+
 	/**
 	 * Specify style of control, 'rect' or 'circle'
 	 */
-	cornerStrokeColor?: "rect" | "circle";
+	cornerStyle?: "rect" | "circle";
 
 	/**
 	 * When true, this object will use center point as the origin of transformation
diff --git a/types/fancy-log/tsconfig.json b/types/fancy-log/tsconfig.json
index 0ef3d95d9e..8cc1c5b8e5 100644
--- a/types/fancy-log/tsconfig.json
+++ b/types/fancy-log/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "fancy-log-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/feathersjs__authentication-client/tsconfig.json b/types/feathersjs__authentication-client/tsconfig.json
index 62adef4864..86a5d990d8 100644
--- a/types/feathersjs__authentication-client/tsconfig.json
+++ b/types/feathersjs__authentication-client/tsconfig.json
@@ -17,11 +17,16 @@
         "noEmit": true,
         "forceConsistentCasingInFileNames": true,
         "paths": {
-            "@feathersjs/authentication-client": ["feathersjs__authentication-client"],
-            "@feathersjs/feathers": ["feathersjs__feathers"]
+            "@feathersjs/authentication-client": [
+                "feathersjs__authentication-client"
+            ],
+            "@feathersjs/feathers": [
+                "feathersjs__feathers"
+            ]
         }
     },
     "files": [
-        "index.d.ts", "feathersjs__authentication-client-tests.ts"
+        "index.d.ts",
+        "feathersjs__authentication-client-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/feathersjs__authentication-jwt/tsconfig.json b/types/feathersjs__authentication-jwt/tsconfig.json
index 9845c047e6..5ed2a46955 100644
--- a/types/feathersjs__authentication-jwt/tsconfig.json
+++ b/types/feathersjs__authentication-jwt/tsconfig.json
@@ -16,11 +16,16 @@
         "noEmit": true,
         "forceConsistentCasingInFileNames": true,
         "paths": {
-            "@feathersjs/authentication-jwt": ["feathersjs__authentication-jwt"],
-            "@feathersjs/feathers": ["feathersjs__feathers"]
+            "@feathersjs/authentication-jwt": [
+                "feathersjs__authentication-jwt"
+            ],
+            "@feathersjs/feathers": [
+                "feathersjs__feathers"
+            ]
         }
     },
     "files": [
-        "index.d.ts", "feathersjs__authentication-jwt-tests.ts"
+        "index.d.ts",
+        "feathersjs__authentication-jwt-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/feathersjs__authentication-local/tsconfig.json b/types/feathersjs__authentication-local/tsconfig.json
index 1972b0a171..f6517787b4 100644
--- a/types/feathersjs__authentication-local/tsconfig.json
+++ b/types/feathersjs__authentication-local/tsconfig.json
@@ -16,11 +16,16 @@
         "noEmit": true,
         "forceConsistentCasingInFileNames": true,
         "paths": {
-            "@feathersjs/authentication-local": ["feathersjs__authentication-local"],
-            "@feathersjs/feathers": ["feathersjs__feathers"]
+            "@feathersjs/authentication-local": [
+                "feathersjs__authentication-local"
+            ],
+            "@feathersjs/feathers": [
+                "feathersjs__feathers"
+            ]
         }
     },
     "files": [
-        "index.d.ts", "feathersjs__authentication-local-tests.ts"
+        "index.d.ts",
+        "feathersjs__authentication-local-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/feathersjs__authentication-oauth1/tsconfig.json b/types/feathersjs__authentication-oauth1/tsconfig.json
index 0a57818109..139783ebba 100644
--- a/types/feathersjs__authentication-oauth1/tsconfig.json
+++ b/types/feathersjs__authentication-oauth1/tsconfig.json
@@ -16,11 +16,16 @@
         "noEmit": true,
         "forceConsistentCasingInFileNames": true,
         "paths": {
-            "@feathersjs/authentication-oauth1": ["feathersjs__authentication-oauth1"],
-            "@feathersjs/feathers": ["feathersjs__feathers"]
+            "@feathersjs/authentication-oauth1": [
+                "feathersjs__authentication-oauth1"
+            ],
+            "@feathersjs/feathers": [
+                "feathersjs__feathers"
+            ]
         }
     },
     "files": [
-        "index.d.ts", "feathersjs__authentication-oauth1-tests.ts"
+        "index.d.ts",
+        "feathersjs__authentication-oauth1-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/feathersjs__authentication-oauth2/tsconfig.json b/types/feathersjs__authentication-oauth2/tsconfig.json
index 6c347cef78..a0650a2123 100644
--- a/types/feathersjs__authentication-oauth2/tsconfig.json
+++ b/types/feathersjs__authentication-oauth2/tsconfig.json
@@ -16,11 +16,16 @@
         "noEmit": true,
         "forceConsistentCasingInFileNames": true,
         "paths": {
-            "@feathersjs/authentication-oauth2": ["feathersjs__authentication-oauth2"],
-            "@feathersjs/feathers": ["feathersjs__feathers"]
+            "@feathersjs/authentication-oauth2": [
+                "feathersjs__authentication-oauth2"
+            ],
+            "@feathersjs/feathers": [
+                "feathersjs__feathers"
+            ]
         }
     },
     "files": [
-        "index.d.ts", "feathersjs__authentication-oauth2-tests.ts"
+        "index.d.ts",
+        "feathersjs__authentication-oauth2-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/feathersjs__authentication/tsconfig.json b/types/feathersjs__authentication/tsconfig.json
index 8cb6f348ed..136165d7ae 100644
--- a/types/feathersjs__authentication/tsconfig.json
+++ b/types/feathersjs__authentication/tsconfig.json
@@ -16,11 +16,16 @@
         "noEmit": true,
         "forceConsistentCasingInFileNames": true,
         "paths": {
-            "@feathersjs/authentication": ["feathersjs__authentication"],
-            "@feathersjs/feathers": ["feathersjs__feathers"]
+            "@feathersjs/authentication": [
+                "feathersjs__authentication"
+            ],
+            "@feathersjs/feathers": [
+                "feathersjs__feathers"
+            ]
         }
     },
     "files": [
-        "index.d.ts", "feathersjs__authentication-tests.ts"
+        "index.d.ts",
+        "feathersjs__authentication-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/feathersjs__configuration/tsconfig.json b/types/feathersjs__configuration/tsconfig.json
index 4ff80d4bea..66219a58d3 100644
--- a/types/feathersjs__configuration/tsconfig.json
+++ b/types/feathersjs__configuration/tsconfig.json
@@ -16,11 +16,16 @@
         "noEmit": true,
         "forceConsistentCasingInFileNames": true,
         "paths": {
-            "@feathersjs/configuration": ["feathersjs__configuration"],
-            "@feathersjs/feathers": ["feathersjs__feathers"]
+            "@feathersjs/configuration": [
+                "feathersjs__configuration"
+            ],
+            "@feathersjs/feathers": [
+                "feathersjs__feathers"
+            ]
         }
     },
     "files": [
-        "index.d.ts", "feathersjs__configuration-tests.ts"
+        "index.d.ts",
+        "feathersjs__configuration-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/feathersjs__errors/tsconfig.json b/types/feathersjs__errors/tsconfig.json
index f07ee484aa..f796bba231 100644
--- a/types/feathersjs__errors/tsconfig.json
+++ b/types/feathersjs__errors/tsconfig.json
@@ -16,12 +16,21 @@
         "noEmit": true,
         "forceConsistentCasingInFileNames": true,
         "paths": {
-            "@feathersjs/errors": ["feathersjs__errors"],
-            "@feathersjs/errors/handler": ["feathersjs__errors/handler"],
-            "@feathersjs/errors/not-found": ["feathersjs__errors/not-found"]
+            "@feathersjs/errors": [
+                "feathersjs__errors"
+            ],
+            "@feathersjs/errors/handler": [
+                "feathersjs__errors/handler"
+            ],
+            "@feathersjs/errors/not-found": [
+                "feathersjs__errors/not-found"
+            ]
         }
     },
     "files": [
-        "index.d.ts", "feathersjs__errors-tests.ts", "handler.d.ts", "not-found.d.ts"
+        "index.d.ts",
+        "feathersjs__errors-tests.ts",
+        "handler.d.ts",
+        "not-found.d.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/feathersjs__express/tsconfig.json b/types/feathersjs__express/tsconfig.json
index 8489861fc9..8564d13a65 100644
--- a/types/feathersjs__express/tsconfig.json
+++ b/types/feathersjs__express/tsconfig.json
@@ -16,11 +16,16 @@
         "noEmit": true,
         "forceConsistentCasingInFileNames": true,
         "paths": {
-            "@feathersjs/express": ["feathersjs__express"],
-            "@feathersjs/feathers": ["feathersjs__feathers"]
+            "@feathersjs/express": [
+                "feathersjs__express"
+            ],
+            "@feathersjs/feathers": [
+                "feathersjs__feathers"
+            ]
         }
     },
     "files": [
-        "index.d.ts", "feathersjs__express-tests.ts"
+        "index.d.ts",
+        "feathersjs__express-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/feathersjs__feathers/tsconfig.json b/types/feathersjs__feathers/tsconfig.json
index b4eeb705cc..f7d218481f 100644
--- a/types/feathersjs__feathers/tsconfig.json
+++ b/types/feathersjs__feathers/tsconfig.json
@@ -16,10 +16,13 @@
         "noEmit": true,
         "forceConsistentCasingInFileNames": true,
         "paths": {
-            "@feathersjs/feathers": ["feathersjs__feathers"]
+            "@feathersjs/feathers": [
+                "feathersjs__feathers"
+            ]
         }
     },
     "files": [
-        "index.d.ts", "feathersjs__feathers-tests.ts"
+        "index.d.ts",
+        "feathersjs__feathers-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/feathersjs__primus-client/tsconfig.json b/types/feathersjs__primus-client/tsconfig.json
index 2c798b2f88..4ecb275180 100644
--- a/types/feathersjs__primus-client/tsconfig.json
+++ b/types/feathersjs__primus-client/tsconfig.json
@@ -16,11 +16,16 @@
         "noEmit": true,
         "forceConsistentCasingInFileNames": true,
         "paths": {
-            "@feathersjs/primus-client": ["feathersjs__primus-client"],
-            "@feathersjs/feathers": ["feathersjs__feathers"]
+            "@feathersjs/primus-client": [
+                "feathersjs__primus-client"
+            ],
+            "@feathersjs/feathers": [
+                "feathersjs__feathers"
+            ]
         }
     },
     "files": [
-        "index.d.ts", "feathersjs__primus-client-tests.ts"
+        "index.d.ts",
+        "feathersjs__primus-client-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/feathersjs__primus/tsconfig.json b/types/feathersjs__primus/tsconfig.json
index ca7b8a3077..9d6c7ec351 100644
--- a/types/feathersjs__primus/tsconfig.json
+++ b/types/feathersjs__primus/tsconfig.json
@@ -16,11 +16,16 @@
         "noEmit": true,
         "forceConsistentCasingInFileNames": true,
         "paths": {
-            "@feathersjs/primus": ["feathersjs__primus"],
-            "@feathersjs/feathers": ["feathersjs__feathers"]
+            "@feathersjs/primus": [
+                "feathersjs__primus"
+            ],
+            "@feathersjs/feathers": [
+                "feathersjs__feathers"
+            ]
         }
     },
     "files": [
-        "index.d.ts", "feathersjs__primus-tests.ts"
+        "index.d.ts",
+        "feathersjs__primus-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/feathersjs__rest-client/tsconfig.json b/types/feathersjs__rest-client/tsconfig.json
index f63a18a220..565175bb1b 100644
--- a/types/feathersjs__rest-client/tsconfig.json
+++ b/types/feathersjs__rest-client/tsconfig.json
@@ -16,10 +16,13 @@
         "noEmit": true,
         "forceConsistentCasingInFileNames": true,
         "paths": {
-            "@feathersjs/rest-client": ["feathersjs__rest-client"]
+            "@feathersjs/rest-client": [
+                "feathersjs__rest-client"
+            ]
         }
     },
     "files": [
-        "index.d.ts", "feathersjs__rest-client-tests.ts"
+        "index.d.ts",
+        "feathersjs__rest-client-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/feathersjs__socket-commons/tsconfig.json b/types/feathersjs__socket-commons/tsconfig.json
index 6532818264..7d495d1bae 100644
--- a/types/feathersjs__socket-commons/tsconfig.json
+++ b/types/feathersjs__socket-commons/tsconfig.json
@@ -16,11 +16,16 @@
         "noEmit": true,
         "forceConsistentCasingInFileNames": true,
         "paths": {
-            "@feathersjs/socket-commons": ["feathersjs__socket-commons"],
-            "@feathersjs/feathers": ["feathersjs__feathers"]
+            "@feathersjs/socket-commons": [
+                "feathersjs__socket-commons"
+            ],
+            "@feathersjs/feathers": [
+                "feathersjs__feathers"
+            ]
         }
     },
     "files": [
-        "index.d.ts", "feathersjs__socket-commons-tests.ts"
+        "index.d.ts",
+        "feathersjs__socket-commons-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/feathersjs__socketio-client/tsconfig.json b/types/feathersjs__socketio-client/tsconfig.json
index ffea4d4f91..13e41575a4 100644
--- a/types/feathersjs__socketio-client/tsconfig.json
+++ b/types/feathersjs__socketio-client/tsconfig.json
@@ -16,12 +16,16 @@
         "noEmit": true,
         "forceConsistentCasingInFileNames": true,
         "paths": {
-            "@feathersjs/socketio-client": ["feathersjs__socketio-client"],
-            "@feathersjs/feathers": ["feathersjs__feathers"]
-
+            "@feathersjs/socketio-client": [
+                "feathersjs__socketio-client"
+            ],
+            "@feathersjs/feathers": [
+                "feathersjs__feathers"
+            ]
         }
     },
     "files": [
-        "index.d.ts", "feathersjs__socketio-client-tests.ts"
+        "index.d.ts",
+        "feathersjs__socketio-client-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/feathersjs__socketio/tsconfig.json b/types/feathersjs__socketio/tsconfig.json
index 2b3cc51adc..25dfd99137 100644
--- a/types/feathersjs__socketio/tsconfig.json
+++ b/types/feathersjs__socketio/tsconfig.json
@@ -16,11 +16,16 @@
         "noEmit": true,
         "forceConsistentCasingInFileNames": true,
         "paths": {
-            "@feathersjs/socketio": ["feathersjs__socketio"],
-            "@feathersjs/feathers": ["feathersjs__feathers"]
+            "@feathersjs/socketio": [
+                "feathersjs__socketio"
+            ],
+            "@feathersjs/feathers": [
+                "feathersjs__feathers"
+            ]
         }
     },
     "files": [
-        "index.d.ts", "feathersjs__socketio-tests.ts"
+        "index.d.ts",
+        "feathersjs__socketio-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/feedme/tsconfig.json b/types/feedme/tsconfig.json
index aa5f186309..7ab0d74a0e 100644
--- a/types/feedme/tsconfig.json
+++ b/types/feedme/tsconfig.json
@@ -14,7 +14,7 @@
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true,
-        "strictFunctionTypes" : false
+        "strictFunctionTypes": false
     },
     "files": [
         "index.d.ts",
diff --git a/types/feedparser/feedparser-tests.ts b/types/feedparser/feedparser-tests.ts
index 25d652de8c..1b35498a5e 100644
--- a/types/feedparser/feedparser-tests.ts
+++ b/types/feedparser/feedparser-tests.ts
@@ -1,5 +1,5 @@
 import request = require('request');
-import * as FeedParser from "feedparser";
+import FeedParser = require("feedparser");
 
 const req = request('https://news.google.com/news?cf=all&hl=en&pz=1&ned=us&output=rss');
 const feedparser = new FeedParser({});
diff --git a/types/feedparser/tsconfig.json b/types/feedparser/tsconfig.json
index 683adf9415..0a7666d303 100644
--- a/types/feedparser/tsconfig.json
+++ b/types/feedparser/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "feedparser-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/ffi/tsconfig.json b/types/ffi/tsconfig.json
index db74f21b0e..73d314a1b0 100644
--- a/types/ffi/tsconfig.json
+++ b/types/ffi/tsconfig.json
@@ -21,4 +21,4 @@
         "node-ffi-buffer.d.ts",
         "ffi-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/file-saver/tsconfig.json b/types/file-saver/tsconfig.json
index 803ff5f510..e4a4473e87 100644
--- a/types/file-saver/tsconfig.json
+++ b/types/file-saver/tsconfig.json
@@ -21,4 +21,4 @@
         "index.d.ts",
         "file-saver-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/finalhandler/finalhandler-tests.ts b/types/finalhandler/finalhandler-tests.ts
index 81b9565404..3b40b217d0 100644
--- a/types/finalhandler/finalhandler-tests.ts
+++ b/types/finalhandler/finalhandler-tests.ts
@@ -1,6 +1,5 @@
-
 import { ServerRequest, ServerResponse } from "http";
-import * as finalHandler from "finalhandler";
+import finalHandler = require("finalhandler");
 
 let req: ServerRequest;
 let res: ServerResponse;
diff --git a/types/find-root/tsconfig.json b/types/find-root/tsconfig.json
index 72d7b324a3..9293671d11 100644
--- a/types/find-root/tsconfig.json
+++ b/types/find-root/tsconfig.json
@@ -1,23 +1,23 @@
 {
     "compilerOptions": {
-        "module":                           "commonjs",
-        "lib":                              [
+        "module": "commonjs",
+        "lib": [
             "es6"
         ],
-        "noImplicitAny":                    true,
-        "noImplicitThis":                   true,
-        "strictNullChecks":                 true,
-        "baseUrl":                          "../",
-        "typeRoots":                        [
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
             "../"
         ],
-        "types":                            [],
-        "noEmit":                           true,
+        "types": [],
+        "noEmit": true,
         "forceConsistentCasingInFileNames": true,
-        "strictFunctionTypes":              true
+        "strictFunctionTypes": true
     },
-    "files":           [
+    "files": [
         "index.d.ts",
         "find-root-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/find/tsconfig.json b/types/find/tsconfig.json
index e231e78ff5..fe3b8b7e2f 100644
--- a/types/find/tsconfig.json
+++ b/types/find/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "find-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/firefox-webext-browser/tsconfig.json b/types/firefox-webext-browser/tsconfig.json
index 202f6824d1..82dd1256b5 100644
--- a/types/firefox-webext-browser/tsconfig.json
+++ b/types/firefox-webext-browser/tsconfig.json
@@ -21,4 +21,4 @@
         "index.d.ts",
         "firefox-webext-browser-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/firmata/firmata-tests.ts b/types/firmata/firmata-tests.ts
index d50160e2dd..9a3137ea39 100644
--- a/types/firmata/firmata-tests.ts
+++ b/types/firmata/firmata-tests.ts
@@ -1,4 +1,4 @@
-import * as Board from 'firmata';
+import Board = require('firmata');
 
 function test_basic_board() {
 	const board = new Board('');
diff --git a/types/firmata/tsconfig.json b/types/firmata/tsconfig.json
index d843e1300d..109d49f85b 100644
--- a/types/firmata/tsconfig.json
+++ b/types/firmata/tsconfig.json
@@ -13,7 +13,9 @@
             "../"
         ],
         "paths": {
-            "serialport": ["serialport/v4"]
+            "serialport": [
+                "serialport/v4"
+            ]
         },
         "types": [],
         "noEmit": true,
diff --git a/types/first-mate/tsconfig.json b/types/first-mate/tsconfig.json
index 3c11f8dbb2..d9b53e9300 100644
--- a/types/first-mate/tsconfig.json
+++ b/types/first-mate/tsconfig.json
@@ -21,4 +21,4 @@
         "index.d.ts",
         "first-mate-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/fixed-data-table-2/index.d.ts b/types/fixed-data-table-2/index.d.ts
index a39397a228..0b844ec194 100644
--- a/types/fixed-data-table-2/index.d.ts
+++ b/types/fixed-data-table-2/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/schrodinger/fixed-data-table-2
 // Definitions by: Ilya Petukhov <https://github.com/ilivit>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from "react";
 
diff --git a/types/fixed-data-table-2/tsconfig.json b/types/fixed-data-table-2/tsconfig.json
index c548d5c369..54122fd5dd 100644
--- a/types/fixed-data-table-2/tsconfig.json
+++ b/types/fixed-data-table-2/tsconfig.json
@@ -5,8 +5,11 @@
     ],
     "compilerOptions": {
         "module": "commonjs",
-        "lib": ["es6", "dom"],
-        "jsx":"preserve",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "jsx": "preserve",
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
@@ -19,4 +22,4 @@
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     }
-}
+}
\ No newline at end of file
diff --git a/types/fixed-data-table/index.d.ts b/types/fixed-data-table/index.d.ts
index 9eef731cf9..c8ee33a2a1 100644
--- a/types/fixed-data-table/index.d.ts
+++ b/types/fixed-data-table/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/facebook/fixed-data-table
 // Definitions by: Petar Paar <https://github.com/pepaar>, Stephen Jelfs <https://github.com/stephenjelfs>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 /// <reference types="react"/>
 
diff --git a/types/flux/index.d.ts b/types/flux/index.d.ts
index 9a95368afb..ffc0330228 100644
--- a/types/flux/index.d.ts
+++ b/types/flux/index.d.ts
@@ -3,9 +3,9 @@
 // Definitions by: Steve Baker <https://github.com/stkb>
 //                 Giedrius Grabauskas <https://github.com/GiedriusGrabauskas>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
-import * as Dispatcher from "./lib/Dispatcher";
+import Dispatcher = require("./lib/Dispatcher");
 
 export {
     Dispatcher
diff --git a/types/flux/utils.d.ts b/types/flux/utils.d.ts
index 4eb3d96e99..d9ced309db 100644
--- a/types/flux/utils.d.ts
+++ b/types/flux/utils.d.ts
@@ -1,7 +1,7 @@
-import * as Container from "./lib/FluxContainer";
-import * as Mixin from "./lib/FluxMixinLegacy";
-import * as ReduceStore from "./lib/FluxReduceStore";
-import * as Store from "./lib/FluxStore";
+import Container = require("./lib/FluxContainer");
+import Mixin = require("./lib/FluxMixinLegacy");
+import ReduceStore = require("./lib/FluxReduceStore");
+import Store = require("./lib/FluxStore");
 
 export {
     Container,
diff --git a/types/fluxxor/index.d.ts b/types/fluxxor/index.d.ts
index d5389f9cde..3457dba949 100644
--- a/types/fluxxor/index.d.ts
+++ b/types/fluxxor/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/BinaryMuse/fluxxor
 // Definitions by: Yuichi Murata <https://github.com/mrk21>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as EventEmitter3 from 'eventemitter3';
 import * as React from "react";
diff --git a/types/form-urlencoded/tsconfig.json b/types/form-urlencoded/tsconfig.json
index 4eefbe0a12..ed8d448443 100644
--- a/types/form-urlencoded/tsconfig.json
+++ b/types/form-urlencoded/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "form-urlencoded-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/format-duration/tsconfig.json b/types/format-duration/tsconfig.json
index f17a4f7c6c..d5347747a1 100644
--- a/types/format-duration/tsconfig.json
+++ b/types/format-duration/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "format-duration-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/format-io/tsconfig.json b/types/format-io/tsconfig.json
index 29333d35cf..a12183763e 100644
--- a/types/format-io/tsconfig.json
+++ b/types/format-io/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "format-io-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/forms/tsconfig.json b/types/forms/tsconfig.json
index 1185c1ffbb..442854037d 100644
--- a/types/forms/tsconfig.json
+++ b/types/forms/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "forms-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/friendly-errors-webpack-plugin/friendly-errors-webpack-plugin-tests.ts b/types/friendly-errors-webpack-plugin/friendly-errors-webpack-plugin-tests.ts
index 4ce3828f3f..11f9395974 100644
--- a/types/friendly-errors-webpack-plugin/friendly-errors-webpack-plugin-tests.ts
+++ b/types/friendly-errors-webpack-plugin/friendly-errors-webpack-plugin-tests.ts
@@ -1,5 +1,5 @@
-import * as webpack from 'webpack';
-import * as FriendlyErrorsPlugin from 'friendly-errors-webpack-plugin';
+import webpack = require('webpack');
+import FriendlyErrorsPlugin = require('friendly-errors-webpack-plugin');
 
 const compiler = webpack({
     plugins: [
diff --git a/types/fs-cson/tsconfig.json b/types/fs-cson/tsconfig.json
index fcd9242b1d..05e0a15821 100644
--- a/types/fs-cson/tsconfig.json
+++ b/types/fs-cson/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "fs-cson-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/fs-plus/tsconfig.json b/types/fs-plus/tsconfig.json
index 1ab0098d52..40360a794d 100644
--- a/types/fs-plus/tsconfig.json
+++ b/types/fs-plus/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "fs-plus-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/fs-readfile-promise/fs-readfile-promise-tests.ts b/types/fs-readfile-promise/fs-readfile-promise-tests.ts
index 9bd1ac070c..1871207710 100644
--- a/types/fs-readfile-promise/fs-readfile-promise-tests.ts
+++ b/types/fs-readfile-promise/fs-readfile-promise-tests.ts
@@ -1,4 +1,4 @@
-import * as readFile from "fs-readfile-promise";
+import readFile = require("fs-readfile-promise");
 
 declare const path: string;
 declare const encoding: string;
diff --git a/types/fscreen/tsconfig.json b/types/fscreen/tsconfig.json
index e352d9fd2e..2ecb50bbeb 100644
--- a/types/fscreen/tsconfig.json
+++ b/types/fscreen/tsconfig.json
@@ -22,4 +22,4 @@
         "index.d.ts",
         "fscreen-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/fullpage.js/tsconfig.json b/types/fullpage.js/tsconfig.json
index d20953732c..c8a11e250e 100644
--- a/types/fullpage.js/tsconfig.json
+++ b/types/fullpage.js/tsconfig.json
@@ -21,4 +21,4 @@
         "index.d.ts",
         "fullpage.js-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/fuse/fuse-tests.ts b/types/fuse/fuse-tests.ts
deleted file mode 100644
index 801829d78d..0000000000
--- a/types/fuse/fuse-tests.ts
+++ /dev/null
@@ -1,130 +0,0 @@
-
-
-function test_fuse_find_identifiers() {
-	var books = [{
-		id: 1,
-		title: 'The Great Gatsby',
-		author: 'F. Scott Fitzgerald'
-	}, {
-		id: 2,
-		title: 'The DaVinci Code',
-		author: 'Dan Brown'
-	}, {
-		id: 3,
-		title: 'Angels & Demons',
-		author: 'Dan Brown'
-	}];
-	var options = {
-		keys: ['author', 'title'],   // keys to search in
-		id: 'id'                     // return a list of identifiers only
-	};
-	var f = new Fuse(books, options);
-	var result = f.search('brwn'); // Fuzzy-search for pattern 'brwn'
-}
-
-function test_fuse_find_records() {
-	var books = [{
-		id: 1,
-		title: 'The Great Gatsby',
-		author: 'F. Scott Fitzgerald'
-	}, {
-		id: 2,
-		title: 'The DaVinci Code',
-		author: 'Dan Brown'
-	}, {
-		id: 3,
-		title: 'Angels & Demons',
-		author: 'Dan Brown'
-	}];
-	var options = {
-		keys: ['author', 'title']
-	};
-	var f = new Fuse(books, options);
-	var result = f.search('brwn');
-}
-
-function test_fuse_flat_array() {
-	var books = ["Old Man's War", "The Lock Artist", "HTML5", "Right Ho Jeeves", "The Code of the Wooster", "Thank You Jeeves", "The DaVinci Code", "Angels & Demons", "The Silmarillion", "Syrup", "The Lost Symbol", "The Book of Lies", "Lamb", "Fool", "Incompetence", "Fat", "Colony", "Backwards, Red Dwarf", "The Grand Design", "The Book of Samson", "The Preservationist", "Fallen", "Monster 1959"];
-	var f = new Fuse(books);
-	var result = f.search('Falen');
-}
-
-function test_fuse_deep_key_search() {
-	var books = [{
-		id: 1,
-		title: 'The Great Gatsby',
-		author: {
-			firstName: 'F. Scott',
-			lastName: 'Fitzgerald'
-		}
-	}, {
-		title: 'The DaVinci Code',
-		author: {
-			firstName: 'Dan',
-			lastName: 'Brown'
-		}
-	}];
-
-	var options = {
-		keys: ['author.firstName']
-	};
-	var f = new Fuse(books, options);
-	var result = f.search('brwn');
-}
-
-interface Book {
-	id?: number;
-	title?: string;
-	author?: {firstName: string; lastName: string};
-}
-
-function test_generic_fuse() {
-	var books: Book[] = [{
-		id: 1,
-		title: 'The Great Gatsby',
-		author: {
-			firstName: 'F. Scott',
-			lastName: 'Fitzgerald'
-		}
-	}, {
-		title: 'The DaVinci Code',
-		author: {
-			firstName: 'Dan',
-			lastName: 'Brown'
-		}
-	}];
-
-	var options = {
-		keys: ["title", "author.firstName"]
-	};
-	var f = new Fuse<Book>(books, options);
-	var result = f.search('brwn');
-}
-
-function test_getFn() {
-	var books = [{
-		id: 1,
-		title: 'The Great Gatsby',
-		author: {
-			firstName: 'F. Scott',
-			lastName: 'Fitzgerald'
-		}
-	}, {
-		title: 'The DaVinci Code',
-		author: {
-			firstName: 'Dan',
-			lastName: 'Brown'
-		}
-	}];
-
-	var options = {
-		keys: ["title", "author.firstName"],
-		getFn: (obj: Book, path: string): string => {
-			if (!obj) {
-				return null;
-			}
-			return obj.author.firstName;
-		}
-	};
-	var f = new Fuse<Book>(books, options);
-}
diff --git a/types/fuse/index.d.ts b/types/fuse/index.d.ts
deleted file mode 100644
index 9442e43490..0000000000
--- a/types/fuse/index.d.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-// Type definitions for Fuse.js 2.5.0
-// Project: https://github.com/krisk/Fuse
-// Definitions by: Greg Smith <https://github.com/smrq>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare class Fuse<T> {
-	constructor(list: T[], options?: Fuse.Options<T>);
-	search(pattern: string): T[];
-}
-
-declare namespace Fuse {
-	interface SearchFnConstructor {
-		new (pattern: string, options?: SearchOptions): SearchFn;
-	}
-
-	interface SearchFn {
-		search(text: string): SearchResult;
-	}
-
-	interface SearchResult {
-		readonly isMatch: boolean;
-		readonly score: number;
-	}
-
-	interface SearchOptions {
-		location?: number;
-		distance?: number;
-		threshold?: number;
-		maxPatternLength?: number;
-	}
-
-	interface Options<T> {
-		id?: string;
-		caseSensitive?: boolean;
-		include?: string[];
-		shouldSort?: boolean;
-		searchFn?: SearchFnConstructor;
-		sortFn?: (a: {score: number}, b: {score: number}) => number;
-		keys?: string[] | { name:string; weight:number} [];
-		verbose?:boolean;
-		tokenize?: boolean;
-		tokenSeparator? : RegExp;
-		matchAllTokens?: boolean;
-		location?: number;
-		distance?: number;
-		threshold?: number;
-		maxPatternLength?: number;
-		includeScore?: boolean;
-		getFn?: (obj: T, path: string) => string;
-	}
-}
-
-export = Fuse;
-export as namespace Fuse;
diff --git a/types/fuzzaldrin/tsconfig.json b/types/fuzzaldrin/tsconfig.json
index 2e1263faf8..9a5894b281 100644
--- a/types/fuzzaldrin/tsconfig.json
+++ b/types/fuzzaldrin/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "fuzzaldrin-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/fuzzyset.js/index.d.ts b/types/fuzzyset.js/index.d.ts
index 04914683bc..4e4bcfefb6 100644
--- a/types/fuzzyset.js/index.d.ts
+++ b/types/fuzzyset.js/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for fuzzyset.js 0.0
 // Project: https://github.com/Glench/fuzzyset.js
 // Definitions by: Louis Grignon <https://github.com/lgrignon>
+//                Narain Sagar <https://github.com/narainsagar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -13,7 +14,7 @@ interface FuzzySet {
 }
 
 declare function FuzzySet(
-  source: string[],
+  source?: string[],
   useLevenshtein?: boolean,
   gramSizeLower?: number,
   gramSizeUpper?: number,
diff --git a/types/fuzzyset.js/tsconfig.json b/types/fuzzyset.js/tsconfig.json
index a1eeb06b97..85e606ff8b 100644
--- a/types/fuzzyset.js/tsconfig.json
+++ b/types/fuzzyset.js/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "fuzzyset.js-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/fuzzyset/index.d.ts b/types/fuzzyset/index.d.ts
index 4d923110d5..2e97e3b47a 100644
--- a/types/fuzzyset/index.d.ts
+++ b/types/fuzzyset/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for fuzzset 1.0
 // Project: https://github.com/washt/fuzzyset
 // Definitions by: Louis Grignon <https://github.com/lgrignon>
+//                Narain Sagar <https://github.com/narainsagar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 interface FuzzySet {
@@ -11,7 +12,7 @@ interface FuzzySet {
     values(): string[];
 }
 
-declare function FuzzySet(source: string[], useLevenshtein?: boolean, gramSizeLower?: number, gramSizeUpper?: number): FuzzySet;
+declare function FuzzySet(source?: string[], useLevenshtein?: boolean, gramSizeLower?: number, gramSizeUpper?: number): FuzzySet;
 
 export = FuzzySet;
 export as namespace FuzzySet;
diff --git a/types/gapi.auth2/index.d.ts b/types/gapi.auth2/index.d.ts
index 0acae5e2a7..fdb4c08cc3 100644
--- a/types/gapi.auth2/index.d.ts
+++ b/types/gapi.auth2/index.d.ts
@@ -21,7 +21,7 @@ declare namespace gapi.auth2 {
      * Calls the onInit function when the GoogleAuth object is fully initialized, or calls the onFailure function if
      * initialization fails.
      */
-    then(onInit: (googleAuth: GoogleAuth) => any, onFailure?: (reason: string) => any): any;
+    then(onInit: (googleAuth: GoogleAuth) => any, onFailure?: (reason: {error: string, details: string}) => any): any;
 
     /**
      * Signs in the user using the specified options.
diff --git a/types/gapi.client.acceleratedmobilepageurl/tsconfig.json b/types/gapi.client.acceleratedmobilepageurl/tsconfig.json
index 60d81925fe..0fd2965955 100644
--- a/types/gapi.client.acceleratedmobilepageurl/tsconfig.json
+++ b/types/gapi.client.acceleratedmobilepageurl/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.adexchangebuyer/tsconfig.json b/types/gapi.client.adexchangebuyer/tsconfig.json
index a6ddc40ec7..e5b042eba8 100644
--- a/types/gapi.client.adexchangebuyer/tsconfig.json
+++ b/types/gapi.client.adexchangebuyer/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.adexchangebuyer2/tsconfig.json b/types/gapi.client.adexchangebuyer2/tsconfig.json
index 453ca167ee..8143251a27 100644
--- a/types/gapi.client.adexchangebuyer2/tsconfig.json
+++ b/types/gapi.client.adexchangebuyer2/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.adexchangeseller/tsconfig.json b/types/gapi.client.adexchangeseller/tsconfig.json
index a38d57f5b8..0f5a97fa3c 100644
--- a/types/gapi.client.adexchangeseller/tsconfig.json
+++ b/types/gapi.client.adexchangeseller/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.adexperiencereport/tsconfig.json b/types/gapi.client.adexperiencereport/tsconfig.json
index 968c080cf9..206d4af70a 100644
--- a/types/gapi.client.adexperiencereport/tsconfig.json
+++ b/types/gapi.client.adexperiencereport/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.admin/tsconfig.json b/types/gapi.client.admin/tsconfig.json
index 840f1feb2d..2f0376936f 100644
--- a/types/gapi.client.admin/tsconfig.json
+++ b/types/gapi.client.admin/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.adsense/tsconfig.json b/types/gapi.client.adsense/tsconfig.json
index 49b1e08a5a..2166cc106d 100644
--- a/types/gapi.client.adsense/tsconfig.json
+++ b/types/gapi.client.adsense/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.adsensehost/tsconfig.json b/types/gapi.client.adsensehost/tsconfig.json
index 5cee9dc200..6440280718 100644
--- a/types/gapi.client.adsensehost/tsconfig.json
+++ b/types/gapi.client.adsensehost/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.analytics/tsconfig.json b/types/gapi.client.analytics/tsconfig.json
index 24b9a3e308..b21d000ed3 100644
--- a/types/gapi.client.analytics/tsconfig.json
+++ b/types/gapi.client.analytics/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.analyticsreporting/tsconfig.json b/types/gapi.client.analyticsreporting/tsconfig.json
index 2f65484898..ab2b1caf97 100644
--- a/types/gapi.client.analyticsreporting/tsconfig.json
+++ b/types/gapi.client.analyticsreporting/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.androiddeviceprovisioning/tsconfig.json b/types/gapi.client.androiddeviceprovisioning/tsconfig.json
index 953923be00..12116a10cb 100644
--- a/types/gapi.client.androiddeviceprovisioning/tsconfig.json
+++ b/types/gapi.client.androiddeviceprovisioning/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.androidenterprise/tsconfig.json b/types/gapi.client.androidenterprise/tsconfig.json
index d641db9824..d27797184a 100644
--- a/types/gapi.client.androidenterprise/tsconfig.json
+++ b/types/gapi.client.androidenterprise/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.androidmanagement/tsconfig.json b/types/gapi.client.androidmanagement/tsconfig.json
index 3cfbad08e0..1ffc42dd14 100644
--- a/types/gapi.client.androidmanagement/tsconfig.json
+++ b/types/gapi.client.androidmanagement/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.androidpublisher/tsconfig.json b/types/gapi.client.androidpublisher/tsconfig.json
index 6f724fe172..ecb1498903 100644
--- a/types/gapi.client.androidpublisher/tsconfig.json
+++ b/types/gapi.client.androidpublisher/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.appengine/tsconfig.json b/types/gapi.client.appengine/tsconfig.json
index 0af2b9eade..b820e2611b 100644
--- a/types/gapi.client.appengine/tsconfig.json
+++ b/types/gapi.client.appengine/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.appsactivity/tsconfig.json b/types/gapi.client.appsactivity/tsconfig.json
index 0afc87f3ad..23925d5b3b 100644
--- a/types/gapi.client.appsactivity/tsconfig.json
+++ b/types/gapi.client.appsactivity/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.appstate/tsconfig.json b/types/gapi.client.appstate/tsconfig.json
index e9b5b7a850..684a5c956e 100644
--- a/types/gapi.client.appstate/tsconfig.json
+++ b/types/gapi.client.appstate/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.bigquery/tsconfig.json b/types/gapi.client.bigquery/tsconfig.json
index 23f55a96a4..c68b4fcf23 100644
--- a/types/gapi.client.bigquery/tsconfig.json
+++ b/types/gapi.client.bigquery/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.bigquerydatatransfer/tsconfig.json b/types/gapi.client.bigquerydatatransfer/tsconfig.json
index 312df37f3f..b6861fc514 100644
--- a/types/gapi.client.bigquerydatatransfer/tsconfig.json
+++ b/types/gapi.client.bigquerydatatransfer/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.blogger/tsconfig.json b/types/gapi.client.blogger/tsconfig.json
index 1b5be0ad2b..001618422c 100644
--- a/types/gapi.client.blogger/tsconfig.json
+++ b/types/gapi.client.blogger/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.books/tsconfig.json b/types/gapi.client.books/tsconfig.json
index d011bdcf5c..49e413d1bf 100644
--- a/types/gapi.client.books/tsconfig.json
+++ b/types/gapi.client.books/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.calendar/tsconfig.json b/types/gapi.client.calendar/tsconfig.json
index 5d44c3d92a..e8247f5377 100644
--- a/types/gapi.client.calendar/tsconfig.json
+++ b/types/gapi.client.calendar/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.civicinfo/tsconfig.json b/types/gapi.client.civicinfo/tsconfig.json
index 6c3ced88c9..26caf528cc 100644
--- a/types/gapi.client.civicinfo/tsconfig.json
+++ b/types/gapi.client.civicinfo/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.classroom/tsconfig.json b/types/gapi.client.classroom/tsconfig.json
index 4e1a97323a..f72a3246ed 100644
--- a/types/gapi.client.classroom/tsconfig.json
+++ b/types/gapi.client.classroom/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.cloudbilling/tsconfig.json b/types/gapi.client.cloudbilling/tsconfig.json
index 66cfdbefe4..83c05e6b40 100644
--- a/types/gapi.client.cloudbilling/tsconfig.json
+++ b/types/gapi.client.cloudbilling/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.cloudbuild/tsconfig.json b/types/gapi.client.cloudbuild/tsconfig.json
index 22d8d6d390..c6363df89b 100644
--- a/types/gapi.client.cloudbuild/tsconfig.json
+++ b/types/gapi.client.cloudbuild/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.clouddebugger/tsconfig.json b/types/gapi.client.clouddebugger/tsconfig.json
index de9d4c94bc..33f64ad59e 100644
--- a/types/gapi.client.clouddebugger/tsconfig.json
+++ b/types/gapi.client.clouddebugger/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.clouderrorreporting/tsconfig.json b/types/gapi.client.clouderrorreporting/tsconfig.json
index cc1296f8ee..116e148c0c 100644
--- a/types/gapi.client.clouderrorreporting/tsconfig.json
+++ b/types/gapi.client.clouderrorreporting/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.cloudfunctions/tsconfig.json b/types/gapi.client.cloudfunctions/tsconfig.json
index 720b272f2e..46bb12a627 100644
--- a/types/gapi.client.cloudfunctions/tsconfig.json
+++ b/types/gapi.client.cloudfunctions/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.cloudiot/tsconfig.json b/types/gapi.client.cloudiot/tsconfig.json
index 03ed93c76d..7b54703058 100644
--- a/types/gapi.client.cloudiot/tsconfig.json
+++ b/types/gapi.client.cloudiot/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.cloudkms/tsconfig.json b/types/gapi.client.cloudkms/tsconfig.json
index ff982b97d1..d27d0bbaa3 100644
--- a/types/gapi.client.cloudkms/tsconfig.json
+++ b/types/gapi.client.cloudkms/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.cloudmonitoring/tsconfig.json b/types/gapi.client.cloudmonitoring/tsconfig.json
index e007418ca9..54e7d1567b 100644
--- a/types/gapi.client.cloudmonitoring/tsconfig.json
+++ b/types/gapi.client.cloudmonitoring/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.cloudresourcemanager/tsconfig.json b/types/gapi.client.cloudresourcemanager/tsconfig.json
index c82cbc16f6..41c45ac865 100644
--- a/types/gapi.client.cloudresourcemanager/tsconfig.json
+++ b/types/gapi.client.cloudresourcemanager/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.cloudtasks/tsconfig.json b/types/gapi.client.cloudtasks/tsconfig.json
index d4240ab7d4..dae7618ff1 100644
--- a/types/gapi.client.cloudtasks/tsconfig.json
+++ b/types/gapi.client.cloudtasks/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.cloudtrace/tsconfig.json b/types/gapi.client.cloudtrace/tsconfig.json
index 977a1fd91f..cc8c41940a 100644
--- a/types/gapi.client.cloudtrace/tsconfig.json
+++ b/types/gapi.client.cloudtrace/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.clouduseraccounts/tsconfig.json b/types/gapi.client.clouduseraccounts/tsconfig.json
index a6e3b9ffec..f06f628609 100644
--- a/types/gapi.client.clouduseraccounts/tsconfig.json
+++ b/types/gapi.client.clouduseraccounts/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.compute/tsconfig.json b/types/gapi.client.compute/tsconfig.json
index 496204435b..18e4ca6050 100644
--- a/types/gapi.client.compute/tsconfig.json
+++ b/types/gapi.client.compute/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.consumersurveys/tsconfig.json b/types/gapi.client.consumersurveys/tsconfig.json
index e8c3646083..714956c5c1 100644
--- a/types/gapi.client.consumersurveys/tsconfig.json
+++ b/types/gapi.client.consumersurveys/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.container/tsconfig.json b/types/gapi.client.container/tsconfig.json
index 51ff6c98bb..0308b2a560 100644
--- a/types/gapi.client.container/tsconfig.json
+++ b/types/gapi.client.container/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.content/tsconfig.json b/types/gapi.client.content/tsconfig.json
index 566c98a224..a247481450 100644
--- a/types/gapi.client.content/tsconfig.json
+++ b/types/gapi.client.content/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.customsearch/tsconfig.json b/types/gapi.client.customsearch/tsconfig.json
index 9b5c4f447d..8280f86eaa 100644
--- a/types/gapi.client.customsearch/tsconfig.json
+++ b/types/gapi.client.customsearch/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.dataflow/tsconfig.json b/types/gapi.client.dataflow/tsconfig.json
index 08c1fced14..6522ceb5d4 100644
--- a/types/gapi.client.dataflow/tsconfig.json
+++ b/types/gapi.client.dataflow/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.dataproc/tsconfig.json b/types/gapi.client.dataproc/tsconfig.json
index 83a765706a..bb10e0d757 100644
--- a/types/gapi.client.dataproc/tsconfig.json
+++ b/types/gapi.client.dataproc/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.datastore/tsconfig.json b/types/gapi.client.datastore/tsconfig.json
index a84cddd73f..a719e54035 100644
--- a/types/gapi.client.datastore/tsconfig.json
+++ b/types/gapi.client.datastore/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.deploymentmanager/tsconfig.json b/types/gapi.client.deploymentmanager/tsconfig.json
index 76527cf87c..e666803af6 100644
--- a/types/gapi.client.deploymentmanager/tsconfig.json
+++ b/types/gapi.client.deploymentmanager/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.dfareporting/tsconfig.json b/types/gapi.client.dfareporting/tsconfig.json
index 78bcd11678..b323df27c4 100644
--- a/types/gapi.client.dfareporting/tsconfig.json
+++ b/types/gapi.client.dfareporting/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.discovery/tsconfig.json b/types/gapi.client.discovery/tsconfig.json
index b597d1b278..f80e8b97af 100644
--- a/types/gapi.client.discovery/tsconfig.json
+++ b/types/gapi.client.discovery/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.dlp/tsconfig.json b/types/gapi.client.dlp/tsconfig.json
index b7ab822674..a6f87ae754 100644
--- a/types/gapi.client.dlp/tsconfig.json
+++ b/types/gapi.client.dlp/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.dns/tsconfig.json b/types/gapi.client.dns/tsconfig.json
index 93f3858c6c..5d0eafa155 100644
--- a/types/gapi.client.dns/tsconfig.json
+++ b/types/gapi.client.dns/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.doubleclickbidmanager/tsconfig.json b/types/gapi.client.doubleclickbidmanager/tsconfig.json
index 1e00b8c904..dfbfab8519 100644
--- a/types/gapi.client.doubleclickbidmanager/tsconfig.json
+++ b/types/gapi.client.doubleclickbidmanager/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.doubleclicksearch/tsconfig.json b/types/gapi.client.doubleclicksearch/tsconfig.json
index fb0d0a44bd..1354de8813 100644
--- a/types/gapi.client.doubleclicksearch/tsconfig.json
+++ b/types/gapi.client.doubleclicksearch/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.drive/tsconfig.json b/types/gapi.client.drive/tsconfig.json
index 6d5901b410..0cdc6f7fab 100644
--- a/types/gapi.client.drive/tsconfig.json
+++ b/types/gapi.client.drive/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.firebasedynamiclinks/tsconfig.json b/types/gapi.client.firebasedynamiclinks/tsconfig.json
index e43d9944a4..b4616b1ac4 100644
--- a/types/gapi.client.firebasedynamiclinks/tsconfig.json
+++ b/types/gapi.client.firebasedynamiclinks/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.firebaseremoteconfig/tsconfig.json b/types/gapi.client.firebaseremoteconfig/tsconfig.json
index 9366ffa276..1fa55e9c5c 100644
--- a/types/gapi.client.firebaseremoteconfig/tsconfig.json
+++ b/types/gapi.client.firebaseremoteconfig/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.firebaserules/tsconfig.json b/types/gapi.client.firebaserules/tsconfig.json
index fe476614b8..531c7b9c33 100644
--- a/types/gapi.client.firebaserules/tsconfig.json
+++ b/types/gapi.client.firebaserules/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.firestore/tsconfig.json b/types/gapi.client.firestore/tsconfig.json
index c15195612c..54cb67c9b2 100644
--- a/types/gapi.client.firestore/tsconfig.json
+++ b/types/gapi.client.firestore/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.fitness/tsconfig.json b/types/gapi.client.fitness/tsconfig.json
index d165e53085..0b1a941e04 100644
--- a/types/gapi.client.fitness/tsconfig.json
+++ b/types/gapi.client.fitness/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.fusiontables/tsconfig.json b/types/gapi.client.fusiontables/tsconfig.json
index 74936cb7a6..78d5b14a5d 100644
--- a/types/gapi.client.fusiontables/tsconfig.json
+++ b/types/gapi.client.fusiontables/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.games/tsconfig.json b/types/gapi.client.games/tsconfig.json
index d2bbd017e2..d22702d2ea 100644
--- a/types/gapi.client.games/tsconfig.json
+++ b/types/gapi.client.games/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.gamesconfiguration/tsconfig.json b/types/gapi.client.gamesconfiguration/tsconfig.json
index 66a95276f8..bdc823e6cf 100644
--- a/types/gapi.client.gamesconfiguration/tsconfig.json
+++ b/types/gapi.client.gamesconfiguration/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.gamesmanagement/tsconfig.json b/types/gapi.client.gamesmanagement/tsconfig.json
index 91d2485de8..78df6ae3df 100644
--- a/types/gapi.client.gamesmanagement/tsconfig.json
+++ b/types/gapi.client.gamesmanagement/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.genomics/tsconfig.json b/types/gapi.client.genomics/tsconfig.json
index f3814992d0..8a285dbda4 100644
--- a/types/gapi.client.genomics/tsconfig.json
+++ b/types/gapi.client.genomics/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.gmail/tsconfig.json b/types/gapi.client.gmail/tsconfig.json
index f0a8989f4f..b810b9f7be 100644
--- a/types/gapi.client.gmail/tsconfig.json
+++ b/types/gapi.client.gmail/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.groupsmigration/tsconfig.json b/types/gapi.client.groupsmigration/tsconfig.json
index e790df35fc..88a0064350 100644
--- a/types/gapi.client.groupsmigration/tsconfig.json
+++ b/types/gapi.client.groupsmigration/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.groupssettings/tsconfig.json b/types/gapi.client.groupssettings/tsconfig.json
index 855b1f2828..6723bfb2d7 100644
--- a/types/gapi.client.groupssettings/tsconfig.json
+++ b/types/gapi.client.groupssettings/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.iam/tsconfig.json b/types/gapi.client.iam/tsconfig.json
index 4cfc571a22..2b567973a1 100644
--- a/types/gapi.client.iam/tsconfig.json
+++ b/types/gapi.client.iam/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.identitytoolkit/tsconfig.json b/types/gapi.client.identitytoolkit/tsconfig.json
index 558805120e..ff88e1866a 100644
--- a/types/gapi.client.identitytoolkit/tsconfig.json
+++ b/types/gapi.client.identitytoolkit/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.kgsearch/tsconfig.json b/types/gapi.client.kgsearch/tsconfig.json
index 3dc92ba79b..4bad676e7d 100644
--- a/types/gapi.client.kgsearch/tsconfig.json
+++ b/types/gapi.client.kgsearch/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.language/tsconfig.json b/types/gapi.client.language/tsconfig.json
index 12044b7569..8162238282 100644
--- a/types/gapi.client.language/tsconfig.json
+++ b/types/gapi.client.language/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.licensing/tsconfig.json b/types/gapi.client.licensing/tsconfig.json
index 2cde1d0a5f..13e001e436 100644
--- a/types/gapi.client.licensing/tsconfig.json
+++ b/types/gapi.client.licensing/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.logging/tsconfig.json b/types/gapi.client.logging/tsconfig.json
index 315ea3a5e0..c6ebe96413 100644
--- a/types/gapi.client.logging/tsconfig.json
+++ b/types/gapi.client.logging/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.manufacturers/tsconfig.json b/types/gapi.client.manufacturers/tsconfig.json
index 143de33ad9..d8a0388fe1 100644
--- a/types/gapi.client.manufacturers/tsconfig.json
+++ b/types/gapi.client.manufacturers/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.mirror/tsconfig.json b/types/gapi.client.mirror/tsconfig.json
index 3404622c43..f894696074 100644
--- a/types/gapi.client.mirror/tsconfig.json
+++ b/types/gapi.client.mirror/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.ml/tsconfig.json b/types/gapi.client.ml/tsconfig.json
index e665f45a5b..1d21245a4e 100644
--- a/types/gapi.client.ml/tsconfig.json
+++ b/types/gapi.client.ml/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.monitoring/tsconfig.json b/types/gapi.client.monitoring/tsconfig.json
index 4c5c8d9129..f44fad6650 100644
--- a/types/gapi.client.monitoring/tsconfig.json
+++ b/types/gapi.client.monitoring/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.oauth2/tsconfig.json b/types/gapi.client.oauth2/tsconfig.json
index 593137d956..f9dd5407e1 100644
--- a/types/gapi.client.oauth2/tsconfig.json
+++ b/types/gapi.client.oauth2/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.oslogin/tsconfig.json b/types/gapi.client.oslogin/tsconfig.json
index bcf0faa3cb..f81538e45a 100644
--- a/types/gapi.client.oslogin/tsconfig.json
+++ b/types/gapi.client.oslogin/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.pagespeedonline/tsconfig.json b/types/gapi.client.pagespeedonline/tsconfig.json
index 38b680e5ae..9e4bc08b88 100644
--- a/types/gapi.client.pagespeedonline/tsconfig.json
+++ b/types/gapi.client.pagespeedonline/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.partners/tsconfig.json b/types/gapi.client.partners/tsconfig.json
index cbecfb7e6e..e12985473a 100644
--- a/types/gapi.client.partners/tsconfig.json
+++ b/types/gapi.client.partners/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.people/tsconfig.json b/types/gapi.client.people/tsconfig.json
index 4a64b3a83d..924219ea32 100644
--- a/types/gapi.client.people/tsconfig.json
+++ b/types/gapi.client.people/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.playcustomapp/tsconfig.json b/types/gapi.client.playcustomapp/tsconfig.json
index 432fd7ebe4..ebe1466518 100644
--- a/types/gapi.client.playcustomapp/tsconfig.json
+++ b/types/gapi.client.playcustomapp/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.playmoviespartner/tsconfig.json b/types/gapi.client.playmoviespartner/tsconfig.json
index 9751ed88eb..425943632e 100644
--- a/types/gapi.client.playmoviespartner/tsconfig.json
+++ b/types/gapi.client.playmoviespartner/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.plus/tsconfig.json b/types/gapi.client.plus/tsconfig.json
index 933d6c865a..9f6c29a6dc 100644
--- a/types/gapi.client.plus/tsconfig.json
+++ b/types/gapi.client.plus/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.plusdomains/tsconfig.json b/types/gapi.client.plusdomains/tsconfig.json
index aad16ba9c1..03d93d8899 100644
--- a/types/gapi.client.plusdomains/tsconfig.json
+++ b/types/gapi.client.plusdomains/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.prediction/tsconfig.json b/types/gapi.client.prediction/tsconfig.json
index 15c0255ef0..c05f0c2439 100644
--- a/types/gapi.client.prediction/tsconfig.json
+++ b/types/gapi.client.prediction/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.proximitybeacon/tsconfig.json b/types/gapi.client.proximitybeacon/tsconfig.json
index 8f240f1352..19b9be85a2 100644
--- a/types/gapi.client.proximitybeacon/tsconfig.json
+++ b/types/gapi.client.proximitybeacon/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.pubsub/tsconfig.json b/types/gapi.client.pubsub/tsconfig.json
index c5b386832c..e45351fb03 100644
--- a/types/gapi.client.pubsub/tsconfig.json
+++ b/types/gapi.client.pubsub/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.qpxexpress/tsconfig.json b/types/gapi.client.qpxexpress/tsconfig.json
index 759fd511d6..d3b8b13c66 100644
--- a/types/gapi.client.qpxexpress/tsconfig.json
+++ b/types/gapi.client.qpxexpress/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.reseller/tsconfig.json b/types/gapi.client.reseller/tsconfig.json
index 62660a16cc..8ab2c25ee6 100644
--- a/types/gapi.client.reseller/tsconfig.json
+++ b/types/gapi.client.reseller/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.resourceviews/tsconfig.json b/types/gapi.client.resourceviews/tsconfig.json
index d910ac6b45..6300fd1151 100644
--- a/types/gapi.client.resourceviews/tsconfig.json
+++ b/types/gapi.client.resourceviews/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.runtimeconfig/tsconfig.json b/types/gapi.client.runtimeconfig/tsconfig.json
index 5e27079b43..dadf837be7 100644
--- a/types/gapi.client.runtimeconfig/tsconfig.json
+++ b/types/gapi.client.runtimeconfig/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.safebrowsing/tsconfig.json b/types/gapi.client.safebrowsing/tsconfig.json
index 3545ceeab3..74e51a2cbc 100644
--- a/types/gapi.client.safebrowsing/tsconfig.json
+++ b/types/gapi.client.safebrowsing/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.script/tsconfig.json b/types/gapi.client.script/tsconfig.json
index 2ee2653a1f..319dd1964c 100644
--- a/types/gapi.client.script/tsconfig.json
+++ b/types/gapi.client.script/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.searchconsole/tsconfig.json b/types/gapi.client.searchconsole/tsconfig.json
index f2e33ebce6..bd5b102658 100644
--- a/types/gapi.client.searchconsole/tsconfig.json
+++ b/types/gapi.client.searchconsole/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.servicecontrol/tsconfig.json b/types/gapi.client.servicecontrol/tsconfig.json
index 14d7667280..bd6d6cb319 100644
--- a/types/gapi.client.servicecontrol/tsconfig.json
+++ b/types/gapi.client.servicecontrol/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.servicemanagement/tsconfig.json b/types/gapi.client.servicemanagement/tsconfig.json
index c1ec19c789..4b2f3f3033 100644
--- a/types/gapi.client.servicemanagement/tsconfig.json
+++ b/types/gapi.client.servicemanagement/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.serviceuser/tsconfig.json b/types/gapi.client.serviceuser/tsconfig.json
index 3213e6fbe7..761c8e6ff0 100644
--- a/types/gapi.client.serviceuser/tsconfig.json
+++ b/types/gapi.client.serviceuser/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.sheets/tsconfig.json b/types/gapi.client.sheets/tsconfig.json
index 23b7d8ecf0..e33c680c3b 100644
--- a/types/gapi.client.sheets/tsconfig.json
+++ b/types/gapi.client.sheets/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.siteverification/tsconfig.json b/types/gapi.client.siteverification/tsconfig.json
index a32d7d01b6..3e16fff5e6 100644
--- a/types/gapi.client.siteverification/tsconfig.json
+++ b/types/gapi.client.siteverification/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.slides/tsconfig.json b/types/gapi.client.slides/tsconfig.json
index 94b7cd8068..7c80804a9b 100644
--- a/types/gapi.client.slides/tsconfig.json
+++ b/types/gapi.client.slides/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.sourcerepo/tsconfig.json b/types/gapi.client.sourcerepo/tsconfig.json
index 1b6a4b8191..28567a5918 100644
--- a/types/gapi.client.sourcerepo/tsconfig.json
+++ b/types/gapi.client.sourcerepo/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.spanner/tsconfig.json b/types/gapi.client.spanner/tsconfig.json
index a4fcfe1835..f2881e121f 100644
--- a/types/gapi.client.spanner/tsconfig.json
+++ b/types/gapi.client.spanner/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.spectrum/tsconfig.json b/types/gapi.client.spectrum/tsconfig.json
index 6dcfe9f1ea..d848a3e2bf 100644
--- a/types/gapi.client.spectrum/tsconfig.json
+++ b/types/gapi.client.spectrum/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.speech/tsconfig.json b/types/gapi.client.speech/tsconfig.json
index 694c7824cb..d306132ca3 100644
--- a/types/gapi.client.speech/tsconfig.json
+++ b/types/gapi.client.speech/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.sqladmin/tsconfig.json b/types/gapi.client.sqladmin/tsconfig.json
index a8bd3bb164..cb549f0610 100644
--- a/types/gapi.client.sqladmin/tsconfig.json
+++ b/types/gapi.client.sqladmin/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.storage/tsconfig.json b/types/gapi.client.storage/tsconfig.json
index 761e1e8caa..385c1ec29b 100644
--- a/types/gapi.client.storage/tsconfig.json
+++ b/types/gapi.client.storage/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.storagetransfer/tsconfig.json b/types/gapi.client.storagetransfer/tsconfig.json
index 4eb74edeea..6667668558 100644
--- a/types/gapi.client.storagetransfer/tsconfig.json
+++ b/types/gapi.client.storagetransfer/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.streetviewpublish/tsconfig.json b/types/gapi.client.streetviewpublish/tsconfig.json
index 1e2afe51e0..22dbf97452 100644
--- a/types/gapi.client.streetviewpublish/tsconfig.json
+++ b/types/gapi.client.streetviewpublish/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.surveys/tsconfig.json b/types/gapi.client.surveys/tsconfig.json
index c0230c586d..7ebcd996c0 100644
--- a/types/gapi.client.surveys/tsconfig.json
+++ b/types/gapi.client.surveys/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.tagmanager/tsconfig.json b/types/gapi.client.tagmanager/tsconfig.json
index 92a3d1732b..778fe51625 100644
--- a/types/gapi.client.tagmanager/tsconfig.json
+++ b/types/gapi.client.tagmanager/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.taskqueue/tsconfig.json b/types/gapi.client.taskqueue/tsconfig.json
index 95db41d7b6..a4e8bb673a 100644
--- a/types/gapi.client.taskqueue/tsconfig.json
+++ b/types/gapi.client.taskqueue/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.tasks/tsconfig.json b/types/gapi.client.tasks/tsconfig.json
index a8ac77689b..f836df6fa5 100644
--- a/types/gapi.client.tasks/tsconfig.json
+++ b/types/gapi.client.tasks/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.testing/tsconfig.json b/types/gapi.client.testing/tsconfig.json
index 88e8341cfb..67009c1a89 100644
--- a/types/gapi.client.testing/tsconfig.json
+++ b/types/gapi.client.testing/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.toolresults/tsconfig.json b/types/gapi.client.toolresults/tsconfig.json
index 2e0b9eee8b..9ca885401a 100644
--- a/types/gapi.client.toolresults/tsconfig.json
+++ b/types/gapi.client.toolresults/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.translate/tsconfig.json b/types/gapi.client.translate/tsconfig.json
index 6f75322a8d..3eaeb43e7e 100644
--- a/types/gapi.client.translate/tsconfig.json
+++ b/types/gapi.client.translate/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.urlshortener/tsconfig.json b/types/gapi.client.urlshortener/tsconfig.json
index d66d384a36..81b85bb376 100644
--- a/types/gapi.client.urlshortener/tsconfig.json
+++ b/types/gapi.client.urlshortener/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.vault/tsconfig.json b/types/gapi.client.vault/tsconfig.json
index f6f0c61f24..a5b74d6c6e 100644
--- a/types/gapi.client.vault/tsconfig.json
+++ b/types/gapi.client.vault/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.videointelligence/tsconfig.json b/types/gapi.client.videointelligence/tsconfig.json
index 5db40cf349..0c56166786 100644
--- a/types/gapi.client.videointelligence/tsconfig.json
+++ b/types/gapi.client.videointelligence/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.vision/tsconfig.json b/types/gapi.client.vision/tsconfig.json
index 300f812220..55958ec5d7 100644
--- a/types/gapi.client.vision/tsconfig.json
+++ b/types/gapi.client.vision/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.webfonts/tsconfig.json b/types/gapi.client.webfonts/tsconfig.json
index 99419f718b..a71d43a04e 100644
--- a/types/gapi.client.webfonts/tsconfig.json
+++ b/types/gapi.client.webfonts/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.webmasters/tsconfig.json b/types/gapi.client.webmasters/tsconfig.json
index f542550a2f..91d34de5b3 100644
--- a/types/gapi.client.webmasters/tsconfig.json
+++ b/types/gapi.client.webmasters/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.youtube/tsconfig.json b/types/gapi.client.youtube/tsconfig.json
index 727bee6a41..cd757bd384 100644
--- a/types/gapi.client.youtube/tsconfig.json
+++ b/types/gapi.client.youtube/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.youtubeanalytics/tsconfig.json b/types/gapi.client.youtubeanalytics/tsconfig.json
index 84b8975062..264fbff108 100644
--- a/types/gapi.client.youtubeanalytics/tsconfig.json
+++ b/types/gapi.client.youtubeanalytics/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client.youtubereporting/tsconfig.json b/types/gapi.client.youtubereporting/tsconfig.json
index 05e2060796..a160687d23 100644
--- a/types/gapi.client.youtubereporting/tsconfig.json
+++ b/types/gapi.client.youtubereporting/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,        
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/gapi.client/tsconfig.json b/types/gapi.client/tsconfig.json
index 09471da3d2..d53b6cfde3 100644
--- a/types/gapi.client/tsconfig.json
+++ b/types/gapi.client/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,              
+        "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
     "files": [
diff --git a/types/geetest/tsconfig.json b/types/geetest/tsconfig.json
index e1eabe6427..17e9320d39 100644
--- a/types/geetest/tsconfig.json
+++ b/types/geetest/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "geetest-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/gen-readlines/tsconfig.json b/types/gen-readlines/tsconfig.json
index 18d185012c..ad224ae02e 100644
--- a/types/gen-readlines/tsconfig.json
+++ b/types/gen-readlines/tsconfig.json
@@ -15,10 +15,10 @@
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true,
-        "strictFunctionTypes" : true
+        "strictFunctionTypes": true
     },
     "files": [
         "index.d.ts",
         "gen-readlines-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/get-caller-file/get-caller-file-tests.ts b/types/get-caller-file/get-caller-file-tests.ts
new file mode 100644
index 0000000000..b7fdd9a8a4
--- /dev/null
+++ b/types/get-caller-file/get-caller-file-tests.ts
@@ -0,0 +1,4 @@
+import getCallerFile = require('get-caller-file');
+
+let caller: string = getCallerFile();
+caller = getCallerFile(3);
diff --git a/types/get-caller-file/index.d.ts b/types/get-caller-file/index.d.ts
new file mode 100644
index 0000000000..48ba941a50
--- /dev/null
+++ b/types/get-caller-file/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for get-caller-file 1.0
+// Project: https://github.com/stefanpenner/get-caller-file#readme
+// Definitions by: Klaus Meinhardt <https://github.com/ajafff>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare function getCallerFile(position?: number): string;
+
+export = getCallerFile;
diff --git a/types/get-caller-file/tsconfig.json b/types/get-caller-file/tsconfig.json
new file mode 100644
index 0000000000..f54443c20d
--- /dev/null
+++ b/types/get-caller-file/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "esModuleInterop": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "get-caller-file-tests.ts"
+    ]
+}
diff --git a/types/get-caller-file/tslint.json b/types/get-caller-file/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/get-caller-file/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/gifffer/gifffer-tests.ts b/types/gifffer/gifffer-tests.ts
index b069e0020c..cd718cd56a 100644
--- a/types/gifffer/gifffer-tests.ts
+++ b/types/gifffer/gifffer-tests.ts
@@ -1,4 +1,4 @@
-import Gifffer from 'gifffer';
+import Gifffer = require('gifffer');
 
 let gifs: HTMLButtonElement[];
 
diff --git a/types/gifffer/index.d.ts b/types/gifffer/index.d.ts
index ac0f7663cc..c9742d31b8 100644
--- a/types/gifffer/index.d.ts
+++ b/types/gifffer/index.d.ts
@@ -3,15 +3,21 @@
 // Definitions by: William Lohan <https://github.com/gatimus>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/**
- * @see {@link https://github.com/krasimir/gifffer#styling|Styling}
- */
-export interface GiffferOptions {
-    playButtonStyles: { [style: string]: string; };
-    playButtonIconStyles: { [style: string]: string; };
+declare namespace Gifffer {
+    /**
+     * @see {@link https://github.com/krasimir/gifffer#styling|Styling}
+     */
+    interface GiffferOptions {
+        playButtonStyles: { [style: string]: string; };
+        playButtonIconStyles: { [style: string]: string; };
+    }
 }
 
 /**
  * @see {@link https://github.com/krasimir/gifffer#usage|Usage}
  */
-export default function Gifffer(options?: GiffferOptions): HTMLButtonElement[];
+declare function Gifffer(options?: Gifffer.GiffferOptions): HTMLButtonElement[];
+
+export as namespace Gifffer;
+
+export = Gifffer;
diff --git a/types/gifffer/tsconfig.json b/types/gifffer/tsconfig.json
index 273e998048..aeeb7d4d77 100644
--- a/types/gifffer/tsconfig.json
+++ b/types/gifffer/tsconfig.json
@@ -21,4 +21,4 @@
         "index.d.ts",
         "gifffer-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/github-username-regex/tsconfig.json b/types/github-username-regex/tsconfig.json
index 4a30cf07ad..88dde1a00c 100644
--- a/types/github-username-regex/tsconfig.json
+++ b/types/github-username-regex/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "github-username-regex-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/glob-expand/glob-expand-tests.ts b/types/glob-expand/glob-expand-tests.ts
index 70275ea0cf..1e61bc0c49 100644
--- a/types/glob-expand/glob-expand-tests.ts
+++ b/types/glob-expand/glob-expand-tests.ts
@@ -1,5 +1,4 @@
-
-import * as expand from "glob-expand";
+import expand = require("glob-expand");
 
 expand({ filter: 'isFile', cwd: '../' }, ['**/*.*', '!exclude/these/**/*.*']);
 // returns all files in cwd ['file1', 'file2',...] but excluding
diff --git a/types/glob-parent/tsconfig.json b/types/glob-parent/tsconfig.json
index 1e74b9bc82..1a38c21a8f 100644
--- a/types/glob-parent/tsconfig.json
+++ b/types/glob-parent/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "glob-parent-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/globalize/index.d.ts b/types/globalize/index.d.ts
index c0fbbd3d0d..6ec31883aa 100644
--- a/types/globalize/index.d.ts
+++ b/types/globalize/index.d.ts
@@ -30,6 +30,12 @@ interface DateFormatterOptions {
 	 * Note this is NOT recommended for i18n in general. Use skeleton instead.
 	 */
 	raw?: string;
+
+	/**
+	 * String based on the time zone names of the IANA time zone database, 
+	 * such as "Asia/Shanghai", "Asia/Kolkata", "America/New_York".
+	 */
+	timeZone?: string;
 }
 
 interface CommonNumberFormatterOptions {
@@ -126,6 +132,13 @@ interface GlobalizeStatic {
 
 	cldr: Cldr.CldrStatic;
 
+	/**
+	 * Globalize.loadTimeZone ( ianaTzData, ... )
+	 * This method allows you to load IANA time zone data to enable options.timeZone feature on date formatters and parsers.
+	 * @param {Object} ianaTzData A JSON object with zdumped IANA timezone data. Get the data via https://github.com/rxaviers/iana-tz-data
+	 */
+	loadTimeZone(ianaTzData: Object): void;
+
 	/**
 	 * Globalize.load( json, ... )
 	 * @param {Object} [JSON]
diff --git a/types/globby/globby-tests.ts b/types/globby/globby-tests.ts
index 68acb7cde8..1c3c1842d4 100644
--- a/types/globby/globby-tests.ts
+++ b/types/globby/globby-tests.ts
@@ -1,6 +1,6 @@
 import { IOptions } from 'glob';
 
-import * as globby from "globby";
+import globby = require("globby");
 
 (async () => {
     let result: string[];
diff --git a/types/google-apps-script-oauth2/tsconfig.json b/types/google-apps-script-oauth2/tsconfig.json
index bc09dd70b9..d836bc05ae 100644
--- a/types/google-apps-script-oauth2/tsconfig.json
+++ b/types/google-apps-script-oauth2/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "google-apps-script-oauth2-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/google-cloud__pubsub/google-cloud__pubsub-tests.ts b/types/google-cloud__pubsub/google-cloud__pubsub-tests.ts
index 7a9b9905c2..3d31dd7291 100644
--- a/types/google-cloud__pubsub/google-cloud__pubsub-tests.ts
+++ b/types/google-cloud__pubsub/google-cloud__pubsub-tests.ts
@@ -1,4 +1,4 @@
-import * as PubSub from '@google-cloud/pubsub';
+import PubSub = require('@google-cloud/pubsub');
 
 // AUTHOR NOTES: We use the examples directly from the library documentation
 // where possible. If there is a problem with a given example (e.g. undocumented
diff --git a/types/google-cloud__storage/google-cloud__storage-tests.ts b/types/google-cloud__storage/google-cloud__storage-tests.ts
index 24d300b8e6..dec2846f26 100644
--- a/types/google-cloud__storage/google-cloud__storage-tests.ts
+++ b/types/google-cloud__storage/google-cloud__storage-tests.ts
@@ -26,7 +26,7 @@ import {
     WriteStreamOptions,
     UploadOptions
 } from "@google-cloud/storage";
-import * as CloudStorage from "@google-cloud/storage";
+import CloudStorage = require("@google-cloud/storage");
 
 /**
  * Test the storage service.
diff --git a/types/google-map-react/index.d.ts b/types/google-map-react/index.d.ts
index ec2f08d2ab..d0606f76fd 100644
--- a/types/google-map-react/index.d.ts
+++ b/types/google-map-react/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/istarkov/google-map-react
 // Definitions by: Honza Brecka <https://github.com/honzabrecka>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from 'react';
 
diff --git a/types/googlemaps/index.d.ts b/types/googlemaps/index.d.ts
index 4519a50eab..526f5b7e06 100644
--- a/types/googlemaps/index.d.ts
+++ b/types/googlemaps/index.d.ts
@@ -55,6 +55,7 @@ declare namespace google.maps {
         data: Data;
         mapTypes: MapTypeRegistry;
         overlayMapTypes: MVCArray<MapType>;
+        setClickableIcons(clickable: boolean): void;
     }
 
     export interface MapOptions {
@@ -2684,7 +2685,7 @@ declare namespace google.maps {
             constructor(options?: DrawingManagerOptions);
             getDrawingMode(): OverlayType;
             getMap(): Map;
-            setDrawingMode(drawingMode: OverlayType): void;
+            setDrawingMode(drawingMode: OverlayType | null): void;
             setMap(map: Map | null): void;
             setOptions(options: DrawingManagerOptions): void;
         }
diff --git a/types/got/index.d.ts b/types/got/index.d.ts
index f76a907b7d..30a5b2c0be 100644
--- a/types/got/index.d.ts
+++ b/types/got/index.d.ts
@@ -80,7 +80,7 @@ declare namespace got {
 
     type GotStreamFn = (url: GotUrl, options?: GotOptions<string | null>) => GotEmitter & nodeStream.Duplex;
 
-    type GotUrl = string | http.RequestOptions | URL;
+    type GotUrl = string | http.RequestOptions | Url;
 
     interface GotBodyOptions<E extends string | null> extends GotOptions<E> {
         body?: string | Buffer | nodeStream.Readable;
diff --git a/types/graphql-iso-date/tsconfig.json b/types/graphql-iso-date/tsconfig.json
index 6feabb1388..1ea5d6fc91 100644
--- a/types/graphql-iso-date/tsconfig.json
+++ b/types/graphql-iso-date/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "graphql-iso-date-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/graphql-relay/graphql-relay-tests.ts b/types/graphql-relay/graphql-relay-tests.ts
index a451f0faab..6cc1f0f5ce 100644
--- a/types/graphql-relay/graphql-relay-tests.ts
+++ b/types/graphql-relay/graphql-relay-tests.ts
@@ -122,7 +122,8 @@ const idFetcher = (id: string, context: number, info: GraphQLResolveInfo) => {
     info.fieldName = "f";
 };
 const nodeDef = nodeDefinitions<number>(idFetcher, resolver);
-const fieldConfig: GraphQLFieldConfig<any, any> = nodeDef.nodeField;
+const nodeFieldConfig: GraphQLFieldConfig<any, any> = nodeDef.nodeField;
+const nodesFieldConfig: GraphQLFieldConfig<any, any> = nodeDef.nodesField;
 const interfaceType: GraphQLInterfaceType = nodeDef.nodeInterface;
 // toGlobalId takes a type name and an ID specific to that type name, and returns a "global ID" that is unique among all types.
 toGlobalId("t", "i").toLowerCase();
diff --git a/types/graphql-relay/index.d.ts b/types/graphql-relay/index.d.ts
index 2318a527e4..50ed0c3b7d 100644
--- a/types/graphql-relay/index.d.ts
+++ b/types/graphql-relay/index.d.ts
@@ -245,6 +245,7 @@ export function mutationWithClientMutationId(
 export interface GraphQLNodeDefinitions {
     nodeInterface: GraphQLInterfaceType;
     nodeField: GraphQLFieldConfig<any, any>;
+    nodesField: GraphQLFieldConfig<any, any>;
 }
 
 export type typeResolverFn = ((any: any) => GraphQLObjectType) |
diff --git a/types/graphql/language/parser.d.ts b/types/graphql/language/parser.d.ts
index a0b8a0c7a4..ffafaae7fb 100644
--- a/types/graphql/language/parser.d.ts
+++ b/types/graphql/language/parser.d.ts
@@ -6,12 +6,51 @@ import { Lexer } from './lexer';
  * Configuration options to control parser behavior
  */
 export interface ParseOptions {
+
   /**
    * By default, the parser creates AST nodes that know the location
    * in the source that they correspond to. This configuration flag
    * disables that behavior for performance or testing.
    */
-  noLocation?: boolean;
+  noLocation?: boolean,
+
+  /**
+   * If enabled, the parser will parse empty fields sets in the Schema
+   * Definition Language. Otherwise, the parser will follow the current
+   * specification.
+   *
+   * This option is provided to ease adoption of the final SDL specification
+   * and will be removed in a future major release.
+   */
+  allowLegacySDLEmptyFields?: boolean,
+
+  /**
+   * If enabled, the parser will parse implemented interfaces with no `&`
+   * character between each interface. Otherwise, the parser will follow the
+   * current specification.
+   *
+   * This option is provided to ease adoption of the final SDL specification
+   * and will be removed in a future major release.
+   */
+  allowLegacySDLImplementsInterfaces?: boolean,
+
+  /**
+   * EXPERIMENTAL:
+   *
+   * If enabled, the parser will understand and parse variable definitions
+   * contained in a fragment definition. They'll be represented in the
+   * `variableDefinitions` field of the FragmentDefinitionNode.
+   *
+   * The syntax is identical to normal, query-defined variables. For example:
+   *
+   *   fragment A($var: Boolean = false) on T  {
+   *     ...
+   *   }
+   *
+   * Note: this feature is experimental and may change or be removed in the
+   * future.
+   */
+  experimentalFragmentVariables?: boolean,
 }
 
 /**
@@ -35,15 +74,22 @@ export function parseValue(
   options?: ParseOptions,
 ): ValueNode;
 
-export function parseConstValue<TOptions>(lexer: Lexer<TOptions>): ValueNode;
-
 /**
- * Type :
- *   - NamedType
- *   - ListType
- *   - NonNullType
+ * Given a string containing a GraphQL Type (ex. `[Int!]`), parse the AST for
+ * that type.
+ * Throws GraphQLError if a syntax error is encountered.
+ *
+ * This is useful within tools that operate upon GraphQL Types directly and
+ * in isolation of complete GraphQL documents.
+ *
+ * Consider providing the results to the utility function: typeFromAST().
  */
-export function parseType<TOptions>(lexer: Lexer<TOptions>): TypeNode;
+export function parseType(
+    source: Source | string,
+    options?: ParseOptions,
+): TypeNode;
+
+export function parseConstValue<TOptions>(lexer: Lexer<TOptions>): ValueNode;
 
 /**
  * Type :
diff --git a/types/grasp/grasp-tests.ts b/types/grasp/grasp-tests.ts
index 647f57d8fd..87da0b8d45 100644
--- a/types/grasp/grasp-tests.ts
+++ b/types/grasp/grasp-tests.ts
@@ -1,5 +1,5 @@
 import fs = require("fs");
-import * as grasp from "grasp";
+import grasp = require("grasp");
 
 grasp(); // $ExpectError
 grasp({ args: [] }); // $ExpectType void
diff --git a/types/grasp/tsconfig.json b/types/grasp/tsconfig.json
index e0996e4408..a2955269a5 100644
--- a/types/grasp/tsconfig.json
+++ b/types/grasp/tsconfig.json
@@ -1,16 +1,23 @@
 {
     "compilerOptions": {
         "module": "commonjs",
-        "lib": ["es6"],
+        "lib": [
+            "es6"
+        ],
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
-        "typeRoots": ["../"],
+        "typeRoots": [
+            "../"
+        ],
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     },
-    "files": ["index.d.ts", "grasp-tests.ts"]
-}
+    "files": [
+        "index.d.ts",
+        "grasp-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/grid-styled/grid-styled-tests.tsx b/types/grid-styled/grid-styled-tests.tsx
new file mode 100644
index 0000000000..750ecbf3eb
--- /dev/null
+++ b/types/grid-styled/grid-styled-tests.tsx
@@ -0,0 +1,8 @@
+import * as React from "react";
+import { Flex, Box } from "grid-styled";
+
+const Layout = () => (
+    <Flex m={4}>
+        <Box px={3} py={2} />
+    </Flex>
+);
diff --git a/types/grid-styled/index.d.ts b/types/grid-styled/index.d.ts
new file mode 100644
index 0000000000..bea89b9237
--- /dev/null
+++ b/types/grid-styled/index.d.ts
@@ -0,0 +1,75 @@
+// Type definitions for grid-styled 3.0
+// Project: https://github.com/jxnblk/grid-styled
+// Definitions by: Anton Vasin <https://github.com/antonvasin>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.6
+
+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>>;
+
+import { ComponentClass } from "react";
+import { StyledComponentClass } from "styled-components";
+
+export type ResponsiveProp = number | string | Array<string | number>;
+
+export interface CommonProps {
+    width: ResponsiveProp;
+    fontSize: ResponsiveProp;
+    color: ResponsiveProp;
+    bg: ResponsiveProp;
+    m: ResponsiveProp;
+    mt: ResponsiveProp;
+    mr: ResponsiveProp;
+    mb: ResponsiveProp;
+    ml: ResponsiveProp;
+    mx: ResponsiveProp;
+    my: ResponsiveProp;
+    p: ResponsiveProp;
+    pt: ResponsiveProp;
+    pr: ResponsiveProp;
+    pb: ResponsiveProp;
+    pl: ResponsiveProp;
+    px: ResponsiveProp;
+    py: ResponsiveProp;
+    theme: any;
+}
+
+export interface BoxProps
+    extends Omit<React.HTMLProps<HTMLDivElement>, "width" | "wrap" | "is"> {
+    flex: ResponsiveProp;
+    order: ResponsiveProp;
+    is: string | ComponentClass<any>;
+}
+
+export interface FlexProps extends BoxProps {
+    align: ResponsiveProp | boolean;
+    justify: ResponsiveProp | boolean;
+    flexDirection: ResponsiveProp | boolean;
+    wrap: ResponsiveProp | boolean;
+}
+
+export type BoxComponent = StyledComponentClass<
+    Partial<CommonProps & BoxProps>,
+    any
+>;
+
+export type FlexComponent = StyledComponentClass<
+    Partial<CommonProps & FlexProps>,
+    any
+>;
+
+export interface Theme {
+    breakpoints: string[];
+    space: number[];
+    fontSizes: number[];
+}
+
+export const Box: BoxComponent;
+export const Flex: FlexComponent;
+export const theme: Theme;
+export type DivProps = Omit<React.HTMLProps<HTMLDivElement>, "ref"> & {
+    innerRef: (el: HTMLDivElement) => any;
+};
+export const div: ComponentClass<DivProps>;
diff --git a/types/grid-styled/package.json b/types/grid-styled/package.json
new file mode 100644
index 0000000000..c381522c0d
--- /dev/null
+++ b/types/grid-styled/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "styled-components": ">=2.0 || >=3.0"
+    }
+}
diff --git a/types/grid-styled/tsconfig.json b/types/grid-styled/tsconfig.json
new file mode 100644
index 0000000000..ddc6a0e9f2
--- /dev/null
+++ b/types/grid-styled/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "jsx": "react"
+    },
+    "files": [
+        "index.d.ts",
+        "grid-styled-tests.tsx"
+    ]
+}
\ No newline at end of file
diff --git a/types/grid-styled/tslint.json b/types/grid-styled/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/grid-styled/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/guid/tsconfig.json b/types/guid/tsconfig.json
index 17563577fd..96b2e27f93 100644
--- a/types/guid/tsconfig.json
+++ b/types/guid/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "guid-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/gulp-angular-templatecache/gulp-angular-templatecache-tests.ts b/types/gulp-angular-templatecache/gulp-angular-templatecache-tests.ts
index 559dd4f609..706b3acaff 100644
--- a/types/gulp-angular-templatecache/gulp-angular-templatecache-tests.ts
+++ b/types/gulp-angular-templatecache/gulp-angular-templatecache-tests.ts
@@ -1,5 +1,5 @@
 import * as gulp from 'gulp';
-import * as templateCache from 'gulp-angular-templatecache';
+import templateCache = require('gulp-angular-templatecache');
 
 gulp.task('templatecache:no-arguments', function () {
     return gulp.src('templates/**/*.html')
diff --git a/types/gulp-autoprefixer/gulp-autoprefixer-tests.ts b/types/gulp-autoprefixer/gulp-autoprefixer-tests.ts
index 386e1a882a..c2d87223b8 100644
--- a/types/gulp-autoprefixer/gulp-autoprefixer-tests.ts
+++ b/types/gulp-autoprefixer/gulp-autoprefixer-tests.ts
@@ -1,5 +1,5 @@
 import * as gulp from "gulp";
-import * as autoprefixer from "gulp-autoprefixer";
+import autoprefixer = require("gulp-autoprefixer");
 
 gulp.src("test.css")
     .pipe(autoprefixer())
diff --git a/types/gulp-batch/gulp-batch-tests.ts b/types/gulp-batch/gulp-batch-tests.ts
index c5936eb031..da0c67e84c 100644
--- a/types/gulp-batch/gulp-batch-tests.ts
+++ b/types/gulp-batch/gulp-batch-tests.ts
@@ -1,5 +1,5 @@
 import * as gulp from "gulp";
-import * as batch from "gulp-batch";
+import batch = require("gulp-batch");
 
 gulp.task('default', () => {
     gulp.watch([ 'lib/**', 'test/**' ], batch((events: any, cb: any) => {
diff --git a/types/gulp-bump/gulp-bump-tests.ts b/types/gulp-bump/gulp-bump-tests.ts
index b15e800a5e..caf5aecf6b 100644
--- a/types/gulp-bump/gulp-bump-tests.ts
+++ b/types/gulp-bump/gulp-bump-tests.ts
@@ -1,5 +1,5 @@
 import * as gulp from 'gulp';
-import * as GulpBump from 'gulp-bump';
+import GulpBump = require('gulp-bump');
 
 gulp
     .src('package.json')
diff --git a/types/gulp-bump/tsconfig.json b/types/gulp-bump/tsconfig.json
index 003c952709..a652799d36 100644
--- a/types/gulp-bump/tsconfig.json
+++ b/types/gulp-bump/tsconfig.json
@@ -21,4 +21,4 @@
         "index.d.ts",
         "gulp-bump-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/gulp-cache/gulp-cache-tests.ts b/types/gulp-cache/gulp-cache-tests.ts
index 31df7b0259..cc02e95119 100644
--- a/types/gulp-cache/gulp-cache-tests.ts
+++ b/types/gulp-cache/gulp-cache-tests.ts
@@ -1,6 +1,6 @@
 import * as fs from "fs";
 import * as gulp from "gulp";
-import * as cache from "gulp-cache";
+import cache = require("gulp-cache");
 import File = require("vinyl");
 
 // Some gulp plugin
diff --git a/types/gulp-clean-dest/tsconfig.json b/types/gulp-clean-dest/tsconfig.json
index 777c860568..8e6d932b7e 100644
--- a/types/gulp-clean-dest/tsconfig.json
+++ b/types/gulp-clean-dest/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "gulp-clean-dest-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/gulp-coffeelint/gulp-coffeelint-tests.ts b/types/gulp-coffeelint/gulp-coffeelint-tests.ts
index 5d18b98862..0acc0fb9e4 100644
--- a/types/gulp-coffeelint/gulp-coffeelint-tests.ts
+++ b/types/gulp-coffeelint/gulp-coffeelint-tests.ts
@@ -1,10 +1,6 @@
-
-
-
 import coffeelint = require('gulp-coffeelint');
 import gulp = require('gulp');
 
-
 gulp.task('lint', function () {
     gulp.src('./src/*.coffee')
         .pipe(coffeelint())
@@ -52,6 +48,3 @@ gulp.task('lint', function() {
         .pipe(coffeelint())
         .pipe(coffeelint.reporter(myReporter));
 });
-
-
-
diff --git a/types/gulp-concat/gulp-concat-tests.ts b/types/gulp-concat/gulp-concat-tests.ts
index 172aa61451..d1d0ebd1ad 100644
--- a/types/gulp-concat/gulp-concat-tests.ts
+++ b/types/gulp-concat/gulp-concat-tests.ts
@@ -1,8 +1,5 @@
-
-
-
 import gulp = require("gulp");
-import * as concat from "gulp-concat";
+import concat = require("gulp-concat");
 
 gulp.task("concat:simple", () => {
     gulp.src(["file*.txt"])
diff --git a/types/gulp-connect/gulp-connect-tests.ts b/types/gulp-connect/gulp-connect-tests.ts
index f1767701b0..ea29d2337d 100644
--- a/types/gulp-connect/gulp-connect-tests.ts
+++ b/types/gulp-connect/gulp-connect-tests.ts
@@ -89,7 +89,7 @@ gulp.task('connect', () => {
 // The following tests are custom tests to validate the more complicated APIs
 
 // Validate gulp-connect typings allow express apps to be passed in as middleware
-import * as express from "express";
+import express = require("express");
 
 gulp.task('connect', () => {
     const middleware = [
diff --git a/types/gulp-copy/gulp-copy-tests.ts b/types/gulp-copy/gulp-copy-tests.ts
index f4bc3ac023..0b5d71f646 100644
--- a/types/gulp-copy/gulp-copy-tests.ts
+++ b/types/gulp-copy/gulp-copy-tests.ts
@@ -1,5 +1,5 @@
 import * as gulp from "gulp";
-import * as gulpCopy from "gulp-copy";
+import gulpCopy = require("gulp-copy");
 
 gulp.task("copy-files", () => {
     gulp.src("*.nonexistent")
diff --git a/types/gulp-csso/gulp-csso-tests.ts b/types/gulp-csso/gulp-csso-tests.ts
index 8595a92ce8..30f693d24d 100644
--- a/types/gulp-csso/gulp-csso-tests.ts
+++ b/types/gulp-csso/gulp-csso-tests.ts
@@ -1,8 +1,5 @@
-
-
-
 import * as gulp from 'gulp';
-import * as csso from 'gulp-csso';
+import csso = require('gulp-csso');
 
 gulp.task('default', () =>
     gulp.src('./main.css')
diff --git a/types/gulp-debug/gulp-debug-tests.ts b/types/gulp-debug/gulp-debug-tests.ts
index d5c8a6d52b..f9ffce748d 100644
--- a/types/gulp-debug/gulp-debug-tests.ts
+++ b/types/gulp-debug/gulp-debug-tests.ts
@@ -1,8 +1,5 @@
-
-
-
 import * as gulp from 'gulp';
-import * as debug from 'gulp-debug';
+import debug = require('gulp-debug');
 
 gulp.task('default', () =>
     gulp.src('foo.js')
@@ -10,5 +7,4 @@ gulp.task('default', () =>
         .pipe(gulp.dest('dist'))
 );
 
-
 debug();
diff --git a/types/gulp-diff/gulp-diff-tests.ts b/types/gulp-diff/gulp-diff-tests.ts
index 23748d11e8..7c17e5235a 100644
--- a/types/gulp-diff/gulp-diff-tests.ts
+++ b/types/gulp-diff/gulp-diff-tests.ts
@@ -1,5 +1,5 @@
 import * as gulp from 'gulp';
-import * as diff from 'gulp-diff';
+import diff = require('gulp-diff');
 
 gulp.task('task', () => {
   return gulp.src('src')
diff --git a/types/gulp-dtsm/gulp-dtsm-tests.ts b/types/gulp-dtsm/gulp-dtsm-tests.ts
index dafc6b3468..1262a57210 100644
--- a/types/gulp-dtsm/gulp-dtsm-tests.ts
+++ b/types/gulp-dtsm/gulp-dtsm-tests.ts
@@ -1,4 +1,4 @@
-import * as dtsm from 'gulp-dtsm';
+import dtsm = require('gulp-dtsm');
 import * as gulp from 'gulp';
 
 var stream: NodeJS.WritableStream = dtsm();
diff --git a/types/gulp-espower/gulp-espower-tests.ts b/types/gulp-espower/gulp-espower-tests.ts
index 9c04e1d3a0..e06cdda2e8 100644
--- a/types/gulp-espower/gulp-espower-tests.ts
+++ b/types/gulp-espower/gulp-espower-tests.ts
@@ -1,7 +1,3 @@
-
-
-
-
 import espower = require('gulp-espower');
 import * as gulp from 'gulp';
 
@@ -9,7 +5,6 @@ gulp.src('src/*.coffee')
     .pipe(espower())
     .pipe(gulp.dest('out'));
 
-
 gulp.src('src/*.coffee')
     .pipe(espower({ patterns: ['assert(value, [message])'] }))
     .pipe(gulp.dest('out'));
diff --git a/types/gulp-filter/gulp-filter-tests.ts b/types/gulp-filter/gulp-filter-tests.ts
index 903f4083f7..730e6f0ae4 100644
--- a/types/gulp-filter/gulp-filter-tests.ts
+++ b/types/gulp-filter/gulp-filter-tests.ts
@@ -1,8 +1,8 @@
 import * as gulp from 'gulp';
-import * as uglify from 'gulp-uglify';
-import * as less from 'gulp-less';
-import * as concat from 'gulp-concat';
-import * as filter from 'gulp-filter';
+import uglify = require('gulp-uglify');
+import less = require('gulp-less');
+import concat = require('gulp-concat');
+import filter = require('gulp-filter');
 
 // Filter only
 gulp.task('default', () => {
diff --git a/types/gulp-flatten/gulp-flatten-tests.ts b/types/gulp-flatten/gulp-flatten-tests.ts
index 8c89236d61..431b7819a9 100644
--- a/types/gulp-flatten/gulp-flatten-tests.ts
+++ b/types/gulp-flatten/gulp-flatten-tests.ts
@@ -1,8 +1,5 @@
-
-
-
 import * as gulp from "gulp";
-import * as flatten from "gulp-flatten";
+import flatten = require("gulp-flatten");
 
 gulp.task("flatten:simple", () => {
     gulp.src(["files/**/*.txt"])
diff --git a/types/gulp-gh-pages/gulp-gh-pages-tests.ts b/types/gulp-gh-pages/gulp-gh-pages-tests.ts
index df527b0023..e541f18508 100644
--- a/types/gulp-gh-pages/gulp-gh-pages-tests.ts
+++ b/types/gulp-gh-pages/gulp-gh-pages-tests.ts
@@ -1,5 +1,5 @@
 import * as gulp from "gulp";
-import * as ghPages from "gulp-gh-pages";
+import ghPages = require("gulp-gh-pages");
 
 gulp.src("test.css")
     .pipe(ghPages());
diff --git a/types/gulp-gzip/gulp-gzip-tests.ts b/types/gulp-gzip/gulp-gzip-tests.ts
index 0a4d125d43..20648e38e1 100644
--- a/types/gulp-gzip/gulp-gzip-tests.ts
+++ b/types/gulp-gzip/gulp-gzip-tests.ts
@@ -1,6 +1,3 @@
-
-
-
 import gulp = require('gulp');
 import gzip = require('gulp-gzip');
 
diff --git a/types/gulp-html-replace/gulp-html-replace-tests.ts b/types/gulp-html-replace/gulp-html-replace-tests.ts
index 9a21a53b84..ca1e66c680 100644
--- a/types/gulp-html-replace/gulp-html-replace-tests.ts
+++ b/types/gulp-html-replace/gulp-html-replace-tests.ts
@@ -1,5 +1,5 @@
 import * as gulp from 'gulp';
-import * as htmlreplace from 'gulp-html-replace';
+import htmlreplace = require('gulp-html-replace');
 
 // Examples taken from README.md of the gulp-html-replace project:
 // https://www.npmjs.com/package/gulp-html-replace
diff --git a/types/gulp-htmlmin/gulp-htmlmin-tests.ts b/types/gulp-htmlmin/gulp-htmlmin-tests.ts
index 29c3bcd4fe..e0ca8be7cd 100644
--- a/types/gulp-htmlmin/gulp-htmlmin-tests.ts
+++ b/types/gulp-htmlmin/gulp-htmlmin-tests.ts
@@ -1,8 +1,5 @@
-
-
-
 import * as gulp from 'gulp';
-import * as htmlmin from 'gulp-htmlmin';
+import htmlmin = require('gulp-htmlmin');
 
 gulp.task('minify', function() {
   return gulp.src('src/*.html')
diff --git a/types/gulp-inject/gulp-inject-tests.ts b/types/gulp-inject/gulp-inject-tests.ts
index ef29ebc343..d57756ccfa 100644
--- a/types/gulp-inject/gulp-inject-tests.ts
+++ b/types/gulp-inject/gulp-inject-tests.ts
@@ -1,8 +1,5 @@
-
-
-
 import * as gulp from "gulp";
-import * as inject from "gulp-inject";
+import inject = require("gulp-inject");
 
 gulp.task("inject:simple", () => {
     gulp.src("src/index.html")
diff --git a/types/gulp-install/gulp-install-tests.ts b/types/gulp-install/gulp-install-tests.ts
index b822b42706..85b1f6ee1b 100644
--- a/types/gulp-install/gulp-install-tests.ts
+++ b/types/gulp-install/gulp-install-tests.ts
@@ -1,8 +1,5 @@
-
-
-
 import * as gulp from 'gulp';
-import * as install from 'gulp-install';
+import install = require('gulp-install');
 
 // Examples taken from https://www.npmjs.com/package/gulp-install
 
diff --git a/types/gulp-jade/gulp-jade-tests.ts b/types/gulp-jade/gulp-jade-tests.ts
index f184184573..e43917f597 100644
--- a/types/gulp-jade/gulp-jade-tests.ts
+++ b/types/gulp-jade/gulp-jade-tests.ts
@@ -1,5 +1,5 @@
 import * as gulp from 'gulp';
-import * as jade from 'gulp-jade';
+import jade = require('gulp-jade');
 
 gulp.task('jade', () => {
   gulp.src('src/**/*.jade')
diff --git a/types/gulp-jasmine-browser/gulp-jasmine-browser-tests.ts b/types/gulp-jasmine-browser/gulp-jasmine-browser-tests.ts
index db219148d3..ba2584a2a0 100644
--- a/types/gulp-jasmine-browser/gulp-jasmine-browser-tests.ts
+++ b/types/gulp-jasmine-browser/gulp-jasmine-browser-tests.ts
@@ -1,6 +1,3 @@
-
-
-
 import gulp = require('gulp');
 import jasmineBrowser = require('gulp-jasmine-browser');
 
@@ -10,21 +7,18 @@ gulp.task('jasmine', () =>
     .pipe(jasmineBrowser.server({port: 8888}))
 );
 
-
 gulp.task('jasmine-phantom', () =>
   gulp.src(['src/**/*.js', 'spec/**/*_spec.js'])
     .pipe(jasmineBrowser.specRunner({console: true}))
     .pipe(jasmineBrowser.headless())
 );
 
-
 gulp.task('jasmine-slimerjs', () =>
   gulp.src(['src/**/*.js', 'spec/**/*_spec.js'])
     .pipe(jasmineBrowser.specRunner({console: true}))
     .pipe(jasmineBrowser.headless({driver: 'slimerjs'}))
 );
 
-
 gulp.task('jasmine', () =>
   gulp.src('spec/**/*_spec.js')
     .pipe(jasmineBrowser.specRunner())
diff --git a/types/gulp-jasmine/tsconfig.json b/types/gulp-jasmine/tsconfig.json
index d44751f20b..2214b37e87 100644
--- a/types/gulp-jasmine/tsconfig.json
+++ b/types/gulp-jasmine/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "gulp-jasmine-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/gulp-json-editor/gulp-json-editor-tests.ts b/types/gulp-json-editor/gulp-json-editor-tests.ts
index 67176063de..c4fc082360 100644
--- a/types/gulp-json-editor/gulp-json-editor-tests.ts
+++ b/types/gulp-json-editor/gulp-json-editor-tests.ts
@@ -1,8 +1,5 @@
-
-
-
 import * as gulp from 'gulp';
-import * as jeditor from 'gulp-json-editor';
+import jeditor = require('gulp-json-editor');
 
 // Samples taken from https://www.npmjs.com/package/gulp-json-editor
 
diff --git a/types/gulp-jsonminify/gulp-jsonminify-tests.ts b/types/gulp-jsonminify/gulp-jsonminify-tests.ts
index 23008bad7e..c158f83627 100644
--- a/types/gulp-jsonminify/gulp-jsonminify-tests.ts
+++ b/types/gulp-jsonminify/gulp-jsonminify-tests.ts
@@ -1,5 +1,5 @@
 import * as gulp from 'gulp';
-import * as jsonminify from 'gulp-jsonminify';
+import jsonminify = require('gulp-jsonminify');
 
 gulp.task('minify', () => {
   return gulp.src('src/*.json')
diff --git a/types/gulp-jsonminify/tsconfig.json b/types/gulp-jsonminify/tsconfig.json
index 0b6036c600..080412463f 100644
--- a/types/gulp-jsonminify/tsconfig.json
+++ b/types/gulp-jsonminify/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "gulp-jsonminify-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/gulp-jspm/gulp-jspm-tests.ts b/types/gulp-jspm/gulp-jspm-tests.ts
index 5f3e0812f1..f2c5c4d4e9 100644
--- a/types/gulp-jspm/gulp-jspm-tests.ts
+++ b/types/gulp-jspm/gulp-jspm-tests.ts
@@ -1,8 +1,5 @@
-
-
-
 import * as gulp from 'gulp';
-import * as gulpJspm from 'gulp-jspm';
+import gulpJspm = require('gulp-jspm');
 
 // Examples taken from https://www.npmjs.com/package/gulp-jspm
 gulp.task('default', function(){
@@ -26,7 +23,7 @@ gulp.src('src/main.jsx')
 gulp.src('src/main.jsx')
     .pipe(gulpJspm({plugin: 'jsx'})) // `jspm bundle main.jsx!jsx`
     .pipe(gulp.dest('build/'));
- 
+
 // all other options given to gulp-jspm are passed on to jspm, e.g.
 gulp.src('src/main.js')
     .pipe(gulpJspm({inject: true})) // `jspm bundle main --inject`
diff --git a/types/gulp-less/gulp-less-tests.ts b/types/gulp-less/gulp-less-tests.ts
index bd5335d80e..a5ac36c508 100644
--- a/types/gulp-less/gulp-less-tests.ts
+++ b/types/gulp-less/gulp-less-tests.ts
@@ -1,8 +1,5 @@
-
-
-
 import * as gulp from "gulp";
-import * as less from "gulp-less";
+import less = require("gulp-less");
 
 // Without options
 gulp.task("less", () => {
diff --git a/types/gulp-load-plugins/gulp-load-plugins-tests.ts b/types/gulp-load-plugins/gulp-load-plugins-tests.ts
index a0cff649ec..4f118a0688 100644
--- a/types/gulp-load-plugins/gulp-load-plugins-tests.ts
+++ b/types/gulp-load-plugins/gulp-load-plugins-tests.ts
@@ -1,6 +1,6 @@
 import * as gulp from 'gulp';
-import * as gulpConcat from 'gulp-concat';
-import * as gulpLoadPlugins from 'gulp-load-plugins';
+import gulpConcat = require('gulp-concat');
+import gulpLoadPlugins = require('gulp-load-plugins');
 
 interface GulpPlugins extends IGulpPlugins {
 	concat: typeof gulpConcat;
diff --git a/types/gulp-minify-css/gulp-minify-css-tests.ts b/types/gulp-minify-css/gulp-minify-css-tests.ts
index 597111d30c..9de00a3ae8 100644
--- a/types/gulp-minify-css/gulp-minify-css-tests.ts
+++ b/types/gulp-minify-css/gulp-minify-css-tests.ts
@@ -1,8 +1,5 @@
-
-
-
 import * as gulp from "gulp";
-import * as minifyCSS from "gulp-minify-css";
+import minifyCSS = require("gulp-minify-css");
 
 gulp.task("minify-css", () => {
     gulp.src("css/**/*.css")
diff --git a/types/gulp-minify-html/gulp-minify-html-tests.ts b/types/gulp-minify-html/gulp-minify-html-tests.ts
index fd27474de2..5071348899 100644
--- a/types/gulp-minify-html/gulp-minify-html-tests.ts
+++ b/types/gulp-minify-html/gulp-minify-html-tests.ts
@@ -1,8 +1,5 @@
-
-
-
 import * as gulp from 'gulp';
-import * as minifyHtml from 'gulp-minify-html';
+import minifyHtml = require('gulp-minify-html');
 
 // This package has been deprecated in favor of gulp-htmlmin, which should be faster and more comprehensive.
 
diff --git a/types/gulp-mocha/gulp-mocha-tests.ts b/types/gulp-mocha/gulp-mocha-tests.ts
index c84d710380..d007900825 100644
--- a/types/gulp-mocha/gulp-mocha-tests.ts
+++ b/types/gulp-mocha/gulp-mocha-tests.ts
@@ -1,5 +1,5 @@
 import * as gulp from "gulp";
-import * as mocha from "gulp-mocha";
+import mocha = require("gulp-mocha");
 
 gulp.task('default', function () {
     return gulp.src('test.js', {read: false})
diff --git a/types/gulp-modernizr/gulp-modernizr-tests.ts b/types/gulp-modernizr/gulp-modernizr-tests.ts
index a29f642d7f..8c5b4c0e31 100644
--- a/types/gulp-modernizr/gulp-modernizr-tests.ts
+++ b/types/gulp-modernizr/gulp-modernizr-tests.ts
@@ -1,5 +1,5 @@
 import { src, dest } from 'gulp';
-import * as gulpModernizr from 'gulp-modernizr';
+import gulpModernizr = require('gulp-modernizr');
 
 const s1 = gulpModernizr();
 const s2 = gulpModernizr('filename.js', {});
diff --git a/types/gulp-msbuild/gulp-msbuild-tests.ts b/types/gulp-msbuild/gulp-msbuild-tests.ts
index f9e5ce053b..386746c0de 100644
--- a/types/gulp-msbuild/gulp-msbuild-tests.ts
+++ b/types/gulp-msbuild/gulp-msbuild-tests.ts
@@ -1,4 +1,4 @@
-import * as msbuild from "gulp-msbuild";
+import msbuild = require("gulp-msbuild");
 
 const stream = msbuild({
     stdout: false,
diff --git a/types/gulp-mustache/gulp-mustache-tests.ts b/types/gulp-mustache/gulp-mustache-tests.ts
index c069a1dd02..d8285370e7 100644
--- a/types/gulp-mustache/gulp-mustache-tests.ts
+++ b/types/gulp-mustache/gulp-mustache-tests.ts
@@ -1,5 +1,4 @@
-import * as mustache from "gulp-mustache";
-// noinspection ES6UnusedImports
+import mustache = require("gulp-mustache");
 import { Transform } from "stream";
 
 mustache({ // $ExpectType Transform
diff --git a/types/gulp-ng-annotate/gulp-ng-annotate-tests.ts b/types/gulp-ng-annotate/gulp-ng-annotate-tests.ts
index ea48672fb0..6116b87ad2 100644
--- a/types/gulp-ng-annotate/gulp-ng-annotate-tests.ts
+++ b/types/gulp-ng-annotate/gulp-ng-annotate-tests.ts
@@ -1,6 +1,3 @@
-
-
-
 import ngAnnotate = require('gulp-ng-annotate');
 import gulp = require('gulp');
 
diff --git a/types/gulp-nodemon/gulp-nodemon-tests.ts b/types/gulp-nodemon/gulp-nodemon-tests.ts
index 4c36b42aa9..85e90a667b 100644
--- a/types/gulp-nodemon/gulp-nodemon-tests.ts
+++ b/types/gulp-nodemon/gulp-nodemon-tests.ts
@@ -1,6 +1,3 @@
-
-
-
 import gulp = require('gulp');
 import path = require('path');
 import nodemon = require('gulp-nodemon');
diff --git a/types/gulp-nunit-runner/gulp-nunit-runner-tests.ts b/types/gulp-nunit-runner/gulp-nunit-runner-tests.ts
index 0e55fef37a..ea571c3cf8 100644
--- a/types/gulp-nunit-runner/gulp-nunit-runner-tests.ts
+++ b/types/gulp-nunit-runner/gulp-nunit-runner-tests.ts
@@ -1,4 +1,4 @@
-import * as nunit from "gulp-nunit-runner";
+import nunit = require("gulp-nunit-runner");
 
 const stream = nunit({
     executable: 'c:/Program Files/NUnit/bin',
diff --git a/types/gulp-protractor/gulp-protractor-tests.ts b/types/gulp-protractor/gulp-protractor-tests.ts
index 77d31e2bea..c79ac9220c 100644
--- a/types/gulp-protractor/gulp-protractor-tests.ts
+++ b/types/gulp-protractor/gulp-protractor-tests.ts
@@ -1,6 +1,3 @@
-
-
-
 import gulp = require('gulp');
 import protractor = require('gulp-protractor');
 
diff --git a/types/gulp-pug/gulp-pug-tests.ts b/types/gulp-pug/gulp-pug-tests.ts
index 0ec83a248f..1ba56b91e4 100644
--- a/types/gulp-pug/gulp-pug-tests.ts
+++ b/types/gulp-pug/gulp-pug-tests.ts
@@ -1,5 +1,5 @@
 import { src, dest } from 'gulp';
-import * as gulpPug from 'gulp-pug';
+import gulpPug = require('gulp-pug');
 
 const s1 = gulpPug();
 const s2 = gulpPug({});
diff --git a/types/gulp-replace/gulp-replace-tests.ts b/types/gulp-replace/gulp-replace-tests.ts
index 6a17057495..79f77b93a9 100644
--- a/types/gulp-replace/gulp-replace-tests.ts
+++ b/types/gulp-replace/gulp-replace-tests.ts
@@ -1,5 +1,5 @@
 import * as gulp from "gulp";
-import * as replace from "gulp-replace";
+import replace = require("gulp-replace");
 
 gulp.task('templates', function(){
     gulp.src(['file.txt'])
diff --git a/types/gulp-rev-replace/gulp-rev-replace-tests.ts b/types/gulp-rev-replace/gulp-rev-replace-tests.ts
index 2d7e5a3580..3d191811bb 100644
--- a/types/gulp-rev-replace/gulp-rev-replace-tests.ts
+++ b/types/gulp-rev-replace/gulp-rev-replace-tests.ts
@@ -1,7 +1,7 @@
 import * as gulp from 'gulp';
-import * as revReplace from 'gulp-rev-replace';
-import * as rev from 'gulp-rev';
-import * as useref from 'gulp-useref';
+import revReplace = require('gulp-rev-replace');
+import rev = require('gulp-rev');
+import useref = require('gulp-useref');
 
 gulp.task("index", () => {
     return gulp.src("src/index.html")
diff --git a/types/gulp-rev/gulp-rev-tests.ts b/types/gulp-rev/gulp-rev-tests.ts
index c13b23fc71..c19616de11 100644
--- a/types/gulp-rev/gulp-rev-tests.ts
+++ b/types/gulp-rev/gulp-rev-tests.ts
@@ -1,6 +1,3 @@
-
-
-
 import gulp = require('gulp');
 import rev = require('gulp-rev');
 
diff --git a/types/gulp-ruby-sass/gulp-ruby-sass-tests.ts b/types/gulp-ruby-sass/gulp-ruby-sass-tests.ts
index 69346a16d8..70a034bd68 100644
--- a/types/gulp-ruby-sass/gulp-ruby-sass-tests.ts
+++ b/types/gulp-ruby-sass/gulp-ruby-sass-tests.ts
@@ -1,5 +1,5 @@
 import * as gulp from "gulp";
-import * as sass from "gulp-ruby-sass";
+import sass = require("gulp-ruby-sass");
 
 gulp.task('sass', function () {
     sass('./scss/*.scss')
diff --git a/types/gulp-sass/gulp-sass-tests.ts b/types/gulp-sass/gulp-sass-tests.ts
index 72192512a7..5bed46d938 100644
--- a/types/gulp-sass/gulp-sass-tests.ts
+++ b/types/gulp-sass/gulp-sass-tests.ts
@@ -1,5 +1,5 @@
 import gulp = require("gulp");
-import * as sass from "gulp-sass"; 
+import sass = require("gulp-sass");
 
 gulp.task('sass', function () {
     gulp.src('./scss/*.scss')
diff --git a/types/gulp-size/gulp-size-tests.ts b/types/gulp-size/gulp-size-tests.ts
index bd53018d6a..f978842201 100644
--- a/types/gulp-size/gulp-size-tests.ts
+++ b/types/gulp-size/gulp-size-tests.ts
@@ -1,6 +1,6 @@
 import * as gulp from 'gulp';
-import * as size from 'gulp-size';
-import * as debug from 'gulp-debug';
+import size = require('gulp-size');
+import debug = require('gulp-debug');
 
 gulp.task('default', () =>
     gulp.src('fixture.js')
diff --git a/types/gulp-sort/gulp-sort-tests.ts b/types/gulp-sort/gulp-sort-tests.ts
index 62e17d27a2..e3cf64f429 100644
--- a/types/gulp-sort/gulp-sort-tests.ts
+++ b/types/gulp-sort/gulp-sort-tests.ts
@@ -1,7 +1,7 @@
 /** Tests taken from https://github.com/pgilad/gulp-sort#usage */
 
 import * as gulp from 'gulp';
-import * as sort from 'gulp-sort';
+import sort = require('gulp-sort');
 import * as gulpUtil from 'gulp-util';
 
 // default sort
diff --git a/types/gulp-strip-debug/gulp-strip-debug-tests.ts b/types/gulp-strip-debug/gulp-strip-debug-tests.ts
index 9a0b04e48a..0e8b6c1a8b 100644
--- a/types/gulp-strip-debug/gulp-strip-debug-tests.ts
+++ b/types/gulp-strip-debug/gulp-strip-debug-tests.ts
@@ -1,8 +1,5 @@
-
-
-
 import * as gulp from 'gulp';
-import * as stripDebug from 'gulp-strip-debug';
+import stripDebug = require('gulp-strip-debug');
 
 // Example taken from https://www.npmjs.com/package/gulp-strip-debug
 gulp.task('default', function () {
diff --git a/types/gulp-tsd/gulp-tsd-tests.ts b/types/gulp-tsd/gulp-tsd-tests.ts
index 0b7a1dadea..e593ec2634 100644
--- a/types/gulp-tsd/gulp-tsd-tests.ts
+++ b/types/gulp-tsd/gulp-tsd-tests.ts
@@ -1,8 +1,5 @@
-
-
-
 import * as gulp from "gulp";
-import * as tsd from "gulp-tsd";
+import tsd = require("gulp-tsd");
 
 gulp.task("tsd", () => {
     gulp.src("gulp_tsd.json")
diff --git a/types/gulp-uglify/composer.d.ts b/types/gulp-uglify/composer.d.ts
index bb3f04f134..0584a72fc0 100644
--- a/types/gulp-uglify/composer.d.ts
+++ b/types/gulp-uglify/composer.d.ts
@@ -1,5 +1,5 @@
 import * as UglifyJS from 'uglify-js';
-import * as GulpUglify from '.';
+import GulpUglify = require('.');
 
 interface Composer {
     (uglify: Uglify, log: Logger): typeof GulpUglify;
diff --git a/types/gulp-uglify/gulp-uglify-tests.ts b/types/gulp-uglify/gulp-uglify-tests.ts
index 172d7cae0b..1a23580e8c 100644
--- a/types/gulp-uglify/gulp-uglify-tests.ts
+++ b/types/gulp-uglify/gulp-uglify-tests.ts
@@ -1,5 +1,5 @@
 import * as gulp from 'gulp';
-import * as uglify from 'gulp-uglify';
+import uglify = require('gulp-uglify');
 import pump = require('pump');
 import uglifyjs = require('uglify-js');
 import composer = require('gulp-uglify/composer');
diff --git a/types/gulp-useref/gulp-useref-tests.ts b/types/gulp-useref/gulp-useref-tests.ts
index 5d777fd6e6..91cc7919e7 100644
--- a/types/gulp-useref/gulp-useref-tests.ts
+++ b/types/gulp-useref/gulp-useref-tests.ts
@@ -1,5 +1,5 @@
 import * as gulp from 'gulp';
-import * as useref from 'gulp-useref';
+import useref = require('gulp-useref');
 
 // Usage
 gulp.task('default', function () {
@@ -14,7 +14,7 @@ gulp.task('default', function () {
         .pipe(gulp.dest('dist'));
 });
 
-import * as gulpif from 'gulp-if';
+import gulpif = require('gulp-if');
 import uglify = require('gulp-uglify');
 import minifyCss = require('gulp-minify-css');
 
diff --git a/types/gulp-watch/gulp-watch-tests.ts b/types/gulp-watch/gulp-watch-tests.ts
index b273662824..360c53dd19 100644
--- a/types/gulp-watch/gulp-watch-tests.ts
+++ b/types/gulp-watch/gulp-watch-tests.ts
@@ -1,5 +1,5 @@
 import * as gulp from 'gulp';
-import * as watch from 'gulp-watch';
+import watch = require('gulp-watch');
 
 gulp.task('stream', () =>
     gulp.src('css/**/*.css')
diff --git a/types/gulp-zip/gulp-zip-tests.ts b/types/gulp-zip/gulp-zip-tests.ts
index 983a4263ce..428ce81ebd 100644
--- a/types/gulp-zip/gulp-zip-tests.ts
+++ b/types/gulp-zip/gulp-zip-tests.ts
@@ -1,4 +1,4 @@
-import * as GulpZip from 'gulp-zip';
+import GulpZip = require('gulp-zip');
 
 GulpZip('file.zip').on('end', () => {});
 GulpZip('file.zip', {compress: false}).on('end', () => {});
diff --git a/types/gulp/test/index.ts b/types/gulp/test/index.ts
index 853799d8c4..f5ca436450 100644
--- a/types/gulp/test/index.ts
+++ b/types/gulp/test/index.ts
@@ -1,7 +1,7 @@
 import * as gulp from 'gulp';
 import * as undertaker from 'undertaker';
 import * as registry from 'undertaker-registry';
-import * as del from "del";
+import del = require("del");
 
 const minify: () => any = () => { };
 const jade: () => any = () => { };
diff --git a/types/gzip-js/tsconfig.json b/types/gzip-js/tsconfig.json
index a8138e1de9..c402315042 100644
--- a/types/gzip-js/tsconfig.json
+++ b/types/gzip-js/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "gzip-js-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/gzip-size/v3/tsconfig.json b/types/gzip-size/v3/tsconfig.json
index 88a695711b..62a3e7db2b 100644
--- a/types/gzip-size/v3/tsconfig.json
+++ b/types/gzip-size/v3/tsconfig.json
@@ -25,4 +25,4 @@
         "index.d.ts",
         "gzip-size-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/h2o2/tsconfig.json b/types/h2o2/tsconfig.json
index 30a156a786..7cc2bc6d91 100644
--- a/types/h2o2/tsconfig.json
+++ b/types/h2o2/tsconfig.json
@@ -14,7 +14,12 @@
         ],
         "types": [],
         "paths": {
-            "boom": ["boom/v4"]
+            "boom": [
+                "boom/v4"
+            ],
+            "hapi": [
+                "hapi/v16"
+            ]
         },
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
@@ -23,4 +28,4 @@
         "index.d.ts",
         "h2o2-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/halogen/index.d.ts b/types/halogen/index.d.ts
index 216281972e..de09f29f43 100644
--- a/types/halogen/index.d.ts
+++ b/types/halogen/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/yuanyan/halogen
 // Definitions by: Vincent Rouffiat <https://github.com/steller>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as react from "react";
 
diff --git a/types/hapi-auth-basic/tsconfig.json b/types/hapi-auth-basic/tsconfig.json
index 56ac44dbdd..9d6132482f 100644
--- a/types/hapi-auth-basic/tsconfig.json
+++ b/types/hapi-auth-basic/tsconfig.json
@@ -14,7 +14,12 @@
         ],
         "types": [],
         "paths": {
-            "boom": ["boom/v4"]
+            "boom": [
+                "boom/v4"
+            ],
+            "hapi": [
+                "hapi/v16"
+            ]
         },
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
@@ -23,4 +28,4 @@
         "index.d.ts",
         "hapi-auth-basic-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/hapi-auth-jwt2/tsconfig.json b/types/hapi-auth-jwt2/tsconfig.json
index 78a8423cc4..1f8cc10075 100644
--- a/types/hapi-auth-jwt2/tsconfig.json
+++ b/types/hapi-auth-jwt2/tsconfig.json
@@ -14,7 +14,12 @@
         ],
         "types": [],
         "paths": {
-            "boom": ["boom/v4"]
+            "boom": [
+                "boom/v4"
+            ],
+            "hapi": [
+                "hapi/v16"
+            ]
         },
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
@@ -23,4 +28,4 @@
         "index.d.ts",
         "hapi-auth-jwt2-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/hapi-decorators/tsconfig.json b/types/hapi-decorators/tsconfig.json
index 80aa56a21e..44437f4b9e 100644
--- a/types/hapi-decorators/tsconfig.json
+++ b/types/hapi-decorators/tsconfig.json
@@ -16,7 +16,12 @@
         ],
         "types": [],
         "paths": {
-            "boom": ["boom/v4"]
+            "boom": [
+                "boom/v4"
+            ],
+            "hapi": [
+                "hapi/v16"
+            ]
         },
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
@@ -25,4 +30,4 @@
         "index.d.ts",
         "hapi-decorators-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/hapi/definitions/plugin/plugin-registered.d.ts b/types/hapi/definitions/plugin/plugin-registered.d.ts
new file mode 100644
index 0000000000..6ce68e5e85
--- /dev/null
+++ b/types/hapi/definitions/plugin/plugin-registered.d.ts
@@ -0,0 +1,32 @@
+/**
+ * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverregistrations)
+ */
+export interface PluginsListRegistered {
+}
+
+/**
+ * An object of the currently registered plugins where each key is a registered plugin name and the value is an
+ * object containing:
+ * * version - the plugin version.
+ * * name - the plugin name.
+ * * options - (optional) options passed to the plugin during registration.
+ * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverregistrations)
+ */
+export interface PluginRegistered {
+
+    /**
+     * the plugin version.
+     */
+    version: string;
+
+    /**
+     * the plugin name.
+     */
+    name: string;
+
+    /**
+     * options used to register the plugin.
+     */
+    options: object;
+
+}
diff --git a/types/hapi/definitions/plugin/plugin.d.ts b/types/hapi/definitions/plugin/plugin.d.ts
new file mode 100644
index 0000000000..925ac02205
--- /dev/null
+++ b/types/hapi/definitions/plugin/plugin.d.ts
@@ -0,0 +1,58 @@
+import {Server, ServerRegisterOptions} from "hapi";
+
+export interface PluginsStates {
+}
+
+export interface PluginSpecificConfiguration {
+
+}
+
+export interface PluginNameVersion {
+    /**
+     * (required) the plugin name string. The name is used as a unique key. Published plugins (e.g. published in the npm
+     * registry) should use the same name as the name field in their 'package.json' file. Names must be
+     * unique within each application.
+     */
+    name: string;
+
+    /** optional plugin version. The version is only used informatively to enable other plugins to find out the versions loaded. The version should be the same as the one specified in the plugin's 'package.json' file. */
+    version?: string;
+}
+
+export interface PluginPackage {
+
+    /**
+     * Alternatively, the name and version can be included via the pkg property containing the 'package.json' file for the module which already has the name and version included
+     */
+    pkg: any;
+}
+
+/**
+ * Plugins provide a way to organize application code by splitting the server logic into smaller components. Each
+ * plugin can manipulate the server through the standard server interface, but with the added ability to sandbox
+ * certain properties. For example, setting a file path in one plugin doesn't affect the file path set
+ * in another plugin.
+ * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#plugins)
+ *
+ * The type T is the type of the plugin options.
+ */
+export interface PluginBase<T> {
+
+    /**
+     * (required) the registration function with the signature async function(server, options) where:
+     * * server - the server object with a plugin-specific server.realm.
+     * * options - any options passed to the plugin during registration via server.register().
+     */
+    register: (server: Server, options: T) => Promise<void>;
+
+    /** (optional) if true, allows the plugin to be registered multiple times with the same server. Defaults to false. */
+    multiple?: boolean;
+
+    /** (optional) a string or an array of strings indicating a plugin dependency. Same as setting dependencies via server.dependency(). */
+    dependencies?: string | string[];
+
+    /** once - (optional) if true, will only register the plugin once per server. If set, overrides the once option passed to server.register(). Defaults to no override. */
+    once?: boolean;
+}
+
+export type Plugin<T> = PluginBase<T> & (PluginNameVersion | PluginPackage);
diff --git a/types/hapi/definitions/request/request-auth.d.ts b/types/hapi/definitions/request/request-auth.d.ts
new file mode 100644
index 0000000000..d2f22e81cd
--- /dev/null
+++ b/types/hapi/definitions/request/request-auth.d.ts
@@ -0,0 +1,34 @@
+/**
+ * User-extensible type for request.auth credentials.
+ */
+export interface AuthCredentials {
+    user?: string;
+}
+
+/**
+ * Authentication information:
+ * * artifacts - an artifact object received from the authentication strategy and used in authentication-related actions.
+ * * credentials - the credential object received during the authentication process. The presence of an object does not mean successful authentication.
+ * * error - the authentication error is failed and mode set to 'try'.
+ * * isAuthenticated - true if the request has been successfully authenticated, otherwise false.
+ * * isAuthorized - true is the request has been successfully authorized against the route authentication access configuration. If the route has not access rules defined or if the request failed authorization, set to false.
+ * * mode - the route authentication mode.
+ * * strategy - the name of the strategy used.
+ * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-requestauth)
+ */
+export interface RequestAuth {
+    /** an artifact object received from the authentication strategy and used in authentication-related actions. */
+    artifacts: object;
+    /** the credential object received during the authentication process. The presence of an object does not mean successful authentication. */
+    credentials: AuthCredentials;
+    /** the authentication error is failed and mode set to 'try'. */
+    error: Error;
+    /** true if the request has been successfully authenticated, otherwise false. */
+    isAuthenticated: boolean;
+    /** true is the request has been successfully authorized against the route authentication access configuration. If the route has not access rules defined or if the request failed authorization, set to false. */
+    isAuthorized: boolean;
+    /** the route authentication mode. */
+    mode: string;
+    /** the name of the strategy used. */
+    strategy: string;
+}
diff --git a/types/hapi/definitions/request/request-events.d.ts b/types/hapi/definitions/request/request-events.d.ts
new file mode 100644
index 0000000000..dfcb004d24
--- /dev/null
+++ b/types/hapi/definitions/request/request-events.d.ts
@@ -0,0 +1,45 @@
+import * as Podium from "podium";
+import {PeekListener} from "hapi";
+
+/**
+ * 'peek' - emitted for each chunk of payload data read from the client connection. The event method signature is function(chunk, encoding).
+ * 'finish' - emitted when the request payload finished reading. The event method signature is function ().
+ * 'disconnect' - emitted when a request errors or aborts unexpectedly.
+ * For context [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-requestevents)
+ */
+export type RequestEventType = "peek" | "finish" | "disconnect";
+
+/**
+ * Access: read only and the public podium interface.
+ * The request.events supports the following events:
+ * * 'peek' - emitted for each chunk of payload data read from the client connection. The event method signature is function(chunk, encoding).
+ * * 'finish' - emitted when the request payload finished reading. The event method signature is function ().
+ * * 'disconnect' - emitted when a request errors or aborts unexpectedly.
+ * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-requestevents)
+ */
+export interface RequestEvents extends Podium {
+
+    /**
+     * Access: read only and the public podium interface.
+     * The request.events supports the following events:
+     * * 'peek' - emitted for each chunk of payload data read from the client connection. The event method signature is function(chunk, encoding).
+     * * 'finish' - emitted when the request payload finished reading. The event method signature is function ().
+     * * 'disconnect' - emitted when a request errors or aborts unexpectedly.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-requestevents)
+     */
+    on(criteria: "peek", listener: PeekListener): void;
+    on(criteria: "finish" | "disconnect", listener: () => void): void;
+    on(criteria: RequestEventType, listener: Function): void;
+
+    /**
+     * Access: read only and the public podium interface.
+     * The request.events supports the following events:
+     * * 'peek' - emitted for each chunk of payload data read from the client connection. The event method signature is function(chunk, encoding).
+     * * 'finish' - emitted when the request payload finished reading. The event method signature is function ().
+     * * 'disconnect' - emitted when a request errors or aborts unexpectedly.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-requestevents)
+     */
+    once(criteria: "peek", listener: PeekListener): void;
+    once(criteria: "finish" | "disconnect", listener: () => void): void;
+    once(criteria: RequestEventType, listener: Function): void;
+}
diff --git a/types/hapi/definitions/request/request-info.d.ts b/types/hapi/definitions/request/request-info.d.ts
new file mode 100644
index 0000000000..a4892438a2
--- /dev/null
+++ b/types/hapi/definitions/request/request-info.d.ts
@@ -0,0 +1,41 @@
+/**
+ * Request information:
+ * * acceptEncoding - the request preferred encoding.
+ * * cors - if CORS is enabled for the route, contains the following:
+ * * isOriginMatch - true if the request 'Origin' header matches the configured CORS restrictions. Set to false if no 'Origin' header is found or if it does not match. Note that this is only available after the 'onRequest' extension point as CORS is configured per-route and no routing decisions are made at that point in the request lifecycle.
+ * * host - content of the HTTP 'Host' header (e.g. 'example.com:8080').
+ * * hostname - the hostname part of the 'Host' header (e.g. 'example.com').
+ * * id - a unique request identifier (using the format '{now}:{connection.info.id}:{5 digits counter}').
+ * * received - request reception timestamp.
+ * * referrer - content of the HTTP 'Referrer' (or 'Referer') header.
+ * * remoteAddress - remote client IP address.
+ * * remotePort - remote client port.
+ * * responded - request response timestamp (0 is not responded yet).
+ * Note that the request.info object is not meant to be modified.
+ * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-requestinfo)
+ */
+export interface RequestInfo {
+    /** the request preferred encoding. */
+    acceptEncoding: string;
+    /** if CORS is enabled for the route, contains the following: */
+    cors: {
+        /**
+         * true if the request 'Origin' header matches the configured CORS restrictions. Set to false if no 'Origin' header is found or if it does not match. Note that this is only available after the 'onRequest' extension point as CORS is configured per-route and no routing decisions are made at that point in the request lifecycle.
+         */
+        isOriginMatch?: boolean;
+    };
+    /** content of the HTTP 'Host' header (e.g. 'example.com:8080'). */
+    host: string;
+    /** the hostname part of the 'Host' header (e.g. 'example.com'). */
+    hostname: string;
+    /** request reception timestamp. */
+    received: number;
+    /** content of the HTTP 'Referrer' (or 'Referer') header. */
+    referrer: string;
+    /** remote client IP address. */
+    remoteAddress: string;
+    /** remote client port. */
+    remotePort: string;
+    /** request response timestamp (0 is not responded yet). */
+    responded: number;
+}
diff --git a/types/hapi/definitions/request/request-route.d.ts b/types/hapi/definitions/request/request-route.d.ts
new file mode 100644
index 0000000000..fbafd033a6
--- /dev/null
+++ b/types/hapi/definitions/request/request-route.d.ts
@@ -0,0 +1,45 @@
+import {Request, RouteOptions, ServerRealm, Util} from "hapi";
+
+/**
+ * The request route information object, where:
+ * * method - the route HTTP method.
+ * * path - the route path.
+ * * vhost - the route vhost option if configured.
+ * * realm - the active realm associated with the route.
+ * * settings - the route options object with all defaults applied.
+ * * fingerprint - the route internal normalized string representing the normalized path.
+ * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-requestroute)
+ */
+export interface RequestRoute {
+
+    /** the route HTTP method. */
+    method: Util.HTTP_METHODS_PARTIAL;
+
+    /** the route path. */
+    path: string;
+
+    /** the route vhost option if configured. */
+    vhost?: string | string[];
+
+    /** the active realm associated with the route.*/
+    realm: ServerRealm;
+
+    /** the route options object with all defaults applied. */
+    settings: RouteOptions;
+
+    /** the route internal normalized string representing the normalized path. */
+    fingerprint: string;
+
+    auth: {
+        /**
+         * Validates a request against the route's authentication access configuration, where:
+         * @param request - the request object.
+         * @return Return value: true if the request would have passed the route's access requirements.
+         * Note that the route's authentication mode and strategies are ignored. The only match is made between the request.auth.credentials scope and entity information and the route access configuration.
+         * If the route uses dynamic scopes, the scopes are constructed against the request.query, request.params, request.payload, and request.auth.credentials which may or may not match between the route and the request's route. If this method is called using a request that has not been authenticated (yet or not at all), it will return false if the route requires any authentication.
+         * [See docs](https://hapijs.com/api/17.0.1#-requestrouteauthaccessrequest)
+         */
+        access(request: Request): boolean;
+    }
+
+}
diff --git a/types/hapi/definitions/request/request.d.ts b/types/hapi/definitions/request/request.d.ts
new file mode 100644
index 0000000000..f04a57be96
--- /dev/null
+++ b/types/hapi/definitions/request/request.d.ts
@@ -0,0 +1,224 @@
+import * as stream from "stream";
+import * as url from "url";
+import * as http from "http";
+import * as Podium from "podium";
+import {ApplicationState, PluginsStates, RequestAuth, RequestEvents, RequestInfo, RequestRoute, ResponseObject, ResponseValue, Server, Util} from "hapi";
+
+/**
+ * An object containing the values of params, query, and payload before any validation modifications made. Only set when input validation is performed.
+ * For context [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-requestorig)
+ */
+export interface RequestOrig {
+    params: object;
+    query: object;
+    payload: object;
+}
+
+export interface RequestLog {
+    request: string;
+    timestamp: number;
+    tags: string[];
+    data: string | object;
+    channel: string;
+}
+
+/**
+ * The request object is created internally for each incoming request. It is not the same object received from the node
+ * HTTP server callback (which is available via [request.raw.req](https://github.com/hapijs/hapi/blob/master/API.md#request.raw)). The request properties change throughout
+ * the request [lifecycle](https://github.com/hapijs/hapi/blob/master/API.md#request-lifecycle).
+ */
+export interface Request extends Podium {
+
+    /**
+     * Application-specific state. Provides a safe place to store application data without potential conflicts with the framework. Should not be used by plugins which should use plugins[name].
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-requestapp)
+     */
+    app: ApplicationState;
+
+    /**
+     * Authentication information:
+     * * artifacts - an artifact object received from the authentication strategy and used in authentication-related actions.
+     * * credentials - the credential object received during the authentication process. The presence of an object does not mean successful authentication.
+     * * error - the authentication error is failed and mode set to 'try'.
+     * * isAuthenticated - true if the request has been successfully authenticated, otherwise false.
+     * * isAuthorized - true is the request has been successfully authorized against the route authentication access configuration. If the route has not access rules defined or if the request failed authorization, set to false.
+     * * mode - the route authentication mode.
+     * * strategy - the name of the strategy used.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-requestauth)
+     */
+    readonly auth: RequestAuth;
+
+    /**
+     * Access: read only and the public podium interface.
+     * The request.events supports the following events:
+     * * 'peek' - emitted for each chunk of payload data read from the client connection. The event method signature is function(chunk, encoding).
+     * * 'finish' - emitted when the request payload finished reading. The event method signature is function ().
+     * * 'disconnect' - emitted when a request errors or aborts unexpectedly.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-requestevents)
+     */
+    events: RequestEvents;
+
+    /**
+     * The raw request headers (references request.raw.req.headers).
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-requestheaders)
+     */
+    readonly headers: Util.Dictionary<string>;
+
+    /**
+     * Request information:
+     * * acceptEncoding - the request preferred encoding.
+     * * cors - if CORS is enabled for the route, contains the following:
+     * * isOriginMatch - true if the request 'Origin' header matches the configured CORS restrictions. Set to false if no 'Origin' header is found or if it does not match. Note that this is only available after the 'onRequest' extension point as CORS is configured per-route and no routing decisions are made at that point in the request lifecycle.
+     * * host - content of the HTTP 'Host' header (e.g. 'example.com:8080').
+     * * hostname - the hostname part of the 'Host' header (e.g. 'example.com').
+     * * id - a unique request identifier (using the format '{now}:{connection.info.id}:{5 digits counter}').
+     * * received - request reception timestamp.
+     * * referrer - content of the HTTP 'Referrer' (or 'Referer') header.
+     * * remoteAddress - remote client IP address.
+     * * remotePort - remote client port.
+     * * responded - request response timestamp (0 is not responded yet).
+     * Note that the request.info object is not meant to be modified.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-requestinfo)
+     */
+    readonly info: RequestInfo;
+
+    /**
+     * An array containing the logged request events.
+     * Note that this array will be empty if route log.collect is set to false.
+     */
+    readonly logs: RequestLog[];
+
+    /**
+     * The request method in lower case (e.g. 'get', 'post').
+     */
+    readonly method: Util.HTTP_METHODS_PARTIAL_LOWERCASE;
+
+    /**
+     * The parsed content-type header. Only available when payload parsing enabled and no payload error occurred.
+     */
+    readonly mime: string;
+
+    /**
+     * An object containing the values of params, query, and payload before any validation modifications made. Only set when input validation is performed.
+     */
+    readonly orig: RequestOrig;
+
+    /**
+     * An object where each key is a path parameter name with matching value as described in [Path parameters](https://github.com/hapijs/hapi/blob/master/API.md#path-parameters).
+     */
+    readonly params: Util.Dictionary<string>;
+
+    /**
+     * An array containing all the path params values in the order they appeared in the path.
+     */
+    readonly paramsArray: string[];
+
+    /**
+     * The request URI's pathname component.
+     */
+    readonly path: string;
+
+    /**
+     * The request payload based on the route payload.output and payload.parse settings.
+     * TODO check this typing and add references / links.
+     */
+    readonly payload: stream.Readable | Buffer | string | object;
+
+    /**
+     * Plugin-specific state. Provides a place to store and pass request-level plugin data. The plugins is an object where each key is a plugin name and the value is the state.
+     */
+    plugins: PluginsStates;
+
+    /**
+     * An object where each key is the name assigned by a route pre-handler methods function. The values are the raw values provided to the continuation function as argument. For the wrapped response object, use responses.
+     */
+    readonly pre: Util.Dictionary<object>;
+
+    /**
+     * Access: read / write (see limitations below).
+     * The response object when set. The object can be modified but must not be assigned another object. To replace the response with another from within an extension point, use reply(response) to override with a different response. Contains null when no response has been set (e.g. when a request terminates prematurely when the client disconnects).
+     */
+    response: ResponseObject | null;
+
+    /**
+     * Same as pre but represented as the response object created by the pre method.
+     */
+    readonly preResponses: Util.Dictionary<object>;
+
+    /**
+     * By default the object outputted from node's URL parse() method. Might also be set indirectly via request.setUrl in which case it may be a string (if url is set to an object with the query attribute as an unparsed string).
+     */
+    readonly query: any;
+
+    /**
+     * An object containing the Node HTTP server objects. Direct interaction with these raw objects is not recommended.
+     * * req - the node request object.
+     * * res - the node response object.
+     */
+    readonly raw: {
+        req: http.IncomingMessage;
+        res: http.ServerResponse;
+    };
+
+    /**
+     * The request route information object and method
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-requestroute)
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-requestrouteauthaccessrequest)
+     */
+    readonly route: RequestRoute;
+
+    /**
+     * Access: read only and the public server interface.
+     * The server object.
+     */
+    server: Server;
+
+    /**
+     * An object containing parsed HTTP state information (cookies) where each key is the cookie name and value is the matching cookie content after processing using any registered cookie definition.
+     */
+    readonly state: Util.Dictionary<any>;
+
+    /**
+     * The parsed request URI.
+     */
+    readonly url: url.Url;
+
+    /**
+     * Returns a response which you can pass into the reply interface where:
+     * @param source - the value to set as the source of the reply interface, optional.
+     * @param options - options for the method, optional.
+     * @return ResponseObject
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-requestgenerateresponsesource-options)
+     */
+    generateResponse(source: string | object | null, options?: {variety?: string; prepare?: (response: ResponseObject) => Promise<ResponseObject>; marshal?: (response: ResponseObject) => Promise<ResponseValue>; close?: (response: ResponseObject) => void; }): ResponseObject;
+
+    /**
+     * Logs request-specific events. When called, the server emits a 'request' event which can be used by other listeners or plugins. The arguments are:
+     * @param tags - a string or an array of strings (e.g. ['error', 'database', 'read']) used to identify the event. Tags are used instead of log levels and provide a much more expressive mechanism for describing and filtering events.
+     * @param data - (optional) an message string or object with the application data being logged. If data is a function, the function signature is function() and it called once to generate (return value) the actual data emitted to the listeners.
+     * Any logs generated by the server internally will be emitted only on the 'request-internal' channel and will include the event.internal flag set to true.
+     * @return void
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-requestlogtags-data)
+     */
+    log(tags: string | string[], data?: string | object | (() => string | object)): void;
+
+    /**
+     * Changes the request method before the router begins processing the request where:
+     * @param method - is the request HTTP method (e.g. 'GET').
+     * @return void
+     * Can only be called from an 'onRequest' extension method.
+     * [See docs](https://hapijs.com/api/17.0.1#-requestsetmethodmethod)
+     */
+    setMethod(method: Util.HTTP_METHODS_PARTIAL): void;
+
+    /**
+     * Changes the request URI before the router begins processing the request where:
+     * Can only be called from an 'onRequest' extension method.
+     * @param url - the new request URI. If url is a string, it is parsed with node's URL parse() method with parseQueryString set to true. url can also be set to an object compatible with node's URL parse() method output.
+     * @param stripTrailingSlash - if true, strip the trailing slash from the path. Defaults to false.
+     * @return void
+     * [See docs](https://hapijs.com/api/17.0.1#-requestseturlurl-striptrailingslash)
+     */
+    setUrl(url: string | url.URL, stripTrailingSlash?: boolean): void;
+
+}
diff --git a/types/hapi/definitions/response/response-events.d.ts b/types/hapi/definitions/response/response-events.d.ts
new file mode 100644
index 0000000000..b31fe0c21e
--- /dev/null
+++ b/types/hapi/definitions/response/response-events.d.ts
@@ -0,0 +1,29 @@
+import * as Podium from "podium";
+import {PeekListener} from "hapi";
+
+/**
+ * Access: read only and the public podium interface.
+ * The response.events object supports the following events:
+ * * 'peek' - emitted for each chunk of data written back to the client connection. The event method signature is function(chunk, encoding).
+ * * 'finish' - emitted when the response finished writing but before the client response connection is ended. The event method signature is function ().
+ * [See docs](https://hapijs.com/api/17.0.1#-responseevents)
+ */
+export interface ResponseEvents extends Podium {
+
+    /**
+     * 'peek' - emitted for each chunk of data written back to the client connection. The event method signature is function(chunk, encoding).
+     * 'finish' - emitted when the response finished writing but before the client response connection is ended. The event method signature is function ().
+     */
+    on(criteria: 'peek', listener: PeekListener): void;
+    on(criteria: 'finish', listener: () => void): void;
+    on(criteria: 'peek' | 'finish', listener: Function): void;
+
+    /**
+     * 'peek' - emitted for each chunk of data written back to the client connection. The event method signature is function(chunk, encoding).
+     * 'finish' - emitted when the response finished writing but before the client response connection is ended. The event method signature is function ().
+     */
+    once(criteria: 'peek', listener: PeekListener): void;
+    once(criteria: 'finish', listener: () => void): void;
+    once(criteria: 'peek' | 'finish', listener: Function): void;
+
+}
diff --git a/types/hapi/definitions/response/response-object.d.ts b/types/hapi/definitions/response/response-object.d.ts
new file mode 100644
index 0000000000..4382338551
--- /dev/null
+++ b/types/hapi/definitions/response/response-object.d.ts
@@ -0,0 +1,288 @@
+import * as Podium from "podium";
+import {ApplicationState, Json, Lifecycle, PluginsStates, ResponseEvents, ResponseSettings, ServerStateCookieOptions, Util} from "hapi";
+
+/**
+ * Object where:
+ *  * append - if true, the value is appended to any existing header value using separator. Defaults to false.
+ *  * separator - string used as separator when appending to an existing value. Defaults to ','.
+ *  * override - if false, the header value is not set if an existing value present. Defaults to true.
+ *  * duplicate - if false, the header value is not modified if the provided value is already included. Does not apply when append is false or if the name is 'set-cookie'. Defaults to true.
+ * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-responseheadername-value-options)
+ * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#response-object)
+ */
+export interface ResponseObjectHeaderOptions {
+    append?: boolean;
+    separator?: string;
+    override?: boolean;
+    duplicate?: boolean;
+}
+
+/**
+ * The response object contains the request response value along with various HTTP headers and flags. When a lifecycle
+ * method returns a value, the value is wrapped in a response object along with some default flags (e.g. 200 status
+ * code). In order to customize a response before it is returned, the h.response() method is provided.
+ * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#response-object)
+ * TODO, check extending from Podium is correct.  Extending because of "The response object supports the following events" [See docs](https://hapijs.com/api/17.0.1#-responseevents)
+ */
+export interface ResponseObject extends Podium {
+
+    /**
+     * Default value: {}.
+     * Application-specific state. Provides a safe place to store application data without potential conflicts with the framework. Should not be used by plugins which should use plugins[name].
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-responseapp)
+     */
+    app: ApplicationState;
+
+    /**
+     * Access: read only and the public podium interface.
+     * The response.events object supports the following events:
+     * * 'peek' - emitted for each chunk of data written back to the client connection. The event method signature is function(chunk, encoding).
+     * * 'finish' - emitted when the response finished writing but before the client response connection is ended. The event method signature is function ().
+     * [See docs](https://hapijs.com/api/17.0.1#-responseevents)
+     */
+    readonly events: ResponseEvents;
+
+    /**
+     * Default value: {}.
+     * An object containing the response headers where each key is a header field name and the value is the string header value or array of string.
+     * Note that this is an incomplete list of headers to be included with the response. Additional headers will be added once the response is prepared for transmission.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-responseheaders)
+     */
+    readonly headers: Util.Dictionary<string | string[]>;
+
+    /**
+     * Default value: {}.
+     * Plugin-specific state. Provides a place to store and pass request-level plugin data. plugins is an object where each key is a plugin name and the value is the state.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-responseplugins)
+     */
+    plugins: PluginsStates;
+
+    /**
+     * Object containing the response handling flags.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-responsesettings)
+     */
+    readonly settings: ResponseSettings;
+
+    /**
+     * The raw value returned by the lifecycle method.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-responsesource)
+     */
+    readonly source: Lifecycle.ReturnValue;
+
+    /**
+     * Default value: 200.
+     * The HTTP response status code.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-responsestatuscode)
+     */
+    readonly statusCode: number;
+
+    /**
+     * A string indicating the type of source with available values:
+     * * 'plain' - a plain response such as string, number, null, or simple object.
+     * * 'buffer' - a Buffer.
+     * * 'stream' - a Stream.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-responsevariety)
+     */
+    readonly variety: 'plain' | 'buffer' | 'stream';
+
+    /**
+     * Sets the HTTP 'Content-Length' header (to avoid chunked transfer encoding) where:
+     * @param length - the header value. Must match the actual payload size.
+     * @return Return value: the current response object.
+     * [See docs](https://hapijs.com/api/17.0.1#-responsebyteslength)
+     */
+    bytes(length: number): ResponseObject;
+
+    /**
+     * Sets the 'Content-Type' HTTP header 'charset' property where:
+     * @param charset - the charset property value.
+     * @return Return value: the current response object.
+     * [See docs](https://hapijs.com/api/17.0.1#-responsecharsetcharset)
+     */
+    charset(charset: string): ResponseObject;
+
+    /**
+     * Sets the 'Content-Type' HTTP header 'charset' property where:
+     * $param charset - the charset property value.
+     * @return Return value: the current response object.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-responsecodestatuscode)
+     */
+    code(statusCode: number): ResponseObject;
+
+    /**
+     * Sets the HTTP status message where:
+     * @param httpMessage - the HTTP status message (e.g. 'Ok' for status code 200).
+     * @return Return value: the current response object.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-responsemessagehttpmessage)
+     */
+    message(httpMessage: string): ResponseObject;
+
+    /**
+     * Sets the HTTP status code to Created (201) and the HTTP 'Location' header where:
+     * @param uri - an absolute or relative URI used as the 'Location' header value.
+     * @return Return value: the current response object.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-responsecreateduri)
+     */
+    created(uri: string): ResponseObject;
+
+    /**
+     * Sets the string encoding scheme used to serial data into the HTTP payload where:
+     * @param encoding  the encoding property value (see node Buffer encoding [See docs](https://nodejs.org/api/buffer.html#buffer_buffers_and_character_encodings)).
+     *  * 'ascii' - for 7-bit ASCII data only. This encoding is fast and will strip the high bit if set.
+     *  * 'utf8' - Multibyte encoded Unicode characters. Many web pages and other document formats use UTF-8.
+     *  * 'utf16le' - 2 or 4 bytes, little-endian encoded Unicode characters. Surrogate pairs (U+10000 to U+10FFFF) are supported.
+     *  * 'ucs2' - Alias of 'utf16le'.
+     *  * 'base64' - Base64 encoding. When creating a Buffer from a string, this encoding will also correctly accept "URL and Filename Safe Alphabet" as specified in RFC4648, Section 5.
+     *  * 'latin1' - A way of encoding the Buffer into a one-byte encoded string (as defined by the IANA in RFC1345, page 63, to be the Latin-1 supplement block and C0/C1 control codes).
+     *  * 'binary' - Alias for 'latin1'.
+     *  * 'hex' - Encode each byte as two hexadecimal characters.
+     * @return Return value: the current response object.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-responseencodingencoding)
+     */
+    encoding(encoding: 'ascii' | 'utf8' | 'utf16le' | 'ucs2' | 'base64' | 'latin1' | 'binary' | 'hex'): ResponseObject;
+
+    /**
+     * Sets the representation entity tag where:
+     * @param tag - the entity tag string without the double-quote.
+     * @param options - (optional) settings where:
+     *  * weak - if true, the tag will be prefixed with the 'W/' weak signifier. Weak tags will fail to match identical tags for the purpose of determining 304 response status. Defaults to false.
+     *  * vary - if true and content encoding is set or applied to the response (e.g 'gzip' or 'deflate'), the encoding name will be automatically added to the tag at transmission time (separated by a '-' character). Ignored when weak is true. Defaults to true.
+     * @return Return value: the current response object.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-responseetagtag-options)
+     */
+    etag(tag: string, options?: {weak: boolean, vary: boolean}): ResponseObject;
+
+    /**
+     * Sets an HTTP header where:
+     * @param name - the header name.
+     * @param value - the header value.
+     * @param options - (optional) object where:
+     *  * append - if true, the value is appended to any existing header value using separator. Defaults to false.
+     *  * separator - string used as separator when appending to an existing value. Defaults to ','.
+     *  * override - if false, the header value is not set if an existing value present. Defaults to true.
+     *  * duplicate - if false, the header value is not modified if the provided value is already included. Does not apply when append is false or if the name is 'set-cookie'. Defaults to true.
+     *  @return Return value: the current response object.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-responseheadername-value-options)
+     */
+    header(name: string, value: string, options?: ResponseObjectHeaderOptions): ResponseObject;
+
+    /**
+     * Sets the HTTP 'Location' header where:
+     * @param uri - an absolute or relative URI used as the 'Location' header value.
+     * @return Return value: the current response object.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-responselocationuri)
+     */
+    location(uri: string): ResponseObject;
+
+    /**
+     * Sets an HTTP redirection response (302) and decorates the response with additional methods, where:
+     * @param uri - an absolute or relative URI used to redirect the client to another resource.
+     * @return Return value: the current response object.
+     * Decorates the response object with the response.temporary(), response.permanent(), and response.rewritable() methods to easily change the default redirection code (302).
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-responseredirecturi)
+     */
+    redirect(uri: string): ResponseObject;
+
+    /**
+     * Sets the JSON.stringify() replacer argument where:
+     * @param method - the replacer function or array. Defaults to none.
+     * @return Return value: the current response object.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-responsereplacermethod)
+     */
+    replacer(method: Json.StringifyReplacer): ResponseObject;
+
+    /**
+     * Sets the JSON.stringify() space argument where:
+     * @param count - the number of spaces to indent nested object keys. Defaults to no indentation.
+     * @return Return value: the current response object.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-responsespacescount)
+     */
+    spaces(count: number): ResponseObject;
+
+    /**
+     * Sets an HTTP cookie where:
+     * @param name - the cookie name.
+     * @param value - the cookie value. If no options.encoding is defined, must be a string. See server.state() for supported encoding values.
+     * @param options - (optional) configuration. If the state was previously registered with the server using server.state(), the specified keys in options are merged with the default server definition.
+     * @return Return value: the current response object.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-responsestatename-value-options)
+     */
+    state(name: string, value: object | string, options?: ServerStateCookieOptions): ResponseObject;
+
+    /**
+     * Sets a string suffix when the response is process via JSON.stringify() where:
+     * @param suffix - the string suffix.
+     * @return Return value: the current response object.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-responsesuffixsuffix)
+     */
+    suffix(suffix: string): ResponseObject;
+
+    /**
+     * Overrides the default route cache expiration rule for this response instance where:
+     * @param msec - the time-to-live value in milliseconds.
+     * @return Return value: the current response object.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-responsettlmsec)
+     */
+    ttl(msec: number): ResponseObject;
+
+    /**
+     * Sets the HTTP 'Content-Type' header where:
+     * @param mimeType - is the mime type.
+     * @return Return value: the current response object.
+     * Should only be used to override the built-in default for each response type.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-responsetypemimetype)
+     */
+    type(mimeType: string): ResponseObject;
+
+    /**
+     * Clears the HTTP cookie by setting an expired value where:
+     * @param name - the cookie name.
+     * @param options - (optional) configuration for expiring cookie. If the state was previously registered with the server using server.state(), the specified options are merged with the server definition.
+     * @return Return value: the current response object.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-responseunstatename-options)
+     */
+    unstate(name: string, options?: ServerStateCookieOptions): ResponseObject;
+
+    /**
+     * Adds the provided header to the list of inputs affected the response generation via the HTTP 'Vary' header where:
+     * @param header - the HTTP request header name.
+     * @return Return value: the current response object.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-responsevaryheader)
+     */
+    vary(header: string): ResponseObject;
+
+    /**
+     * Marks the response object as a takeover response.
+     * @return Return value: the current response object.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-responsetakeover)
+     */
+    takeover(): ResponseObject;
+
+    /**
+     * Sets the status code to 302 or 307 (based on the response.rewritable() setting) where:
+     * @param isTemporary - if false, sets status to permanent. Defaults to true.
+     * @return Return value: the current response object.
+     * Only available after calling the response.redirect() method.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-responsetemporaryistemporary)
+     */
+    temporary(isTemporary: boolean): ResponseObject;
+
+    /**
+     * Sets the status code to 301 or 308 (based on the response.rewritable() setting) where:
+     * @param isPermanent - if false, sets status to temporary. Defaults to true.
+     * @return Return value: the current response object.
+     * Only available after calling the response.redirect() method.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-responsepermanentispermanent)
+     */
+    permanent(isPermanent: boolean): ResponseObject;
+
+    /**
+     * Sets the status code to 301/302 for rewritable (allows changing the request method from 'POST' to 'GET') or 307/308 for non-rewritable (does not allow changing the request method from 'POST' to 'GET'). Exact code based on the response.temporary() or response.permanent() setting. Arguments:
+     * @param isRewritable - if false, sets to non-rewritable. Defaults to true.
+     * @return Return value: the current response object.
+     * Only available after calling the response.redirect() method.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-responserewritableisrewritable)
+     */
+    rewritable(isRewritable: boolean): ResponseObject;
+
+}
diff --git a/types/hapi/definitions/response/response-settings.d.ts b/types/hapi/definitions/response/response-settings.d.ts
new file mode 100644
index 0000000000..0926878d1c
--- /dev/null
+++ b/types/hapi/definitions/response/response-settings.d.ts
@@ -0,0 +1,33 @@
+import {Json} from "hapi";
+
+/**
+ * Object containing the response handling flags.
+ * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-responsesettings)
+ */
+export interface ResponseSettings {
+
+    /**
+     * Defaults value: true.
+     * If true and source is a Stream, copies the statusCode and headers properties of the stream object to the outbound response.
+     */
+    readonly passThrough: boolean;
+
+    /**
+     * Default value: null (use route defaults).
+     * Override the route json options used when source value requires stringification.
+     */
+    readonly stringify: Json.StringifyArguments;
+
+    /**
+     * Default value: null (use route defaults).
+     * If set, overrides the route cache with an expiration value in milliseconds.
+     */
+    readonly ttl: number;
+
+    /**
+     * Default value: false.
+     * If true, a suffix will be automatically added to the 'ETag' header at transmission time (separated by a '-' character) when the HTTP 'Vary' header is present.
+     */
+    varyEtag: boolean;
+
+}
diff --git a/types/hapi/definitions/response/response-toolkit.d.ts b/types/hapi/definitions/response/response-toolkit.d.ts
new file mode 100644
index 0000000000..8fb64a6ea3
--- /dev/null
+++ b/types/hapi/definitions/response/response-toolkit.d.ts
@@ -0,0 +1,139 @@
+import {Request, ResponseObject, ServerRealm, ServerStateCookieOptions} from "hapi";
+
+/**
+ * See more about Lifecycle
+ * https://github.com/hapijs/hapi/blob/master/API.md#request-lifecycle
+ *
+ */
+
+export type ResponseValue = string | object;
+
+export interface AuthenticationData {
+    credentials: object;
+    artifacts?: object;
+}
+
+/**
+ * The response toolkit is a collection of properties and utilities passed to every [lifecycle method](https://github.com/hapijs/hapi/blob/master/API.md#lifecycle-methods)
+ * It is somewhat hard to define as it provides both utilities for manipulating responses as well as other information. Since the
+ * toolkit is passed as a function argument, developers can name it whatever they want. For the purpose of this
+ * document the h notation is used. It is named in the spirit of the RethinkDB r method, with h for hapi.
+ * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#response-toolkit)
+ */
+export interface ResponseToolkit {
+
+    /**
+     * A response symbol. When returned by a lifecycle method, the request lifecycle skips to the finalizing step
+     * without further interaction with the node response stream. It is the developer's responsibility to write
+     * and end the response directly via [request.raw.res](https://github.com/hapijs/hapi/blob/master/API.md#request.raw).
+     */
+    readonly abandon: symbol;
+
+    /**
+     * A response symbol. When returned by a lifecycle method, the request lifecycle skips to the finalizing step after
+     * calling request.raw.res.end()) to close the the node response stream.
+     */
+    readonly close: symbol;
+
+    /**
+     * A response symbol. Provides access to the route or server context set via the route [bind](https://github.com/hapijs/hapi/blob/master/API.md#route.options.bind)
+     * option or [server.bind()](https://github.com/hapijs/hapi/blob/master/API.md#server.bind()).
+     */
+    readonly context: any;
+
+    /**
+     * A response symbol. When returned by a lifecycle method, the request lifecycle continues without changing the response.
+     */
+    readonly continue: symbol;
+
+    /**
+     * The [server realm](https://github.com/hapijs/hapi/blob/master/API.md#server.realm) associated with the matching
+     * route. Defaults to the root server realm in the onRequest step.
+     */
+    readonly realm: ServerRealm;
+
+    /**
+     * Access: read only and public request interface.
+     * The [request] object. This is a duplication of the request lifecycle method argument used by
+     * [toolkit decorations](https://github.com/hapijs/hapi/blob/master/API.md#server.decorate()) to access the current request.
+     */
+    readonly request: Readonly<Request>
+
+    /**
+     * Used by the [authentication] method to pass back valid credentials where:
+     * @param data - an object with:
+     * * credentials - (required) object representing the authenticated entity.
+     * * artifacts - (optional) authentication artifacts object specific to the authentication scheme.
+     * @return Return value: an internal authentication object.
+     */
+    authenticated(data: AuthenticationData): object;
+
+    /**
+     * Sets the response 'ETag' and 'Last-Modified' headers and checks for any conditional request headers to decide if
+     * the response is going to qualify for an HTTP 304 (Not Modified). If the entity values match the request
+     * conditions, h.entity() returns a response object for the lifecycle method to return as its value which will
+     * set a 304 response. Otherwise, it sets the provided entity headers and returns undefined.
+     * The method argumetns are:
+     * @param options - a required configuration object with:
+     * * etag - the ETag string. Required if modified is not present. Defaults to no header.
+     * * modified - the Last-Modified header value. Required if etag is not present. Defaults to no header.
+     * * vary - same as the response.etag() option. Defaults to true.
+     * @return Return value: - a response object if the response is unmodified. - undefined if the response has changed.
+     * If undefined is returned, the developer must return a valid lifecycle method value. If a response is returned,
+     * it should be used as the return value (but may be customize using the response methods).
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-hentityoptions)
+     */
+    entity(options?: {etag?: string, modified?: string, vary?: boolean}): ResponseObject | undefined;
+
+    /**
+     * Redirects the client to the specified uri. Same as calling h.response().redirect(uri).
+     * @param url
+     * @return Returns a response object.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-hredirecturi)
+     */
+    redirect(uri?: string): ResponseObject;
+
+    /**
+     * Wraps the provided value and returns a response object which allows customizing the response
+     * (e.g. setting the HTTP status code, custom headers, etc.), where:
+     * @param value - (optional) return value. Defaults to null.
+     * @return Returns a response object.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-hresponsevalue)
+     */
+    response(value?: ResponseValue): ResponseObject;
+
+    /**
+     * Sets a response cookie using the same arguments as response.state().
+     * @param name of the cookie
+     * @param value of the cookie
+     * @param (optional) ServerStateCookieOptions object.
+     * @return Return value: none.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-hstatename-value-options)
+     */
+    state(name: string, value: string, options?: ServerStateCookieOptions): void;
+
+    /**
+     * Used by the [authentication] method to indicate authentication failed and pass back the credentials received where:
+     * @param error - (required) the authentication error.
+     * @param data - (optional) an object with:
+     * * credentials - (required) object representing the authenticated entity.
+     * * artifacts - (optional) authentication artifacts object specific to the authentication scheme.
+     * @return void.
+     * The method is used to pass both the authentication error and the credentials. For example, if a request included
+     * expired credentials, it allows the method to pass back the user information (combined with a 'try'
+     * authentication mode) for error customization.
+     * There is no difference between throwing the error or passing it with the h.unauthenticated() method is no credentials are passed, but it might still be helpful for code clarity.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-hunauthenticatederror-data)
+     */
+    unauthenticated(error: Error, data?: AuthenticationData): void;
+
+    /**
+     * Clears a response cookie using the same arguments as
+     * @param name of the cookie
+     * @param options (optional) ServerStateCookieOptions object.
+     * @return void.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-hunstatename-options)
+     */
+    unstate(name: string, options?: ServerStateCookieOptions): void;
+
+}
diff --git a/types/hapi/definitions/route/route-options-access.d.ts b/types/hapi/definitions/route/route-options-access.d.ts
new file mode 100644
index 0000000000..2446d7b1c4
--- /dev/null
+++ b/types/hapi/definitions/route/route-options-access.d.ts
@@ -0,0 +1,82 @@
+
+export type RouteOptionsAccessScope = false | string | string[];
+
+export type RouteOptionsAccessEntity = 'any' | 'user' | 'app';
+
+export interface RouteOptionsAccessScopeObject {
+    scope: RouteOptionsAccessScope;
+}
+
+export interface RouteOptionsAccessEntityObject {
+    entity: RouteOptionsAccessEntity;
+}
+
+export type RouteOptionsAccessObject = RouteOptionsAccessScopeObject | RouteOptionsAccessEntityObject | (RouteOptionsAccessScopeObject & RouteOptionsAccessEntityObject);
+
+/**
+ * Route Authentication Options
+ */
+export interface RouteOptionsAccess {
+
+    /**
+     * Default value: none.
+     * An object or array of objects specifying the route access rules. Each rule is evaluated against an incoming request and access is granted if at least one of the rules matches. Each rule object must include at least one of scope or entity.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsauthaccess)
+     */
+    access?: RouteOptionsAccessObject | RouteOptionsAccessObject[];
+
+    /**
+     * Default value: false (no scope requirements).
+     * The application scope required to access the route. Value can be a scope string or an array of scope strings. When authenticated, the credentials object scope property must contain at least one of the scopes defined to access the route.
+     * If a scope string begins with a + character, that scope is required. If a scope string begins with a ! character, that scope is forbidden. For example, the scope ['!a', '+b', 'c', 'd'] means the incoming request credentials' scope must not include 'a', must include 'b', and must include one of 'c' or 'd'.
+     * You may also access properties on the request object (query, params, payload, and credentials) to populate a dynamic scope by using the '{' and '}' characters around the property name, such as 'user-{params.id}'.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsauthaccessscope)
+     */
+    scope?: RouteOptionsAccessScope;
+
+    /**
+     * Default value: 'any'.
+     * The required authenticated entity type. If set, must match the entity value of the request authenticated credentials. Available values:
+     * * 'any' - the authentication can be on behalf of a user or application.
+     * * 'user' - the authentication must be on behalf of a user which is identified by the presence of a 'user' attribute in the credentials object returned by the authentication strategy.
+     * * 'app' - the authentication must be on behalf of an application which is identified by the lack of presence of a user attribute in the credentials object returned by the authentication strategy.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsauthaccessentity)
+     */
+    entity?: RouteOptionsAccessEntity;
+
+    /**
+     * Default value: 'required'.
+     * The authentication mode. Available values:
+     * * 'required' - authentication is required.
+     * * 'optional' - authentication is optional - the request must include valid credentials or no credentials at all.
+     * * 'try' - similar to 'optional', any request credentials are attempted authentication, but if the credentials are invalid, the request proceeds regardless of the authentication error.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsauthmode)
+     */
+    mode?: 'required' | 'optional' | 'try';
+
+    /**
+     * Default value: false, unless the scheme requires payload authentication.
+     * If set, the incoming request payload is authenticated after it is processed. Requires a strategy with payload authentication support (e.g. Hawk). Cannot be set to a value other than 'required' when the scheme sets the authentication options.payload to true.
+     * Available values:
+     * * false - no payload authentication.
+     * * 'required' - payload authentication required.
+     * * 'optional' - payload authentication performed only when the client includes payload authentication information (e.g. hash attribute in Hawk).
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsauthpayload)
+     */
+    payload?: false | 'required' | 'optional';
+
+    /**
+     * Default value: the default strategy set via server.auth.default().
+     * An array of string strategy names in the order they should be attempted. Cannot be used together with strategy.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsauthstrategies)
+     */
+    strategies?: string[];
+
+    /**
+     * Default value: the default strategy set via server.auth.default().
+     * A string strategy names. Cannot be used together with strategies.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsauthstrategy)
+     */
+    strategy?: string;
+
+}
diff --git a/types/hapi/definitions/route/route-options-cache.d.ts b/types/hapi/definitions/route/route-options-cache.d.ts
new file mode 100644
index 0000000000..1b17ee4e96
--- /dev/null
+++ b/types/hapi/definitions/route/route-options-cache.d.ts
@@ -0,0 +1,27 @@
+/**
+ * Values are:
+ * * * 'default' - no privacy flag.
+ * * * 'public' - mark the response as suitable for public caching.
+ * * * 'private' - mark the response as suitable only for private caching.
+ * * expiresIn - relative expiration expressed in the number of milliseconds since the item was saved in the cache. Cannot be used together with expiresAt.
+ * * expiresAt - time of day expressed in 24h notation using the 'HH:MM' format, at which point all cache records for the route expire. Cannot be used together with expiresIn.
+ * * statuses - an array of HTTP response status code numbers (e.g. 200) which are allowed to include a valid caching directive.
+ * * otherwise - a string with the value of the 'Cache-Control' header when caching is disabled.
+ * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionscache)
+ */
+export type RouteOptionsCache = {
+    privacy?: 'default' | 'public' | 'privacy';
+    statuses?: number[];
+    otherwise?: string;
+} & (
+    {
+    expiresIn?: number;
+    expiresAt?: undefined;
+    } | {
+    expiresIn?: undefined;
+    expiresAt?: string;
+    } | {
+    expiresIn?: undefined;
+    expiresAt?: undefined;
+    }
+);
diff --git a/types/hapi/definitions/route/route-options-cors.d.ts b/types/hapi/definitions/route/route-options-cors.d.ts
new file mode 100644
index 0000000000..8264680ec8
--- /dev/null
+++ b/types/hapi/definitions/route/route-options-cors.d.ts
@@ -0,0 +1,42 @@
+/**
+ * Default value: false (no CORS headers).
+ * The Cross-Origin Resource Sharing protocol allows browsers to make cross-origin API calls. CORS is required by web applications running inside a browser which are loaded from a different domain than the API server. To enable, set cors to true, or to an object with the following options:
+ * * origin - an array of allowed origin servers strings ('Access-Control-Allow-Origin'). The array can contain any combination of fully qualified origins along with origin strings containing a wildcard '*' character, or a single '*' origin string. If set to 'ignore', any incoming Origin header is ignored (present or not) and the 'Access-Control-Allow-Origin' header is set to '*'. Defaults to any origin ['*'].
+ * * maxAge - number of seconds the browser should cache the CORS response ('Access-Control-Max-Age'). The greater the value, the longer it will take before the browser checks for changes in policy. Defaults to 86400 (one day).
+ * * headers - a strings array of allowed headers ('Access-Control-Allow-Headers'). Defaults to ['Accept', 'Authorization', 'Content-Type', 'If-None-Match'].
+ * * additionalHeaders - a strings array of additional headers to headers. Use this to keep the default headers in place.
+ * * exposedHeaders - a strings array of exposed headers ('Access-Control-Expose-Headers'). Defaults to ['WWW-Authenticate', 'Server-Authorization'].
+ * * additionalExposedHeaders - a strings array of additional headers to exposedHeaders. Use this to keep the default headers in place.
+ * * credentials - if true, allows user credentials to be sent ('Access-Control-Allow-Credentials'). Defaults to false.
+ * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionscors)
+ */
+export interface RouteOptionsCors {
+    /**
+     * an array of allowed origin servers strings ('Access-Control-Allow-Origin'). The array can contain any combination of fully qualified origins along with origin strings containing a wildcard '*' character, or a single '*' origin string. If set to 'ignore', any incoming Origin header is ignored (present or not) and the 'Access-Control-Allow-Origin' header is set to '*'. Defaults to any origin ['*'].
+     */
+    origin?: string[] | '*'| 'ignore';
+    /**
+     * number of seconds the browser should cache the CORS response ('Access-Control-Max-Age'). The greater the value, the longer it will take before the browser checks for changes in policy. Defaults to 86400 (one day).
+     */
+    maxAge?: number;
+    /**
+     * a strings array of allowed headers ('Access-Control-Allow-Headers'). Defaults to ['Accept', 'Authorization', 'Content-Type', 'If-None-Match'].
+     */
+    headers?: string[];
+    /**
+     * a strings array of additional headers to headers. Use this to keep the default headers in place.
+     */
+    additionalHeaders?: string[];
+    /**
+     * a strings array of exposed headers ('Access-Control-Expose-Headers'). Defaults to ['WWW-Authenticate', 'Server-Authorization'].
+     */
+    exposedHeaders?: string[];
+    /**
+     * a strings array of additional headers to exposedHeaders. Use this to keep the default headers in place.
+     */
+    additionalExposedHeaders?: string[];
+    /**
+     * if true, allows user credentials to be sent ('Access-Control-Allow-Credentials'). Defaults to false.
+     */
+    credentials?: boolean;
+}
diff --git a/types/hapi/definitions/route/route-options-payload.d.ts b/types/hapi/definitions/route/route-options-payload.d.ts
new file mode 100644
index 0000000000..a13db35c32
--- /dev/null
+++ b/types/hapi/definitions/route/route-options-payload.d.ts
@@ -0,0 +1,122 @@
+import {Lifecycle, Util} from "hapi";
+
+/**
+ * The value must be one of:
+ * * 'data' - the incoming payload is read fully into memory. If parse is true, the payload is parsed (JSON, form-decoded, multipart) based on the 'Content-Type' header. If parse is false, a raw Buffer is returned.
+ * * 'stream' - the incoming payload is made available via a Stream.Readable interface. If the payload is 'multipart/form-data' and parse is true, field values are presented as text while files are provided as streams. File streams from a 'multipart/form-data' upload will also have a hapi property containing the filename and headers properties. Note that payload streams for multipart payloads are a synthetic interface created on top of the entire mutlipart content loaded into memory. To avoid loading large multipart payloads into memory, set parse to false and handle the multipart payload in the handler using a streaming parser (e.g. pez).
+ * * 'file' - the incoming payload is written to temporary file in the directory specified by the uploads settings. If the payload is 'multipart/form-data' and parse is true, field values are presented as text while files are saved to disk. Note that it is the sole responsibility of the application to clean up the files generated by the framework. This can be done by keeping track of which files are used (e.g. using the request.app object), and listening to the server 'response' event to perform cleanup.
+ * For context [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionspayloadoutput)
+ */
+export type PayloadOutput = 'data' | 'stream' | 'file';
+
+/**
+  * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionspayloadcompression)
+ */
+export type PayloadCompressionDecoderSettings = object;
+
+/**
+ * Determines how the request payload is processed.
+ * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionspayload)
+ */
+export interface RouteOptionsPayload {
+
+    /**
+     * Default value: allows parsing of the following mime types:
+     * * application/json
+     * * application/*+json
+     * * application/octet-stream
+     * * application/x-www-form-urlencoded
+     * * multipart/form-data
+     * * text/*
+     * A string or an array of strings with the allowed mime types for the endpoint. Use this settings to limit the set of allowed mime types. Note that allowing additional mime types not listed above will not enable them to be parsed, and if parse is true, the request will result in an error response.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionspayloadallow)
+     */
+    allow?: string | string[];
+
+    /**
+     * Default value: none.
+     * An object where each key is a content-encoding name and each value is an object with the desired decoder settings. Note that encoder settings are set in compression.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionspayloadcompression)
+     */
+    compression?: Util.Dictionary<PayloadCompressionDecoderSettings>;
+
+    /**
+     * Default value: 'application/json'.
+     * The default content type if the 'Content-Type' request header is missing.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionspayloaddefaultcontenttype)
+     */
+    defaultContentType?: string;
+
+    /**
+     * Default value: 'error' (return a Bad Request (400) error response).
+     * A failAction value which determines how to handle payload parsing errors.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionspayloadfailaction)
+     */
+    failAction?: Lifecycle.FailAction;
+
+    /**
+     * Default value: 1048576 (1MB).
+     * Limits the size of incoming payloads to the specified byte count. Allowing very large payloads may cause the server to run out of memory.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionspayloadmaxbytes)
+     */
+    maxBytes?: number;
+
+    /**
+     * Default value: none.
+     * Overrides payload processing for multipart requests. Value can be one of:
+     * * false - disable multipart processing.
+     * an object with the following required options:
+     * * output - same as the output option with an additional value option:
+     * * * annotated - wraps each multipart part in an object with the following keys: // TODO type this?
+     * * * * headers - the part headers.
+     * * * * filename - the part file name.
+     * * * * payload - the processed part payload.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionspayloadmultipart)
+     */
+    multipart?: false | {
+        output: PayloadOutput | 'annotated';
+    };
+
+    /**
+     * Default value: 'data'.
+     * The processed payload format. The value must be one of:
+     * * 'data' - the incoming payload is read fully into memory. If parse is true, the payload is parsed (JSON, form-decoded, multipart) based on the 'Content-Type' header. If parse is false, a raw Buffer is returned.
+     * * 'stream' - the incoming payload is made available via a Stream.Readable interface. If the payload is 'multipart/form-data' and parse is true, field values are presented as text while files are provided as streams. File streams from a 'multipart/form-data' upload will also have a hapi property containing the filename and headers properties. Note that payload streams for multipart payloads are a synthetic interface created on top of the entire mutlipart content loaded into memory. To avoid loading large multipart payloads into memory, set parse to false and handle the multipart payload in the handler using a streaming parser (e.g. pez).
+     * * 'file' - the incoming payload is written to temporary file in the directory specified by the uploads settings. If the payload is 'multipart/form-data' and parse is true, field values are presented as text while files are saved to disk. Note that it is the sole responsibility of the application to clean up the files generated by the framework. This can be done by keeping track of which files are used (e.g. using the request.app object), and listening to the server 'response' event to perform cleanup.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionspayloadoutput)
+     */
+    output?: PayloadOutput;
+
+    /**
+     * Default value: none.
+     * A mime type string overriding the 'Content-Type' header value received.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionspayloadoverride)
+     */
+    override?: string;
+
+    /**
+     * Default value: true.
+     * Determines if the incoming payload is processed or presented raw. Available values:
+     * * true - if the request 'Content-Type' matches the allowed mime types set by allow (for the whole payload as well as parts), the payload is converted into an object when possible. If the format is unknown, a Bad Request (400) error response is sent. Any known content encoding is decoded.
+     * * false - the raw payload is returned unmodified.
+     * * 'gunzip' - the raw payload is returned unmodified after any known content encoding is decoded.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionspayloadparse)
+     */
+    parse?: boolean | 'gunzip';
+
+    /**
+     * Default value: to 10000 (10 seconds).
+     * Payload reception timeout in milliseconds. Sets the maximum time allowed for the client to transmit the request payload (body) before giving up and responding with a Request Timeout (408) error response.
+     * Set to false to disable.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionspayloadtimeout)
+     */
+    timeout?: false | number;
+
+    /**
+     * Default value: os.tmpdir().
+     * The directory used for writing file uploads.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionspayloaduploads)
+     */
+    uploads?: string;
+
+}
diff --git a/types/hapi/definitions/route/route-options-pre.d.ts b/types/hapi/definitions/route/route-options-pre.d.ts
new file mode 100644
index 0000000000..8745bf5a00
--- /dev/null
+++ b/types/hapi/definitions/route/route-options-pre.d.ts
@@ -0,0 +1,33 @@
+import {Lifecycle} from "hapi";
+
+/**
+ * For context [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionspre)
+ */
+export type RouteOptionsPreArray = RouteOptionsPreAllOptions[];
+
+/**
+ * For context [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionspre)
+ */
+export type RouteOptionsPreAllOptions = RouteOptionsPreObject | RouteOptionsPreObject[] | Lifecycle.Method;
+
+/**
+ * An object with:
+ * * method - a lifecycle method.
+ * * assign - key name used to assign the response of the method to in request.pre and request.preResponses.
+ * * failAction - A failAction value which determine what to do when a pre-handler method throws an error. If assign is specified and the failAction setting is not 'error', the error will be assigned.
+ * For context [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionspre)
+ */
+export interface RouteOptionsPreObject {
+    /**
+     * a lifecycle method.
+     */
+    method: Lifecycle.Method;
+    /**
+     * key name used to assign the response of the method to in request.pre and request.preResponses.
+     */
+    assign: string;
+    /**
+     * A failAction value which determine what to do when a pre-handler method throws an error. If assign is specified and the failAction setting is not 'error', the error will be assigned.
+     */
+    failAction?: Lifecycle.FailAction;
+}
diff --git a/types/hapi/definitions/route/route-options-response.d.ts b/types/hapi/definitions/route/route-options-response.d.ts
new file mode 100644
index 0000000000..b0c3925bfe
--- /dev/null
+++ b/types/hapi/definitions/route/route-options-response.d.ts
@@ -0,0 +1,76 @@
+import {Lifecycle, Util} from "hapi";
+import {ValidationOptions} from "joi";
+
+export type RouteOptionsResponseSchema = boolean | ValidationOptions | ((value: object | Buffer | string, options: ValidationOptions) => Promise<any>);
+
+/**
+ * Processing rules for the outgoing response.
+ * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsresponse)
+ */
+export interface RouteOptionsResponse {
+
+    /**
+     * Default value: 200.
+     * The default HTTP status code when the payload is considered empty. Value can be 200 or 204. Note that a 200 status code is converted to a 204 only at the time of response transmission (the response status code will remain 200 throughout the request lifecycle unless manually set).
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsresponseemptystatuscode)
+     */
+    emptyStatusCode?: 200 | 204;
+
+    /**
+     * Default value: 'error' (return an Internal Server Error (500) error response).
+     * A failAction value which defines what to do when a response fails payload validation.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsresponsefailaction)
+     */
+    failAction?: Lifecycle.FailAction;
+
+    /**
+     * Default value: false.
+     * If true, applies the validation rule changes to the response payload.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsresponsemodify)
+     */
+    modify?: boolean;
+
+    /**
+     * Default value: none.
+     * [joi](http://github.com/hapijs/joi) options object pass to the validation function. Useful to set global options such as stripUnknown or abortEarly (the complete list is available here). If a custom validation function is defined via schema or status then options can an arbitrary object that will be passed to this function as the second argument.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsresponseoptions)
+     */
+    options?: ValidationOptions; // TODO needs validation
+
+    /**
+     * Default value: true.
+     * If false, payload range support is disabled.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsresponseranges)
+     */
+    ranges?: boolean;
+
+    /**
+     * Default value: 100 (all responses).
+     * The percent of response payloads validated (0 - 100). Set to 0 to disable all validation.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsresponsesample)
+     */
+    sample?: number;
+
+    /**
+     * Default value: true (no validation).
+     * The default response payload validation rules (for all non-error responses) expressed as one of:
+     * * true - any payload allowed (no validation).
+     * * false - no payload allowed.
+     * * a joi validation object. The options along with the request context ({ headers, params, query, payload, app, auth }) are passed to the validation function.
+     * * a validation function using the signature async function(value, options) where:
+     * * * value - the pending response payload.
+     * * * options - The options along with the request context ({ headers, params, query, payload, app, auth }).
+     * * * if the function returns a value and modify is true, the value is used as the new response. If the original response is an error, the return value is used to override the original error output.payload. If an error is thrown, the error is processed according to failAction.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsresponseschema)
+     */
+    schema?: RouteOptionsResponseSchema;
+
+    /**
+     * Default value: none.
+     * Validation schemas for specific HTTP status codes. Responses (excluding errors) not matching the listed status codes are validated using the default schema.
+     * status is set to an object where each key is a 3 digit HTTP status code and the value has the same definition as schema.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsresponsestatus)
+     */
+    status?: Util.Dictionary<RouteOptionsResponseSchema>;
+
+}
diff --git a/types/hapi/definitions/route/route-options-secure.d.ts b/types/hapi/definitions/route/route-options-secure.d.ts
new file mode 100644
index 0000000000..669d1371ed
--- /dev/null
+++ b/types/hapi/definitions/route/route-options-secure.d.ts
@@ -0,0 +1,74 @@
+/**
+ * Default value: false (security headers disabled).
+ * Sets common security headers. To enable, set security to true or to an object with the following options:
+ * * hsts - controls the 'Strict-Transport-Security' header, where:
+ * * * true - the header will be set to max-age=15768000. This is the default value.
+ * * * a number - the maxAge parameter will be set to the provided value.
+ * * * an object with the following fields:
+ * * * * maxAge - the max-age portion of the header, as a number. Default is 15768000.
+ * * * * includeSubDomains - a boolean specifying whether to add the includeSubDomains flag to the header.
+ * * * * preload - a boolean specifying whether to add the 'preload' flag (used to submit domains inclusion in Chrome's HTTP Strict Transport Security (HSTS) preload list) to the header.
+ * * xframe - controls the 'X-Frame-Options' header, where:
+ * * * true - the header will be set to 'DENY'. This is the default value.
+ * * * 'deny' - the headers will be set to 'DENY'.
+ * * * 'sameorigin' - the headers will be set to 'SAMEORIGIN'.
+ * * * an object for specifying the 'allow-from' rule, where:
+ * * * * rule - one of:
+ * * * * * 'deny'
+ * * * * * 'sameorigin'
+ * * * * * 'allow-from'
+ * * * * source - when rule is 'allow-from' this is used to form the rest of the header, otherwise this field is ignored. If rule is 'allow-from' but source is unset, the rule will be automatically changed to 'sameorigin'.
+ * * xss - boolean that controls the 'X-XSS-PROTECTION' header for Internet Explorer. Defaults to true which sets the header to equal '1; mode=block'.
+ *       Note: this setting can create a security vulnerability in versions of Internet Exploere below 8, as well as unpatched versions of IE8. See here and here for more information. If you actively support old versions of IE, it may be wise to explicitly set this flag to false.
+ * * noOpen - boolean controlling the 'X-Download-Options' header for Internet Explorer, preventing downloads from executing in your context. Defaults to true setting the header to 'noopen'.
+ * * noSniff - boolean controlling the 'X-Content-Type-Options' header. Defaults to true setting the header to its only and default option, 'nosniff'.
+ * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionssecurity)
+ */
+export interface RouteOptionsSecureObject {
+    /**
+     * hsts - controls the 'Strict-Transport-Security' header
+     */
+    hsts?: boolean | number | {
+        /**
+         * the max-age portion of the header, as a number. Default is 15768000.
+         */
+        maxAge: number;
+        /**
+         * a boolean specifying whether to add the includeSubDomains flag to the header.
+         */
+        includeSubdomains: boolean;
+        /**
+         * a boolean specifying whether to add the 'preload' flag (used to submit domains inclusion in Chrome's HTTP Strict Transport Security (HSTS) preload list) to the header.
+         */
+        preload: boolean;
+    };
+    /**
+     * controls the 'X-Frame-Options' header
+     */
+    xframe?: true | 'deny' | 'sameorigin' | {
+        /**
+         * an object for specifying the 'allow-from' rule,
+         */
+        rule: 'deny' | 'sameorigin' | 'allow-from';
+        /**
+         * when rule is 'allow-from' this is used to form the rest of the header, otherwise this field is ignored. If rule is 'allow-from' but source is unset, the rule will be automatically changed to 'sameorigin'.
+         */
+        source: string;
+    };
+    /**
+     * boolean that controls the 'X-XSS-PROTECTION' header for Internet Explorer. Defaults to true which sets the header to equal '1; mode=block'.
+     * Note: this setting can create a security vulnerability in versions of Internet Exploere below 8, as well as unpatched versions of IE8. See here and here for more information. If you actively support old versions of IE, it may be wise to explicitly set this flag to false.
+     */
+    xss: boolean;
+    /**
+     * boolean controlling the 'X-Download-Options' header for Internet Explorer, preventing downloads from executing in your context. Defaults to true setting the header to 'noopen'.
+     */
+    noOpen?: boolean;
+    /**
+     * boolean controlling the 'X-Content-Type-Options' header. Defaults to true setting the header to its only and default option, 'nosniff'.
+     */
+    noSniff?: boolean;
+}
+
+
+export type RouteOptionsSecure = boolean | RouteOptionsSecureObject;
diff --git a/types/hapi/definitions/route/route-options-validate.d.ts b/types/hapi/definitions/route/route-options-validate.d.ts
new file mode 100644
index 0000000000..7fa61d5bef
--- /dev/null
+++ b/types/hapi/definitions/route/route-options-validate.d.ts
@@ -0,0 +1,92 @@
+import {Lifecycle, RouteOptionsResponseSchema} from "hapi";
+import {ValidationOptions} from "joi";
+
+/**
+ * Default value: { headers: true, params: true, query: true, payload: true, failAction: 'error' }.
+ * Request input validation rules for various request components.
+ * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsvalidate)
+ */
+export interface RouteOptionsValidate {
+
+    /**
+     * Default value: none.
+     * An optional object with error fields copied into every validation error response.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsvalidateerrorfields)
+     */
+    errorFields?: object;
+
+    /**
+     * Default value: 'error' (return a Bad Request (400) error response).
+     * A failAction value which determines how to handle failed validations. When set to a function, the err argument includes the type of validation error under err.output.payload.validation.source.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsvalidatefailaction)
+     */
+    failAction?: Lifecycle.FailAction;
+
+    /**
+     * Default value: true (no validation).
+     * Validation rules for incoming request headers:
+     * * true - any headers allowed (no validation performed).
+     * * a joi validation object.
+     * * a validation function using the signature async function(value, options) where:
+     * * * value - the request.headers object containing the request headers.
+     * * * options - options.
+     * * * if a value is returned, the value is used as the new request.headers value and the original value is stored in request.orig.headers. Otherwise, the headers are left unchanged. If an error is thrown, the error is handled according to failAction.
+     * Note that all header field names must be in lowercase to match the headers normalized by node.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsvalidateheaders)
+     */
+    headers?: RouteOptionsResponseSchema;
+
+    /**
+     * Default value: none.
+     * An options object passed to the joi rules or the custom validation methods. Used for setting global options such as stripUnknown or abortEarly (the complete list is available here).
+     * If a custom validation function (see headers, params, query, or payload above) is defined then options can an arbitrary object that will be passed to this function as the second parameter.
+     * The values of the other inputs (i.e. headers, query, params, payload, app, and auth) are added to the options object under the validation context (accessible in rules as Joi.ref('$query.key')).
+     * Note that validation is performed in order (i.e. headers, params, query, and payload) and if type casting is used (e.g. converting a string to a number), the value of inputs not yet validated will reflect the raw, unvalidated and unmodified values.
+     * If the validation rules for headers, params, query, and payload are defined at both the server routes level and at the route level, the individual route settings override the routes defaults (the rules are not merged).
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsvalidateparams)
+     */
+    options?: ValidationOptions | object;
+
+    /**
+     * Default value: true (no validation).
+     * Validation rules for incoming request path parameters, after matching the path against the route, extracting any parameters, and storing them in request.params, where:
+     * * true - any path parameter value allowed (no validation performed).
+     * * a joi validation object.
+     * * a validation function using the signature async function(value, options) where:
+     * * * value - the request.params object containing the request path parameters.
+     * * * options - options.
+     * if a value is returned, the value is used as the new request.params value and the original value is stored in request.orig.params. Otherwise, the path parameters are left unchanged. If an error is thrown, the error is handled according to failAction.
+     * Note that failing to match the validation rules to the route path parameters definition will cause all requests to fail.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsvalidateparams)
+     */
+    params?: RouteOptionsResponseSchema;
+
+    /**
+     * Default value: true (no validation).
+     * Validation rules for incoming request payload (request body), where:
+     * * true - any payload allowed (no validation performed). false - no payload allowed.
+     * * a joi validation object. Note that empty payloads are represented by a null value. If a validation schema is provided and empty payload are allowed, the schema must be explicitly defined by setting the rule to a joi schema with null allowed (e.g. Joi.object({  keys here  }).allow(null)).
+     * * a validation function using the signature async function(value, options) where:
+     * * * value - the request.query object containing the request query parameters.
+     * * * options - options.
+     * if a value is returned, the value is used as the new request.payload value and the original value is stored in request.orig.payload. Otherwise, the payload is left unchanged. If an error is thrown, the error is handled according to failAction.
+     * Note that validating large payloads and modifying them will cause memory duplication of the payload (since the original is kept), as well as the significant performance cost of validating large amounts of data.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsvalidatepayload)
+     */
+    payload?: RouteOptionsResponseSchema;
+
+    /**
+     * Default value: true (no validation).
+     * Validation rules for incoming request URI query component (the key-value part of the URI between '?' and '#'). The query is parsed into its individual key-value pairs, decoded, and stored in request.query prior to validation. Where:
+     * * true - any query parameter value allowed (no validation performed). false - no query parameter value allowed.
+     * * a joi validation object.
+     * * a validation function using the signature async function(value, options) where:
+     * * * value - the request.query object containing the request query parameters.
+     * * * options - options.
+     * if a value is returned, the value is used as the new request.query value and the original value is stored in request.orig.query. Otherwise, the query parameters are left unchanged. If an error is thrown, the error is handled according to failAction.
+     * Note that changes to the query parameters will not be reflected in request.url.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsvalidatequery)
+     */
+    query?: RouteOptionsResponseSchema;
+
+}
diff --git a/types/hapi/definitions/route/route-options.d.ts b/types/hapi/definitions/route/route-options.d.ts
new file mode 100644
index 0000000000..e66668c75c
--- /dev/null
+++ b/types/hapi/definitions/route/route-options.d.ts
@@ -0,0 +1,284 @@
+import {
+    Json,
+    Lifecycle,
+    PluginSpecificConfiguration,
+    RouteOptionsAccess,
+    RouteOptionsCache,
+    RouteOptionsCors,
+    RouteOptionsPayload,
+    RouteOptionsPreArray,
+    RouteOptionsResponse,
+    RouteOptionsSecure,
+    RouteOptionsValidate,
+    Util
+} from "hapi";
+
+/**
+ * For context [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionscompression)
+ * For context [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverencoderencoding-encoder)
+ */
+export type RouteCompressionEncoderSettings = object;
+
+/**
+ * Each route can be customized to change the default behavior of the request lifecycle.
+ * For context [See docs](https://github.com/hapijs/hapi/blob/master/API.md#route-options)
+ */
+export interface RouteOptions {
+
+    /**
+     * Application-specific route configuration state. Should not be used by plugins which should use options.plugins[name] instead.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsapp)
+     */
+    app?: any;
+
+    /**
+     * Route authentication configuration. Value can be:
+     * false to disable authentication if a default strategy is set.
+     * a string with the name of an authentication strategy registered with server.auth.strategy(). The strategy will be set to 'required' mode.
+     * an authentication configuration object.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsapp)
+     */
+    auth?: false | string | RouteOptionsAccess;
+
+    /**
+     * Default value: null.
+     * An object passed back to the provided handler (via this) when called. Ignored if the method is an arrow function.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsbind)
+     */
+    bind?: object | null;
+
+    /**
+     * Default value: { privacy: 'default', statuses: [200], otherwise: 'no-cache' }.
+     * If the route method is 'GET', the route can be configured to include HTTP caching directives in the response. Caching can be customized using an object with the following options:
+     * privacy - determines the privacy flag included in client-side caching using the 'Cache-Control' header. Values are:
+     * * * 'default' - no privacy flag.
+     * * * 'public' - mark the response as suitable for public caching.
+     * * * 'private' - mark the response as suitable only for private caching.
+     * * expiresIn - relative expiration expressed in the number of milliseconds since the item was saved in the cache. Cannot be used together with expiresAt.
+     * * expiresAt - time of day expressed in 24h notation using the 'HH:MM' format, at which point all cache records for the route expire. Cannot be used together with expiresIn.
+     * * statuses - an array of HTTP response status code numbers (e.g. 200) which are allowed to include a valid caching directive.
+     * * otherwise - a string with the value of the 'Cache-Control' header when caching is disabled.
+     * The default Cache-Control: no-cache header can be disabled by setting cache to false.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionscache)
+     */
+    cache?: false | RouteOptionsCache;
+
+    /**
+     * An object where each key is a content-encoding name and each value is an object with the desired encoder settings. Note that decoder settings are set in compression.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionscompression)
+     */
+    compression?: Util.Dictionary<RouteCompressionEncoderSettings>;
+
+    /**
+     * Default value: false (no CORS headers).
+     * The Cross-Origin Resource Sharing protocol allows browsers to make cross-origin API calls. CORS is required by web applications running inside a browser which are loaded from a different domain than the API server. To enable, set cors to true, or to an object with the following options:
+     * * origin - an array of allowed origin servers strings ('Access-Control-Allow-Origin'). The array can contain any combination of fully qualified origins along with origin strings containing a wildcard '*' character, or a single '*' origin string. If set to 'ignore', any incoming Origin header is ignored (present or not) and the 'Access-Control-Allow-Origin' header is set to '*'. Defaults to any origin ['*'].
+     * * maxAge - number of seconds the browser should cache the CORS response ('Access-Control-Max-Age'). The greater the value, the longer it will take before the browser checks for changes in policy. Defaults to 86400 (one day).
+     * * headers - a strings array of allowed headers ('Access-Control-Allow-Headers'). Defaults to ['Accept', 'Authorization', 'Content-Type', 'If-None-Match'].
+     * * additionalHeaders - a strings array of additional headers to headers. Use this to keep the default headers in place.
+     * * exposedHeaders - a strings array of exposed headers ('Access-Control-Expose-Headers'). Defaults to ['WWW-Authenticate', 'Server-Authorization'].
+     * * additionalExposedHeaders - a strings array of additional headers to exposedHeaders. Use this to keep the default headers in place.
+     * * credentials - if true, allows user credentials to be sent ('Access-Control-Allow-Credentials'). Defaults to false.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionscors)
+     */
+    cors?: false | RouteOptionsCors;
+
+    /**
+     * Default value: none.
+     * Route description used for generating documentation (string).
+     * This setting is not available when setting server route defaults using server.options.routes.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsdescription)
+     */
+    description?: string;
+
+    /**
+     * Default value: none.
+     * Route-level request extension points by setting the option to an object with a key for each of the desired extension points ('onRequest' is not allowed), and the value is the same as the server.ext(events) event argument.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsext)
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#request-lifecycle)
+     */
+    ext?: object;
+
+    /**
+     * Default value: { relativeTo: '.' }.
+     * Defines the behavior for accessing files:
+     * * relativeTo - determines the folder relative paths are resolved against.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsfiles)
+     */
+    files?: {
+        relativeTo: string;
+    }
+
+    /**
+     * Default value: none.
+     * The route handler function performs the main business logic of the route and sets the response. handler can be assigned:
+     * * a lifecycle method.
+     * * an object with a single property using the name of a handler type registred with the server.handler() method. The matching property value is passed as options to the registered handler generator.
+     * Note: handlers using a fat arrow style function cannot be bound to any bind property. Instead, the bound context is available under h.context.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionshandler)
+     */
+    handler?: Lifecycle.Method | object;
+
+    /**
+     * Default value: none.
+     * An optional unique identifier used to look up the route using server.lookup(). Cannot be assigned to routes added with an array of methods.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsid)
+     */
+    id?: string;
+
+    /**
+     * Default value: false.
+     * If true, the route cannot be accessed through the HTTP listener but only through the server.inject() interface with the allowInternals option set to true. Used for internal routes that should not be accessible to the outside world.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsisinternal)
+     */
+    isInternal?: boolean;
+
+    /**
+     * Default value: none.
+     * Optional arguments passed to JSON.stringify() when converting an object or error response to a string payload or escaping it after stringification. Supports the following:
+     * * replacer - the replacer function or array. Defaults to no action.
+     * * space - number of spaces to indent nested object keys. Defaults to no indentation.
+     * * suffix - string suffix added after conversion to JSON string. Defaults to no suffix.
+     * * escape - calls Hoek.jsonEscape() after conversion to JSON string. Defaults to false.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsjson)
+     */
+    json?: Json.StringifyArguments;
+
+    /**
+     * Default value: none.
+     * Enables JSONP support by setting the value to the query parameter name containing the function name used to wrap the response payload.
+     * For example, if the value is 'callback', a request comes in with 'callback=me', and the JSON response is '{ "a":"b" }', the payload will be 'me({ "a":"b" });'. Cannot be used with stream responses.
+     * The 'Content-Type' response header is set to 'text/javascript' and the 'X-Content-Type-Options' response header is set to 'nosniff', and will override those headers even if explicitly set by response.type().
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsjsonp)
+     */
+    jsonp?: string;
+
+    /**
+     * Default value: { collect: false }.
+     * Request logging options:
+     * collect - if true, request-level logs (both internal and application) are collected and accessible via request.logs.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionslog)
+     */
+    log?: {
+        collect: boolean;
+    }
+
+    /**
+     * Default value: none.
+     * Route notes used for generating documentation (string or array of strings).
+     * This setting is not available when setting server route defaults using server.options.routes.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsnotes)
+     */
+    notes?: string | string[];
+
+    /**
+     * Determines how the request payload is processed.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionspayload)
+     */
+    payload?: RouteOptionsPayload;
+
+    /**
+     * Default value: {}.
+     * Plugin-specific configuration. plugins is an object where each key is a plugin name and the value is the plugin configuration.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsplugins)
+     */
+    plugins?: Util.Dictionary<PluginSpecificConfiguration>;
+
+    /**
+     * Default value: none.
+     * The pre option allows defining methods for performing actions before the handler is called. These methods allow breaking the handler logic into smaller, reusable components that can be shared ascross routes, as well as provide a cleaner error handling of prerequisite operations (e.g. load required reference data from a database).
+     * pre is assigned an ordered array of methods which are called serially in order. If the pre array contains another array of methods as one of its elements, those methods are called in parallel. Note that during parallel execution, if any of the methods error, return a takeover response, or abort signal, the other parallel methods will continue to execute but will be ignored once completed.
+     * pre can be assigned a mixed array of:
+     * * an array containing the elements listed below, which are executed in parallel.
+     * * an object with:
+     * * * method - a lifecycle method.
+     * * * assign - key name used to assign the response of the method to in request.pre and request.preResponses.
+     * * * failAction - A failAction value which determine what to do when a pre-handler method throws an error. If assign is specified and the failAction setting is not 'error', the error will be assigned.
+     * * a method function - same as including an object with a single method key.
+     * Note that pre-handler methods do not behave the same way other lifecycle methods do when a value is returned. Instead of the return value becoming the new response payload, the value is used to assign the corresponding request.pre and request.preResponses properties. Otherwise, the handling of errors, takeover response response, or abort signal behave the same as any other lifecycle methods.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionspre)
+     */
+    pre?: RouteOptionsPreArray;
+
+    /**
+     * Processing rules for the outgoing response.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsresponse)
+     */
+    response?: RouteOptionsResponse;
+
+    /**
+     * Default value: false (security headers disabled).
+     * Sets common security headers. To enable, set security to true or to an object with the following options:
+     * * hsts - controls the 'Strict-Transport-Security' header, where:
+     * * * true - the header will be set to max-age=15768000. This is the default value.
+     * * * a number - the maxAge parameter will be set to the provided value.
+     * * * an object with the following fields:
+     * * * * maxAge - the max-age portion of the header, as a number. Default is 15768000.
+     * * * * includeSubDomains - a boolean specifying whether to add the includeSubDomains flag to the header.
+     * * * * preload - a boolean specifying whether to add the 'preload' flag (used to submit domains inclusion in Chrome's HTTP Strict Transport Security (HSTS) preload list) to the header.
+     * * xframe - controls the 'X-Frame-Options' header, where:
+     * * * true - the header will be set to 'DENY'. This is the default value.
+     * * * 'deny' - the headers will be set to 'DENY'.
+     * * * 'sameorigin' - the headers will be set to 'SAMEORIGIN'.
+     * * * an object for specifying the 'allow-from' rule, where:
+     * * * * rule - one of:
+     * * * * * 'deny'
+     * * * * * 'sameorigin'
+     * * * * * 'allow-from'
+     * * * * source - when rule is 'allow-from' this is used to form the rest of the header, otherwise this field is ignored. If rule is 'allow-from' but source is unset, the rule will be automatically changed to 'sameorigin'.
+     * * xss - boolean that controls the 'X-XSS-PROTECTION' header for Internet Explorer. Defaults to true which sets the header to equal '1; mode=block'.
+     *       Note: this setting can create a security vulnerability in versions of Internet Exploere below 8, as well as unpatched versions of IE8. See here and here for more information. If you actively support old versions of IE, it may be wise to explicitly set this flag to false.
+     * * noOpen - boolean controlling the 'X-Download-Options' header for Internet Explorer, preventing downloads from executing in your context. Defaults to true setting the header to 'noopen'.
+     * * noSniff - boolean controlling the 'X-Content-Type-Options' header. Defaults to true setting the header to its only and default option, 'nosniff'.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionssecurity)
+     */
+    security?: RouteOptionsSecure;
+
+    /**
+     * Default value: { parse: true, failAction: 'error' }.
+     * HTTP state management (cookies) allows the server to store information on the client which is sent back to the server with every request (as defined in RFC 6265). state supports the following options:
+     * parse - determines if incoming 'Cookie' headers are parsed and stored in the request.state object.
+     * failAction - A failAction value which determines how to handle cookie parsing errors. Defaults to 'error' (return a Bad Request (400) error response).
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsstate)
+     */
+    state?: {
+        parse?: boolean;
+        failAction?: Lifecycle.FailAction;
+    }
+
+    /**
+     * Default value: none.
+     * Route tags used for generating documentation (array of strings).
+     * This setting is not available when setting server route defaults using server.options.routes.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionstags)
+     */
+    tags?: string[];
+
+    /**
+     * Default value: { server: false }.
+     * Timeouts for processing durations.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionstimeout)
+     */
+    timeout?: {
+
+        /**
+         * Response timeout in milliseconds. Sets the maximum time allowed for the server to respond to an incoming request before giving up and responding with a Service Unavailable (503) error response.
+         */
+        server?: boolean | number;
+
+        /**
+         * Default value: none (use node default of 2 minutes).
+         * By default, node sockets automatically timeout after 2 minutes. Use this option to override this behavior. Set to false to disable socket timeouts.
+         */
+        socket?: boolean | number;
+
+    };
+
+    /**
+     * Default value: { headers: true, params: true, query: true, payload: true, failAction: 'error' }.
+     * Request input validation rules for various request components.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsvalidate)
+     */
+    validate?: RouteOptionsValidate;
+
+}
diff --git a/types/hapi/definitions/server/server-auth-scheme.d.ts b/types/hapi/definitions/server/server-auth-scheme.d.ts
new file mode 100644
index 0000000000..5eed01f0a0
--- /dev/null
+++ b/types/hapi/definitions/server/server-auth-scheme.d.ts
@@ -0,0 +1,74 @@
+import {Lifecycle, Request, ResponseToolkit, Server} from "hapi";
+
+/**
+ * The scheme options argument passed to server.auth.strategy() when instantiation a strategy.
+ * For context [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverauthschemename-scheme)
+ */
+export type ServerAuthSchemeOptions = object;
+
+/**
+ * the method implementing the scheme with signature function(server, options) where:
+ * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverauthschemename-scheme)
+ * @param server - a reference to the server object the scheme is added to.
+ * @param options - (optional) the scheme options argument passed to server.auth.strategy() when instantiation a strategy.
+ */
+export interface ServerAuthScheme {
+    (server: Server, options?: ServerAuthSchemeOptions): ServerAuthSchemeObject;
+}
+
+export interface ServerAuthSchemeObjectApi {
+}
+
+/**
+ * The scheme method must return an object with the following
+ * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#authentication-scheme)
+ */
+export interface ServerAuthSchemeObject {
+
+    /**
+     * optional object which is exposed via the [server.auth.api](https://github.com/hapijs/hapi/blob/master/API.md#server.auth.api) object.
+     */
+    api?: ServerAuthSchemeObjectApi;
+
+    /**
+     * A lifecycle method function called for each incoming request configured with the authentication scheme. The
+     * method is provided with two special toolkit methods for returning an authenticated or an unauthenticate result:
+     * * h.authenticated() - indicate request authenticated successfully.
+     * * h.unauthenticated() - indicate request failed to authenticate.
+     * @param request the request object.
+     * @param h the ResponseToolkit
+     * @return the Lifecycle.ReturnValue
+     */
+    authenticate(request: Request, h: ResponseToolkit): Lifecycle.ReturnValue;
+
+    /**
+     * A lifecycle method to authenticate the request payload.
+     * When the scheme payload() method returns an error with a message, it means payload validation failed due to bad
+     * payload. If the error has no message but includes a scheme name (e.g. Boom.unauthorized(null, 'Custom')),
+     * authentication may still be successful if the route auth.payload configuration is set to 'optional'.
+     * @param request the request object.
+     * @param h the ResponseToolkit
+     * @return the Lifecycle.ReturnValue
+     */
+    payload?(request: Request, h: ResponseToolkit): Lifecycle.ReturnValue;
+
+    /**
+     * A lifecycle method to decorate the response with authentication headers before the response headers or payload is written.
+     * @param request the request object.
+     * @param h the ResponseToolkit
+     * @return the Lifecycle.ReturnValue
+     */
+    response?(request: Request, h: ResponseToolkit): Lifecycle.ReturnValue;
+
+    /**
+     * An object with the following keys:
+     * * payload
+     */
+    options?: {
+        /**
+         * if true, requires payload validation as part of the scheme and forbids routes from disabling payload auth validation. Defaults to false.
+         */
+        payload?: boolean;
+    };
+
+}
diff --git a/types/hapi/definitions/server/server-auth.d.ts b/types/hapi/definitions/server/server-auth.d.ts
new file mode 100644
index 0000000000..92cb0c4c98
--- /dev/null
+++ b/types/hapi/definitions/server/server-auth.d.ts
@@ -0,0 +1,82 @@
+import {Request, RouteOptionsAccess, ServerAuthScheme, Util} from "hapi";
+
+/**
+ * An authentication configuration object using the same format as the route auth handler options.
+ * For reference [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverauthdefaultoptions)
+ */
+export interface ServerAuthConfig extends RouteOptionsAccess {
+
+}
+
+export interface ServerAuth {
+
+    /**
+     * An object where each key is an authentication strategy name and the value is the exposed strategy API.
+     * Available only when the authentication scheme exposes an API by returning an api key in the object
+     * returned from its implementation function.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverauthapi)
+     */
+    api: Util.Dictionary<any>;
+
+    /**
+     * Contains the default authentication configuration is a default strategy was set via
+     * [server.auth.default()](https://github.com/hapijs/hapi/blob/master/API.md#server.auth.default()).
+     */
+    readonly settings: {
+        default: ServerAuthConfig;
+    }
+
+    /**
+     * Sets a default strategy which is applied to every route where:
+     * @param options - one of:
+     * * a string with the default strategy name
+     * * an authentication configuration object using the same format as the route auth handler options.
+     * @return void.
+     * The default does not apply when a route config specifies auth as false, or has an authentication strategy
+     * configured (contains the strategy or strategies authentication settings). Otherwise, the route authentication
+     * config is applied to the defaults.
+     * Note that if the route has authentication configured, the default only applies at the time of adding the route,
+     * not at runtime. This means that calling server.auth.default() after adding a route with some authentication
+     * config will have no impact on the routes added prior. However, the default will apply to routes added
+     * before server.auth.default() is called if those routes lack any authentication config.
+     * The default auth strategy configuration can be accessed via server.auth.settings.default. To obtain the active
+     * authentication configuration of a route, use server.auth.lookup(request.route).
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverauthdefaultoptions)
+     */
+    default(options: string | ServerAuthConfig): void;
+
+    /**
+     * Registers an authentication scheme where:
+     * @param name the scheme name.
+     * @param scheme - the method implementing the scheme with signature function(server, options) where:
+     * * server - a reference to the server object the scheme is added to.
+     * * options - (optional) the scheme options argument passed to server.auth.strategy() when instantiation a strategy.
+     * @return void.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverauthschemename-scheme)
+     */
+    scheme(name: string, scheme: ServerAuthScheme): void;
+
+    /**
+     * Registers an authentication strategy where:
+     * @param name - the strategy name.
+     * @param scheme - the scheme name (must be previously registered using server.auth.scheme()).
+     * @param options - scheme options based on the scheme requirements.
+     * @return Return value: none.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverauthstrategyname-scheme-options)
+     */
+    strategy(name: string, scheme: string, options?: object): void;
+
+    /**
+     * Tests a request against an authentication strategy where:
+     * @param strategy - the strategy name registered with server.auth.strategy().
+     * @param request - the request object.
+     * @return Return value: the authentication credentials object if authentication was successful, otherwise throws an error.
+     * Note that the test() method does not take into account the route authentication configuration. It also does not
+     * perform payload authentication. It is limited to the basic strategy authentication execution. It does not
+     * include verifying scope, entity, or other route properties.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-await-serverauthteststrategy-request)
+     */
+    test(strategy: string, request: Request): Promise<any>;
+
+}
+
diff --git a/types/hapi/definitions/server/server-cache.d.ts b/types/hapi/definitions/server/server-cache.d.ts
new file mode 100644
index 0000000000..730f5e8675
--- /dev/null
+++ b/types/hapi/definitions/server/server-cache.d.ts
@@ -0,0 +1,42 @@
+import * as catbox from "catbox";
+import {ServerOptionsCache} from "hapi";
+
+/**
+ * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-servercacheoptions)
+ */
+export interface ServerCache {
+
+    /**
+     * Provisions a cache segment within the server cache facility where:
+     * @param options - [catbox policy](https://github.com/hapijs/catbox#policy) configuration where:
+     * * expiresIn - relative expiration expressed in the number of milliseconds since the item was saved in the cache. Cannot be used together with expiresAt.
+     * * expiresAt - time of day expressed in 24h notation using the 'HH:MM' format, at which point all cache records expire. Uses local time. Cannot be used together with expiresIn.
+     * * generateFunc - a function used to generate a new cache item if one is not found in the cache when calling get(). The method's signature is async function(id, flags) where:
+     * - `id` - the `id` string or object provided to the `get()` method.
+     * - `flags` - an object used to pass back additional flags to the cache where:
+     * - `ttl` - the cache ttl value in milliseconds. Set to `0` to skip storing in the cache. Defaults to the cache global policy.
+     * * staleIn - number of milliseconds to mark an item stored in cache as stale and attempt to regenerate it when generateFunc is provided. Must be less than expiresIn.
+     * * staleTimeout - number of milliseconds to wait before checking if an item is stale.
+     * * generateTimeout - number of milliseconds to wait before returning a timeout error when the generateFunc function takes too long to return a value. When the value is eventually returned, it is stored in the cache for future requests. Required if generateFunc is present. Set to false to disable timeouts which may cause all get() requests to get stuck forever.
+     * * generateOnReadError - if false, an upstream cache read error will stop the cache.get() method from calling the generate function and will instead pass back the cache error. Defaults to true.
+     * * generateIgnoreWriteError - if false, an upstream cache write error when calling cache.get() will be passed back with the generated value when calling. Defaults to true.
+     * * dropOnError - if true, an error or timeout in the generateFunc causes the stale value to be evicted from the cache. Defaults to true.
+     * * pendingGenerateTimeout - number of milliseconds while generateFunc call is in progress for a given id, before a subsequent generateFunc call is allowed. Defaults to 0 (no blocking of concurrent generateFunc calls beyond staleTimeout).
+     * * cache - the cache name configured in server.cache. Defaults to the default cache.
+     * * segment - string segment name, used to isolate cached items within the cache partition. When called within a plugin, defaults to '!name' where 'name' is the plugin name. When called within a server method, defaults to '#name' where 'name' is the server method name. Required when called outside of a plugin.
+     * * shared - if true, allows multiple cache provisions to share the same segment. Default to false.
+     * @return Catbox Policy.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-servercacheoptions)
+     */
+    (options: ServerOptionsCache): catbox.Policy;
+
+    /**
+     * Provisions a server cache as described in server.cache where:
+     * @param options - same as the server cache configuration options.
+     * @return Return value: none.
+     * Note that if the server has been initialized or started, the cache will be automatically started to match the state of any other provisioned server cache.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-await-servercacheprovisionoptions)
+     */
+    provision(options: ServerOptionsCache): Promise<void>;
+
+}
diff --git a/types/hapi/definitions/server/server-events.d.ts b/types/hapi/definitions/server/server-events.d.ts
new file mode 100644
index 0000000000..b1e0c05405
--- /dev/null
+++ b/types/hapi/definitions/server/server-events.d.ts
@@ -0,0 +1,146 @@
+import * as Podium from "podium";
+
+/**
+ * an event name string.
+ * an event options object.
+ * a podium emitter object.
+ * For context [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-servereventevents)
+ */
+export type ServerEventsApplication = string | ServerEventsApplicationObject | Podium;
+
+/**
+ * Object that it will be used in Event
+ * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-servereventevents)
+ */
+export interface ServerEventsApplicationObject {
+    /** the event name string (required). */
+    name: string;
+    /** a string or array of strings specifying the event channels available. Defaults to no channel restrictions (event updates can specify a channel or not). */
+    channels?: string | string[];
+    /** if true, the data object passed to server.events.emit() is cloned before it is passed to the listeners (unless an override specified by each listener). Defaults to false (data is passed as-is). */
+    clone?: boolean;
+    /** if true, the data object passed to server.event.emit() must be an array and the listener method is called with each array element passed as a separate argument (unless an override specified by each listener). This should only be used when the emitted data structure is known and predictable. Defaults to false (data is emitted as a single argument regardless of its type). */
+    spread?: boolean;
+    /** if true and the criteria object passed to server.event.emit() includes tags, the tags are mapped to an object (where each tag string is the key and the value is true) which is appended to the arguments list at the end. A configuration override can be set by each listener. Defaults to false. */
+    tags?: boolean;
+    /** if true, the same event name can be registered multiple times where the second registration is ignored. Note that if the registration config is changed between registrations, only the first configuration is used. Defaults to false (a duplicate registration will throw an error). */
+    shared?: boolean;
+}
+
+/**
+ * A criteria object with the following optional keys (unless noted otherwise):
+ * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-servereventsoncriteria-listener)
+ */
+export interface ServerEventCriteria {
+    /** (required) the event name string. */
+    name: string;
+    /** a string or array of strings specifying the event channels to subscribe to. If the event registration specified a list of allowed channels, the channels array must match the allowed channels. If channels are specified, event updates without any channel designation will not be included in the subscription. Defaults to no channels filter. */
+    channels?: string | string[];
+    /** if true, the data object passed to server.event.emit() is cloned before it is passed to the listener method. Defaults to the event registration option (which defaults to false). */
+    clone?: boolean;
+    /** a positive integer indicating the number of times the listener can be called after which the subscription is automatically removed. A count of 1 is the same as calling server.events.once(). Defaults to no limit. */
+    count?: number;
+    /**
+     * filter - the event tags (if present) to subscribe to which can be one of:
+     * * a tag string.
+     * * an array of tag strings.
+     * * an object with the following:
+     * * * tags - a tag string or array of tag strings.
+     * * * all - if true, all tags must be present for the event update to match the subscription. Defaults to false (at least one matching tag).
+     */
+    filter?: string | string[] | {tags: string | string[], all?: boolean};
+    /** if true, and the data object passed to server.event.emit() is an array, the listener method is called with each array element passed as a separate argument. This should only be used when the emitted data structure is known and predictable. Defaults to the event registration option (which defaults to false). */
+    spread?: boolean;
+    /** if true and the criteria object passed to server.event.emit() includes tags, the tags are mapped to an object (where each tag string is the key and the value is true) which is appended to the arguments list at the end. Defaults to the event registration option (which defaults to false). */
+    tags?: boolean;
+}
+
+/**
+ * Access: podium public interface.
+ * The server events emitter. Utilizes the podium with support for event criteria validation, channels, and filters.
+ * Use the following methods to interact with server.events:
+ * [server.event(events)](https://github.com/hapijs/hapi/blob/master/API.md#server.event()) - register application events.
+ * [server.events.emit(criteria, data)](https://github.com/hapijs/hapi/blob/master/API.md#server.events.emit()) - emit server events.
+ * [server.events.on(criteria, listener)](https://github.com/hapijs/hapi/blob/master/API.md#server.events.on()) - subscribe to all events.
+ * [server.events.once(criteria, listener)](https://github.com/hapijs/hapi/blob/master/API.md#server.events.once()) - subscribe to
+ * Other methods include: server.events.removeListener(name, listener), server.events.removeAllListeners(name), and server.events.hasListeners(name).
+ * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverevents)
+ */
+export interface ServerEvents extends Podium {
+
+    /**
+     * Emits a custom application event to all the subscribed listeners where:
+     * @param criteria - the event update criteria which must be one of:
+     * * the event name string.
+     * * an object with the following optional keys (unless noted otherwise):
+     * * * name - the event name string (required).
+     * * * channel - the channel name string.
+     * * * tags - a tag string or array of tag strings.
+     * @param data - the value emitted to the subscribers. If data is a function, the function signature is function() and it called once to generate (return value) the actual data emitted to the listeners. If no listeners match the event, the data function is not invoked.
+     * @return Return value: none.
+     * Note that events must be registered before they can be emitted or subscribed to by calling server.event(events). This is done to detect event name misspelling and invalid event activities.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-await-servereventsemitcriteria-data)
+     */
+    emit(criteria: string, data: any | Function): Promise<void>;
+    emit(criteria: {name: string, channel?: string, tags?: string | string[]}, data: any): Promise<void>;
+
+    /**
+     * Subscribe to an event where:
+     * @param criteria - the subscription criteria which must be one of:
+     * * event name string which can be any of the built-in server events
+     * * a custom application event registered with server.event().
+     * * a criteria object
+     * @param listener - the handler method set to receive event updates. The function signature depends on the event argument, and the spread and tags options.
+     * @return Return value: none.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-servereventsoncriteria-listener)
+     * See ['log' event](https://github.com/hapijs/hapi/blob/master/API.md#-log-event)
+     * See ['request' event](https://github.com/hapijs/hapi/blob/master/API.md#-request-event)
+     * See ['response' event](https://github.com/hapijs/hapi/blob/master/API.md#-response-event)
+     * See ['route' event](https://github.com/hapijs/hapi/blob/master/API.md#-route-event)
+     * See ['start' event](https://github.com/hapijs/hapi/blob/master/API.md#-start-event)
+     * See ['stop' event](https://github.com/hapijs/hapi/blob/master/API.md#-stop-event)
+     */
+    on(criteria: string | ServerEventsApplicationObject | ServerEventCriteria, listener: Function): void;
+
+    /**
+     * Same as calling [server.events.on()](https://github.com/hapijs/hapi/blob/master/API.md#server.events.on()) with the count option set to 1.
+     * @param criteria - the subscription criteria which must be one of:
+     * * event name string which can be any of the built-in server events
+     * * a custom application event registered with server.event().
+     * * a criteria object
+     * @param listener - the handler method set to receive event updates. The function signature depends on the event argument, and the spread and tags options.
+     * @return Return value: none.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-servereventsoncecriteria-listener)
+     */
+    once(criteria: string | ServerEventsApplicationObject | ServerEventCriteria, listener: Function): void;
+
+    /**
+     * Same as calling server.events.on() with the count option set to 1.
+     * @param criteria - the subscription criteria which must be one of:
+     * * event name string which can be any of the built-in server events
+     * * a custom application event registered with server.event().
+     * * a criteria object
+     * @return Return value: a promise that resolves when the event is emitted.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-await-servereventsoncecriteria)
+     */
+    once(criteria: string | ServerEventsApplicationObject | ServerEventCriteria): Promise<any>;
+
+    /**
+     * The follow method is only mentioned in Hapi API. The doc about that method can be found [here](https://github.com/hapijs/podium/blob/master/API.md#podiumremovelistenername-listener)
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverevents)
+     */
+    removeListener(name: string, listener: Podium.Listener): Podium;
+
+    /**
+     * The follow method is only mentioned in Hapi API. The doc about that method can be found [here](https://github.com/hapijs/podium/blob/master/API.md#podiumremovealllistenersname)
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverevents)
+     */
+    removeAllListeners(name: string): Podium;
+
+    /**
+     * The follow method is only mentioned in Hapi API. The doc about that method can be found [here](https://github.com/hapijs/podium/blob/master/API.md#podiumhaslistenersname)
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverevents)
+     */
+    hasListeners(name: string): boolean;
+
+}
diff --git a/types/hapi/definitions/server/server-ext.d.ts b/types/hapi/definitions/server/server-ext.d.ts
new file mode 100644
index 0000000000..8bd29cbb18
--- /dev/null
+++ b/types/hapi/definitions/server/server-ext.d.ts
@@ -0,0 +1,146 @@
+import {Lifecycle, Server} from "hapi";
+
+/**
+ * The extension point event name. The available extension points include the request extension points as well as the following server extension points:
+ * 'onPreStart' - called before the connection listeners are started.
+ * 'onPostStart' - called after the connection listeners are started.
+ * 'onPreStop' - called before the connection listeners are stopped.
+ * 'onPostStop' - called after the connection listeners are stopped.
+ * For context [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverextevents)
+ * For context [See docs](https://github.com/hapijs/hapi/blob/master/API.md#request-lifecycle)
+ */
+export type ServerExtType = 'onRequest' | 'onPreStart' | 'onPostStart' | 'onPreStop' | 'onPostStop'| 'onPreResponse';
+
+/**
+ * The extension point event name for Request
+ * For context [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverextevents)
+ * For context [See docs](https://github.com/hapijs/hapi/blob/master/API.md#request-lifecycle)
+ */
+export type ServerExtRequestType = 'onRequest';
+
+/**
+ * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverextevents)
+ * Registers an extension function in one of the request lifecycle extension points where:
+ * @param events - an object or array of objects with the following:
+ * * type - (required) the extension point event name. The available extension points include the request extension points as well as the following server extension points:
+ * * * 'onPreStart' - called before the connection listeners are started.
+ * * * 'onPostStart' - called after the connection listeners are started.
+ * * * 'onPreStop' - called before the connection listeners are stopped.
+ * * * 'onPostStop' - called after the connection listeners are stopped.
+ * * method - (required) a function or an array of functions to be executed at a specified point during request processing. The required extension function signature is:
+ * * * server extension points: async function(server) where:
+ * * * * server - the server object.
+ * * * * this - the object provided via options.bind or the current active context set with server.bind().
+ * * * request extension points: a lifecycle method.
+ * * options - (optional) an object with the following:
+ * * * before - a string or array of strings of plugin names this method must execute before (on the same event). Otherwise, extension methods are executed in the order added.
+ * * * after - a string or array of strings of plugin names this method must execute after (on the same event). Otherwise, extension methods are executed in the order added.
+ * * * bind - a context object passed back to the provided method (via this) when called. Ignored if the method is an arrow function.
+ * * * sandbox - if set to 'plugin' when adding a request extension points the extension is only added to routes defined by the current plugin. Not allowed when configuring route-level extensions, or when adding server extensions. Defaults to 'server' which applies to any route added to the server the extension is added to.
+ * @return void
+ */
+export interface ServerExtEventsObject {
+    /**
+     * (required) the extension point event name. The available extension points include the request extension points as well as the following server extension points:
+     * * 'onPreStart' - called before the connection listeners are started.
+     * * 'onPostStart' - called after the connection listeners are started.
+     * * 'onPreStop' - called before the connection listeners are stopped.
+     */
+    type: ServerExtType;
+    /**
+     * (required) a function or an array of functions to be executed at a specified point during request processing. The required extension function signature is:
+     * * server extension points: async function(server) where:
+     * * * server - the server object.
+     * * * this - the object provided via options.bind or the current active context set with server.bind().
+     * * request extension points: a lifecycle method.
+     */
+    method: ServerExtPointFunction | ServerExtPointFunction[] | Function;
+    /**
+     * options - (optional) an object with the following:
+     * * before - a string or array of strings of plugin names this method must execute before (on the same event). Otherwise, extension methods are executed in the order added.
+     * * after - a string or array of strings of plugin names this method must execute after (on the same event). Otherwise, extension methods are executed in the order added.
+     * * bind - a context object passed back to the provided method (via this) when called. Ignored if the method is an arrow function.
+     * * sandbox - if set to 'plugin' when adding a request extension points the extension is only added to routes defined by the current plugin. Not allowed when configuring route-level extensions, or when adding server extensions. Defaults to 'server' which applies to any route added to the server the extension is added to.
+     */
+    options?: ServerExtOptions;
+}
+
+/**
+ * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverextevents)
+ * Registers an extension function in one of the request lifecycle extension points where:
+ * @param events - an object or array of objects with the following:
+ * * type - (required) the extension point event name. The available extension points include the request extension points as well as the following server extension points:
+ * * * 'onPreStart' - called before the connection listeners are started.
+ * * * 'onPostStart' - called after the connection listeners are started.
+ * * * 'onPreStop' - called before the connection listeners are stopped.
+ * * * 'onPostStop' - called after the connection listeners are stopped.
+ * * method - (required) a function or an array of functions to be executed at a specified point during request processing. The required extension function signature is:
+ * * * server extension points: async function(server) where:
+ * * * * server - the server object.
+ * * * * this - the object provided via options.bind or the current active context set with server.bind().
+ * * * request extension points: a lifecycle method.
+ * * options - (optional) an object with the following:
+ * * * before - a string or array of strings of plugin names this method must execute before (on the same event). Otherwise, extension methods are executed in the order added.
+ * * * after - a string or array of strings of plugin names this method must execute after (on the same event). Otherwise, extension methods are executed in the order added.
+ * * * bind - a context object passed back to the provided method (via this) when called. Ignored if the method is an arrow function.
+ * * * sandbox - if set to 'plugin' when adding a request extension points the extension is only added to routes defined by the current plugin. Not allowed when configuring route-level extensions, or when adding server extensions. Defaults to 'server' which applies to any route added to the server the extension is added to.
+ * @return void
+ */
+export interface ServerExtEventsRequestObject {
+    /**
+     * (required) the extension point event name. The available extension points include the request extension points as well as the following server extension points:
+     * * 'onPreStart' - called before the connection listeners are started.
+     * * 'onPostStart' - called after the connection listeners are started.
+     * * 'onPreStop' - called before the connection listeners are stopped.
+     * * 'onPostStop' - called after the connection listeners are stopped.
+     */
+    type: ServerExtRequestType;
+    /**
+     * (required) a function or an array of functions to be executed at a specified point during request processing. The required extension function signature is:
+     * * server extension points: async function(server) where:
+     * * * server - the server object.
+     * * * this - the object provided via options.bind or the current active context set with server.bind().
+     * * request extension points: a lifecycle method.
+     */
+    method: Lifecycle.Method | Lifecycle.Method[];
+    /**
+     * (optional) an object with the following:
+     * * before - a string or array of strings of plugin names this method must execute before (on the same event). Otherwise, extension methods are executed in the order added.
+     * * after - a string or array of strings of plugin names this method must execute after (on the same event). Otherwise, extension methods are executed in the order added.
+     * * bind - a context object passed back to the provided method (via this) when called. Ignored if the method is an arrow function.
+     * * sandbox - if set to 'plugin' when adding a request extension points the extension is only added to routes defined by the current plugin. Not allowed when configuring route-level extensions, or when adding server extensions. Defaults to 'server' which applies to any route added to the server the extension is added to.
+     */
+    options?: ServerExtOptions;
+}
+
+export interface ServerExtPointFunction {
+    (server: Server): void;
+}
+
+/**
+ * An object with the following:
+ * * before - a string or array of strings of plugin names this method must execute before (on the same event). Otherwise, extension methods are executed in the order added.
+ * * after - a string or array of strings of plugin names this method must execute after (on the same event). Otherwise, extension methods are executed in the order added.
+ * * bind - a context object passed back to the provided method (via this) when called. Ignored if the method is an arrow function.
+ * * sandbox - if set to 'plugin' when adding a request extension points the extension is only added to routes defined by the current plugin. Not allowed when configuring route-level extensions, or when adding server extensions. Defaults to 'server' which applies to any route added to the server the extension is added to.
+ * For context [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverextevents)
+ */
+export interface ServerExtOptions {
+    /**
+     * a string or array of strings of plugin names this method must execute before (on the same event). Otherwise, extension methods are executed in the order added.
+     */
+    before: string | string[];
+    /**
+     * a string or array of strings of plugin names this method must execute after (on the same event). Otherwise, extension methods are executed in the order added.
+     */
+    after: string | string[];
+    /**
+     * a context object passed back to the provided method (via this) when called. Ignored if the method is an arrow function.
+     */
+    bind: object;
+    /**
+     * if set to 'plugin' when adding a request extension points the extension is only added to routes defined by the current plugin. Not allowed when configuring route-level extensions, or when adding server extensions. Defaults to 'server' which applies to any route added to the server the extension is added to.
+     */
+    sandbox?: 'server' | 'plugin';
+}
+
diff --git a/types/hapi/definitions/server/server-info.d.ts b/types/hapi/definitions/server/server-info.d.ts
new file mode 100644
index 0000000000..399543e08e
--- /dev/null
+++ b/types/hapi/definitions/server/server-info.d.ts
@@ -0,0 +1,55 @@
+/**
+ * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverinfo)
+ * An object containing information about the server where:
+ */
+export interface ServerInfo {
+
+    /**
+     * a unique server identifier (using the format '{hostname}:{pid}:{now base36}').
+     */
+    id: string;
+
+    /**
+     * server creation timestamp.
+     */
+    created: number;
+
+    /**
+     * server start timestamp (0 when stopped).
+     */
+    started: number;
+
+    /**
+     * the connection [port](https://github.com/hapijs/hapi/blob/master/API.md#server.options.port) based on the following rules:
+     *  * before the server has been started: the configured port value.
+     *  * after the server has been started: the actual port assigned when no port is configured or was set to 0.
+     */
+    port: number | string;
+
+    /**
+     * The [host](https://github.com/hapijs/hapi/blob/master/API.md#server.options.host) configuration value.
+     */
+    host: string;
+
+    /**
+     * the active IP address the connection was bound to after starting. Set to undefined until the server has been
+     * started or when using a non TCP port (e.g. UNIX domain socket).
+     */
+    address: undefined | string;
+
+    /**
+     *  the protocol used:
+     * * 'http' - HTTP.
+     * * 'https' - HTTPS.
+     * * 'socket' - UNIX domain socket or Windows named pipe.
+     */
+    protocol: 'http' | 'https' | 'socket';
+
+    /**
+     * a string representing the connection (e.g. 'http://example.com:8080' or 'socket:/unix/domain/socket/path'). Contains
+     * the uri value if set, otherwise constructed from the available settings. If no port is configured or is set
+     * to 0, the uri will not include a port component until the server is started.
+     */
+    uri: string;
+
+}
diff --git a/types/hapi/definitions/server/server-inject.d.ts b/types/hapi/definitions/server/server-inject.d.ts
new file mode 100644
index 0000000000..99789febfe
--- /dev/null
+++ b/types/hapi/definitions/server/server-inject.d.ts
@@ -0,0 +1,71 @@
+import {AuthCredentials, PluginsStates, Request} from "hapi";
+import * as Shot from "shot";
+
+/**
+ * An object with:
+ * * method - (optional) the request HTTP method (e.g. 'POST'). Defaults to 'GET'.
+ * * url - (required) the request URL. If the URI includes an authority (e.g. 'example.com:8080'), it is used to automatically set an HTTP 'Host' header, unless one was specified in headers.
+ * * headers - (optional) an object with optional request headers where each key is the header name and the value is the header content. Defaults to no additions to the default shot headers.
+ * * payload - (optional) an string, buffer or object containing the request payload. In case of an object it will be converted to a string for you. Defaults to no payload. Note that payload processing defaults to 'application/json' if no 'Content-Type' header provided.
+ * * credentials - (optional) an credentials object containing authentication information. The credentials are used to bypass the default authentication strategies, and are validated directly as if they were received via an authentication scheme. Defaults to no credentials.
+ * * artifacts - (optional) an artifacts object containing authentication artifact information. The artifacts are used to bypass the default authentication strategies, and are validated directly as if they were received via an authentication scheme. Ignored if set without credentials. Defaults to no artifacts.
+ * * app - (optional) sets the initial value of request.app, defaults to {}.
+ * * plugins - (optional) sets the initial value of request.plugins, defaults to {}.
+ * * allowInternals - (optional) allows access to routes with config.isInternal set to true. Defaults to false.
+ * * remoteAddress - (optional) sets the remote address for the incoming connection.
+ * * simulate - (optional) an object with options used to simulate client request stream conditions for testing:
+ * * error - if true, emits an 'error' event after payload transmission (if any). Defaults to false.
+ * * close - if true, emits a 'close' event after payload transmission (if any). Defaults to false.
+ * * end - if false, does not end the stream. Defaults to true.
+ * * split - indicates whether the request payload will be split into chunks. Defaults to undefined, meaning payload will not be chunked.
+ * * validate - (optional) if false, the options inputs are not validated. This is recommended for run-time usage of inject() to make it perform faster where input validation can be tested separately.
+ * For context [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-await-serverinjectoptions)
+ * For context [Shot module](https://github.com/hapijs/shot)
+ */
+export interface ServerInjectOptions extends Shot.RequestOptions {
+    /**
+     * an credentials object containing authentication information. The credentials are used to bypass the default authentication strategies, and are validated directly as if they were received via an authentication scheme. Defaults to no credentials.
+     */
+    credentials?: AuthCredentials;
+    /**
+     * (an artifacts object containing authentication artifact information. The artifacts are used to bypass the default authentication strategies, and are validated directly as if they were received via an authentication scheme. Ignored if set without credentials. Defaults to no artifacts.
+     */
+    artifacts?: object;
+    /**
+     * sets the initial value of request.app, defaults to {}.
+     */
+    app?: any;
+    /**
+     * sets the initial value of request.plugins, defaults to {}.
+     */
+    plugins?: PluginsStates;
+    /**
+     * allows access to routes with config.isInternal set to true. Defaults to false.
+     */
+    allowInternals?: boolean;
+}
+
+/**
+ * A response object with the following properties:
+ * * statusCode - the HTTP status code.
+ * * headers - an object containing the headers set.
+ * * payload - the response payload string.
+ * * rawPayload - the raw response payload buffer.
+ * * raw - an object with the injection request and response objects:
+ * * req - the simulated node request object.
+ * * res - the simulated node response object.
+ * * result - the raw handler response (e.g. when not a stream or a view) before it is serialized for transmission. If not available, the value is set to payload. Useful for inspection and reuse of the internal objects returned (instead of parsing the response string).
+ * * request - the request object.
+ * For context [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-await-serverinjectoptions)
+ * For context [Shot module](https://github.com/hapijs/shot)
+ */
+export interface ServerInjectResponse extends Shot.ResponseObject {
+    /**
+     * the raw handler response (e.g. when not a stream or a view) before it is serialized for transmission. If not available, the value is set to payload. Useful for inspection and reuse of the internal objects returned (instead of parsing the response string).
+     */
+    result: object | undefined;
+    /**
+     * the request object.
+     */
+    request: Request;
+}
diff --git a/types/hapi/definitions/server/server-method.d.ts b/types/hapi/definitions/server/server-method.d.ts
new file mode 100644
index 0000000000..920560086a
--- /dev/null
+++ b/types/hapi/definitions/server/server-method.d.ts
@@ -0,0 +1,64 @@
+import * as catbox from "catbox";
+
+/**
+ * The method function with a signature async function(...args, [flags]) where:
+ * * ...args - the method function arguments (can be any number of arguments or none).
+ * * flags - when caching is enabled, an object used to set optional method result flags:
+ * * * ttl - 0 if result is valid but cannot be cached. Defaults to cache policy.
+ * For reference [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-servermethodname-method-options)
+ */
+export type ServerMethod = (...args: any[]) => Promise<any>;
+
+/**
+ * The same cache configuration used in server.cache().
+ * The generateTimeout option is required.
+ * For reference [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-servermethodname-method-options)
+ * For reference [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-servercacheoptions)
+ */
+export interface ServerMethodCache extends catbox.PolicyOptions {
+    generateTimeout: number | false;
+}
+
+/**
+ * Configuration object:
+ * * bind - a context object passed back to the method function (via this) when called. Defaults to active context (set via server.bind() when the method is registered. Ignored if the method is an arrow function.
+ * * cache - the same cache configuration used in server.cache(). The generateTimeout option is required.
+ * * generateKey - a function used to generate a unique key (for caching) from the arguments passed to the method function (the flags argument is not passed as input). The server will automatically generate a unique key if the function's arguments are all of types 'string', 'number', or 'boolean'. However if the method uses other types of arguments, a key generation function must be provided which takes the same arguments as the function and returns a unique string (or null if no key can be generated).
+ * For reference [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-servermethodname-method-options)
+ */
+export interface ServerMethodOptions {
+    /**
+     * a context object passed back to the method function (via this) when called. Defaults to active context (set via server.bind() when the method is registered. Ignored if the method is an arrow function.
+     */
+    bind?: object;
+    /**
+     * the same cache configuration used in server.cache(). The generateTimeout option is required.
+     */
+    cache?: ServerMethodCache;
+    /**
+     * a function used to generate a unique key (for caching) from the arguments passed to the method function (the flags argument is not passed as input). The server will automatically generate a unique key if the function's arguments are all of types 'string', 'number', or 'boolean'. However if the method uses other types of arguments, a key generation function must be provided which takes the same arguments as the function and returns a unique string (or null if no key can be generated).
+     */
+    generateKey?: Function;
+}
+
+/**
+ * An object or an array of objects where each one contains:
+ * * name - the method name.
+ * * method - the method function.
+ * * options - (optional) settings.
+ * For reference [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-servermethodmethods)
+ */
+export interface ServerMethodConfigurationObject {
+    /**
+     * the method name.
+     */
+    name: string;
+    /**
+     * the method function.
+     */
+    method: ServerMethod;
+    /**
+     * (optional) settings.
+     */
+    options?: ServerMethodOptions;
+}
diff --git a/types/hapi/definitions/server/server-options-cache.d.ts b/types/hapi/definitions/server/server-options-cache.d.ts
new file mode 100644
index 0000000000..1e75ebe857
--- /dev/null
+++ b/types/hapi/definitions/server/server-options-cache.d.ts
@@ -0,0 +1,25 @@
+import * as Catbox from "catbox";
+
+/**
+ * hapi uses catbox for its cache implementation which includes support for common storage solutions (e.g. Redis,
+ * MongoDB, Memcached, Riak, among others). Caching is only utilized if methods and plugins explicitly store their state in the cache.
+ * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-cache)
+ */
+export interface ServerOptionsCache extends Catbox.PolicyOptions {
+
+    /** a class, a prototype function, or a catbox engine object. */
+    engine?: Catbox.EnginePrototypeOrObject;
+
+    /** an identifier used later when provisioning or configuring caching for server methods or plugins. Each cache name must be unique. A single item may omit the name option which defines the default cache. If every cache includes a name, a default memory cache is provisioned as well. */
+    name?: string;
+
+    /** if true, allows multiple cache users to share the same segment (e.g. multiple methods using the same cache storage container). Default to false. */
+    shared?: boolean;
+
+    /** (optional) string used to isolate cached data. Defaults to 'hapi-cache'. */
+    partition?: string;
+
+    /** other options passed to the catbox strategy used. Other options are only passed to catbox when engine above is a class or function and ignored if engine is a catbox engine object). */
+    [s: string]: any;
+
+}
diff --git a/types/hapi/definitions/server/server-options.d.ts b/types/hapi/definitions/server/server-options.d.ts
new file mode 100644
index 0000000000..2f74c17bb4
--- /dev/null
+++ b/types/hapi/definitions/server/server-options.d.ts
@@ -0,0 +1,186 @@
+import * as http from "http";
+import * as https from "https";
+import * as catbox from "catbox";
+import {MimosOptions} from "mimos";
+import {PluginSpecificConfiguration, RouteOptions, ServerOptionsCache} from "hapi";
+
+export interface ServerOptionsCompression {
+    minBytes: number;
+}
+
+/**
+ * The server options control the behavior of the server object. Note that the options object is deeply cloned
+ * (with the exception of listener which is shallowly copied) and should not contain any values that are unsafe to perform deep copy on.
+ * All options are optionals.
+ * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-server-options)
+ */
+export interface ServerOptions {
+
+    /**
+     * Default value: '0.0.0.0' (all available network interfaces).
+     * Sets the hostname or IP address the server will listen on. If not configured, defaults to host if present, otherwise to all available network interfaces. Set to '127.0.0.1' or 'localhost' to restrict the server to only those coming from the same host.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serveroptionsaddress)
+     */
+    address?: string;
+
+    /**
+     * Default value: {}.
+     * Provides application-specific configuration which can later be accessed via server.settings.app. The framework does not interact with this object. It is simply a reference made available anywhere a server reference is provided.
+     * Note the difference between server.settings.app which is used to store static configuration values and server.app which is meant for storing run-time state.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serveroptionsapp)
+     */
+    app?: any;
+
+    /**
+     * Default value: true.
+     * Used to disable the automatic initialization of the listener. When false, indicates that the listener will be started manually outside the framework.
+     * Cannot be set to true along with a port value.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serveroptionsautolisten)
+     */
+    autoListen?: boolean;
+
+    /**
+     * Default value: { engine: require('catbox-memory' }.
+     * Sets up server-side caching providers. Every server includes a default cache for storing application state. By default, a simple memory-based cache is created which has limited capacity and capabilities.
+     * hapi uses catbox for its cache implementation which includes support for common storage solutions (e.g. Redis, MongoDB, Memcached, Riak, among others). Caching is only utilized if methods and plugins explicitly store their state in the cache.
+     * The server cache configuration only defines the storage container itself. The configuration can be assigned one or more (array):
+     * * a class or prototype function (usually obtained by calling require() on a catbox strategy such as require('catbox-redis')). A new catbox client will be created internally using this function.
+     * * a configuration object with the following:
+     * * * engine - a class, a prototype function, or a catbox engine object.
+     * * * name - an identifier used later when provisioning or configuring caching for server methods or plugins. Each cache name must be unique. A single item may omit the name option which defines the default cache. If every cache includes a name, a default memory cache is provisioned as well.
+     * * * shared - if true, allows multiple cache users to share the same segment (e.g. multiple methods using the same cache storage container). Default to false.
+     * * * partition - (optional) string used to isolate cached data. Defaults to 'hapi-cache'.
+     * * * other options passed to the catbox strategy used. Other options are only passed to catbox when engine above is a class or function and ignored if engine is a catbox engine object).
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serveroptionscache)
+     */
+    cache?: catbox.EnginePrototype | ServerOptionsCache | ServerOptionsCache[];
+
+    /**
+     * Default value: { minBytes: 1024 }.
+     * Defines server handling of content encoding requests. If false, response content encoding is disabled and no compression is performed by the server.
+     */
+    compression?: boolean | ServerOptionsCompression;
+
+    /**
+     * Default value: { request: ['implementation'] }.
+     * Determines which logged events are sent to the console. This should only be used for development and does not affect which events are actually logged internally and recorded. Set to false to disable all console logging, or to an object with:
+     * * log - a string array of server log tags to be displayed via console.error() when the events are logged via server.log() as well as internally generated server logs. Defaults to no output.
+     * * request - a string array of request log tags to be displayed via console.error() when the events are logged via request.log() as well as internally generated request logs. For example, to display all errors, set the option to ['error']. To turn off all console debug messages set it to false. To display all request logs, set it to '*'. Defaults to uncaught errors thrown in external code (these errors are handled automatically and result in an Internal Server Error response) or runtime errors due to developer error.
+     * For example, to display all errors, set the log or request to ['error']. To turn off all output set the log or request to false. To display all server logs, set the log or request to '*'. To disable all debug information, set debug to false.
+     */
+    debug?: false | {
+        log?: string[] | false;
+        request?: string[] | false;
+    };
+
+    /**
+     * Default value: the operating system hostname and if not available, to 'localhost'.
+     * The public hostname or IP address. Used to set server.info.host and server.info.uri and as address is none provided.
+     */
+    host?: string;
+
+    /**
+     * Default value: none.
+     * An optional node HTTP (or HTTPS) http.Server object (or an object with a compatible interface).
+     * If the listener needs to be manually started, set autoListen to false.
+     * If the listener uses TLS, set tls to true.
+     */
+    listener?: http.Server;
+
+    /**
+     * Default value: { sampleInterval: 0 }.
+     * Server excessive load handling limits where:
+     * * sampleInterval - the frequency of sampling in milliseconds. When set to 0, the other load options are ignored. Defaults to 0 (no sampling).
+     * * maxHeapUsedBytes - maximum V8 heap size over which incoming requests are rejected with an HTTP Server Timeout (503) response. Defaults to 0 (no limit).
+     * * maxRssBytes - maximum process RSS size over which incoming requests are rejected with an HTTP Server Timeout (503) response. Defaults to 0 (no limit).
+     * * maxEventLoopDelay - maximum event loop delay duration in milliseconds over which incoming requests are rejected with an HTTP Server Timeout (503) response. Defaults to 0 (no limit).
+     */
+    load?: {
+        /** the frequency of sampling in milliseconds. When set to 0, the other load options are ignored. Defaults to 0 (no sampling). */
+        sampleInterval?: number;
+        /** maximum V8 heap size over which incoming requests are rejected with an HTTP Server Timeout (503) response. Defaults to 0 (no limit). */
+        maxHeapUsedBytes?: number;
+        /** maximum process RSS size over which incoming requests are rejected with an HTTP Server Timeout (503) response. Defaults to 0 (no limit).*/
+        maxRssBytes?: number;
+        /** maximum event loop delay duration in milliseconds over which incoming requests are rejected with an HTTP Server Timeout (503) response. Defaults to 0 (no limit).*/
+        maxEventLoopDelay?: number;
+    };
+
+    /**
+     * Default value: none.
+     * Options passed to the mimos module when generating the mime database used by the server (and accessed via server.mime):
+     * * override - an object hash that is merged into the built in mime information specified here. Each key value pair represents a single mime object. Each override value must contain:
+     * * key - the lower-cased mime-type string (e.g. 'application/javascript').
+     * * value - an object following the specifications outlined here. Additional values include:
+     * * * type - specify the type value of result objects, defaults to key.
+     * * * predicate - method with signature function(mime) when this mime type is found in the database, this function will execute to allows customizations.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serveroptionsmime)
+     */
+    mime?: MimosOptions;
+
+    /**
+     * Default value: {}.
+     * Plugin-specific configuration which can later be accessed via server.settings.plugins. plugins is an object where each key is a plugin name and the value is the configuration. Note the difference between server.settings.plugins which is used to store static configuration values and server.plugins which is meant for storing run-time state.
+     */
+    plugins?: PluginSpecificConfiguration;
+
+    /**
+     * Default value: 0 (an ephemeral port).
+     * The TCP port the server will listen to. Defaults the next available port when the server is started (and assigned to server.info.port).
+     * If port is a string containing a '/' character, it is used as a UNIX domain socket path. If it starts with '\.\pipe', it is used as a Windows named pipe.
+     */
+    port?: number | string;
+
+    /**
+     * Default value: { isCaseSensitive: true, stripTrailingSlash: false }.
+     * Controls how incoming request URIs are matched against the routing table:
+     * * isCaseSensitive - determines whether the paths '/example' and '/EXAMPLE' are considered different resources. Defaults to true.
+     * * stripTrailingSlash - removes trailing slashes on incoming paths. Defaults to false.
+     */
+    router?: {
+        isCaseSensitive?: boolean;
+        stripTrailingSlash?: boolean;
+    };
+
+    /**
+     * Default value: none.
+     * A route options object used as the default configuration for every route.
+     */
+    routes?: RouteOptions;
+
+    /**
+     Default value:
+     {
+         strictHeader: true,
+         ignoreErrors: false,
+         isSecure: true,
+         isHttpOnly: true,
+         isSameSite: 'Strict',
+         encoding: 'none'
+     }
+     Sets the default configuration for every state (cookie) set explicitly via server.state() or implicitly (without definition) using the state configuration object.
+     */
+    // TODO I am not sure if I need to use all the server.state() definition (like the default value) OR only the options below. The v16 use "any" here.
+    // state?: ServerStateCookieOptions;
+    state?: {
+        strictHeader?: boolean,
+        ignoreErrors?: boolean,
+        isSecure?: boolean,
+        isHttpOnly?: boolean,
+        isSameSite?: false | 'Strict' | 'Lax',
+        encoding?: 'none' | 'base64' | 'base64json' | 'form' | 'iron'
+    };
+
+    /**
+     * Default value: none.
+     * Used to create an HTTPS connection. The tls object is passed unchanged to the node HTTPS server as described in the node HTTPS documentation.
+     */
+    tls?: true | https.RequestOptions;
+
+    /**
+     * Default value: constructed from runtime server information.
+     * The full public URI without the path (e.g. 'http://example.com:8080'). If present, used as the server server.info.uri, otherwise constructed from the server settings.
+     */
+    uri?: string;
+
+}
diff --git a/types/hapi/definitions/server/server-realm.d.ts b/types/hapi/definitions/server/server-realm.d.ts
new file mode 100644
index 0000000000..eb921a1699
--- /dev/null
+++ b/types/hapi/definitions/server/server-realm.d.ts
@@ -0,0 +1,35 @@
+import {PluginsStates} from "hapi";
+
+/**
+ * The realm object contains sandboxed server settings specific to each plugin or authentication strategy. When registering a plugin or an authentication scheme, a server object reference is provided with a new server.realm container specific to that registration. It allows each plugin to maintain its own settings without leaking and affecting other plugins.
+ * For example, a plugin can set a default file path for local resources without breaking other plugins' configured paths. When calling server.bind(), the active realm's settings.bind property is set which is then used by routes and extensions added at the same level (server root or plugin).
+ * 
+ * https://github.com/hapijs/hapi/blob/master/API.md#server.realm
+ */
+export interface ServerRealm {
+    /** when the server object is provided as an argument to the plugin register() method, modifiers provides the registration preferences passed the server.register() method and includes: */
+    modifiers: {
+        /** routes preferences: */
+        route: {
+            /** the route path prefix used by any calls to server.route() from the server. Note that if a prefix is used and the route path is set to '/', the resulting path will not include the trailing slash. */
+            prefix: string;
+            /** the route virtual host settings used by any calls to server.route() from the server. */
+            vhost: string;
+        }
+    };
+    /** the realm of the parent server object, or null for the root server. */
+    parent: ServerRealm | null;
+    /** the active plugin name (empty string if at the server root). */
+    plugin: string;
+    /** the plugin options object passed at registration. */
+    pluginOptions: object;
+    /** plugin-specific state to be shared only among activities sharing the same active state. plugins is an object where each key is a plugin name and the value is the plugin state. */
+    plugins: PluginsStates;
+    /** settings overrides */
+    settings: {
+        files: {
+            relativeTo: string;
+        };
+        bind: object;
+    };
+}
diff --git a/types/hapi/definitions/server/server-register.d.ts b/types/hapi/definitions/server/server-register.d.ts
new file mode 100644
index 0000000000..313a3c164e
--- /dev/null
+++ b/types/hapi/definitions/server/server-register.d.ts
@@ -0,0 +1,62 @@
+import {Plugin} from "hapi";
+
+/**
+ * Registration options (different from the options passed to the registration function):
+ * * once - if true, subsequent registrations of the same plugin are skipped without error. Cannot be used with plugin options. Defaults to false. If not set to true, an error will be thrown the second time a plugin is registered on the server.
+ * * routes - modifiers applied to each route added by the plugin:
+ * * * prefix - string added as prefix to any route path (must begin with '/'). If a plugin registers a child plugin the prefix is passed on to the child or is added in front of the child-specific prefix.
+ * * * vhost - virtual host string (or array of strings) applied to every route. The outer-most vhost overrides the any nested configuration.
+ * For reference [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-await-serverregisterplugins-options)
+ */
+export interface ServerRegisterOptions {
+    /**
+     * if true, subsequent registrations of the same plugin are skipped without error. Cannot be used with plugin options. Defaults to false. If not set to true, an error will be thrown the second time a plugin is registered on the server.
+     */
+    once?: boolean;
+    /**
+     * modifiers applied to each route added by the plugin:
+     */
+    routes?: {
+        /**
+         * string added as prefix to any route path (must begin with '/'). If a plugin registers a child plugin the prefix is passed on to the child or is added in front of the child-specific prefix.
+         */
+        prefix: string;
+        /**
+         * virtual host string (or array of strings) applied to every route. The outer-most vhost overrides the any nested configuration.
+         */
+        vhost: string | string[];
+    };
+}
+
+/**
+ * An object with the following:
+ * * plugin - a plugin object.
+ * * options - (optional) options passed to the plugin during registration.
+ * * once - if true, subsequent registrations of the same plugin are skipped without error. Cannot be used with plugin options. Defaults to false. If not set to true, an error will be thrown the second time a plugin is registered on the server.
+ * * routes - modifiers applied to each route added by the plugin:
+ * * * prefix - string added as prefix to any route path (must begin with '/'). If a plugin registers a child plugin the prefix is passed on to the child or is added in front of the child-specific prefix.
+ * * * vhost - virtual host string (or array of strings) applied to every route. The outer-most vhost overrides the any nested configuration.
+ * For reference [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-await-serverregisterplugins-options)
+ *
+ * The type parameter T is the type of the plugin configuration options.
+ */
+export interface ServerRegisterPluginObject<T> extends ServerRegisterOptions {
+    /**
+     * a plugin object.
+     */
+    plugin: Plugin<T>;
+    /**
+     * options passed to the plugin during registration.
+     */
+    options?: T;
+}
+
+export interface ServerRegisterPluginObjectArray<T, U, V, W, X, Y, Z> extends Array<ServerRegisterPluginObject<T> | ServerRegisterPluginObject<U> | ServerRegisterPluginObject<V> | ServerRegisterPluginObject<W> | ServerRegisterPluginObject<X> | ServerRegisterPluginObject<Y> | ServerRegisterPluginObject<Z> | undefined> {
+    0: ServerRegisterPluginObject<T>;
+    1?: ServerRegisterPluginObject<U>;
+    2?: ServerRegisterPluginObject<V>;
+    3?: ServerRegisterPluginObject<W>;
+    4?: ServerRegisterPluginObject<X>;
+    5?: ServerRegisterPluginObject<Y>;
+    6?: ServerRegisterPluginObject<Z>;
+}
diff --git a/types/hapi/definitions/server/server-route.d.ts b/types/hapi/definitions/server/server-route.d.ts
new file mode 100644
index 0000000000..7c9087bddd
--- /dev/null
+++ b/types/hapi/definitions/server/server-route.d.ts
@@ -0,0 +1,55 @@
+import {Lifecycle, RouteOptions, Server, Util} from "hapi";
+
+export interface ServerRouteConfig {
+}
+
+/**
+ * A route configuration object or an array of configuration objects where each object contains:
+ * * path - (required) the absolute path used to match incoming requests (must begin with '/'). Incoming requests are compared to the configured paths based on the server's router configuration. The path can include named parameters enclosed in {} which will be matched against literal values in the request as described in Path parameters.
+ * * method - (required) the HTTP method. Typically one of 'GET', 'POST', 'PUT', 'PATCH', 'DELETE', or 'OPTIONS'. Any HTTP method is allowed, except for 'HEAD'. Use '*' to match against any HTTP method (only when an exact match was not found, and any match with a specific method will be given a higher priority over a wildcard match). Can be assigned an array of methods which has the same result as adding the same route with different methods manually.
+ * * vhost - (optional) a domain string or an array of domain strings for limiting the route to only requests with a matching host header field. Matching is done against the hostname part of the header only (excluding the port). Defaults to all hosts.
+ * * handler - (required when handler is not set) the route handler function called to generate the response after successful authentication and validation.
+ * * options - additional route options. The options value can be an object or a function that returns an object using the signature function(server) where server is the server the route is being added to and this is bound to the current realm's bind option.
+ * * rules - route custom rules object. The object is passed to each rules processor registered with server.rules(). Cannot be used if route.options.rules is defined.
+ * For context [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverrouteroute)
+ */
+export interface ServerRoute {
+
+    /**
+     * (required) the absolute path used to match incoming requests (must begin with '/'). Incoming requests are compared to the configured paths based on the server's router configuration. The path can include named parameters enclosed in {} which will be matched against literal values in the request as described in Path parameters.
+     * For context [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverrouteroute)
+     * For context [See docs](https://github.com/hapijs/hapi/blob/master/API.md#path-parameters)
+     */
+    path: string;
+
+    /**
+     * (required) the HTTP method. Typically one of 'GET', 'POST', 'PUT', 'PATCH', 'DELETE', or 'OPTIONS'. Any HTTP method is allowed, except for 'HEAD'. Use '*' to match against any HTTP method (only when an exact match was not found, and any match with a specific method will be given a higher priority over a wildcard match). Can be assigned an array of methods which has the same result as adding the same route with different methods manually.
+     */
+    method: Util.HTTP_METHODS_PARTIAL | Util.HTTP_METHODS_PARTIAL[] | string | string[];
+
+    /**
+     * (optional) a domain string or an array of domain strings for limiting the route to only requests with a matching host header field. Matching is done against the hostname part of the header only (excluding the port). Defaults to all hosts.
+     */
+    vhost?: string | string[];
+
+    /**
+     * (required when handler is not set) the route handler function called to generate the response after successful authentication and validation.
+     */
+    handler?: Lifecycle.Method | object;
+
+    /**
+     * additional route options. The options value can be an object or a function that returns an object using the signature function(server) where server is the server the route is being added to and this is bound to the current realm's bind option.
+     */
+    options?: RouteOptions | ((server: Server) => RouteOptions);
+
+    /**
+     * route custom rules object. The object is passed to each rules processor registered with server.rules(). Cannot be used if route.options.rules is defined.
+     */
+    rules?: object;
+
+    /**
+     * Missing documentation. Exist only in examples and test files.
+     */
+    config?: ServerRouteConfig;
+
+}
diff --git a/types/hapi/definitions/server/server-state-options.d.ts b/types/hapi/definitions/server/server-state-options.d.ts
new file mode 100644
index 0000000000..f95eb4b794
--- /dev/null
+++ b/types/hapi/definitions/server/server-state-options.d.ts
@@ -0,0 +1,63 @@
+import { Request } from "hapi";
+import { SealOptions, SealOptionsSub } from "iron";
+
+/**
+ * Optional cookie settings
+ * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverstatename-options)
+ */
+export interface ServerStateCookieOptions {
+    /** time-to-live in milliseconds. Defaults to null (session time-life - cookies are deleted when the browser is closed). */
+    ttl?: number | null;
+    /** sets the 'Secure' flag. Defaults to true. */
+    isSecure?: boolean;
+    /** sets the 'HttpOnly' flag. Defaults to true. */
+    isHttpOnly?: boolean;
+    /**
+     * sets the 'SameSite' flag. The value must be one of:
+     *  * false - no flag.
+     *  * 'Strict' - sets the value to 'Strict' (this is the default value).
+     *  * 'Lax' - sets the value to 'Lax'.
+     */
+    isSameSite?: false | 'Strict' | 'Lax';
+    /** the path scope. Defaults to null (no path). */
+    path?: string | null;
+    /** the domain scope. Defaults to null (no domain). */
+    domain?: string | null;
+    /**
+     * if present and the cookie was not received from the client or explicitly set by the route handler, the
+     * cookie is automatically added to the response with the provided value. The value can be
+     * a function with signature async function(request) where:
+     */
+    autoValue?(request: Request): void;
+    /**
+     * encoding performs on the provided value before serialization. Options are:
+     *  * 'none' - no encoding. When used, the cookie value must be a string. This is the default value.
+     *  * 'base64' - string value is encoded using Base64.
+     *  * 'base64json' - object value is JSON-stringified then encoded using Base64.
+     *  * 'form' - object value is encoded using the x-www-form-urlencoded method.
+     *  * 'iron' - Encrypts and sign the value using iron.
+     */
+    encoding?: 'none' | 'base64' | 'base64json' | 'form' | 'iron';
+    /**
+     * an object used to calculate an HMAC for cookie integrity validation. This does not provide privacy, only a mean
+     * to verify that the cookie value was generated by the server. Redundant when 'iron' encoding is used. Options are:
+     *  * integrity - algorithm options. Defaults to require('iron').defaults.integrity.
+     *  * password - password used for HMAC key generation (must be at least 32 characters long).
+     */
+    sign?: {
+        integrity?: SealOptionsSub;
+        password: string;
+    };
+    /** password used for 'iron' encoding (must be at least 32 characters long). */
+    password?: string;
+    /** options for 'iron' encoding. Defaults to require('iron').defaults. */
+    iron?: SealOptions;
+    /** if true, errors are ignored and treated as missing cookies. */
+    ignoreErrors?: boolean;
+    /** if true, automatically instruct the client to remove invalid cookies. Defaults to false. */
+    clearInvalid?: boolean;
+    /** if false, allows any cookie value including values in violation of RFC 6265. Defaults to true. */
+    strictHeader?: boolean;
+    /** used by proxy plugins (e.g. h2o2). */
+    passThrough?: any;
+}
diff --git a/types/hapi/definitions/server/server-state.d.ts b/types/hapi/definitions/server/server-state.d.ts
new file mode 100644
index 0000000000..119e06073c
--- /dev/null
+++ b/types/hapi/definitions/server/server-state.d.ts
@@ -0,0 +1,67 @@
+import { ServerStateCookieOptions, Util } from "hapi";
+
+/**
+ * A single object or an array of object where each contains:
+ * * name - the cookie name.
+ * * value - the cookie value.
+ * * options - cookie configuration to override the server settings.
+ */
+export interface ServerStateFormat {
+    name: string;
+    value: string;
+    options: ServerStateCookieOptions;
+}
+
+/**
+ * For context [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverstatename-options)
+ * For context [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serveroptionsstate)
+ */
+export interface ServerState {
+    /**
+     * The server cookies manager.
+     * Access: read only and statehood public interface.
+     */
+    readonly states: object;
+
+    /**
+     * The server cookies manager settings. The settings are based on the values configured in [server.options.state](https://github.com/hapijs/hapi/blob/master/API.md#server.options.state).
+     */
+    readonly settings: ServerStateCookieOptions;
+
+    /**
+     * An object containing the configuration of each cookie added via [server.state()](https://github.com/hapijs/hapi/blob/master/API.md#server.state()) where each key is the
+     * cookie name and value is the configuration object.
+     */
+    readonly cookies: object;
+
+    /**
+     * An array containing the names of all configued cookies.
+     */
+    readonly names: string[];
+
+    /**
+     * Same as calling [server.state()](https://github.com/hapijs/hapi/blob/master/API.md#server.state()).
+     */
+    add(name: string, options?: ServerStateCookieOptions): void;
+
+    /**
+     * Formats an HTTP 'Set-Cookie' header based on the server.options.state where:
+     * @param cookies - a single object or an array of object where each contains:
+     * * name - the cookie name.
+     * * value - the cookie value.
+     * * options - cookie configuration to override the server settings.
+     * @return Return value: a header string.
+     * Note that this utility uses the server configuration but does not change the server state. It is provided for manual cookie formating (e.g. when headers are set manually).
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-async-serverstatesformatcookies)
+     */
+    format(cookies: ServerStateFormat | ServerStateFormat[]): string;
+
+    /**
+     * Parses an HTTP 'Cookies' header based on the server.options.state where:
+     * @param header - the HTTP header.
+     * @return Return value: an object where each key is a cookie name and value is the parsed cookie.
+     * Note that this utility uses the server configuration but does not change the server state. It is provided for manual cookie parsing (e.g. when server parsing is disabled).
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-async-serverstatesparseheader)
+     */
+    parse(header: string): Util.Dictionary<string>;
+}
diff --git a/types/hapi/definitions/server/server.d.ts b/types/hapi/definitions/server/server.d.ts
new file mode 100644
index 0000000000..0133a35775
--- /dev/null
+++ b/types/hapi/definitions/server/server.d.ts
@@ -0,0 +1,563 @@
+import * as http from "http";
+import * as zlib from "zlib";
+import * as Podium from "podium";
+import {
+    ApplicationState,
+    Lifecycle,
+    PayloadCompressionDecoderSettings,
+    Plugin,
+    PluginsListRegistered,
+    Request,
+    RequestRoute,
+    ResponseToolkit,
+    RouteCompressionEncoderSettings,
+    ServerAuth,
+    ServerCache,
+    ServerEvents,
+    ServerEventsApplication,
+    ServerExtEventsObject,
+    ServerExtEventsRequestObject,
+    ServerExtOptions,
+    ServerExtPointFunction,
+    ServerExtType,
+    ServerInfo,
+    ServerInjectOptions,
+    ServerInjectResponse,
+    ServerMethod,
+    ServerMethodConfigurationObject,
+    ServerMethodOptions,
+    ServerOptions,
+    ServerRealm,
+    ServerRegisterOptions,
+    ServerRegisterPluginObject,
+    ServerRegisterPluginObjectArray,
+    ServerRoute,
+    ServerState,
+    ServerStateCookieOptions,
+    Util,
+} from "hapi";
+
+/**
+ * The server object is the main application container. The server manages all incoming requests along with all
+ * the facilities provided by the framework. Each server supports a single connection (e.g. listen to port 80).
+ * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#server)
+ */
+export class Server extends Podium {
+
+    /**
+     * Creates a new server object
+     * @constructor
+     */
+    constructor();
+
+    /**
+     * Creates a new server object where:
+     * @constructor
+     * @param options server configuration object.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serveroptions)
+     */
+    constructor(options: ServerOptions);
+
+    /**
+     * Provides a safe place to store server-specific run-time application data without potential conflicts with
+     * the framework internals. The data can be accessed whenever the server is accessible.
+     * Initialized with an empty object.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverapp)
+     */
+    app?: ApplicationState;
+
+    /**
+     * Server Auth: properties and methods
+     */
+    auth: ServerAuth;
+
+    /**
+     * Provides access to the decorations already applied to various framework interfaces. The object must not be
+     * modified directly, but only through server.decorate.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverdecorations)
+     */
+    readonly decorations: {
+        /**
+         * decorations on the request object.
+         */
+        request: string[],
+        /**
+         * decorations on the response toolkit.
+         */
+        toolkit: string[],
+        /**
+         * decorations on the server object.
+         */
+        server: string[]
+    };
+
+    /**
+     * Register custom application events where:
+     * @param events must be one of:
+     * * an event name string.
+     * * an event options object with the following optional keys (unless noted otherwise):
+     * * * name - the event name string (required).
+     * * * channels - a string or array of strings specifying the event channels available. Defaults to no channel restrictions (event updates can specify a channel or not).
+     * * * clone - if true, the data object passed to server.events.emit() is cloned before it is passed to the listeners (unless an override specified by each listener). Defaults to false (data is passed as-is).
+     * * * spread - if true, the data object passed to server.event.emit() must be an array and the listener method is called with each array element passed as a separate argument (unless an override specified by each listener). This should only be used when the emitted data structure is known and predictable. Defaults to false (data is emitted as a single argument regardless of its type).
+     * * * tags - if true and the criteria object passed to server.event.emit() includes tags, the tags are mapped to an object (where each tag string is the key and the value is true) which is appended to the arguments list at the end. A configuration override can be set by each listener. Defaults to false.
+     * * * shared - if true, the same event name can be registered multiple times where the second registration is ignored. Note that if the registration config is changed between registrations, only the first configuration is used. Defaults to false (a duplicate registration will throw an error).
+     * * a podium emitter object.
+     * * an array containing any of the above.
+     * @return Return value: none.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverevents)
+     */
+    event(events: ServerEventsApplication | ServerEventsApplication[]): void;
+
+    /**
+     * Access: podium public interface.
+     * The server events emitter. Utilizes the podium with support for event criteria validation, channels, and filters.
+     * Use the following methods to interact with server.events:
+     * [server.events.emit(criteria, data)](https://github.com/hapijs/hapi/blob/master/API.md#server.events.emit()) - emit server events.
+     * [server.events.on(criteria, listener)](https://github.com/hapijs/hapi/blob/master/API.md#server.events.on()) - subscribe to all events.
+     * [server.events.once(criteria, listener)](https://github.com/hapijs/hapi/blob/master/API.md#server.events.once()) - subscribe to
+     * Other methods include: server.events.removeListener(name, listener), server.events.removeAllListeners(name), and server.events.hasListeners(name).
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverevents)
+     */
+    events: ServerEvents;
+
+    /**
+     * An object containing information about the server where:
+     * * id - a unique server identifier (using the format '{hostname}:{pid}:{now base36}').
+     * * created - server creation timestamp.
+     * * started - server start timestamp (0 when stopped).
+     * * port - the connection port based on the following rules:
+     * * host - The host configuration value.
+     * * address - the active IP address the connection was bound to after starting. Set to undefined until the server has been started or when using a non TCP port (e.g. UNIX domain socket).
+     * * protocol - the protocol used:
+     * * 'http' - HTTP.
+     * * 'https' - HTTPS.
+     * * 'socket' - UNIX domain socket or Windows named pipe.
+     * * uri - a string representing the connection (e.g. 'http://example.com:8080' or 'socket:/unix/domain/socket/path'). Contains the uri value if set, otherwise constructed from the available settings. If no port is configured or is set to 0, the uri will not include a port component until the server is started.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverinfo)
+     */
+    readonly info: ServerInfo;
+
+    /**
+     * Access: read only and listener public interface.
+     * The node HTTP server object.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverlistener)
+     */
+    listener: http.Server;
+
+    /**
+     * An object containing the process load metrics (when load.sampleInterval is enabled):
+     * * eventLoopDelay - event loop delay milliseconds.
+     * * heapUsed - V8 heap usage.
+     * * rss - RSS memory usage.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverload)
+     */
+    readonly load: {
+        /**
+         * event loop delay milliseconds.
+         */
+        eventLoopDelay: number;
+        /**
+         * V8 heap usage.
+         */
+        heapUsed: number;
+        /**
+         * RSS memory usage.
+         */
+        rss: number;
+    };
+
+    /**
+     * Server methods are functions registered with the server and used throughout the application as a common utility.
+     * Their advantage is in the ability to configure them to use the built-in cache and share across multiple request
+     * handlers without having to create a common module.
+     * sever.methods is an object which provides access to the methods registered via server.method() where each
+     * server method name is an object property.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-servermethods
+     */
+    readonly methods: Util.Dictionary<ServerMethod>;
+
+    /**
+     * Provides access to the server MIME database used for setting content-type information. The object must not be
+     * modified directly but only through the [mime](https://github.com/hapijs/hapi/blob/master/API.md#server.options.mime) server setting.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-servermime)
+     */
+    mime: any;
+
+    /**
+     * An object containing the values exposed by each registered plugin where each key is a plugin name and the values
+     * are the exposed properties by each plugin using server.expose(). Plugins may set the value of
+     * the server.plugins[name] object directly or via the server.expose() method.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverplugins)
+     */
+    plugins: any;
+
+    /**
+     * The realm object contains sandboxed server settings specific to each plugin or authentication strategy. When
+     * registering a plugin or an authentication scheme, a server object reference is provided with a new server.realm
+     * container specific to that registration. It allows each plugin to maintain its own settings without leaking
+     * and affecting other plugins.
+     * For example, a plugin can set a default file path for local resources without breaking other plugins' configured
+     * paths. When calling server.bind(), the active realm's settings.bind property is set which is then used by
+     * routes and extensions added at the same level (server root or plugin).
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverrealm)
+     */
+    readonly realm: ServerRealm;
+
+    /**
+     * An object of the currently registered plugins where each key is a registered plugin name and the value is
+     * an object containing:
+     * * version - the plugin version.
+     * * name - the plugin name.
+     * * options - (optional) options passed to the plugin during registration.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverregistrations)
+     */
+    readonly registrations: PluginsListRegistered;
+
+    /**
+     * The server configuration object after defaults applied.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serversettings)
+     */
+    readonly settings: ServerOptions;
+
+    /**
+     * The server cookies manager.
+     * Access: read only and statehood public interface.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverstates)
+     */
+    readonly states: ServerState;
+
+    /**
+     * A string indicating the listener type where:
+     * * 'socket' - UNIX domain socket or Windows named pipe.
+     * * 'tcp' - an HTTP listener.
+     */
+    readonly type: 'socket' | 'tcp';
+
+    /**
+     * The hapi module version number.
+     */
+    readonly version: string;
+
+    /**
+     * Sets a global context used as the default bind object when adding a route or an extension where:
+     * @param context - the object used to bind this in lifecycle methods such as the route handler and extension methods. The context is also made available as h.context.
+     * @return Return value: none.
+     * When setting a context inside a plugin, the context is applied only to methods set up by the plugin. Note that the context applies only to routes and extensions added after it has been set. Ignored if the method being bound is an arrow function.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverbindcontext)
+     */
+    bind(context: object): void;
+
+    /**
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-servercacheoptions)
+     */
+    cache: ServerCache;
+
+    /**
+     * Registers a custom content decoding compressor to extend the built-in support for 'gzip' and 'deflate' where:
+     * @param encoding - the decoder name string.
+     * @param decoder - a function using the signature function(options) where options are the encoding specific options configured in the route payload.compression configuration option, and the return value is an object compatible with the output of node's zlib.createGunzip().
+     * @return Return value: none.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverdecoderencoding-decoder)
+     */
+    decoder(encoding: string, decoder: ((options: PayloadCompressionDecoderSettings) => zlib.Gunzip)): void;
+
+    /**
+     * Extends various framework interfaces with custom methods where:
+     * @param type - the interface being decorated. Supported types:
+     * 'handler' - adds a new handler type to be used in routes handlers.
+     * 'request' - adds methods to the Request object.
+     * 'server' - adds methods to the Server object.
+     * 'toolkit' - adds methods to the response toolkit.
+     * @param property - the object decoration key name.
+     * @param method - the extension function or other value.
+     * @param options - (optional) supports the following optional settings:
+     * apply - when the type is 'request', if true, the method function is invoked using the signature function(request) where request is the current request object and the returned value is assigned as the decoration.
+     * extend - if true, overrides an existing decoration. The method must be a function with the signature function(existing) where:
+     * existing - is the previously set decoration method value.
+     * must return the new decoration function or value.
+     * cannot be used to extend handler decorations.
+     * @return void;
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverdecoratetype-property-method-options)
+     */
+    decorate(type: 'request', property: string, method: ((request: Request) => Function), options?: {apply: true;  extend: false} ): void;
+    decorate(type: 'handler' | 'request' | 'server' | 'toolkit', property: string, method: Function, options?: {apply: boolean;  extend: boolean} ): void;
+
+    /**
+     * Used within a plugin to declare a required dependency on other plugins where:
+     * @param dependencies - a single string or an array of plugin name strings which must be registered in order for this plugin to operate. Plugins listed must be registered before the server is initialized or started.
+     * @param after - (optional) a function that is called after all the specified dependencies have been registered and before the server starts. The function is only called if the server is initialized or started. The function signature is async function(server) where:
+     * server - the server the dependency() method was called on.
+     * @return Return value: none.
+     * The after method is identical to setting a server extension point on 'onPreStart'.
+     * If a circular dependency is detected, an exception is thrown (e.g. two plugins each has an after function to be called after the other).
+     * The method does not provide version dependency which should be implemented using npm peer dependencies.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverdependencydependencies-after)
+     */
+    dependency(dependencies: string | string[], after?: ((server: Server) => void)): void;
+
+    /**
+     * Registers a custom content encoding compressor to extend the built-in support for 'gzip' and 'deflate' where:
+     * @param encoding - the encoder name string.
+     * @param encoder - a function using the signature function(options) where options are the encoding specific options configured in the route compression option, and the return value is an object compatible with the output of node's zlib.createGzip().
+     * @return Return value: none.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverencoderencoding-encoder)
+     */
+    encoder(encoding: string, encoder: ((options: RouteCompressionEncoderSettings) => zlib.Gzip)): void;
+
+    /**
+     * Used within a plugin to expose a property via server.plugins[name] where:
+     * @param key - the key assigned (server.plugins[name][key]).
+     * @param value - the value assigned.
+     * @return Return value: none.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverexposekey-value)
+     */
+    expose(key: string, value: any): void;
+
+    /**
+     * Merges an object into to the existing content of server.plugins[name] where:
+     * @param obj - the object merged into the exposed properties container.
+     * @return Return value: none.
+     * Note that all the properties of obj are deeply cloned into server.plugins[name], so avoid using this method
+     * for exposing large objects that may be expensive to clone or singleton objects such as database client
+     * objects. Instead favor server.expose(key, value), which only copies a reference to value.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverexposeobj)
+     */
+    expose(obj: object): void;
+
+    /**
+     * Registers an extension function in one of the request lifecycle extension points where:
+     * @param events - an object or array of objects with the following:
+     * * type - (required) the extension point event name. The available extension points include the request extension points as well as the following server extension points:
+     * * * 'onPreStart' - called before the connection listeners are started.
+     * * * 'onPostStart' - called after the connection listeners are started.
+     * * * 'onPreStop' - called before the connection listeners are stopped.
+     * * * 'onPostStop' - called after the connection listeners are stopped.
+     * * method - (required) a function or an array of functions to be executed at a specified point during request processing. The required extension function signature is:
+     * * * server extension points: async function(server) where:
+     * * * * server - the server object.
+     * * * * this - the object provided via options.bind or the current active context set with server.bind().
+     * * * request extension points: a lifecycle method.
+     * * options - (optional) an object with the following:
+     * * * before - a string or array of strings of plugin names this method must execute before (on the same event). Otherwise, extension methods are executed in the order added.
+     * * * after - a string or array of strings of plugin names this method must execute after (on the same event). Otherwise, extension methods are executed in the order added.
+     * * * bind - a context object passed back to the provided method (via this) when called. Ignored if the method is an arrow function.
+     * * * sandbox - if set to 'plugin' when adding a request extension points the extension is only added to routes defined by the current plugin. Not allowed when configuring route-level extensions, or when adding server extensions. Defaults to 'server' which applies to any route added to the server the extension is added to.
+     * @return void
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverextevents)
+     */
+    ext(events: ServerExtEventsObject | ServerExtEventsObject[]): void;
+    ext(events: ServerExtEventsRequestObject | ServerExtEventsRequestObject[]): void;
+
+    /**
+     * Registers a single extension event using the same properties as used in server.ext(events), but passed as arguments.
+     * @return Return value: none.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverextevent-method-options)
+     */
+    ext(event: ServerExtType, method: ServerExtPointFunction | Lifecycle.Method | Function, options?: ServerExtOptions): void;
+
+    /**
+     * Initializes the server (starts the caches, finalizes plugin registration) but does not start listening on the connection port.
+     * @return Return value: none.
+     * Note that if the method fails and throws an error, the server is considered to be in an undefined state and
+     * should be shut down. In most cases it would be impossible to fully recover as the various plugins, caches, and
+     * other event listeners will get confused by repeated attempts to start the server or make assumptions about the
+     * healthy state of the environment. It is recommended to abort the process when the server fails to start properly.
+     * If you must try to resume after an error, call server.stop() first to reset the server state.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-await-serverinitialize)
+     */
+    initialize(): Promise<void>;
+
+    /**
+     * Injects a request into the server simulating an incoming HTTP request without making an actual socket connection. Injection is useful for testing purposes as well as for invoking routing logic internally without the overhead and limitations of the network stack.
+     * The method utilizes the shot module for performing injections, with some additional options and response properties:
+     * @param options - can be assigned a string with the requested URI, or an object with:
+     * * method - (optional) the request HTTP method (e.g. 'POST'). Defaults to 'GET'.
+     * * url - (required) the request URL. If the URI includes an authority (e.g. 'example.com:8080'), it is used to automatically set an HTTP 'Host' header, unless one was specified in headers.
+     * * headers - (optional) an object with optional request headers where each key is the header name and the value is the header content. Defaults to no additions to the default shot headers.
+     * * payload - (optional) an string, buffer or object containing the request payload. In case of an object it will be converted to a string for you. Defaults to no payload. Note that payload processing defaults to 'application/json' if no 'Content-Type' header provided.
+     * * credentials - (optional) an credentials object containing authentication information. The credentials are used to bypass the default authentication strategies, and are validated directly as if they were received via an authentication scheme. Defaults to no credentials.
+     * * artifacts - (optional) an artifacts object containing authentication artifact information. The artifacts are used to bypass the default authentication strategies, and are validated directly as if they were received via an authentication scheme. Ignored if set without credentials. Defaults to no artifacts.
+     * * app - (optional) sets the initial value of request.app, defaults to {}.
+     * * plugins - (optional) sets the initial value of request.plugins, defaults to {}.
+     * * allowInternals - (optional) allows access to routes with config.isInternal set to true. Defaults to false.
+     * * remoteAddress - (optional) sets the remote address for the incoming connection.
+     * * simulate - (optional) an object with options used to simulate client request stream conditions for testing:
+     * * error - if true, emits an 'error' event after payload transmission (if any). Defaults to false.
+     * * close - if true, emits a 'close' event after payload transmission (if any). Defaults to false.
+     * * end - if false, does not end the stream. Defaults to true.
+     * * split - indicates whether the request payload will be split into chunks. Defaults to undefined, meaning payload will not be chunked.
+     * * validate - (optional) if false, the options inputs are not validated. This is recommended for run-time usage of inject() to make it perform faster where input validation can be tested separately.
+     * @return Return value: a response object with the following properties:
+     * * statusCode - the HTTP status code.
+     * * headers - an object containing the headers set.
+     * * payload - the response payload string.
+     * * rawPayload - the raw response payload buffer.
+     * * raw - an object with the injection request and response objects:
+     * * req - the simulated node request object.
+     * * res - the simulated node response object.
+     * * result - the raw handler response (e.g. when not a stream or a view) before it is serialized for transmission. If not available, the value is set to payload. Useful for inspection and reuse of the internal objects returned (instead of parsing the response string).
+     * * request - the request object.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-await-serverinjectoptions)
+     */
+    inject(options: string | ServerInjectOptions): Promise<ServerInjectResponse>;
+
+    /**
+     * Logs server events that cannot be associated with a specific request. When called the server emits a 'log' event which can be used by other listeners or plugins to record the information or output to the console. The arguments are:
+     * @param tags - (required) a string or an array of strings (e.g. ['error', 'database', 'read']) used to identify the event. Tags are used instead of log levels and provide a much more expressive mechanism for describing and filtering events. Any logs generated by the server internally include the 'hapi' tag along with event-specific information.
+     * @param data - (optional) an message string or object with the application data being logged. If data is a function, the function signature is function() and it called once to generate (return value) the actual data emitted to the listeners. If no listeners match the event, the data function is not invoked.
+     * @param timestamp - (optional) an timestamp expressed in milliseconds. Defaults to Date.now() (now).
+     * @return Return value: none.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverlogtags-data-timestamp)
+     */
+    log(tags: string | string[], data?: string | object | (() => any), timestamp?: number): void;
+
+    /**
+     * Looks up a route configuration where:
+     * @param id - the route identifier.
+     * @return Return value: the route information if found, otherwise null.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverlookupid)
+     */
+    lookup(id: string): RequestRoute | null;
+
+    /**
+     * Looks up a route configuration where:
+     * @param method - the HTTP method (e.g. 'GET', 'POST').
+     * @param path - the requested path (must begin with '/').
+     * @param host - (optional) hostname (to match against routes with vhost).
+     * @return Return value: the route information if found, otherwise null.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-servermatchmethod-path-host)
+     */
+    match(method: Util.HTTP_METHODS, path: string, host?: string): RequestRoute | null;
+
+    /**
+     * Registers a server method where:
+     * @param name - a unique method name used to invoke the method via server.methods[name].
+     * @param method - the method function with a signature async function(...args, [flags]) where:
+     * * ...args - the method function arguments (can be any number of arguments or none).
+     * * flags - when caching is enabled, an object used to set optional method result flags:
+     * * * ttl - 0 if result is valid but cannot be cached. Defaults to cache policy.
+     * @param options - (optional) configuration object:
+     * * bind - a context object passed back to the method function (via this) when called. Defaults to active context (set via server.bind() when the method is registered. Ignored if the method is an arrow function.
+     * * cache - the same cache configuration used in server.cache(). The generateTimeout option is required.
+     * * generateKey - a function used to generate a unique key (for caching) from the arguments passed to the method function (the flags argument is not passed as input). The server will automatically generate a unique key if the function's arguments are all of types 'string', 'number', or 'boolean'. However if the method uses other types of arguments, a key generation function must be provided which takes the same arguments as the function and returns a unique string (or null if no key can be generated).
+     * @return Return value: none.
+     * Method names can be nested (e.g. utils.users.get) which will automatically create the full path under server.methods (e.g. accessed via server.methods.utils.users.get).
+     * When configured with caching enabled, server.methods[name].cache is assigned an object with the following properties and methods: - await drop(...args) - a function that can be used to clear the cache for a given key. - stats - an object with cache statistics, see catbox for stats documentation.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-servermethodname-method-options)
+     */
+    method(name: string, method: ServerMethod, options?: ServerMethodOptions): void;
+
+    /**
+     * Registers a server method function as described in server.method() using a configuration object where:
+     * @param methods - an object or an array of objects where each one contains:
+     * * name - the method name.
+     * * method - the method function.
+     * * options - (optional) settings.
+     * @return Return value: none.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-servermethodmethods)
+     */
+    method(methods: ServerMethodConfigurationObject | ServerMethodConfigurationObject[]): void;
+
+    /**
+     * Sets the path prefix used to locate static resources (files and view templates) when relative paths are used where:
+     * @param relativeTo - the path prefix added to any relative file path starting with '.'.
+     * @return Return value: none.
+     * Note that setting a path within a plugin only applies to resources accessed by plugin methods. If no path is set, the server default route configuration files.relativeTo settings is used. The path only applies to routes added after it has been set.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverpathrelativeto)
+     */
+    path(relativeTo: string): void;
+
+    /**
+     * Registers a plugin where:
+     * @param plugins - one or an array of:
+     * * a plugin object.
+     * * an object with the following:
+     * * * plugin - a plugin object.
+     * * * options - (optional) options passed to the plugin during registration.
+     * * * once, routes - (optional) plugin-specific registration options as defined below.
+     * @param options - (optional) registration options (different from the options passed to the registration function):
+     * * once - if true, subsequent registrations of the same plugin are skipped without error. Cannot be used with plugin options. Defaults to false. If not set to true, an error will be thrown the second time a plugin is registered on the server.
+     * * routes - modifiers applied to each route added by the plugin:
+     * * * prefix - string added as prefix to any route path (must begin with '/'). If a plugin registers a child plugin the prefix is passed on to the child or is added in front of the child-specific prefix.
+     * * * vhost - virtual host string (or array of strings) applied to every route. The outer-most vhost overrides the any nested configuration.
+     * @return Return value: none.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-await-serverregisterplugins-options)
+     */
+    register(plugins: Plugin<any> | Plugin<any>[], options?: ServerRegisterOptions): Promise<void>;
+    register<T, U, V, W, X, Y, Z>(plugins: ServerRegisterPluginObject<T> | ServerRegisterPluginObjectArray<T, U, V, W, X, Y, Z>, options?: ServerRegisterOptions): Promise<void>;
+
+    /**
+     * Adds a route where:
+     * @param route - a route configuration object or an array of configuration objects where each object contains:
+     * * path - (required) the absolute path used to match incoming requests (must begin with '/'). Incoming requests are compared to the configured paths based on the server's router configuration. The path can include named parameters enclosed in {} which will be matched against literal values in the request as described in Path parameters.
+     * * method - (required) the HTTP method. Typically one of 'GET', 'POST', 'PUT', 'PATCH', 'DELETE', or 'OPTIONS'. Any HTTP method is allowed, except for 'HEAD'. Use '*' to match against any HTTP method (only when an exact match was not found, and any match with a specific method will be given a higher priority over a wildcard match). Can be assigned an array of methods which has the same result as adding the same route with different methods manually.
+     * * vhost - (optional) a domain string or an array of domain strings for limiting the route to only requests with a matching host header field. Matching is done against the hostname part of the header only (excluding the port). Defaults to all hosts.
+     * * handler - (required when handler is not set) the route handler function called to generate the response after successful authentication and validation.
+     * * options - additional route options. The options value can be an object or a function that returns an object using the signature function(server) where server is the server the route is being added to and this is bound to the current realm's bind option.
+     * * rules - route custom rules object. The object is passed to each rules processor registered with server.rules(). Cannot be used if route.options.rules is defined.
+     * @return Return value: none.
+     * Note that the options object is deeply cloned (with the exception of bind which is shallowly copied) and cannot contain any values that are unsafe to perform deep copy on.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverrouteroute)
+     */
+    route(route: ServerRoute | ServerRoute[]): void;
+
+    /**
+     * Defines a route rules processor for converting route rules object into route configuration where:
+     * @param processor - a function using the signature function(rules, info) where:
+     * * rules -
+     * * info - an object with the following properties:
+     * * * method - the route method.
+     * * * path - the route path.
+     * * * vhost - the route virtual host (if any defined).
+     * * returns a route config object.
+     * @param options - optional settings:
+     * * validate - rules object validation:
+     * * * schema - joi schema.
+     * * * options - optional joi validation options. Defaults to { allowUnknown: true }.
+     * Note that the root server and each plugin server instance can only register one rules processor. If a route is added after the rules are configured, it will not include the rules config. Routes added by plugins apply the rules to each of the parent realms' rules from the root to the route's realm. This means the processor defined by the plugin override the config generated by the root processor if they overlap. The route config overrides the rules config if the overlap.
+     * @return void
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverrulesprocessor-options)
+     */
+    rules(processor: (rules: object, info: {method: string, path: string, vhost?: string}) => object, options?: {validate: object}): void; // TODO needs implementation
+
+    /**
+     * Starts the server by listening for incoming requests on the configured port (unless the connection was configured with autoListen set to false).
+     * @return Return value: none.
+     * Note that if the method fails and throws an error, the server is considered to be in an undefined state and should be shut down. In most cases it would be impossible to fully recover as the various plugins, caches, and other event listeners will get confused by repeated attempts to start the server or make assumptions about the healthy state of the environment. It is recommended to abort the process when the server fails to start properly. If you must try to resume after an error, call server.stop() first to reset the server state.
+     * If a started server is started again, the second call to server.start() is ignored. No events will be emitted and no extension points invoked.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-await-serverstart)
+     */
+    start(): Promise<void>;
+
+    /**
+     * HTTP state management uses client cookies to persist a state across multiple requests.
+     * @param name - the cookie name string.
+     * @param options - are the optional cookie settings
+     * @return Return value: none.
+     * State defaults can be modified via the server default state configuration option.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverstatename-options)
+     */
+    state(name: string, options?: ServerStateCookieOptions): void;
+
+    /**
+     * Stops the server's listener by refusing to accept any new connections or requests (existing connections will continue until closed or timeout), where:
+     * @param options - (optional) object with:
+     * * timeout - overrides the timeout in millisecond before forcefully terminating a connection. Defaults to 5000 (5 seconds).
+     * @return Return value: none.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-await-serverstopoptions)
+     */
+    stop(options?: {timeout: number}): Promise<void>;
+
+    /**
+     * Returns a copy of the routing table where:
+     * @param host - (optional) host to filter routes matching a specific virtual host. Defaults to all virtual hosts.
+     * @return Return value: an array of routes where each route contains:
+     * * settings - the route config with defaults applied.
+     * * method - the HTTP method in lower case.
+     * * path - the route path.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-servertablehost)
+     */
+    table(host?: string): {settings: ServerRoute; method: Util.HTTP_METHODS_PARTIAL_LOWERCASE, path: string}[]; // TODO I am not sure if the ServerRoute is the object expected here
+
+}
diff --git a/types/hapi/definitions/util/common.d.ts b/types/hapi/definitions/util/common.d.ts
new file mode 100644
index 0000000000..3873cc6900
--- /dev/null
+++ b/types/hapi/definitions/util/common.d.ts
@@ -0,0 +1,8 @@
+
+/**
+ *  User-extensible type for application specific state.
+ */
+export interface ApplicationState {	
+}
+
+export type PeekListener = (chunk: string, encoding: string) => void;
\ No newline at end of file
diff --git a/types/hapi/definitions/util/json.d.ts b/types/hapi/definitions/util/json.d.ts
new file mode 100644
index 0000000000..116f6bdf9a
--- /dev/null
+++ b/types/hapi/definitions/util/json.d.ts
@@ -0,0 +1,27 @@
+export namespace Json {
+
+    /**
+     * @see {@link https://developer.mozilla.org/en/docs/Web/JavaScript/Reference/Global_Objects/JSON/stringify#The_replacer_parameter}
+     */
+    export type StringifyReplacer = ((key: string, value: any) => any) | (string | number)[] | undefined;
+
+    /**
+     * Any value greater than 10 is truncated.
+     */
+    export type StringifySpace = number | string;
+
+    /**
+     * For context [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsjson)
+     */
+    export interface StringifyArguments {
+        /** the replacer function or array. Defaults to no action. */
+        replacer?: StringifyReplacer;
+        /** number of spaces to indent nested object keys. Defaults to no indentation. */
+        space?: StringifySpace;
+        /** tring suffix added after conversion to JSON string. Defaults to no suffix. **/
+        suffix?: string;
+        /** calls Hoek.jsonEscape() after conversion to JSON string. Defaults to false. **/
+        escape?: boolean;
+    }
+
+}
diff --git a/types/hapi/definitions/util/lifecycle.d.ts b/types/hapi/definitions/util/lifecycle.d.ts
new file mode 100644
index 0000000000..35f347dcd5
--- /dev/null
+++ b/types/hapi/definitions/util/lifecycle.d.ts
@@ -0,0 +1,59 @@
+import * as Boom from "boom";
+import * as stream from "stream";
+import {Request, ResponseToolkit} from "hapi";
+
+export namespace Lifecycle {
+
+    /**
+     * Lifecycle methods are the interface between the framework and the application. Many of the request lifecycle steps:
+     * extensions, authentication, handlers, pre-handler methods, and failAction function values are lifecyle methods
+     * provided by the developer and executed by the framework.
+     * Each lifecycle method is a function with the signature await function(request, h, [err]) where:
+     * * request - the request object.
+     * * h - the response toolkit the handler must call to set a response and return control back to the framework.
+     * * err - an error object availble only when the method is used as a failAction value.
+     */
+    export interface Method {
+        (request: Request, h: ResponseToolkit): ReturnValue;
+        (request: Request, h: ResponseToolkit, err: Error): ReturnValue;
+    }
+
+    /**
+     * Each lifecycle method must return a value or a promise that resolves into a value. If a lifecycle method returns
+     * without a value or resolves to an undefined value, an Internal Server Error (500) error response is sent.
+     * The return value must be one of:
+     * * Plain value: null, string, number, boolean
+     * * Buffer object
+     * * Error object: plain Error OR a Boom object.
+     * * Stream object
+     * * any object or array
+     * * a toolkit signal:
+     * * a toolkit method response:
+     * * a promise object that resolve to any of the above values
+     * For more info please [See docs](https://github.com/hapijs/hapi/blob/master/API.md#lifecycle-methods)
+     */
+    export type ReturnValue = ReturnValueTypes | (Promise<ReturnValueTypes>);
+    export type ReturnValueTypes =
+        (null | string | number | boolean) |
+        (Buffer) |
+        (Error | Boom.BoomError) |
+        (stream.Stream) |
+        (object | object[]) |
+        Object |
+        ResponseToolkit;
+
+    /**
+     * Various configuration options allows defining how errors are handled. For example, when invalid payload is received or malformed cookie, instead of returning an error, the framework can be configured to perform another action. When supported the failAction option supports the following values:
+     * * 'error' - return the error object as the response.
+     * * 'log' - report the error but continue processing the request.
+     * * 'ignore' - take no action and continue processing the request.
+     * * a lifecycle method with the signature async function(request, h, err) where:
+     * * * request - the request object.
+     * * * h - the response toolkit.
+     * * * err - the error object.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-failaction-configuration)
+     */
+    export type FailAction = 'error' | 'log' | 'ignore' | Method;
+
+}
+
diff --git a/types/hapi/definitions/util/util.d.ts b/types/hapi/definitions/util/util.d.ts
new file mode 100644
index 0000000000..fc9bc97a7c
--- /dev/null
+++ b/types/hapi/definitions/util/util.d.ts
@@ -0,0 +1,8 @@
+export namespace Util {
+    interface Dictionary<T> {
+        [key: string]: T;
+    }
+    type HTTP_METHODS_PARTIAL_LOWERCASE = 'get' | 'post' | 'put' | 'patch' | 'delete' | 'options';
+    type HTTP_METHODS_PARTIAL = 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE' | 'OPTIONS' | HTTP_METHODS_PARTIAL_LOWERCASE;
+    type HTTP_METHODS = 'HEAD' | 'head' | HTTP_METHODS_PARTIAL;
+}
diff --git a/types/hapi/index.d.ts b/types/hapi/index.d.ts
index a97a9f1edb..46d4d07ca3 100644
--- a/types/hapi/index.d.ts
+++ b/types/hapi/index.d.ts
@@ -1,6 +1,8 @@
-// Type definitions for hapi 16.1
+// Type definitions for hapi 17.0
 // Project: https://github.com/hapijs/hapi
-// Definitions by: Jason Swearingen <https://github.com/jasonswearingen>, AJP <https://github.com/AJamesPhillips>
+// Definitions by: Marc Bornträger <https://github.com/BorntraegerMarc>
+//                 Rafael Souza Fijalkowski <https://github.com/rafaelsouzaf>
+//                 Justin Simms <https://github.com/jhsimms>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
 
@@ -12,2712 +14,58 @@
  +                                                                           +
  +                                                                           +
  +                                                                           +
- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + *
- *
- * Removal of IPromise replaced with Promise
- * Removal of IReplyStrict<>
- * Removal of IReply replaced with different interfaces like:
- *      ReplyWithContinue
- *      ReplyNoContinue, etc.
- * Renaming of all interfaces to remove preceding I in preparation of dtslint
- */
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
 
 /// <reference types="node" />
 
-import Events = require("events");
-import stream = require("stream");
-import http = require("http");
-import https = require("https");
-import url = require("url");
-import zlib = require("zlib");
-import domain = require("domain");
-
-import * as Boom from 'boom';
-import {
-    ValidationOptions as JoiValidationOptions,
-    SchemaMap as JoiSchemaMap,
-    Schema as JoiSchema,
-} from 'joi';
-// TODO check JoiValidationObject is correct for "a Joi validation object"
-type JoiValidationObject = JoiSchema | JoiSchemaMap | (JoiSchema | JoiSchemaMap)[];
-
-import * as Catbox from 'catbox';
-import { MimosOptions } from 'mimos';
-import Podium = require('podium');
-import * as Shot from 'shot';
-
-export interface Dictionary<T> {
-    [key: string]: T;
-}
-
-/**
- * Server
- * The Server object is the main application container. The server manages all incoming connections along with all the facilities provided by the framework. A server can contain more than one connection (e.g. listen to port 80 and 8080).
- * [See docs](https://hapijs.com/api/16.1.1#server)
- * [See docs](https://hapijs.com/api/16.1.1#server-properties)
- * [See docs](https://hapijs.com/api/16.1.1#server-events)
- */
-export class Server extends Podium {
-    /**
-     * Creates a new Server object
-     */
-    constructor(options?: ServerOptions);
-
-    /**
-     * Provides a safe place to store server-specific run-time application data without potential conflicts with the framework internals. The data can be accessed whenever the server is accessible. Initialized with an empty object.
-     * [See docs](https://hapijs.com/api/16.1.1#serverapp)
-     */
-    app?: any;
-    /**
-     * An array containing the server's connections. When the server object is returned from server.select(), the connections array only includes the connections matching the selection criteria.
-     * [See docs](https://hapijs.com/api/16.1.1#serverconnections)
-     */
-    connections: ServerConnection[];
-    /**
-     * When the server contains exactly one connection, info is an object containing information about the sole connection
-     * When the server contains more than one connection, each server.connections array member provides its own connection.info.
-     * [See docs](https://hapijs.com/api/16.1.1#serverinfo)
-     */
-    info: ServerConnectionInfo | null;
-    /**
-     * An object containing the process load metrics (when load.sampleInterval is enabled):
-     * [See docs](https://hapijs.com/api/16.1.1#serverload)
-     */
-    load: {
-        /** event loop delay milliseconds. */
-        eventLoopDelay: number;
-        /** V8 heap usage. */
-        heapUsed: number;
-        /** RSS memory usage. */
-        rss: number;
-    };
-    /**
-     * When the server contains exactly one connection, listener is the node HTTP server object of the sole connection.
-     * When the server contains more than one connection, each server.connections array member provides its own connection.listener.
-     * [See docs](https://hapijs.com/api/16.1.1#serverlistener)
-     */
-    listener: ServerListener | null;
-    /**
-     * An object providing access to the server methods cs://hapijs.com/api/16.1.1#servermethodname-method-options} where each server method name is an object property.
-     * [See docs](https://hapijs.com/api/16.1.1#servermethods)
-     */
-    methods: Dictionary<ServerMethod>;
-    /**
-     * Provides access to the server MIME database used for setting content-type information. The object must not be modified directly but only through the mime server setting.
-     * [See docs](https://hapijs.com/api/16.1.1#servermime)
-     */
-    readonly mime: {path(path: string): {type: string}};
-    /**
-     * An object containing the values exposed by each plugin registered where each key is a plugin name and the values are the exposed properties by each plugin using server.expose(). Plugins may set the value of the server.plugins[name] object directly or via the server.expose() method.
-     * [See docs](https://hapijs.com/api/16.1.1#serverplugins)
-     */
-    plugins: PluginsStates;
-    /**
-     * The realm object contains server-wide or plugin-specific state that can be shared across various methods. For example, when calling server.bind(), the active realm settings.bind property is set which is then used by routes and extensions added at the same level (server root or plugin). Realms are a limited version of a sandbox where plugins can maintain state used by the framework when adding routes, extensions, and other properties.
-     * [See docs](https://hapijs.com/api/16.1.1#serverrealm)
-     */
-    readonly realm: ServerRealm;
-    /**
-     * When the server contains exactly one connection, registrations is an object where each key is a registered plugin name
-     * When the server contains more than one connection, each server.connections array member provides its own connection.registrations.
-     * TODO check and offer PR to update Hapi docs: Assuming readonly.
-     * [See docs](https://hapijs.com/api/16.1.1#serverregistrations)
-     */
-    readonly registrations: ServerRegisteredPlugins;
-    /**
-     * The root server object containing all the connections and the root server methods (e.g. start(), stop(), connection()).
-     * TODO, check and offer PR to update Hapi docs: Marked as optional as presumably root server does not reference itself.
-     * [See docs](https://hapijs.com/api/16.1.1#serverroot)
-     */
-    root?: Server;
-    /**
-     * The server configuration object after defaults applied.
-     * [See docs](https://hapijs.com/api/16.1.1#serversettings)
-     */
-    settings: ServerOptions;
-    /**
-     * The hapi module version number.
-     * [See docs](https://hapijs.com/api/16.1.1#serverversion)
-     */
-    version: string;
-
-    /**
-     * [See docs](https://hapijs.com/api/16.1.1#serverauthapi)
-     * [See docs](https://hapijs.com/api/16.1.1#serverauthdefaultoptions)
-     * [See docs](https://hapijs.com/api/16.1.1#serverauthschemename-scheme)
-     * [See docs](https://hapijs.com/api/16.1.1#serverauthstrategyname-scheme-mode-options)
-     * [See docs](https://hapijs.com/api/16.1.1#serverauthteststrategy-request-next)
-     */
-    auth: ServerAuth;
-
-    /**
-     * Sets a global context used as the default bind object when adding a route or an extension
-     * When setting context inside a plugin, the context is applied only to methods set up by the plugin. Note that the context applies only to routes and extensions added after it has been set. Ignored if the method being bound is an arrow function.
-     * @param context  the object used to bind this in handler and extension methods.
-     * [See docs](https://hapijs.com/api/16.1.1#serverbindcontext)
-     */
-    bind(context: any): void;
-    /**
-     * [See docs](https://hapijs.com/api/16.1.1#servercacheoptions)
-     * [See docs](https://hapijs.com/api/16.1.1#servercacheprovisionoptions-callback)
-     */
-    cache: ServerCacheMethod;
-    /**
-     * Adds an incoming server connection
-     * Returns a server object with the new connections selected.
-     * Must be called before any other server method that modifies connections is called for it to apply to the new connection (e.g. server.state())
-     * Note that the options object is deeply cloned (with the exception of listener which is shallowly copied) and cannot contain any values that are unsafe to perform deep copy on.
-     *
-     * [See docs](https://hapijs.com/api/16.1.1#serverconnectionoptions) for various advantage topics covering usage and caveats around use of the function in plugin register(), connectionless plugins calling connection(), etc.
-     * @param connection  a connection configuration object or array of objects
-     */
-    connection(options?: ServerConnectionOptions[]): Server;
-    connection(options?: ServerConnectionOptions): Server;
-    // connection: (options: ServerConnectionOptions[] | ServerConnectionOptions) => Server;
-    /**
-     * Registers a custom content decoding compressor to extend the built-in support for 'gzip' and 'deflate'
-     * [See docs](https://hapijs.com/api/16.1.1#serverdecoderencoding-decoder)
-     * @param encoding  the decoder name string.
-     * @param decoder  a function using the signature function(options) where options are the encoding specific options configured in the route payload.compression configuration option, and the return value is an object compatible with the output of node's zlib.createGunzip().
-     */
-    decoder(encoding: string, decoder: ((options: CompressionDecoderSettings) => zlib.Gunzip)): void;
-    /**
-     * Extends various framework interfaces with custom methods
-     * Note that decorations apply to the entire server and all its connections regardless of current selection.
-     * [See docs](https://hapijs.com/api/16.1.1#serverdecoratetype-property-method-options)
-     *
-     * NOTE: it's not possible to type the result of this action.
-     * It's advised that in a custom definition file, you extend the ReplyNoContinue
-     * and ReplyWithContinue functions.  See Inert `.file` for an example.
-     * Or if it is not part of a library / plugin then you use a namespace within
-     * your code to type the request, server and or reply.  See
-     * [tests/server/decorate.ts](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/hapi/tests/server/decorate.ts)
-     * for examples.
-     * @param type  the interface being decorated. Supported types:
-     *      * 'request' - adds methods to the Request object.
-     *      * 'reply' - adds methods to the reply interface.
-     *      * 'server' - adds methods to the Server object.
-     * @param property  the object decoration key name.
-     * @param method  the extension function or other value.
-     * @param options  if the type is 'request', supports the following optional settings:
-     *      * apply - if true, the method function is invoked using the signature function(request) where request is the current request object and the returned value is assigned as the decoration.
-     */
-    decorate(type: 'request' | 'reply' | 'server', property: string, method: Function): void;
-    decorate(type: 'request', property: string, method: Function, options?: {apply: false}): void;
-    decorate(type: 'request', property: string, method: (request: Request) => Function, options: {apply: true}): void;
-    /**
-     * The server.decorate('server', ...) method can modify this prototype/interface.
-     * Have disabled these typings as there is a better alternative, see example in: tests/server/decorate.ts
-     * [And discussion here](https://github.com/DefinitelyTyped/DefinitelyTyped/issues/14517#issuecomment-298891630)
-     */
-    // [index: string]: any;
-    /**
-     * Used within a plugin to declare a required dependency on other plugins
-     * The after method is identical to setting a server extension point on 'onPreStart'. Connectionless plugins (those with attributes.connections set to false) can only depend on other connectionless plugins (server initialization will fail even of the dependency is loaded but is not connectionless).
-     * Dependencies can also be set via the register attributes property (does not support setting after).
-     * [See docs](https://hapijs.com/api/16.1.1#serverdependencydependencies-after)
-     * @param dependencies  a single string or array of plugin name strings which must be registered in order for this plugin to operate. Plugins listed must be registered before the server is initialized or started. Does not provide version dependency which should be implemented using npm peer dependencies.
-     * @param after  an optional function called after all the specified dependencies have been registered and before the server starts. The function is only called if the server is initialized or started. If a circular dependency is detected, an exception is thrown (e.g. two plugins each has an after function to be called after the other). The function signature is function(server, next)
-     */
-    dependency(dependencies: string | string[], after?: AfterDependencyLoadCallback): void;
-    /**
-     * Emits a custom application event update to all the subscribed listeners
-     * Note that events must be registered before they can be emitted or subscribed to by calling server.event(events). This is done to detect event name misspelling and invalid event activities.
-     * [See docs](https://hapijs.com/api/16.1.1#serveremitcriteria-data-callback)
-     * @param criteria  the event update criteria which if an object can have the following optional keys (unless noted otherwise):
-     *      * name - the event name string (required).
-     *      * channel - the channel name string.
-     *      * tags - a tag string or array of tag strings.
-     * @param data  the value emitted to the subscribers. If data is a function, the function signature is function() and it called once to generate (return value) the actual data emitted to the listeners. If no listeners match the event, the data function is not invoked.
-     * @param callback  an optional callback method invoked when all subscribers have been notified using the signature function(). The callback is called only after all the listeners have been notified, including any event updates emitted earlier (the order of event updates are guaranteed to be in the order they were emitted).
-     */
-    emit(criteria: string | {name: string, channel?: string, tags?: string | string[]}, data: any, callback?: () => void): void;
-    /**
-     * Registers a custom content encoding compressor to extend the built-in support for 'gzip' and 'deflate'
-     * [See docs](https://hapijs.com/api/16.1.1#serverencoderencoding-encoder)
-     * @param encoding  the encoder name string.
-     * @param encoder  a function using the signature function(options) where options are the encoding specific options configured in the route compression configuration option, and the return value is an object compatible with the output of node's zlib.createGzip().
-     */
-    encoder(encoding: string, encoder: ((options: CompressionEncoderSettings) => zlib.Gzip)): void;
-    /**
-     * Register custom application events
-     * [See docs](https://hapijs.com/api/16.1.1#servereventevents)
-     * @param events  see ApplicationEvent
-     */
-    event(events: ApplicationEvent[]): void;
-    event(events: ApplicationEvent): void;
-    /**
-     * Used within a plugin to expose a property via server.plugins[name]
-     * [See docs](https://hapijs.com/api/16.1.1#serverexposekey-value)
-     * @param key  the key assigned (server.plugins[name][key]).
-     * @param value  the value assigned.
-     */
-    expose(key: string, value: any): void;
-    /**
-     * Merges an object into to the existing content of server.plugins[name]
-     * Note that all properties of obj are deeply cloned into server.plugins[name], so you should avoid using this method for exposing large objects that may be expensive to clone or singleton objects such as database client objects. Instead favor the server.expose(key, value) form, which only copies a reference to value.
-     * [See docs](https://hapijs.com/api/16.1.1#serverexposeobj)
-     * @param obj  the object merged into the exposed properties container.
-     */
-    expose(obj: Object): void;
-    /**
-     * Registers an extension function in one of the available extension points
-     * [See docs](https://hapijs.com/api/16.1.1#serverextevents)
-     * @param events  see @ServerExtConfigurationObject
-     */
-    ext(events: ServerStartExtConfigurationObject): void;
-    ext(events: ServerStartExtConfigurationObject[]): void;
-    ext(events: ServerRequestExtConfigurationObjectWithRequest): void;
-    ext(events: ServerRequestExtConfigurationObjectWithRequest[]): void;
-    /**
-     * Registers a single extension event using the same properties as used in server.ext(events), but passed as arguments.
-     * [See docs](https://hapijs.com/api/16.1.1#serverextevent-method-options)
-     * @param event  the extension point event name.
-     * @param method  a function or an array of functions to be executed at a specified point during request processing.
-     * @param options
-     */
-    ext(event: ServerStartExtPoints, method: ServerExtFunction[], options?: ServerExtOptions): void;
-    ext(event: ServerStartExtPoints, method: ServerExtFunction, options?: ServerExtOptions): void;
-    ext(event: ServerRequestExtPoints, method: ServerExtRequestHandler[], options?: ServerExtOptions): void;
-    ext(event: ServerRequestExtPoints, method: ServerExtRequestHandler, options?: ServerExtOptions): void;
-    /**
-     * Registers a new handler type to be used in routes
-     * The method function can have a defaults object or function property. If the property is set to an object, that object is used as the default route config for routes using this handler. If the property is set to a function, the function uses the signature function(method) and returns the route default configuration.
-     * [See docs](https://hapijs.com/api/16.1.1#serverhandlername-method)
-     * @param name  string name for the handler being registered. Cannot override any previously registered type.
-     * @param method  the function used to generate the route handler using the signature function(route, options) where:
-     *      * route - the route public interface object.
-     *      * options - the configuration object provided in the handler config.
-     */
-    handler(name: string, method: MakeRouteHandler): void;
-    /**
-     * Initializes the server (starts the caches, finalizes plugin registration) but does not start listening on the connection ports
-     * Note that if the method fails and the callback includes an error, the server is considered to be in an undefined state and should be shut down. In most cases it would be impossible to fully recover as the various plugins, caches, and other event listeners will get confused by repeated attempts to start the server or make assumptions about the healthy state of the environment. It is recommended to assert that no error has been returned after calling initialize() to abort the process when the server fails to start properly. If you must try to resume after an error, call server.stop() first to reset the server state.
-     * [See docs](https://hapijs.com/api/16.1.1#serverinitializecallback)
-     * @param callback  the callback method when server initialization is completed or failed with the signature function(err)
-     */
-    initialize(callback: (err: Error) => void): void;
-    initialize(): Promise<Error>;
-    /**
-     * When the server contains exactly one connection, injects a request into the sole connection simulating an incoming HTTP request without making an actual socket connection. Injection is useful for testing purposes as well as for invoking routing logic internally without the overhead or limitations of the network stack. Utilizes the shot module for performing injections, with some additional options and response properties
-     * If no callback is provided, a Promise object is returned.
-     * When the server contains more than one connection, each server.connections array member provides its own connection.inject().
-     * [See docs](https://hapijs.com/api/16.1.1#serverinjectoptions-callback)
-     * @param options  can be assigned a string with the requested URI, or an object
-     * @param callback  the callback function with signature function(res)
-     */
-    inject(options: string | InjectedRequestOptions, callback: (res: InjectedResponseObject) => void): void;
-    inject(options: string | InjectedRequestOptions, ): Promise<InjectedResponseObject>;
-    /**
-     * Logs server events that cannot be associated with a specific request. When called the server emits a 'log' event which can be used by other listeners or plugins to record the information or output to the console.
-     * [See docs](https://hapijs.com/api/16.1.1#serverlogtags-data-timestamp)
-     * @param tags  a string or an array of strings (e.g. ['error', 'database', 'read']) used to identify the event. Tags are used instead of log levels and provide a much more expressive mechanism for describing and filtering events. Any logs generated by the server internally include the 'hapi' tag along with event-specific information.
-     * @param data  an optional message string or object with the application data being logged. If data is a function, the function signature is function() and it called once to generate (return value) the actual data emitted to the listeners. If no listeners match the event, the data function is not invoked.
-     * @param timestamp  an optional timestamp expressed in milliseconds. Defaults to Date.now() (now).
-     */
-    log(tags: string | string[], data?: string | Object | Function, timestamp?: number): void;
-    /**
-     * When the server contains exactly one connection, looks up a route configuration.
-     * When the server contains more than one connection, each server.connections array member provides its own connection.lookup() method.
-     * [See docs](https://hapijs.com/api/16.1.1#serverlookupid)
-     * @param id  the route identifier as set in the route options.
-     * @return  the route public interface object if found, otherwise null.
-     */
-    lookup(id: string): RoutePublicInterface | null;
-    /**
-     * When the server contains exactly one connection, looks up a route configuration
-     * When the server contains more than one connection, each server.connections array member provides its own connection.match() method.
-     * [See docs](https://hapijs.com/api/16.1.1#servermatchmethod-path-host)
-     * @param method  the HTTP method (e.g. 'GET', 'POST').  TODO check if it allows HEAD
-     * @param path  the requested path (must begin with '/').
-     * @param host  optional hostname (to match against routes with vhost).
-     * @return  the route public interface object if found, otherwise null.
-     */
-    match(method: HTTP_METHODS, path: string, host?: string): RoutePublicInterface | null;
-    /**
-     * Registers a server method. Server methods are functions registered with the server and used throughout the application as a common utility. Their advantage is in the ability to configure them to use the built-in cache and share across multiple request handlers without having to create a common module.
-     * [See docs](https://hapijs.com/api/16.1.1#servermethodname-method-options)
-     * @param name  a unique method name used to invoke the method via server.methods[name]. Supports using nested names such as utils.users.get which will automatically create the missing path under server.methods and can be accessed for the previous example via server.methods.utils.users.get. When configured with caching enabled, server.methods[name].cache will be an object see ServerMethodNameCacheObject
-     * @param method  the method function
-     * @param options  optional configuration
-     */
-    method(name: string, method: ServerMethod, options?: ServerMethodOptions): void;
-    /**
-     * Registers a server method function as described in server.method() using a configuration object
-     * [See docs](https://hapijs.com/api/16.1.1#servermethodmethods)
-     */
-    method(methods: ServerMethodConfigurationObject[]): void;
-    method(methods: ServerMethodConfigurationObject): void;
-    /**
-     * Subscribe a handler to an event
-     * [See docs](https://hapijs.com/api/16.1.1#serveroncriteria-listener)
-     * @param criteria  the subscription criteria which can be an event name string which can be any of the built-in server events or a custom application event registered with server.event(events).
-     * Or an see ServerEventCriteria.
-     * If 'start' - emitted when the server is started using server.start().
-     * If 'stop' - emitted when the server is stopped using server.stop().
-     * @param listener
-     */
-    on(criteria: 'start' | 'stop' | string | ServerEventCriteria, listener: Function): void;
-    /**
-     * The 'log' event includes the event object and a tags object (where each tag is a key with the value true)
-     * [See docs](https://hapijs.com/api/16.1.1#server-events)
-     */
-    on(criteria: 'log', listener: (event: ServerEventObject, tags: Podium.Tags) => void): void;
-    /**
-     * The 'request' and 'request-internal' events include the request object, the event object, and a tags object (where each tag is a key with the value true)
-     * [See docs](https://hapijs.com/api/16.1.1#server-events)
-     * TODO submit issue to TypeScript.  Using 'request' | 'request-internal' removes the type
-     * interference when using code like: `server.on('request', (request, event, tags) => {...}`
-     * Same for 'response' | 'tail'.
-     */
-    on(criteria: 'request', listener: (request: Request, event: ServerEventObject, tags: Podium.Tags) => void): void;
-    on(criteria: 'request-internal', listener: (request: Request, event: ServerEventObject, tags: Podium.Tags) => void): void;
-    /**
-     * The 'request-error' event includes the request object and the causing error err object
-     * [See docs](https://hapijs.com/api/16.1.1#server-events)
-     */
-    on(criteria: 'request-error', listener: (request: Request, err: Error) => void): void;
-    /**
-     * The 'response' and 'tail' events include the request object
-     * [See docs](https://hapijs.com/api/16.1.1#server-events)
-     * See 'request' and 'request-internal'
-     */
-    on(criteria: 'response', listener: (request: Request) => void): void;
-    on(criteria: 'tail', listener: (request: Request) => void): void;
-    /**
-     * The 'route' event includes the route public interface, the connection, and the server object used to add the route (e.g. the result of a plugin select operation)
-     * [See docs](https://hapijs.com/api/16.1.1#server-events)
-     */
-    on(criteria: 'route', listener: (route: RoutePublicInterface, connection: ServerConnection, server: Server) => void): void;
-    /**
-     * Same as calling server.on() with the count option set to 1.
-     * TODO type this to copy the server.on specific types for 'route', 'tail', etc.
-     * [See docs](https://hapijs.com/api/16.1.1#serveroncecriteria-listener)
-     * @param criteria
-     * @param listener
-     */
-    once(criteria: string | ServerEventCriteria, listener: Function): void;
-    /**
-     * Sets the path prefix used to locate static resources (files and view templates) when relative paths are used
-     * Note that setting a path within a plugin only applies to resources accessed by plugin methods. If no path is set, the connection files.relativeTo configuration is used. The path only applies to routes added after it has been set.
-     * [See docs](https://hapijs.com/api/16.1.1#serverpathrelativeto)
-     * @param relativeTo  the path prefix added to any relative file path starting with '.'.
-     */
-    path(relativeTo: string): void;
-    /**
-     * Registers a plugin
-     * If no callback is provided, a Promise object is returned.
-     * Note that plugin registration are recorded on each of the available connections. When plugins express a dependency on other plugins, both have to be loaded into the same connections for the dependency requirement to be fulfilled. It is recommended that plugin registration happen after all the server connections are created via server.connection().
-     * [See docs](https://hapijs.com/api/16.1.1#serverregisterplugins-options-callback)
-     * @param plugins
-     * @param options
-     * @param callback  with signature function(err) where err an error returned from the registration function. Note that exceptions thrown by the registration function are not handled by the framework.
-     * A note on typings.  Common use case is:
-     *     register(Plugin, (err) => {// do more stuff})
-     * so these typings save passing empty `options` object or having to
-     * explicity type the Error in the Callback e.g.:
-     *     register(Plugin, {}, (err) => {// do more stuff})  or
-     *     register(Plugin, (err: Error) => {// do more stuff})
-     */
-    register<OptionsPassedToPlugin>(plugins: Array<(PluginFunction<OptionsPassedToPlugin> | PluginRegistrationObject<OptionsPassedToPlugin>)>, callback: (err: Error | null) => void): void;
-    register<OptionsPassedToPlugin>(plugins: Array<(PluginFunction<OptionsPassedToPlugin> | PluginRegistrationObject<OptionsPassedToPlugin>)>): Promise<Error | null>;
-    register<OptionsPassedToPlugin>(plugins: PluginFunction<OptionsPassedToPlugin> | PluginRegistrationObject<OptionsPassedToPlugin>, callback: (err: Error | null) => void): void;
-    register<OptionsPassedToPlugin>(plugins: PluginFunction<OptionsPassedToPlugin> | PluginRegistrationObject<OptionsPassedToPlugin>): Promise<Error | null>;
-    register<OptionsPassedToPlugin>(plugins: Array<(PluginFunction<OptionsPassedToPlugin> | PluginRegistrationObject<OptionsPassedToPlugin>)>, options: PluginRegistrationOptions, callback: (err: Error | null) => void): void;
-    register<OptionsPassedToPlugin>(plugins: Array<(PluginFunction<OptionsPassedToPlugin> | PluginRegistrationObject<OptionsPassedToPlugin>)>, options: PluginRegistrationOptions): Promise<Error | null>;
-    register<OptionsPassedToPlugin>(plugins: PluginFunction<OptionsPassedToPlugin> | PluginRegistrationObject<OptionsPassedToPlugin>, options: PluginRegistrationOptions, callback: (err: Error | null) => void): void;
-    register<OptionsPassedToPlugin>(plugins: PluginFunction<OptionsPassedToPlugin> | PluginRegistrationObject<OptionsPassedToPlugin>, options: PluginRegistrationOptions): Promise<Error | null>;
-    /**
-     * Adds a connection route
-     * [See docs](https://hapijs.com/api/16.1.1#serverrouteoptions)
-     * @param options  a route configuration object [See docs](https://hapijs.com/api/16.1.1#route-configuration) or an array of configuration objects.
-     */
-    route(options: RouteConfiguration[]): void;
-    route(options: RouteConfiguration): void;
-    /**
-     * Selects a subset of the server's connections
-     * Returns a server object with connections set to the requested subset. Selecting again on a selection operates as a logic AND statement between the individual selections.
-     * [See docs](https://hapijs.com/api/16.1.1#serverselectlabels)
-     * @param labels  a single string or array of strings of labels used as a logical OR statement to select all the connections with matching labels in their configuration.
-     */
-    select(labels: string | string[]): Server;
-    /**
-     * Starts the server connections by listening for incoming requests on the configured port of each listener (unless the connection was configured with autoListen set to false)
-     * If no callback is provided, a Promise object is returned.
-     * Note that if the method fails and the callback includes an error, the server is considered to be in an undefined state and should be shut down. In most cases it would be impossible to fully recover as the various plugins, caches, and other event listeners will get confused by repeated attempts to start the server or make assumptions about the healthy state of the environment. It is recommended to assert that no error has been returned after calling start() to abort the process when the server fails to start properly. If you must try to resume after a start error, call server.stop() first to reset the server state.
-     * If a started server is started again, the second call to start() will only start new connections added after the initial start() was called. No events will be emitted and no extension points invoked.
-     * [See docs](https://hapijs.com/api/16.1.1#serverstartcallback)
-     * @param callback  the callback method when server startup is completed or failed with the signature function(err) where:
-     *      * err - any startup error condition.
-     */
-    start(callback: (err?: Error) => void): void;
-    start(): Promise<Error | null>;
-    /**
-     * HTTP state management [See docs](https://tools.ietf.org/html/rfc6265) uses client cookies to persist a state across multiple requests. Registers a cookie definitions
-     * [See docs](https://hapijs.com/api/16.1.1#serverstatename-options)
-     * @param name  the cookie name string.
-     * @param options  optional cookie settings
-     */
-    state(name: string, options?: ServerStateCookieConfiguationObject): void;
-    /**
-     * Stops the server's connections by refusing to accept any new connections or requests (existing connections will continue until closed or timeout)
-     * If no callback is provided, a Promise object is returned.
-     * [See docs](https://hapijs.com/api/16.1.1#serverstopoptions-callback)
-     * @param options  options object with:
-     *      * timeout - overrides the timeout in millisecond before forcefully terminating a connection. Defaults to 5000 (5 seconds).
-     * @param callback  optional callback method which is called once all the connections have ended and it is safe to exit the process with signature function(err) where:
-     *      * err - any termination error condition.
-     */
-    stop(options: {timeout: number} | null, callback: (err?: Error) => void): void;
-    stop(options?: {timeout: number}): Promise<Error | null>;
-    /**
-     * Returns a copy of the routing table
-     * Note that if the server has not been started and multiple connections use port 0, the table items will override each other and will produce an incomplete result.
-     * When calling connection.table() directly on each connection, the return value is the same as the array table item value of an individual connection
-     * [See docs](https://hapijs.com/api/16.1.1#servertablehost)
-     * @param host  optional host to filter routes matching a specific virtual host. Defaults to all virtual hosts.
-     */
-    table(host?: string): RoutingTableEntry[];
-}
-
-export interface PluginSpecificConfiguration {}
-
-/**
- * Server Options
- * Note that the options object is deeply cloned and cannot contain any values that are unsafe to perform deep copy on.
- * [See docs](https://hapijs.com/api/16.1.1#new-serveroptions)
- */
-export interface ServerOptions {
-    /** app - application-specific configuration which can later be accessed via server.settings.app. Note the difference between server.settings.app which is used to store static configuration values and server.app which is meant for storing run-time state. Defaults to {}.  */
-    app?: any;
-    /**
-     * cache - sets up server-side caching. Every server includes a default cache for storing application state. By default, a simple memory-based cache is created which has limited capacity and capabilities. hapi uses catbox for its cache which includes support for common storage solutions (e.g. Redis, MongoDB, Memcached, Riak, among others). Caching is only utilized if methods and plugins explicitly store their state in the cache. The server cache configuration only defines the storage container itself. cache can be assigned:
-     *  * a prototype function (usually obtained by calling require() on a catbox strategy such as require('catbox-redis')). A new catbox client will be created internally using this function.
-     *  * a CatboxServerOptionsCacheConfiguration configuration object
-     *  * an array of the above object for configuring multiple cache instances, each with a unique name. When an array of objects is provided, multiple cache connections are established and each array item (except one) must include a name.
-     */
-    cache?: Catbox.EnginePrototype | CatboxServerOptionsCacheConfiguration | CatboxServerOptionsCacheConfiguration[];
-    /** sets the default connections configuration which can be overridden by each connection */
-    connections?: ConnectionConfigurationServerDefaults;
-    /** determines which logged events are sent to the console (this should only be used for development and does not affect which events are actually logged internally and recorded). Set to false to disable all console logging, or to an object with: */
-    debug?: false | {
-        /** a string array of server log tags to be displayed via console.error() when the events are logged via server.log() as well as internally generated server logs. For example, to display all errors, set the option to ['error']. To turn off all console debug messages set it to false. Defaults to uncaught errors thrown in external code (these errors are handled automatically and result in an Internal Server Error response) or runtime errors due to developer error. */
-        log?: string[] | false;
-        /** a string array of request log tags to be displayed via console.error() when the events are logged via request.log() as well as internally generated request logs. For example, to display all errors, set the option to ['error']. To turn off all console debug messages set it to false. Defaults to uncaught errors thrown in external code (these errors are handled automatically and result in an Internal Server Error response) or runtime errors due to developer error. */
-        request?: string[] | false;
-    };
-    /** process load monitoring */
-    load?: {
-        /** the frequency of sampling in milliseconds. Defaults to 0 (no sampling). */
-        sampleInterval?: number;
-    };
-    /** options passed to the mimos module (https://github.com/hapijs/mimos) when generating the mime database used by the server and accessed via server.mime. */
-    mime?: MimosOptions;
-    /** plugin-specific configuration which can later be accessed via server.settings.plugins. plugins is an object where each key is a plugin name and the value is the configuration. Note the difference between server.settings.plugins which is used to store static configuration values and server.plugins which is meant for storing run-time state. Defaults to {}. */
-    plugins?: PluginSpecificConfiguration;
-    /** if false, will not use node domains to protect against exceptions thrown in handlers and other external code. Defaults to true. */
-    useDomains?: boolean;
-}
-
-/**
- * The server event object
- * [See docs](https://hapijs.com/api/16.1.1#server-events)
- */
-export interface ServerEventObject {
-    /** the event timestamp. */
-    timestamp: number;
-    /** if the event relates to a request, the request id. */
-    request: string;
-    /** if the event relates to a server, the server.info.uri. */
-    server: string;
-    /** an array of tags (e.g. ['error', 'http']). */
-    tags: string[];
-    /** optional event-specific information. */
-    data: any;
-    /** true if the event was generated internally by the framework. */
-    internal: boolean;
-}
-
-/**
- * [See docs](https://hapijs.com/api/16.1.1#serveroncriteria-listener)
- */
-export interface ServerEventCriteria {
-    /** the event name string (required). */
-    name: string;
-    /** if true, the listener method receives an additional callback argument which must be called when the method completes. No other event will be emitted until the callback methods is called. The method signature is function(). If block is set to a positive integer, the value is used to set a timeout after which any pending events will be emitted, ignoring the eventual call to callback. Defaults to false (non blocking). */
-    block?: boolean;
-    /** a string or array of strings specifying the event channels to subscribe to. If the event registration specified a list of allowed channels, the channels array must match the allowed channels. If channels are specified, event updates without any channel designation will not be included in the subscription. Defaults to no channels filter. */
-    channels?: string | string[];
-    /** if true, the data object passed to server.emit() is cloned before it is passed to the listener method. Defaults to the event registration option (which defaults to false). */
-    clone?: boolean;
-    /** a positive integer indicating the number of times the listener can be called after which the subscription is automatically removed. A count of 1 is the same as calling server.once(). Defaults to no limit. */
-    count?: number;
-    /**
-     * the event tags (if present) to subscribe to
-     * If the object is given:
-     *  * tags - a tag string or array of tag strings.
-     *  * all - if true, all tags must be present for the event update to match the subscription. Defaults to false (at least one matching tag).
-     */
-    filter?: string | string[] | {tags: string | string[], all?: boolean};
-    /** if true, and the data object passed to server.emit() is an array, the listener method is called with each array element passed as a separate argument. This should only be used when the emitted data structure is known and predictable. Defaults to the event registration option (which defaults to false). */
-    spread?: boolean;
-    /** if true and the criteria object passed to server.emit() includes tags, the tags are mapped to an object (where each tag string is the key and the value is true) which is appended to the arguments list at the end (but before the callback argument if block is set). Defaults to the event registration option (which defaults to false). */
-    tags?: boolean;
-}
-
-/**
- * Server methods, user configured
- * Related to [See docs](https://hapijs.com/api/16.1.1#servermethods)
- * Related to [See docs](https://hapijs.com/api/16.1.1#servermethodname-method-options)
- */
-export interface ServerMethod {
-    /** the method must return a value (result, Error, or a promise) or throw an Error. */
-    (...args: any[]): any | Error | Promise<any>;
-    /** Not possible to improve this typing due to this unresolvable issue:  https://github.com/Microsoft/TypeScript/issues/15190 */
-    (...args: (any | ServerMethodNext)[]): void;
-    /** When configured with caching enabled, server.methods[name].cache will be an object see ServerMethodNameCacheObject */
-    cache?: ServerMethodNameCacheObject;
-}
-
-/**
- * Related to [See docs](https://hapijs.com/api/16.1.1#servermethodname-method-options)
- * @param err  error response if the method failed.
- * @param result  the return value.
- * @param ttl  0 if result is valid but cannot be cached. Defaults to cache policy.
- */
-export interface ServerMethodNext {
-    (err: Error | null, result: any, ttl?: number): void;
-}
-
-/** For context [See docs](https://hapijs.com/api/16.1.1#servermethodname-method-options) */
-export interface ServerMethodNameCacheObject {
-    /**
-     * function that can be used to clear the cache for a given key.
-     * @param ...args  any number of string, number or boolean.  If other types then generateKey function must be specified.
-     * @param callback  last argument is a callback.
-     * Not possible to improve this typing due to this unresolvable issue:  https://github.com/Microsoft/TypeScript/issues/15190
-     */
-    drop(...args: (any | Function)[]): void;
-    /** an object with cache statistics, see stats documentation for catbox. */
-    stats: Catbox.CacheStatisticsObject;
-}
-
-/** For context [See docs](https://hapijs.com/api/16.1.1#servermethodname-method-options) */
-export interface ServerMethodOptions {
-    /** a context object passed back to the method function (via this) when called. Defaults to active context (set via server.bind() when the method is registered. Ignored if the method is an arrow function. */
-    bind?: any;
-    /** the same cache configuration used in server.cache(). The generateTimeout option is required. */
-    cache?: CatboxServerCacheConfiguration;
-    /**
-     * if false, expects the method to be a synchronous function. Note that using a synchronous function with caching will convert the method interface to require a callback as an additional argument with the signature function(err, result, cached, report) since the cache interface cannot return values synchronously. Defaults to true.
-     * TODO: understand and type "an additional argument with the signature function(err, result, cached, report)" if appropriate.
-     */
-    callback?: boolean;
-    /** a function used to generate a unique key (for caching) from the arguments passed to the method function (the callback argument is not passed as input). The server will automatically generate a unique key if the function's arguments are all of types 'string', 'number', or 'boolean'. However if the method uses other types of arguments, a key generation function must be provided which takes the same arguments as the function and returns a unique string (or null if no key can be generated). */
-    generateKey?(args: any[]): string | null;
-}
-
-/** For context [See docs](https://hapijs.com/api/16.1.1#servermethodmethods) */
-export interface ServerMethodConfigurationObject {
-    name: string;
-    method: ServerMethod;
-    options: ServerMethodOptions;
-}
-
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
- +                                                                           +
- +                                                                           +
- +                                                                           +
- +                          Caching with Catbox                              +
- +                                                                           +
- +                                                                           +
- +                                                                           +
- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-// TODO: move to separate file http://stackoverflow.com/questions/43276921
-
-/**
- * TODO confirm this is the same as CatboxServerCacheConfiguration
- *
- * **
- * Server instantiation options configuration for Catbox cache
- * TODO: check it extends Catbox.PolicyOptions and this is what "other options passed to the catbox strategy used." means.
- * For context [See docs](https://hapijs.com/api/16.1.1#new-serveroptions) under: options > cache > a configuration object
- * **
- *    export interface CatboxServerOptionsCacheConfiguration extends Catbox.IPolicyOptions {
- *        // a prototype function or catbox engine object.
- *        engine: Catbox.EnginePrototypeOrObject;
- *        // an identifier used later when provisioning or configuring caching for server methods or plugins. Each cache name must be unique. A single item may omit the name option which defines the default cache. If every cache includes a name, a default memory cache is provisioned as well.
- *        name?: string;
- *        // if true, allows multiple cache users to share the same segment (e.g. multiple methods using the same cache storage container). Default to false.
- *        shared?: boolean;
- *    }
- */
-export type CatboxServerOptionsCacheConfiguration = CatboxServerCacheConfiguration;
-
-/**
- * Server cache method configuration for Catbox cache
- * Used for "Provisions a cache segment within the server cache facility"
- * For context [See docs](https://hapijs.com/api/16.1.1#servercacheoptions)
- * Also used in [See docs](https://hapijs.com/api/16.1.1#servermethodname-method-options) > options.cache
- */
-export interface CatboxServerCacheConfiguration extends Catbox.PolicyOptions {
-    /** the cache name configured in server.cache. Defaults to the default cache. */
-    cache?: string;
-    /** string segment name, used to isolate cached items within the cache partition. When called within a plugin, defaults to '!name' where 'name' is the plugin name. When called within a server method, defaults to '#name' where 'name' is the server method name. Required when called outside of a plugin. */
-    segment?: string;
-    /** if true, allows multiple cache provisions to share the same segment. Default to false. */
-    shared?: boolean;
-    /**
-     * a prototype function or catbox engine object.
-     * [See docs](https://hapijs.com/api/16.1.1#servercacheprovisionoptions-callback) example code includes use of `engine` option.  But server.cache.provision of `options` says "same as the server cache configuration options.".
-     * TODO confirm once PR to hapi docs accepted / rejected.
-     */
-    engine?: Catbox.EnginePrototypeOrObject;
-    /**
-     * an identifier used later when provisioning or configuring caching for server methods or plugins. Each cache name must be unique. A single item may omit the name option which defines the default cache. If every cache includes a name, a default memory cache is provisioned as well.
-     * [See docs](https://hapijs.com/api/16.1.1#servercacheprovisionoptions-callback) example code includes use of `name` option.  But server.cache.provision of `options` says "same as the server cache configuration options.".
-     */
-    name?: string;
-    /**
-     * Additional options to be passed to the Catbox strategy
-     */
-    [s: string]: any;
-}
-
-/**
- * Additional notes
- * payload - In case of an object it will be converted to a string for you. Defaults to no payload. Note that payload processing defaults to 'application/json' if no 'Content-Type' header provided.
- * [See docs](https://hapijs.com/api/16.1.1#serverinjectoptions-callback)
- */
-export interface InjectedRequestOptions extends Shot.RequestOptions {
-    /** an optional credentials object containing authentication information. The credentials are used to bypass the default authentication strategies, and are validated directly as if they were received via an authentication scheme. Defaults to no credentials. */
-    credentials?: any;
-    /** an optional artifacts object containing authentication artifact information. The artifacts are used to bypass the default authentication strategies, and are validated directly as if they were received via an authentication scheme. Ignored if set without credentials. Defaults to no artifacts. */
-    artifacts?: any;
-    /** sets the initial value of request.app. */
-    app?: any;
-    /** sets the initial value of request.plugins. */
-    plugins?: PluginsStates;
-    /** allows access to routes with config.isInternal set to true. Defaults to false. */
-    allowInternals?: boolean;
-}
-
-/**
- * the response object from server.inject
- * [See docs](https://hapijs.com/api/16.1.1#serverinjectoptions-callback)
- */
-export interface InjectedResponseObject extends Shot.ResponseObject {
-    /** the raw handler response (e.g. when not a stream or a view) before it is serialized for transmission. If not available, the value is set to payload. Useful for inspection and reuse of the internal objects returned (instead of parsing the response string). */
-    result: Object | string;
-    /** the request object. */
-    request: InjectedRequestOptions;
-}
-
-/**
- * For context [See docs](https://hapijs.com/api/16.1.1#new-serveroptions) under: options > connections
- */
-export interface ConnectionConfigurationServerDefaults {
-    /** application-specific connection configuration which can be accessed via connection.settings.app. Provides a safe place to store application configuration without potential conflicts with the framework internals. Should not be used to configure plugins which should use plugins[name]. Note the difference between connection.settings.app which is used to store configuration values and connection.app which is meant for storing run-time state.  */
-    app?: any;
-    /** if false, response content encoding is disabled. Defaults to true */
-    compression?: boolean;
-    /** connection load limits configuration where:  */
-    load?: {
-        /** maximum V8 heap size over which incoming requests are rejected with an HTTP Server Timeout (503) response. Defaults to 0 (no limit).  */
-        maxHeapUsedBytes?: number;
-        /** maximum process RSS size over which incoming requests are rejected with an HTTP Server Timeout (503) response. Defaults to 0 (no limit).  */
-        maxRssBytes?: number;
-        /** maximum event loop delay duration in milliseconds over which incoming requests are rejected with an HTTP Server Timeout (503) response. Defaults to 0 (no limit).  */
-        maxEventLoopDelay?: number;
-    };
-    /** plugin-specific configuration which can later be accessed via connection.settings.plugins. Provides a place to store and pass connection-specific plugin configuration. plugins is an object where each key is a plugin name and the value is the configuration. Note the difference between connection.settings.plugins which is used to store configuration values and connection.plugins which is meant for storing run-time state. */
-    plugins?: PluginSpecificConfiguration;
-    /** controls how incoming request URIs are matched against the routing table: */
-    router?: {
-        /** determines whether the paths '/example' and '/EXAMPLE' are considered different resources. Defaults to true.  */
-        isCaseSensitive?: boolean;
-        /** removes trailing slashes on incoming paths. Defaults to false.  */
-        stripTrailingSlash?: boolean;
-    };
-    /** a route options object used to set the default configuration for every route. */
-    routes?: RouteAdditionalConfigurationOptions;
-    /** sets the default configuration for every state (cookie) set explicitly via server.state() or implicitly (without definition) using the [state configuration object](https://hapijs.com/api/16.1.1#serverstatename-options). */
-    state?: ServerStateCookieConfiguationObject;
-}
-
-/**
- * a connection configuration object or array of objects with the following optional keys.
- * Any connections configuration server defaults can be included to override and customize the individual connection.
- * [See docs](https://hapijs.com/api/16.1.1#serverconnectionoptions)
- */
-export interface ServerConnectionOptions extends ConnectionConfigurationServerDefaults {
-    /** host - the public hostname or IP address. Used only to set server.info.host and server.info.uri. If not configured, defaults to the operating system hostname and if not available, to 'localhost'. */
-    host?: string;
-    /** address - sets the host name or IP address the connection will listen on. If not configured, defaults to host if present, otherwise to all available network interfaces (i.e. '0.0.0.0'). Set to 127.0.0.1 or localhost to restrict connection to only those coming from the same machine. */
-    address?: string;
-    /** port - the TCP port the connection will listen to. Defaults to an ephemeral port (0) which uses an available port when the server is started (and assigned to server.info.port). If port is a string containing a '/' character, it is used as a UNIX domain socket path and if it starts with '\.\pipe' as a Windows named pipe. */
-    port?: string | number;
-    /** uri - the full public URI without the path (e.g. 'http://example.com:8080'). If present, used as the connection info.uri otherwise constructed from the connection settings. */
-    uri?: string;
-    /** listener - optional node.js HTTP (or HTTPS) http.Server object or any compatible object. If the listener needs to be manually started, set autoListen to false. If the listener uses TLS, set tls to true. */
-    listener?: http.Server;
-    /** autoListen - indicates that the connection.listener will be started manually outside the framework. Cannot be specified with a port setting. Defaults to true. */
-    autoListen?: boolean;
-    /** labels - a string or string array of labels used to server.select() specific connections matching the specified labels. Defaults to an empty array [] (no labels). */
-    labels?: string | string[];
-    /** tls - used to create an HTTPS connection. The tls object is passed unchanged as options to the node.js HTTPS server as described in the node.js HTTPS [documentation](https://nodejs.org/api/https.html#https_https_createserver_options_requestlistener})  . Set to true when passing a listener object that has been configured to use TLS directly. */
-    tls?: true | https.RequestOptions;
-}
-
-/**
- * For context see RouteAdditionalConfigurationOptions > compression
- * For context [See docs](https://hapijs.com/api/16.1.1#serverencoderencoding-encoder)
- */
-export type CompressionEncoderSettings = any;
-
-/**
- * For context see RouteAdditionalConfigurationOptions > payload > compression
- * For context [See docs](https://hapijs.com/api/16.1.1#serverdecoderencoding-decoder)
- */
-export type CompressionDecoderSettings = any;
-
-/**
- * an optional function called after all the specified dependencies have been registered and before the server starts. The function is only called if the server is initialized or started. If a circular dependency is detected, an exception is thrown (e.g. two plugins each has an after function to be called after the other). The function signature is function(server, next) where:
- * [See docs](https://hapijs.com/api/16.1.1#serverdependencydependencies-after)
- * Also see Server.dependency
- * @param server  the server the dependency() method was called on.
- * @param next  the callback function the method must call to return control over to the application and complete the registration process. The function signature is function(err) where:
- *      * err - internal error condition, which is returned back via the server.initialize() or server.start() callback.
- */
-export interface AfterDependencyLoadCallback {
-    (server: Server, next: (err?: Error) => void): void;
-}
-
-/** For context see RouteAdditionalConfigurationOptions > auth */
-export interface AuthOptions {
-    /**
-     * the authentication mode. Defaults to 'required' if a server authentication strategy is configured, otherwise defaults to no authentication. Available values:
-     *  * 'required' - authentication is required.
-     *  * 'optional' - authentication is optional (must be valid if present).
-     *  * 'try' - same as 'optional' but allows for invalid authentication.
-     */
-    mode?: 'required' | 'optional' | 'try';
-    /** a string array of strategy names in order they should be attempted. If only one strategy is used, strategy can be used instead with the single string value. Defaults to the default authentication strategy which is available only when a single strategy is configured.  */
-    strategies?: string[];
-    strategy?: string;
-    /**
-     * if set, the payload (in requests other than 'GET' and 'HEAD') is authenticated after it is processed. Requires a strategy with payload authentication support (e.g. Hawk). Cannot be set to a value other than 'required' when the scheme sets the options.payload to true. Available values:
-     *  * false - no payload authentication. This is the default value.
-     *  * 'required' - payload authentication required. This is the default value when the scheme sets options.payload to true.
-     *  * 'optional' - payload authentication performed only when the client includes payload authentication information (e.g. hash attribute in Hawk).
-     */
-    payload?: false | 'required' | 'optional';
-    /** specifying the route access rules. */
-    access?: RouteAuthAccessConfiguationObject | RouteAuthAccessConfiguationObject[];
-    /** (undocumented) Convenience way of setting access.scope, will over write all values in `access` */
-    scope?: false | string | string[];
-    /** (undocumented) Convenience way of setting access.entity, will over write all values in `access` */
-    entity?: 'any' | 'user' | 'app';
-}
-
-/**
- * Each rule is evaluated against an incoming request and access is granted if at least one rule matches. Each rule object must include at least one of:
- * For context see RouteAdditionalConfigurationOptions > auth > an object > access
- */
-export interface RouteAuthAccessConfiguationObject {
-    /** the application scope required to access the route. Value can be a scope string or an array of scope strings. The authenticated credentials object scope property must contain at least one of the scopes defined to access the route. If a scope string begins with a + character, that scope is required. If a scope string begins with a ! character, that scope is forbidden. For example, the scope ['!a', '+b', 'c', 'd'] means the incoming request credentials' scope must not include 'a', must include 'b', and must include one of 'c' or 'd'. You may also access properties on the request object (query and params) to populate a dynamic scope by using {} characters around the property name, such as 'user-{params.id}'. Defaults to false (no scope requirements). */
-    scope?: false | string | string[];
-    /**
-     * the required authenticated entity type. If set, must match the entity value of the authentication credentials. Available values:
-     *  * any - the authentication can be on behalf of a user or application. This is the default value.
-     *  * user - the authentication must be on behalf of a user which is identified by the presence of a user attribute in the credentials object returned by the authentication strategy.
-     *  * app - the authentication must be on behalf of an application which is identified by the lack of presence of a user attribute in the credentials object returned by the authentication strategy.
-     */
-    entity?: 'any' | 'user' | 'app';
-}
-
-/**
- * For context see RouteAdditionalConfigurationOptions > cache
- */
-export type RouteCacheOptions = {
-    /**
-     * determines the privacy flag included in client-side caching using the 'Cache-Control' header. Values are:
-     *  * 'default' - no privacy flag. This is the default setting.
-     *  * 'public' - mark the response as suitable for public caching.
-     *  * 'private' - mark the response as suitable only for private caching.
-     */
-    privacy?: 'default' | 'public' | 'private';
-    /** an array of HTTP response status codes (e.g. 200) which are allowed to include a valid caching directive. Defaults to [200]. */
-    statuses?: number[];
-    /** a string with the value of the 'Cache-Control' header when caching is disabled. Defaults to 'no-cache'. */
-    otherwise?: string;
-} & ({
-    /** relative expiration expressed in the number of milliseconds since the item was saved in the cache. Cannot be used together with expiresAt. */
-    expiresIn?: number;
-    /** time of day expressed in 24h notation using the 'HH:MM' format, at which point all cache records for the route expire. Cannot be used together with expiresIn. */
-    expiresAt?: undefined;
-} | {
-    /** relative expiration expressed in the number of milliseconds since the item was saved in the cache. Cannot be used together with expiresAt. */
-    expiresIn?: undefined;
-    /** time of day expressed in 24h notation using the 'HH:MM' format, at which point all cache records for the route expire. Cannot be used together with expiresIn. */
-    expiresAt?: string;
-} | {
-    /** relative expiration expressed in the number of milliseconds since the item was saved in the cache. Cannot be used together with expiresAt. */
-    expiresIn?: undefined;
-    /** time of day expressed in 24h notation using the 'HH:MM' format, at which point all cache records for the route expire. Cannot be used together with expiresIn. */
-    expiresAt?: undefined;
-});
-
-/**
- * For context see RouteAdditionalConfigurationOptions > cors
- */
-export interface CorsConfigurationObject {
-    /** a strings array of allowed origin servers ('Access-Control-Allow-Origin'). The array can contain any combination of fully qualified origins along with origin strings containing a wildcard '*' character, or a single '*' origin string. Defaults to any origin ['*']. */
-    origin?: string[] | '*';
-    /** number of seconds the browser should cache the CORS response ('Access-Control-Max-Age'). The greater the value, the longer it will take before the browser checks for changes in policy. Defaults to 86400 (one day). */
-    maxAge?: number;
-    /** a strings array of allowed headers ('Access-Control-Allow-Headers'). Defaults to ['Accept', 'Authorization', 'Content-Type', 'If-None-Match'] */
-    headers?: string[];
-    /** a strings array of additional headers to headers. Use this to keep the default headers in place. */
-    additionalHeaders?: string[];
-    /** a strings array of exposed headers ('Access-Control-Expose-Headers'). Defaults to ['WWW-Authenticate', 'Server-Authorization']. */
-    exposedHeaders?: string[];
-    /** a strings array of additional headers to exposedHeaders. Use this to keep the default headers in place. */
-    additionalExposedHeaders?: string[];
-    /** if true, allows user credentials to be sent ('Access-Control-Allow-Credentials'). Defaults to false. */
-    credentials?: boolean;
-}
-
-/**
- * An object describing the extension function used whilst registering the extension function in one of the available extension points
- * [See docs](https://hapijs.com/api/16.1.1#serverextevents)
- * For context see RouteAdditionalConfigurationOptions > ext
- */
-export interface ServerStartExtConfigurationObject {
-    /** the extension point event name. */
-    type: ServerStartExtPoints;
-    /**
-     * a function or an array of functions to be executed at a specified point during request processing. The required extension function signature is see ServerExtFunction or see ServerExtRequestHandler
-     */
-    method: ServerExtFunction | ServerExtFunction[];
-    options?: ServerExtOptions;
-}
-
-/**
- * An object describing the extension function used whilst registering the extension function in one of the available extension points
- * [See docs](https://hapijs.com/api/16.1.1#serverextevents)
- * For context see RouteAdditionalConfigurationOptions > ext
- */
-export interface ServerRequestExtConfigurationObject {
-    /** the extension point event name. */
-    type: ServerRequestExtPointsBase;
-    /**
-     * a function or an array of functions to be executed at a specified point during request processing. The required extension function signature is see ServerExtFunction or see ServerExtRequestHandler
-     */
-    method: ServerExtRequestHandler | ServerExtRequestHandler[]
-    options?: ServerExtOptions;
-}
-
-/**
- * An object describing the extension function used whilst registering the extension function in one of the available extension points
- * [See docs](https://hapijs.com/api/16.1.1#serverextevents)
- * For context see RouteAdditionalConfigurationOptions > ext
- */
-export interface ServerRequestExtConfigurationObjectWithRequest {
-    /** the extension point event name. */
-    type: ServerRequestExtPoints;
-    /**
-     * a function or an array of functions to be executed at a specified point during request processing. The required extension function signature is see ServerExtFunction or see ServerExtRequestHandler
-     */
-    method: ServerExtRequestHandler | ServerExtRequestHandler[];
-    options?: ServerExtOptions;
-}
-
-/**
- * [See docs](https://hapijs.com/api/16.1.1#route-configuration) > ext
- */
-export type RouteExtConfigurationObject = ServerStartExtConfigurationObject | ServerRequestExtConfigurationObject;
-
-/**
- * [See docs](https://hapijs.com/api/16.1.1#serverextevents) > events > method
- */
-export type ServerExtMethod = ServerExtFunction | ServerExtRequestHandler;
-
-/**
- * [See docs](https://hapijs.com/api/16.1.1#serverextevents) > events > options
- */
-export interface ServerExtOptions {
-    /** before - a string or array of strings of plugin names this method must execute before (on the same event). Otherwise, extension methods are executed in the order added. */
-    before: string | string[];
-    /** after - a string or array of strings of plugin names this method must execute after (on the same event). Otherwise, extension methods are executed in the order added. */
-    after: string | string[];
-    /** bind - a context object passed back to the provided method (via this) when called. Ignored if the method is an arrow function. */
-    bind: any;
-    /** sandbox - if set to 'plugin' when adding a request extension points the extension is only added to routes defined by the current plugin. Not allowed when configuring route-level extensions, or when adding server extensions. Defaults to 'connection' which applies to any route added to the connection the extension is added to. */
-    sandbox?: 'connection' | 'plugin';
-}
-
-/**
- * [See docs](https://hapijs.com/api/16.1.1#serverextevents) > events > type
- *  * 'onPreStart' - called before the connection listeners are started.
- *  * 'onPostStart' - called after the connection listeners are started.
- *  * 'onPreStop' - called before the connection listeners are stopped.
- *  * 'onPostStop' - called after the connection listeners are stopped.
- */
-export type ServerStartExtPoints = 'onPreStart' | 'onPostStart' | 'onPreStop' | 'onPostStop';
-/**
- * [See docs](https://hapijs.com/api/16.1.1#request-lifecycle)
- *  * The available extension points include the request extension points as well as the following server extension points:
- */
-export type ServerRequestExtPointsBase = 'onPreResponse' | 'onPreAuth' | 'onPostAuth' | 'onPreHandler' | 'onPostHandler' | 'onPreResponse';
-
-export type ServerRequestExtPoints = ServerRequestExtPointsBase | 'onRequest';
-
-/**
- * Server extension function registered an one of the server extension points
- * [See docs](https://hapijs.com/api/16.1.1#serverextevents)
- * For context see ServerExtConfigurationObject
- * @param server - the server object.
- * @param next - the continuation method with signature function(err).
- * @param this - the object provided via options.bind or the current active context set with server.bind().
- */
-export interface ServerExtFunction {
-    (server: Server, next: ContinuationFunction): void;
-}
-
-/**
- * For context see RouteAdditionalConfigurationOptions > payload
- */
-export interface RoutePayloadConfigurationObject {
-    /**
-     * the type of payload representation requested. The value must be one of:
-     *  * 'data' - the incoming payload is read fully into memory. If parse is true, the payload is parsed (JSON, form-decoded, multipart) based on the 'Content-Type' header. If parse is false, the raw Buffer is returned. This is the default value except when a proxy handler is used.
-     *  * 'stream' - the incoming payload is made available via a Stream.Readable interface. If the payload is 'multipart/form-data' and parse is true, fields values are presented as text while files are provided as streams. File streams from a 'multipart/form-data' upload will also have a property hapi containing filename and headers properties.
-     *  * 'file' - the incoming payload is written to temporary file in the directory specified by the server's payload.uploads settings. If the payload is 'multipart/form-data' and parse is true, fields values are presented as text while files are saved. Note that it is the sole responsibility of the application to clean up the files generated by the framework. This can be done by keeping track of which files are used (e.g. using the request.app object), and listening to the server 'response' event to perform any needed cleanup.
-     */
-    output?: PayLoadOutputOption;
-    /**
-     * can be true, false, or gunzip; determines if the incoming payload is processed or presented raw. true and gunzip includes gunzipping when the appropriate 'Content-Encoding' is specified on the received request. If parsing is enabled and the 'Content-Type' is known (for the whole payload as well as parts), the payload is converted into an object when possible. If the format is unknown, a Bad Request (400) error response is sent. Defaults to true, except when a proxy handler is used. The supported mime types are:
-     *  * 'application/json'
-     *  * 'application/x-www-form-urlencoded'
-     *  * 'application/octet-stream'
-     *  * 'text/*'
-     *  * 'multipart/form-data'
-     */
-    parse?: 'gunzip' | boolean;
-    /**
-     * overrides payload processing for multipart requests. Value can be one of:
-     *  * false - disables multipart processing.
-     *  * object with the following required options:
-     *      * output - same as the payload.output option with an additional value option:
-     *          * annotated - wraps each multipart part in an object with the following keys: // TODO type this?
-     *              * headers - the part headers.
-     *              * filename - the part file name.
-     *              * payload - the processed part payload.
-     */
-    multipart?: false | {
-        output: PayLoadOutputOption | 'annotated';
-    };
-    /** a string or an array of strings with the allowed mime types for the endpoint. Defaults to any of the supported mime types listed above. Note that allowing other mime types not listed will not enable them to be parsed, and that if parsing mode is 'parse', the request will result in an error response. */
-    allow?: string | string[];
-    /** a mime type string overriding the 'Content-Type' header value received. Defaults to no override. */
-    override?: string;
-    /** limits the size of incoming payloads to the specified byte count. Allowing very large payloads may cause the server to run out of memory. Defaults to 1048576 (1MB). */
-    maxBytes?: number;
-    /** payload reception timeout in milliseconds. Sets the maximum time allowed for the client to transmit the request payload (body) before giving up and responding with a Request Timeout (408) error response. Set to false to disable. Defaults to 10000 (10 seconds). */
-    timeout?: number | false;
-    /** the directory used for writing file uploads. Defaults to os.tmpdir(). */
-    uploads?: string;
-    /**
-     * determines how to handle payload parsing errors. Allowed values are:
-     *  * 'error' - return a Bad Request (400) error response. This is the default value.
-     *  * 'log' - report the error but continue processing the request.
-     *  * 'ignore' - take no action and continue processing the request.
-     */
-    failAction?: 'error' | 'log' | 'ignore';
-    /** the default 'Content-Type' HTTP header value is not present. Defaults to 'application/json'. */
-    defaultContentType?: string;
-    /** an object where each key is a content-encoding name and each value is an object with the desired decoder settings. Note that encoder settings are set in the root option compression. */
-    compression?: Dictionary<CompressionDecoderSettings>;
-}
-
-export type PayLoadOutputOption = 'data' | 'stream' | 'file';
-
-/**
- * events must be one of:
- *  * an event name string.
- *  * an event options object see ApplicationEventOptionsObject
- * * a podium [See docs](https://github.com/hapijs/podium) emitter object.
- * For context [See docs](https://hapijs.com/api/16.1.1#servereventevents) > events parameter
- */
-export type ApplicationEvent = string | ApplicationEventOptionsObject | Podium;
-
-/**
- * an event options object
- * For context see ApplicationEvent
- * For context [See docs](https://hapijs.com/api/16.1.1#servereventevents) > events parameter
- */
-export interface ApplicationEventOptionsObject {
-    /** the event name string (required). */
-    name: string;
-    /** a string or array of strings specifying the event channels available. Defaults to no channel restrictions (event updates can specify a channel or not). */
-    channels?: string | string[];
-    /** if true, the data object passed to server.emit() is cloned before it is passed to the listeners (unless an override specified by each listener). Defaults to false (data is passed as-is). */
-    clone?: boolean;
-    /** if true, the data object passed to server.emit() must be an array and the listener method is called with each array element passed as a separate argument (unless an override specified by each listener). This should only be used when the emitted data structure is known and predictable. Defaults to false (data is emitted as a single argument regardless of its type). */
-    spread?: boolean;
-    /** if true and the criteria object passed to server.emit() includes tags, the tags are mapped to an object (where each tag string is the key and the value is true) which is appended to the arguments list at the end (but before the callback argument if block is set). A configuration override can be set by each listener. Defaults to false. */
-    tags?: boolean;
-    /** if true, the same event name can be registered multiple times where the second registration is ignored. Note that if the registration config is changed between registrations, only the first configuration is used. Defaults to false (a duplicate registration will throw an error). */
-    shared?: boolean;
-}
-
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
- +                                                                           +
- +                                                                           +
- +                                                                           +
- +                                  Route                                    +
- +                                                                           +
- +                                                                           +
- +                                                                           +
- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-// TODO: move to separate file http://stackoverflow.com/questions/43276921
-
-/**
- * Route configuration
- * The route configuration object
- *
- * [See docs](https://hapijs.com/api/16.1.1#route-configuration)
- *
- * TODO typings check that the following refers to RouteAdditionalConfigurationOptions "Note that the options object is deeply cloned (with the exception of bind which is shallowly copied) and cannot contain any values that are unsafe to perform deep copy on."
- */
-export interface RouteConfiguration {
-    /** the absolute path used to match incoming requests (must begin with '/'). Incoming requests are compared to the configured paths based on the connection router configuration option. The path can include named parameters enclosed in {} which will be matched against literal values in the request as described in Path parameters. */
-    path: string;
-    /** the HTTP method. Typically one of 'GET', 'POST', 'PUT', 'PATCH', 'DELETE', or 'OPTIONS'. Any HTTP method is allowed, except for 'HEAD'. Use '*' to match against any HTTP method (only when an exact match was not found, and any match with a specific method will be given a higher priority over a wildcard match). Can be assigned an array of methods which has the same result as adding the same route with different methods manually. */
-    method: HTTP_METHODS_PARTIAL | '*' | (HTTP_METHODS_PARTIAL | '*')[];
-    /** an optional domain string or an array of domain strings for limiting the route to only requests with a matching host header field. Matching is done against the hostname part of the header only (excluding the port). Defaults to all hosts. */
-    vhost?: string;
-    /** the function called to generate the response after successful authentication and validation. The handler function is described in Route handler. If set to a string, the value is parsed the same way a prerequisite server method string shortcut is processed. Alternatively, handler can be assigned an object with a single key using the name of a registered handler type and value with the options passed to the registered handler. */
-    handler?: string | RouteHandler | RouteHandlerPlugins;
-    /** additional route options. The config value can be an object or a function that returns an object using the signature function(server) where server is the server the route is being added to and this is bound to the current realm's bind option. */
-    config?: RouteAdditionalConfigurationOptions | ((server: Server) => RouteAdditionalConfigurationOptions);
-}
-
-/**
- * Route options
- * Each route can be customize to change the default behavior of the request lifecycle using the following options:
- * [See docs](https://hapijs.com/api/16.1.1#route-options)
- */
-export interface RouteAdditionalConfigurationOptions {
-    /** application specific configuration.Should not be used by plugins which should use plugins[name] instead. */
-    app?: any;
-    /**
-     * Authentication configuration.  Value can be:
-     *  * false to disable authentication if a default strategy is set.
-     *  * a string with the name of an authentication strategy registered with server.auth.strategy().
-     *  * an object
-     */
-    auth?: false | string | AuthOptions;
-    /** an object passed back to the provided handler (via this) when called. Ignored if the method is an arrow function. */
-    bind?: any;
-    /**
-     * Route cache options
-     * if the route method is 'GET', the route can be configured to include caching directives in the response. The default Cache-Control: no-cache header can be disabled by setting cache to false. Caching can be customized using an object
-     * TODO check: the default is to have 'Cache-Control: no-cache', but on first reading is a contridiction as you can disabled cache and disabled no-cache by setting RouteCacheOptions to false?
-     */
-    cache?: boolean | RouteCacheOptions;
-    /** an object where each key is a content-encoding name and each value is an object with the desired encoder settings. Note that decoder settings are set in payload.compression. */
-    compression?: Dictionary<CompressionEncoderSettings>;
-    /** the Cross-Origin Resource Sharing protocol allows browsers to make cross-origin API calls. CORS is required by web applications running inside a browser which are loaded from a different domain than the API server. CORS headers are disabled by default (false). To enable, set cors to true, or to an object */
-    cors?: boolean | CorsConfigurationObject;
-    /** defined a route-level request extension points by setting the option to an object with a key for each of the desired extension points ('onRequest' is not allowed), and the value is the same as the [server.ext(events)](https://hapijs.com/api/16.1.1#serverextevents) event argument. */
-    ext?: RouteExtConfigurationObject | RouteExtConfigurationObject[];
-    /** defines the behavior for accessing files: */
-    files?: {
-        /** determines the folder relative paths are resolved against. */
-        relativeTo: string;
-    };
-    /** an alternative location for the route.handler option. */
-    handler?: string | RouteHandler;
-    /** an optional unique identifier used to look up the route using server.lookup(). Cannot be assigned to routes with an array of methods. */
-    id?: string;
-    /** if true, the route cannot be accessed through the HTTP connection but only through the server.inject() interface with the allowInternals option set to true. Used for internal routes that should not be accessible to the outside world. Defaults to false. */
-    isInternal?: boolean;
-    /** optional arguments passed to JSON.stringify() when converting an object or error response to a string payload. Supports the following: */
-    json?: Json.StringifyArguments & {
-        /** string suffix added after conversion to JSON string. Defaults to no suffix. */
-        suffix?: string;
-    };
-    /** enables JSONP support by setting the value to the query parameter name containing the function name used to wrap the response payload. For example, if the value is 'callback', a request comes in with 'callback=me', and the JSON response is '{ "a":"b" }', the payload will be 'me({ "a":"b" });'. Does not work with stream responses. Headers content-type and x-content-type-options are set to text/javascript and nosniff respectively, and will override those headers even if explicitly set by response.type() */
-    jsonp?: string;
-    /** if true, request level logging is enabled (accessible via request.getLog()). */
-    log?: boolean;
-    /**
-     * determines how the request payload is processed
-     * [See docs](https://hapijs.com/api/16.1.1#route-options)
-     */
-    payload?: RoutePayloadConfigurationObject;
-    /** plugin-specific configuration. plugins is an object where each key is a plugin name and the value is the plugin configuration. */
-    plugins?: PluginSpecificConfiguration;
-    /** an array with [route prerequisites](https://hapijs.com/api/16.1.1#route-prerequisites) methods which are executed in serial or in parallel before the handler is called. */
-    pre?: RoutePrerequisitesArray;
-    /** processing rules for the outgoing response */
-    response?: RouteResponseConfigurationObject;
-    /** sets common security headers (disabled by default). To enable set security to true or to an object with the following options: See RouteSecurityConfigurationObject */
-    security?: boolean | RouteSecurityConfigurationObject;
-    /** HTTP state management (cookies) allows the server to store information on the client which is sent back to the server with every request (as defined in RFC 6265). state supports the following options: */
-    state?: {
-        /** determines if incoming 'Cookie' headers are parsed and stored in the request.state object. Defaults to true. */
-        parse?: boolean;
-        /**
-         * determines how to handle cookie parsing errors. Allowed values are:
-         *  * 'error' - return a Bad Request (400) error response. This is the default value.
-         *  * 'log' - report the error but continue processing the request.
-         *  * 'ignore' - take no action.
-         */
-        failAction: 'error' | 'log' | 'ignore';
-    };
-    /** request input validation rules for various request components. When using a Joi validation object, the values of the other inputs (i.e. headers, query, params, payload, and auth) are made available under the validation context (accessible in rules as Joi.ref('$query.key')). Note that validation is performed in order (i.e. headers, params, query, payload) and if type casting is used (converting a string to number), the value of inputs not yet validated will reflect the raw, unvalidated and unmodified values. If the validation rules for headers, params, query, and payload are defined at both the routes defaults level and an individual route, the individual route settings override the routes defaults (the rules are not merged). The validate object supports: */
-    validate?: RouteValidationConfigurationObject;
-    /** define timeouts for processing durations: */
-    timeout?: {
-        /** response timeout in milliseconds. Sets the maximum time allowed for the server to respond to an incoming client request before giving up and responding with a Service Unavailable (503) error response. Disabled by default (false). */
-        server?: boolean | number;
-        /** by default, node sockets automatically timeout after 2 minutes. Use this option to override this behavior. Defaults to undefined which leaves the node default unchanged. Set to false to disable socket timeouts. */
-        socket?: boolean | number;
-    };
-
-    /**
-     * TODO decide on moving these to an extended interface of RouteAdditionalConfigurationOptions
-     */
-    /**
-     * ONLY WHEN ADDING NEW ROUTES (not when setting defaults).
-     * route description used for generating documentation
-     */
-    description?: string;
-    /**
-     * ONLY WHEN ADDING NEW ROUTES (not when setting defaults).
-     * route notes used for generating documentation
-     */
-    notes?: string | string[];
-    /**
-     * ONLY WHEN ADDING NEW ROUTES (not when setting defaults).
-     * route tags used for generating documentation
-     */
-    tags?: string[];
-}
-
-/**
- * Route public interface
- * When route information is returned or made available as a property, it is an object with the following:
- * [See docs](https://hapijs.com/api/16.1.1#route-public-interface)
- */
-export interface RoutePublicInterface {
-    /** the route HTTP method. */
-    method: string;
-    /** the route path. */
-    path: string;
-    /** the route vhost option if configured. */
-    vhost?: string | string[];
-    /** the [active realm] [See docs](https://hapijs.com/api/16.1.1#serverrealm) associated with the route.*/
-    realm: ServerRealm;
-    /** the [route options] [See docs](https://hapijs.com/api/16.1.1#route-options) object with all defaults applied. */
-    settings: RouteAdditionalConfigurationOptions;
-    /** the route internal normalized string representing the normalized path. */
-    fingerprint: string;
-    /** route authentication utilities: */
-    auth: {
-        /** authenticates the passed request argument against the route's authentication access configuration. Returns true if the request would have passed the route's access requirements. Note that the route's authentication mode and strategies are ignored. The only match is made between the request.auth.credentials scope and entity information and the route access configuration. Also, if the route uses dynamic scopes, the scopes are constructed against the request.query and request.params which may or may not match between the route and the request's route. If this method is called using a request that has not been authenticated (yet or at all), it will return false if the route requires any authentication. */
-        access(request: Request): boolean;
-    };
-}
-
-export type RouteHandlerConfig = any;
-
-/**
- * For context [See docs](https://hapijs.com/api/16.1.1#serverhandlername-method)
- * For source [See docs](https://github.com/hapijs/hapi/blob/v16.1.1/lib/handler.js#L103)
- * For source [See docs](https://github.com/hapijs/hapi/blob/v16.1.1/lib/route.js#L56-L60)
- * TODO check the type of `RouteHandlerConfig` is correct for `defaults`.
- */
-export interface MakeRouteHandler {
-    (route: RoutePublicInterface, options: RouteHandlerConfig): RouteHandler;
-    defaults?: RouteHandlerConfig | ((method: HTTP_METHODS_PARTIAL_lowercase) => RouteHandlerConfig);
-}
-
-/**
- * [See docs](https://hapijs.com/api/16.1.1#servertablehost) > return value
- */
-export interface RoutingTableEntry {
-    /** the connection.info the connection the table was generated for. */
-    info: ServerConnectionInfo;
-    /** the connection labels. */
-    labels: string[];
-    /** an array of routes where each route contains: */
-    table: Route[];
-}
-
-/**
- * [See docs](https://hapijs.com/api/16.1.1#servertablehost) > return value
- * For source [See source](https://github.com/hapijs/hapi/blob/v16.1.1/lib/route.js#L71)
- */
-export interface Route {
-    /**
-     * the route config with defaults applied.
-     * TODO check type of RouteConfiguration here is correct
-     */
-    settings: RouteAdditionalConfigurationOptions;
-    /**
-     * the HTTP method in lower case.
-     * TODO, check if it can contain 'head' or not.
-     */
-    method: HTTP_METHODS_PARTIAL_lowercase;
-    /** the route path. */
-    path: string;
-
-    params: string[];
-
-    connection: ServerConnection;
-
-    fingerprint: string;
-
-    plugin?: any;
-
-    public: RoutePublicInterface;
-
-    server: Server;
-}
-
-/**
- * Route Prerequisites
- * It is often necessary to perform prerequisite actions before the handler is called (e.g. load required reference data from a database). The route pre option allows defining such pre-handler methods. The methods are called in order. If the pre array contains another array, those methods are called in parallel. pre can be assigned a mixed array of:
- *  * arrays containing the elements listed below, which are executed in parallel.
- *  * objects see RoutePrerequisiteObjects
- *  * functions - same as including an object with a single method key.
- *  * strings - special short-hand notation for registered server methods using the format 'name(args)' (e.g. 'user(params.id)') where:
- *      * 'name' - the method name. The name is also used as the default value of assign.
- *      * 'args' - the method arguments (excluding next) where each argument is a property of the request object
- * [See docs](https://hapijs.com/api/16.1.1#route-prerequisites)
- * For context see RouteAdditionalConfigurationOptions > pre
- *
- * TODO follow up on "server methods" in "special short-hand notation for registered server methods" at https://hapijs.com/api/16.1.1#servermethodname-method-options
- * TODO follow up on "request object" in "each argument is a property of the request object" at https://hapijs.com/api/16.1.1#request-object
- */
-export type RoutePrerequisitesArray = RoutePrerequisitesPart[] | (RoutePrerequisitesPart[] | RoutePrerequisitesPart)[];
-export type RoutePrerequisitesPart = RoutePrerequisiteObjects | RoutePrerequisiteRequestHandler | string;
-
-/**
- * see RoutePrerequisites > objects
- */
-export interface RoutePrerequisiteObjects {
-    /** the function to call (or short-hand method string as described below [see RoutePrerequisitesArray]). the function signature is identical to a route handler as described in Route handler. */
-    method: RoutePrerequisiteRequestHandler | string;
-    /** key name to assign the result of the function to within request.pre. */
-    assign: string;
-    /*
-     * determines how to handle errors returned by the method. Allowed values are:
-     *  * 'error' - returns the error response back to the client. This is the default value.
-     *  * 'log' - logs the error but continues processing the request. If assign is used, the error will be assigned.
-     *  * 'ignore' - takes no special action. If assign is used, the error will be assigned.
-     */
-    failAction?: 'error' | 'log' | 'ignore';
-}
-
-/**
- * For context see RouteAdditionalConfigurationOptions > response
- */
-export interface RouteResponseConfigurationObject<ValidationOptions = JoiValidationOptions> {
-    /** the default HTTP status code when the payload is empty. Value can be 200 or 204. Note that a 200 status code is converted to a 204 only at the time or response transmission (the response status code will remain 200 throughout the request lifecycle unless manually set). Defaults to 200. */
-    emptyStatusCode?: number;
-    /**
-     * defines what to do when a response fails payload validation. Options are:
-     *  * 'error' - return an Internal Server Error (500) error response. This is the default value.
-     *  * 'log' - log the error but send the response.
-     *  * a custom error handler function with the signature function(request, reply, source, error) where:
-     *      * 'request' - the request object.
-     *      * 'reply' - the continuation reply interface.
-     *      * 'error' - the error returned from the validation schema.
-     * TODO update type of source once PR to hapi is concluded.
-     */
-    failAction?: 'error' | 'log' | ((request: Request, reply: ReplyWithContinue, source: string, error: Boom.BoomError) => void);
-    /** if true, applies the validation rule changes to the response payload. Defaults to false. */
-    modify?: boolean;
-    /**
-     * options to pass to Joi. Useful to set global options such as stripUnknown or abortEarly (the complete list is available [here](https://github.com/hapijs/joi/blob/master/API.md#validatevalue-schema-options-callback) ).
-     * If a custom validation function (see `schema` or `status` below) is defined then `options` can an arbitrary object that will be passed to this function as the second parameter.
-     * Defaults to no options.
-     */
-    options?: ValidationOptions;
-    /** if false, payload range support is disabled. Defaults to true. */
-    ranges?: boolean;
-    /** the percent of response payloads validated (0 - 100). Set to 0 to disable all validation. Defaults to 100 (all response payloads). */
-    sample?: number;
-    /** the default response payload validation rules (for all non-error responses) */
-    schema?: RouteResponseConfigurationScheme<ValidationOptions>;
-    /** HTTP status-code-specific payload validation rules. The status key is set to an object where each key is a 3 digit HTTP status code and the value has the same definition as schema. If a response status code is not present in the status object, the schema definition is used, except for errors which are not validated by default. */
-    status?: Dictionary<RouteResponseConfigurationScheme<ValidationOptions>>;
-}
-
-/**
- * the default response payload validation rules (for all non-error responses) expressed as one of:
- *  * true - any payload allowed (no validation performed). This is the default.
- *  * false - no payload allowed.
- *  * a Joi validation object. This will receive the request's headers, params, query, payload, and auth credentials and isAuthenticated flags as context.
- *  * a validation function
- *
- * TODO check JoiValidationObject is correct for "a Joi validation object"
- *
- * For context see RouteAdditionalConfigurationOptions > response > schema
- * and
- * For context see RouteAdditionalConfigurationOptions > response > status
- */
-export type RouteResponseConfigurationScheme<ValidationOptions> = boolean | JoiValidationObject | ValidationFunctionForRouteResponse<ValidationOptions>;
-
-/**
- * see RouteResponseConfigurationScheme
- *
- * a validation function using the signature function(value, options, next) where:
- *  * value - the value of the response passed to `reply(value)` in the handler.
- *  * options - the server validation options, merged with an object containing the request's headers, params, payload, and auth credentials object and `isAuthenticated` flag.
- *  * next([err, [value]]) - the callback function called when validation is completed.  `value` will be used as the response value when `err` is falsy, when `value` is not `undefined`, and when `route.settings.response.modify` is `true`.   If the response is already a `Boom` error it will be set as its `message` value.
- */
-export interface ValidationFunctionForRouteResponse<ValidationOptions = {}> {
-    (value: any, options: RouteResponseValidationContext & ValidationOptions, next: ContinuationValueFunction): void;
-}
-
-/**
- * A context for route input validation via a Joi schema or validation function.
- *
- * This object is merged with the route response options and passed into the validation function.
- *
- * See https://github.com/hapijs/hapi/blob/v16.1.1/lib/validation.js#L217
- */
-export interface RouteResponseValidationContext {
-    context: {
-        /** The request headers */
-        headers: Dictionary<string>;
-        /** The request path parameters */
-        params: any;
-        /** The request query parameters */
-        query: any;
-        /** The request payload parameters */
-        payload: any;
-
-        /** Partial request authentication information */
-        auth: {
-            /** true if the request has been successfully authenticated, otherwise false. */
-            isAuthenticated: boolean;
-            /** the credential object received during the authentication process. The presence of an object does not mean successful authentication. */
-            credentials: AuthenticatedCredentials;
-        };
-    }
-}
-
-/**
- * For context see RouteAdditionalConfigurationOptions > security
- */
-export interface RouteSecurityConfigurationObject {
-    /** controls the 'Strict-Transport-Security' header. If set to true the header will be set to max-age=15768000, if specified as a number the maxAge parameter will be set to that number. Defaults to true. You may also specify an object with the following fields: */
-    hsts?: boolean | number | {
-        /** the max-age portion of the header, as a number. Default is 15768000. */
-        maxAge?: number;
-        /** a boolean specifying whether to add the includeSubDomains flag to the header. */
-        includeSubdomains?: boolean;
-        /** a boolean specifying whether to add the 'preload' flag (used to submit domains inclusion in Chrome's HTTP Strict Transport Security (HSTS) preload list) to the header. */
-        preload?: boolean;
-    };
-    /** controls the 'X-Frame-Options' header. When set to true the header will be set to DENY, you may also specify a string value of 'deny' or 'sameorigin'. Defaults to true. To use the 'allow-from' rule, you must set this to an object with the following fields: */
-    xframe?: true | 'deny' | 'sameorigin' | {
-        /** may also be 'deny' or 'sameorigin' but set directly as a string for xframe */
-        rule: 'allow-from';
-        /** when rule is 'allow-from' this is used to form the rest of the header, otherwise this field is ignored. If rule is 'allow-from' but source is unset, the rule will be automatically changed to 'sameorigin'. */
-        source: string;
-    };
-    /** boolean that controls the 'X-XSS-PROTECTION' header for IE. Defaults to true which sets the header to equal '1; mode=block'. NOTE: This setting can create a security vulnerability in versions of IE below 8, as well as unpatched versions of IE8. See [here](https://hackademix.net/2009/11/21/ies-xss-filter-creates-xss-vulnerabilities/) and [here](https://technet.microsoft.com/library/security/ms10-002) for more information. If you actively support old versions of IE, it may be wise to explicitly set this flag to false. [Kept typing non optional to force this security related documentation to be read.] */
-    xss: boolean;
-    /** boolean controlling the 'X-Download-Options' header for IE, preventing downloads from executing in your context. Defaults to true setting the header to 'noopen'. */
-    noOpen?: boolean;
-    /** boolean controlling the 'X-Content-Type-Options' header. Defaults to true setting the header to its only and default option, 'nosniff' */
-    noSniff?: boolean;
-}
-
-/**
- * request input validation rules for various request components. When using a Joi validation object, the values of the other inputs (i.e. headers, query, params, payload, and auth) are made available under the validation context (accessible in rules as Joi.ref('$query.key')). Note that validation is performed in order (i.e. headers, params, query, payload) and if type casting is used (converting a string to number), the value of inputs not yet validated will reflect the raw, unvalidated and unmodified values. If the validation rules for headers, params, query, and payload are defined at both the routes defaults level and an individual route, the individual route settings override the routes defaults (the rules are not merged). The validate object supports:
- * For context see RouteAdditionalConfigurationOptions > validate
- * TODO check JoiValidationObject is correct for "a Joi validation object"
- */
-export interface RouteValidationConfigurationObject<ValidationOptions = JoiValidationOptions> {
-    /**
-     * validation rules for incoming request headers (note that all header field names must be in lowercase to match the headers normalized by node). Values allowed:
-     *  * true - any headers allowed (no validation performed). This is the default.
-     *  * false - no headers allowed (this will cause all valid HTTP requests to fail).
-     *  * a Joi validation object.
-     *  * a validation function using the signature function(value, options, next) where:
-     *      * value - the object containing the request headers.
-     *      * options - the server validation options.
-     *      * next(err, value) - the callback function called when validation is completed.  `value` will be used as the `headers` value when `err` is falsy.  If `next` is called with `undefined` or no arguments then the original value of `value` will be used.
-     */
-    headers?: boolean | JoiValidationObject | ValidationFunctionForRouteInput<ValidationOptions>;
-    /**
-     * validation rules for incoming request path parameters, after matching the path against the route and extracting any parameters then stored in request.params. Values allowed:
-     * Same as `headers`, see above.
-     */
-    params?: boolean | JoiValidationObject | ValidationFunctionForRouteInput<ValidationOptions>;
-    /**
-     * validation rules for an incoming request URI query component (the key-value part of the URI between '?' and '#'). The query is parsed into its individual key-value pairs and stored in request.query prior to validation. Values allowed:
-     * Same as `headers`, see above.
-     */
-    query?: boolean | JoiValidationObject | ValidationFunctionForRouteInput<ValidationOptions>;
-    /**
-     * validation rules for an incoming request payload (request body). Values allowed:
-     * Same as `headers`, see above, with the addition that:
-     *  * a Joi validation object. Note that empty payloads are represented by a null value. If a validation schema is provided and empty payload are supported, it must be explicitly defined by setting the payload value to a joi schema with null allowed (e.g. Joi.object({ /* keys here  * / }).allow(null)).
-     */
-    payload?: boolean | JoiValidationObject | ValidationFunctionForRouteInput<ValidationOptions>;
-    /** an optional object with error fields copied into every validation error response. */
-    errorFields?: any;
-    /**
-     * determines how to handle invalid requests. Allowed values are:
-     *  * 'error' - return a Bad Request (400) error response. This is the default value.
-     *  * 'log' - log the error but continue processing the request.
-     *  * 'ignore' - take no action.
-     *  * a custom error handler function with the signature function(request, reply, source, error) see RouteFailFunction
-     */
-    failAction?: 'error' | 'log' | 'ignore' | RouteFailFunction;
-    /**
-     * options to pass to Joi. Useful to set global options such as stripUnknown or abortEarly (the complete list is [available here](https://github.com/hapijs/joi/blob/master/API.md#validatevalue-schema-options-callback)).
-     * If a custom validation function (see `headers`, `params`, `query`, or `payload` above) is defined then `options` can an arbitrary object that will be passed to this function as the second parameter.
-     * Defaults to no options.
-     */
-    options?: ValidationOptions;
-}
-
-/**
- * a validation function using the signature function(value, options, next) where:
- * For context see RouteAdditionalConfigurationOptions > validate (RouteValidationConfigurationObject)
- *
- * Also see ValidationFunctionForRouteResponse
- * @param value - the object containing the request headers, query, path params or payload.
- * @param options - the server validation options.
- * @param next([err, [value]]) - the callback function called when validation is completed.
- */
-export interface ValidationFunctionForRouteInput<ValidationOptions = {}> {
-    (value: any, options: RouteInputValidationContext & ValidationOptions, next: ContinuationValueFunction): void;
-}
-
-/**
- * A context for route input validation via a Joi schema or validation function.
- *
- * This object is merged with the route validation options and passed into the validation function.
- *
- * See https://github.com/hapijs/hapi/blob/v16.1.1/lib/validation.js#L122
- */
-export interface RouteInputValidationContext {
-    context: {
-        // These are only set when *not* validating the respective source (e.g. params, query and payload are set when validating headers):
-        // See https://github.com/hapijs/hapi/blob/v16.1.1/lib/validation.js#L132
-        headers?: Dictionary<string>;
-        params?: any;
-        query?: any;
-        payload?: any;
-
-        /** The request authentication information */
-        auth: RequestAuthenticationInformation;
-    }
-}
-
-/**
- * a custom error handler function with the signature 'function(request, reply, source, error)`
- * @param request - the request object.
- * @param reply - the continuation reply interface.
- * @param source - the source of the invalid field (e.g. 'headers', 'params', 'query', 'payload').
- * @param error - the error object prepared for the client response (including the validation function error under error.data).
- */
-export interface RouteFailFunction {
-    (request: Request, reply: ReplyWithContinue, source: string, error: any): void;
-}
-
-/**
- * optional cookie settings
- * [See docs](https://hapijs.com/api/16.1.1#serverstatename-options)
- * Related to see ConnectionConfigurationServerDefaults
- */
-export interface ServerStateCookieConfiguationObject {
-    /** time-to-live in milliseconds. Defaults to null (session time-life - cookies are deleted when the browser is closed). */
-    ttl?: number | null;
-    /** sets the 'Secure' flag. Defaults to true. */
-    isSecure?: boolean;
-    /** sets the 'HttpOnly' flag. Defaults to true. */
-    isHttpOnly?: boolean;
-    /**
-     * sets the 'SameSite' flag where the value must be one of:
-     *  * false - no flag.
-     *  * 'Strict' - sets the value to 'Strict' (this is the default value).
-     *  * 'Lax' - sets the value to 'Lax'.
-     */
-    isSameSite?: false | 'Strict' | 'Lax';
-    /** the path scope. Defaults to null (no path). */
-    path?: string | null;
-    /** the domain scope. Defaults to null (no domain). */
-    domain?: string | null;
-    /**
-     * if present and the cookie was not received from the client or explicitly set by the route handler, the cookie is automatically added to the response with the provided value. The value can be a function with signature function(request, next) where:
-     *  * request - the request object.
-     *  * next - the continuation function using the function(err, value) signature.
-     */
-    autoValue?(request: Request, next: ContinuationValueFunction): void;
-    /**
-     * encoding performs on the provided value before serialization. Options are:
-     *  * 'none' - no encoding. When used, the cookie value must be a string. This is the default value.
-     *  * 'base64' - string value is encoded using Base64.
-     *  * 'base64json' - object value is JSON-stringified then encoded using Base64.
-     *  * 'form' - object value is encoded using the x-www-form-urlencoded method.
-     *  * 'iron' - Encrypts and sign the value using iron.
-     */
-    encoding?: 'none' | 'base64' | 'base64json' | 'form' | 'iron';
-    /**
-     * an object used to calculate an HMAC for cookie integrity validation. This does not provide privacy, only a mean to verify that the cookie value was generated by the server. Redundant when 'iron' encoding is used. Options are:
-     *  * integrity - algorithm options. Defaults to require('iron').defaults.integrity.
-     *  * password - password used for HMAC key generation (must be at least 32 characters long).
-     */
-    sign?: {
-        integrity?: any;  // TODO make iron definitions and getting typing from iron
-        password: string;
-    };
-    /** password used for 'iron' encoding (must be at least 32 characters long). */
-    password?: string;
-    /** options for 'iron' encoding. Defaults to require('iron').defaults. */
-    iron?: any;  // TODO make iron definitions and getting typing from iron
-    /** if true, errors are ignored and treated as missing cookies. */
-    ignoreErrors?: boolean;
-    /** if true, automatically instruct the client to remove invalid cookies. Defaults to false. */
-    clearInvalid?: boolean;
-    /** if false, allows any cookie value including values in violation of RFC 6265. Defaults to true. */
-    strictHeader?: boolean;
-    /** used by proxy plugins (e.g. h2o2). */
-    passThrough?: any;
-}
-
-/**
- * [See docs](https://hapijs.com/api/16.1.1#serverconnections)
- */
-export interface ServerConnection {
-    /** settings - the connection configuration object passed to server.connection() after applying the server defaults. */
-    settings: ServerConnectionOptions;
-    /** server - the connection's Server object. */
-    server: Server;
-    /** type - set to 'tcp' is the connection is listening on a TCP port, otherwise to 'socket'(a UNIX domain socket or a Windows named pipe). */
-    type: 'tcp' | 'socket';
-    /**
-     * registrations
-     * Described [See docs](https://hapijs.com/api/16.1.1#serverregistrations) "When the server contains more than one connection, each server.connections array member provides its own connection.registrations."
-     */
-    registrations: ServerRegisteredPlugins;
-    /** states - TODO contribute docs to hapi if they want, and then update type here */
-    states: any;
-    /** auth - TODO contribute docs to hapi if they want, and then update type here */
-    auth: any;
-    /**
-     * plugins
-     * TODO contribute docs to hapi if they want.  Assuming similar to `registrations`, `listener`, `info`, etc
-     */
-    plugins: PluginsStates;
-    /**
-     * app
-     * TODO contribute docs to hapi if they want.  Assuming similar to `registrations`, `listener`, `info`, etc
-     */
-    app: any;
-    /** Described in server.listener [See docs](https://hapijs.com/api/16.1.1#serverlistener) */
-    listener: ServerListener;
-    /** Described in server.info [See docs](https://hapijs.com/api/16.1.1#serverinfo) */
-    info: ServerConnectionInfo;
-    /** Described in server.inject [See docs](https://hapijs.com/api/16.1.1#serverinjectoptions-callback) */
-    inject(options: string | InjectedRequestOptions, callback: (res: InjectedResponseObject) => void): void;
-    inject(options: string | InjectedRequestOptions, ): Promise<InjectedResponseObject>;
-    /** Mentioned but not documented under server.connections [See docs](https://hapijs.com/api/16.1.1#serverconnections) */
-    table(host?: string): Route[];
-    /** Described in server.table [See docs](https://hapijs.com/api/16.1.1#serverlookupid) */
-    lookup(id: string): RoutePublicInterface | null;
-    /** Described in server.table [See docs](https://hapijs.com/api/16.1.1#servermatchmethod-path-host) */
-    match(method: HTTP_METHODS, path: string, host?: string): RoutePublicInterface | null;
-}
-
-/**
- * [See docs](https://hapijs.com/api/16.1.1#serverinfo)
- */
-export interface ServerConnectionInfo {
-    /** a unique connection identifier (using the format '{hostname}:{pid}:{now base36}'). */
-    id: string;
-    /** the connection creation timestamp. */
-    created: number;
-    /** the connection start timestamp (0 when stopped). */
-    started: number;
-    /**
-     * the connection port based on the following rules:
-     *  * the configured port value before the server has been started.
-     *  * the actual port assigned when no port is configured or set to 0 after the server has been started.
-     * TODO check this type.  What happens when socket is a UNIX domain socket or Windows named pipe?
-     */
-    port: number | string;
-    /** the host name the connection was configured to. Defaults to the operating system hostname when available, otherwise 'localhost'. */
-    host: string;
-    /** the active IP address the connection was bound to after starting. Set to undefined until the server has been started or when using a non TCP port (e.g. UNIX domain socket). */
-    address: undefined | string;
-    /** the protocol used.  'socket' when UNIX domain socket or Windows named pipe. */
-    protocol: 'http' | 'https' | 'socket';
-    /** a string representing the connection (e.g. 'http://example.com:8080' or 'socket:/unix/domain/socket/path'). Contains the uri setting if provided, otherwise constructed from the available settings. If no port is available or set to 0, the uri will not include a port component. */
-    uri: string;
-}
-
-/**
- * [See docs](https://hapijs.com/api/16.1.1#serverlistener)
- */
-export type ServerListener = http.Server;
-
-/**
- * server.realm
- * The realm object contains server-wide or plugin-specific state that can be shared across various methods. For example, when calling server.bind(), the active realm settings.bind property is set which is then used by routes and extensions added at the same level (server root or plugin). Realms are a limited version of a sandbox where plugins can maintain state used by the framework when adding routes, extensions, and other properties.
- * [See docs](https://hapijs.com/api/16.1.1#serverrealm)
- */
-export interface ServerRealm {
-    /** when the server object is provided as an argument to the plugin register() method, modifiers provides the registration preferences passed the server.register() method and includes: */
-    modifiers: {
-        /** routes preferences: */
-        route: {
-            /** the route path prefix used by any calls to server.route() from the server. Note that if a prefix is used and the route path is set to '/', the resulting path will not include the trailing slash. */
-            prefix: string;
-            /** the route virtual host settings used by any calls to server.route() from the server. */
-            vhost: string;
-        }
-    };
-    /** the active plugin name (empty string if at the server root). */
-    plugin: string;
-    /** the plugin options object passed at registration. */
-    pluginOptions: any;  // OptionsPassedToPlugin;
-    /** plugin-specific state to be shared only among activities sharing the same active state. plugins is an object where each key is a plugin name and the value is the plugin state. */
-    plugins: PluginsStates;
-    /** settings overrides (from RouteAdditionalConfigurationOptions) */
-    settings: {
-        files: {
-            relativeTo: string;
-        };
-        bind: any;
-    };
-}
-
-/**
- * [See docs](https://hapijs.com/api/16.1.1#serverregistrations)
- */
-export interface ServerRegisteredPlugins {
-    [pluginName: string]: ServerRegisteredPlugin;
-}
-
-/**
- * [See docs](https://hapijs.com/api/16.1.1#serverregistrations)
- */
-export interface ServerRegisteredPlugin {
-    /** the plugin version. */
-    version: string;
-    /** the plugin name. */
-    name: string;
-    /**
-     * options used to register the plugin.
-     * TODO update with outcome of: https://github.com/hapijs/hapi/pull/3479
-     */
-    options: any;  // OptionsPassedToPlugin;
-    /** plugin registration attributes. */
-    attributes: PluginAttributes;
-}
-
-export interface ServerAuth {
-    /**
-     * server.auth.api
-     * An object where each key is a strategy name and the value is the exposed strategy API. Available on when the authentication scheme exposes an API by returning an api key in the object returned from its implementation function.
-     * When the server contains more than one connection, each server.connections array member provides its own connection.auth.api object.
-     * [See docs](https://hapijs.com/api/16.1.1#serverauthapi)
-     */
-    api: Dictionary<Strategy>;
-    /**
-     * server.auth.default
-     * Sets a default strategy which is applied to every route
-     * The default does not apply when the route config specifies auth as false, or has an authentication strategy configured (contains the strategy or strategies authentication settings). Otherwise, the route authentication config is applied to the defaults.
-     * Note that if the route has authentication config, the default only applies at the time of adding the route, not at runtime. This means that calling default() after adding a route with some authentication config will have no impact on the routes added prior. However, the default will apply to routes added before default() is called if those routes lack any authentication config.
-     * The default auth strategy configuration can be accessed via connection.auth.settings.default. To obtain the active authentication configuration of a route, use connection.auth.lookup(request.route).
-     * [See docs](https://hapijs.com/api/16.1.1#serverauthdefaultoptions)
-     */
-    default(options: string | AuthOptions): void;
-    /**
-     * server.auth.scheme
-     * Registers an authentication scheme
-     * [See docs](https://hapijs.com/api/16.1.1#serverauthschemename-scheme)
-     * @param name the scheme name.
-     * @param scheme the method implementing the scheme with signature function(server, options) see ServerAuthScheme
-     */
-    scheme(name: string, scheme: ServerAuthScheme): void;
-    /**
-     * Registers an authentication strategy
-     * [See docs](https://hapijs.com/api/16.1.1#serverauthstrategyname-scheme-mode-options)
-     * @param name  the strategy name.
-     * @param scheme  the scheme name (must be previously registered using server.auth.scheme()).
-     * @param mode  if set to true (which is the same as 'required') or to a valid authentication mode ('required', 'optional', 'try'), the scheme is automatically assigned as the default strategy for any route without an auth config. Can only be assigned to a single server strategy. Defaults to false (no default settings).
-     * @param options  scheme options based on the scheme requirements.
-     */
-    strategy(name: string, scheme: string, options?: any): void;
-    strategy(name: string, scheme: string, mode: boolean | 'required' | 'optional' | 'try', options?: any): void;
-    /**
-     * Tests a request against an authentication strategy
-     * Note that the test() method does not take into account the route authentication configuration. It also does not perform payload authentication. It is limited to the basic strategy authentication execution. It does not include verifying scope, entity, or other route properties.
-     * [See docs](https://hapijs.com/api/16.1.1#serverauthteststrategy-request-next)
-     * @param strategy - the strategy name registered with server.auth.strategy().
-     * @param request - the request object.
-     * @param next - the callback function with signature function(err, credentials) where:
-     *      * err - the error if authentication failed.
-     *      * credentials - the authentication credentials object if authentication was successful.
-     */
-    test(strategy: string, request: Request, next: (err: Error | null, credentials: AuthenticatedCredentials) => void): void;
-}
-
-export type Strategy = any;
-export type SchemeSettings = any;
-
-/**
- * the method implementing the scheme with signature function(server, options) where:
- * [See docs](https://hapijs.com/api/16.1.1#serverauthschemename-scheme)
- * @param server  a reference to the server object the scheme is added to.
- * @param options  optional scheme settings used to instantiate a strategy.
- */
-export interface ServerAuthScheme {
-    (server: Server, options: SchemeSettings): SchemeMethodResult;
-}
-
-/**
- * The scheme method must return an object with the following
- * [See docs](https://hapijs.com/api/16.1.1#serverauthschemename-scheme)
- */
-export interface SchemeMethodResult {
-    /** optional object which is exposed via the server.auth.api object. */
-    api?: Strategy;
-    /**
-     * required function called on each incoming request configured with the authentication scheme
-     * When the scheme authenticate() method implementation calls reply() with an error condition, the specifics of the error affect whether additional authentication strategies will be attempted (if configured for the route). If the err passed to the reply() method includes a message, no additional strategies will be attempted. If the err does not include a message but does include the scheme name (e.g. Boom.unauthorized(null, 'Custom')), additional strategies will be attempted in the order of preference (defined in the route configuration). If authentication fails the scheme names will be present in the 'WWW-Authenticate' header.
-     * @param request  the request object.
-     * @param reply  the reply interface the authentication method must call when done authenticating the request
-     */
-    authenticate(request: Request, reply: ReplySchemeAuth): void;
-    /**
-     * optional function called to authenticate the request payload
-     * When the scheme payload() method returns an error with a message, it means payload validation failed due to bad payload. If the error has no message but includes a scheme name (e.g. Boom.unauthorized(null, 'Custom')), authentication may still be successful if the route auth.payload configuration is set to 'optional'.
-     * @param request  the request object.
-     * @param reply  is called if authentication failed
-     */
-    payload?(request: Request, reply: ReplySchemeAuthOfPayload): void;
-    /**
-     * optional function called to decorate the response with authentication headers before the response headers or payload is written where:
-     * @param request  the request object.
-     * @param reply  is called if an error occured
-     */
-    response?(request: Request, reply: ReplySchemeAuthDecorateResponse): void;
-    /** an optional object with the following keys: */
-    options?: {
-        /** if true, requires payload validation as part of the scheme and forbids routes from disabling payload auth validation. Defaults to false. */
-        payload?: boolean;
-    };
-}
-
-export interface ServerCacheMethod {
-    /**
-     * Provisions a cache segment within the server cache facility
-     * [See docs](https://hapijs.com/api/16.1.1#servercacheoptions)
-     */
-    (options: CatboxServerCacheConfiguration): Catbox.Policy;
-    /**
-     * Provisions a server cache as described in server.cache
-     * If no callback is provided, a Promise object is returned.
-     * Note that if the server has been initialized or started, the cache will be automatically started to match the state of any other provisioned server cache.
-     * [See docs](https://hapijs.com/api/16.1.1#servercacheprovisionoptions-callback)
-     * @param options  same as the server cache configuration options.
-     * @param callback  the callback method when cache provisioning is completed or failed with the signature function(err) where:
-     *      * err - any cache startup error condition.
-     */
-    provision(options: CatboxServerCacheConfiguration): Promise<any>;
-    provision(options: CatboxServerCacheConfiguration, callback: (err?: Error) => void): void;
-}
-
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
- +                                                                           +
- +                                                                           +
- +                                                                           +
- +                               Request                                     +
- +                                                                           +
- +                                                                           +
- +                                                                           +
- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-// TODO: move to separate file http://stackoverflow.com/questions/43276921
-
-/**
- * Request object
- * The request object is created internally for each incoming request. It is different from the node.js request object received from the HTTP server callback (which is available in request.raw.req). The request object methods and properties change throughout the request lifecycle.
- * [See docs](https://hapijs.com/api/16.1.1#request-object)
- * [See docs](https://hapijs.com/api/16.1.1#request-properties)
- */
-export class Request extends Podium {
-    /** application-specific state. Provides a safe place to store application data without potential conflicts with the framework. Should not be used by plugins which should use plugins[name]. */
-    app: any;
-    /** authentication information */
-    auth: RequestAuthenticationInformation;
-    /** the connection the request was received by. */
-    connection: ServerConnection;
-    /**  the node domain object used to protect against exceptions thrown in extensions, handlers and route prerequisites. Can be used to manually bind callback functions otherwise bound to other domains. Set to null when the server useDomains options is false. */
-    domain: domain.Domain | null;
-    /** the raw request headers (references request.raw.headers). */
-    headers: Dictionary<string>;
-    /** a unique request identifier (using the format '{now}:{connection.info.id}:{5 digits counter}').*/
-    id: string;
-    /** request information */
-    info: {
-        /** the request preferred encoding. */
-        acceptEncoding: string;
-        /** if CORS is enabled for the route, contains the following: */
-        cors: {
-            /**
-             * true if the request 'Origin' header matches the configured CORS restrictions. Set to false if no 'Origin' header is found or if it does not match. Note that this is only available after the 'onRequest' extension point as CORS is configured per-route and no routing decisions are made at that point in the request lifecycle.
-             * Note: marking as optional as "... this is only available after ..."
-             */
-            isOriginMatch?: boolean;
-        };
-        /** content of the HTTP 'Host' header (e.g. 'example.com:8080'). */
-        host: string;
-        /** the hostname part of the 'Host' header (e.g. 'example.com'). */
-        hostname: string;
-        /** request reception timestamp. */
-        received: number;
-        /** content of the HTTP 'Referrer' (or 'Referer') header. */
-        referrer: string;
-        /** remote client IP address. */
-        remoteAddress: string;
-        /**
-         * remote client port.
-         * Set to string in casethey're requesting from a UNIX domain socket.
-         * TODO, what type does Hapi return, should this be number | string?
-         */
-        remotePort: string;
-        /** request response timestamp (0 is not responded yet). */
-        responded: number;
-    };
-    /** the request method in lower case (e.g. 'get', 'post'). */
-    method: string;
-    /** the parsed content-type header. Only available when payload parsing enabled and no payload error occurred. */
-    mime: string;
-    /** an object containing the values of params, query, and payload before any validation modifications made. Only set when input validation is performed. */
-    orig: {
-        params: any;
-        query: any;
-        payload: any;
-    };
-    /** an object where each key is a path parameter name with matching value as described in Path parameters [See docs](https://hapijs.com/api/16.1.1#path-parameters). */
-    params: Dictionary<string>;
-    /** an array containing all the path params values in the order they appeared in the path. */
-    paramsArray: string[];
-    /** the request URI's pathname [See docs](https://nodejs.org/api/url.html#url_urlobject_pathname) component. */
-    path: string;
-    /**
-     * the request payload based on the route payload.output and payload.parse settings.
-     * TODO check this typing and add references / links.
-     */
-    payload: stream.Readable | Buffer | any;
-    /** plugin-specific state. Provides a place to store and pass request-level plugin data. The plugins is an object where each key is a plugin name and the value is the state. */
-    plugins: PluginsStates;
-    /** an object where each key is the name assigned by a route prerequisites function. The values are the raw values provided to the continuation function as argument. For the wrapped response object, use responses. */
-    pre: Object;
-    /** the response object when set. The object can be modified but must not be assigned another object. To replace the response with another from within an extension point, use reply(response) to override with a different response. Contains null when no response has been set (e.g. when a request terminates prematurely when the client disconnects). */
-    response: Response | null;
-    /** same as pre but represented as the response object created by the pre method. */
-    preResponses: Object;
-    /**
-     * by default the object outputted from [node's URL parse()](https://nodejs.org/docs/latest/api/url.html#url_urlobject_query) method. 
-     * Might also be set indirectly via [request.setUrl](https://github.com/DefinitelyTyped/DefinitelyTyped/pull/17354#requestseturlurl-striptrailingslash) in which case it may be 
-     * a string (if url is set to an object with the query attribute as an unparsed string).
-     */
-    query: any;
-    /** an object containing the Node HTTP server objects. **Direct interaction with these raw objects is not recommended.** */
-    raw: {
-        req: http.IncomingMessage; // Or http.ClientRequest http://www.apetuts.com/tutorial/node-js-http-client-request-class/ ?
-        res: http.ServerResponse;
-    };
-    /**
-     * the route public interface.
-     * Optional due to "request.route is not yet populated at this point." [See docs](https://hapijs.com/api/16.1.1#request-lifecycle)
-     */
-    route?: RoutePublicInterface;
-    /** the server object. */
-    server: Server;
-    /** an object containing parsed HTTP state information (cookies) where each key is the cookie name and value is the matching cookie content after processing using any registered cookie definition. */
-    state: Dictionary<any>;
-    /** the parsed request URI */
-    url: url.Url;
-
-    /**
-     * request.setUrl(url, [stripTrailingSlash])
-     * Available only in 'onRequest' extension methods.
-     * Changes the request URI before the router begins processing the request
-     * [See docs](https://hapijs.com/api/16.1.1#requestseturlurl-striptrailingslash)
-     * @param url  the new request URI. If url is a string, it is parsed with node's URL parse() method. url can also be set to an object compatible with node's URL parse() method output.
-     * @param stripTrailingSlash  if true, strip the trailing slash from the path. Defaults to false.
-     */
-    setUrl(url: string | url.Url, stripTrailingSlash?: boolean): void;
-    /**
-     * request.setMethod(method)
-     * Available only in 'onRequest' extension methods.
-     * Changes the request method before the router begins processing the request
-     * [See docs](https://hapijs.com/api/16.1.1#requestsetmethodmethod)
-     * @param method  is the request HTTP method (e.g. 'GET').
-     */
-    setMethod(method: HTTP_METHODS): void;
-    /**
-     * request.generateResponse(source, [options])
-     * Always available.
-     * Returns a response which you can pass into the reply interface where:
-     * [See docs](https://hapijs.com/api/16.1.1#requestgenerateresponsesource-options)
-     * @param source  the object to set as the source of the reply interface.  TODO, submit a PR to clarify this doc, from the source code it's clear that "the object to set" refers to something of type `ReplyValue` i.e. that can be null, string, number, object, Stream, Promise, or Buffer.
-     * @param options  options for the method, optional.  Not documented yet, perhaps not very important.
-     */
-    generateResponse(source?: ReplyValue, options?: {marshal?: any; prepare?: any; close?: any; variety?: any}): Response;
-    /**
-     * request.log(tags, [data, [timestamp]])
-     * Always available.
-     * Logs request-specific events. When called, the server emits a 'request' event which can be used by other listeners or plugins.
-     * Any logs generated by the server internally will be emitted only on the 'request-internal' channel and will include the event.internal flag set to true.
-     * [See docs](https://hapijs.com/api/16.1.1#requestlogtags-data-timestamp)
-     * @param tags  a string or an array of strings (e.g. ['error', 'database', 'read']) used to identify the event. Tags are used instead of log levels and provide a much more expressive mechanism for describing and filtering events.
-     * @param data  an optional message string or object with the application data being logged. If data is a function, the function signature is function() and it called once to generate (return value) the actual data emitted to the listeners.
-     * @param timestamp  an optional timestamp expressed in milliseconds. Defaults to Date.now() (now).
-     */
-    log(tags: string | string[], data?: string | Object | (() => string | Object), timestamp?: number): void;
-    /**
-     * request.getLog([tags], [internal])
-     * Always available.
-     * Returns an array containing the events matching any of the tags specified (logical OR)
-     * Note that this methods requires the route log configuration set to true.
-     * [See docs](https://hapijs.com/api/16.1.1#requestgetlogtags-internal)
-     * @param tags  is a single tag string or array of tag strings. If no tags specified, returns all events.
-     * @param internal  filters the events to only those with a matching event.internal value. If true, only internal logs are included. If false, only user event are included. Defaults to all events (undefined).
-     */
-    getLog(tags?: string | string[], internal?: boolean): string[];
-    getLog(internal?: boolean): string[];
-    /**
-     * request.tail([name])
-     * Available until immediately after the 'response' event is emitted.
-     * Adds a request tail which has to complete before the request lifecycle is complete.
-     * Returns a tail function which must be called when the tail activity is completed.
-     * Tails are actions performed throughout the request lifecycle, but which may end after a response is sent back to the client. For example, a request may trigger a database update which should not delay sending back a response. However, it is still desirable to associate the activity with the request when logging it (or an error associated with it).
-     * When all tails completed, the server emits a 'tail' event.
-     * [See docs](https://hapijs.com/api/16.1.1#requesttailname)
-     * @param name  an optional tail name used for logging purposes.
-     */
-    tail(name?: string): (() => void);
-    /**
-     * The server.decorate('request', ...) method can modify this prototype/interface.
-     * Have disabled these typings as there is a better alternative, see example in: tests/server/decorate.ts
-     * [And discussion here](https://github.com/DefinitelyTyped/DefinitelyTyped/issues/14517#issuecomment-298891630)
-     */
-    // [index: string]: any;
-}
-
-export interface RequestAuthenticationInformation {
-    /** true if the request has been successfully authenticated, otherwise false. */
-    isAuthenticated: boolean;
-    /** the credential object received during the authentication process. The presence of an object does not mean successful authentication. */
-    credentials: any;
-    /** an artifact object received from the authentication strategy and used in authentication-related actions. */
-    artifacts: any;
-    /** the route authentication mode. */
-    mode: string;
-    /** the authentication error is failed and mode set to 'try'. */
-    error: Error;
-}
-
-export type HTTP_METHODS_PARTIAL_lowercase = 'get' | 'post' | 'put' | 'patch' | 'delete' | 'options';
-export type HTTP_METHODS_PARTIAL = 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE' | 'OPTIONS' | HTTP_METHODS_PARTIAL_lowercase;
-export type HTTP_METHODS = 'HEAD' | 'head' | HTTP_METHODS_PARTIAL;
-
-/**
- * Request events
- * The request object supports the following events:
- *  * 'peek' - emitted for each chunk of payload data read from the client connection. The event method signature is function(chunk, encoding).
- *  * 'finish' - emitted when the request payload finished reading. The event method signature is function ().
- *  * 'disconnect' - emitted when a request errors or aborts unexpectedly.
- * [See docs](https://hapijs.com/api/16.1.1#request-events)
- */
-export type RequestEventTypes = 'peek' | 'finish' | 'disconnect';
-
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
- +                                                                           +
- +                                                                           +
- +                                                                           +
- +                         Handler functions                                 +
- +                                                                           +
- +                                                                           +
- +                                                                           +
- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-// TODO: move to separate file http://stackoverflow.com/questions/43276921
-
-/**
- * Extending RouteConfiguration.handler
- *
- * The hapi documentation allows for the RouteConfiguration.handler type to have
- * `{[pluginName: string]: pluginOptions}`
- * "handler can be assigned an object with a single key using the name of a registered handler type and value with the options passed to the registered handler"
- * This can be provided by extending the hapi module definition as follows,
- * see h2o2 for example:
- *
- *      declare module 'hapi' {
- *        interface RouteHandlerPlugins {
- *          proxy?: ...
- */
-export interface RouteHandlerPlugins {
-}
-/**
- * The route handler function uses the signature function(request, reply) (NOTE: do not use a fat arrow style function for route handlers as they do not allow context binding and will cause problems when used in conjunction with server.bind) where:
- *  * request - is the incoming request object (this is not the node.js request object).
- *  * reply - the reply interface the handler must call to set a response and return control back to the framework.
- * [See docs](https://hapijs.com/api/16.1.1#route-handler)
- * Same function signature used by request extension point used in server.ext(event), see ServerExtConfigurationObject.method
- */
-export interface RouteHandler {
-    (request: Request, reply: ReplyNoContinue): void;
-    // <T>(request: Request, reply: StrictReply<T>): void;
-}
-
-/**
- * "the function to call, the function signature is identical to a route handler as described in Route handler."
- * [See docs](https://hapijs.com/api/16.1.1#route-prerequisites) Route prerequisites
- */
-export type RoutePrerequisiteRequestHandler = RouteHandler;
-
-/**
- * request extension points: function(request, reply) where
- * this - the object provided via options.bind or the current active context set with server.bind().
- * [See docs](https://hapijs.com/api/16.1.1#serverextevents)
- * @param request  the request object.
- * @param reply  the reply interface which is used to return control back to the framework. To continue normal execution of the request lifecycle, reply.continue() must be called. If the extension type is 'onPostHandler' or 'onPreResponse', a single argument passed to reply.continue() will override the current set response (including all headers) but will not stop the request lifecycle execution. To abort processing and return a response to the client, call reply(value) where value is an error or any other valid response.
- */
-export interface ServerExtRequestHandler {
-    (request: Request, reply: ReplyWithContinue): void;
-}
-
-/**
- * Used by various extensions to handle a request and
- * synchronously return a result of some form.
- *
- * Left in for backwards compatibility of typings but according to the
- * [DefinitelyTyped Readme under common mistakes](https://github.com/DefinitelyTyped/DefinitelyTyped#common-mistakes)
- * it talks about not using generic types unless the type was used in typing one
- * or more of the function arguments. Using it to type the return was suggested
- * to be the same as a type assertion.
- */
-export interface RequestHandler<T> {
-    (request: Request): T;
-}
-
-/**
- * Used by server extension points
- * err can be `Boom` error or Error that will be wrapped as a `Boom` error
- * For source [See code](https://github.com/hapijs/hapi/blob/v16.1.1/lib/reply.js#L109-L118)
- * For source [See code](https://github.com/hapijs/hapi/blob/v16.1.1/lib/response.js#L60-L65)
- */
-export interface ContinuationFunction {
-    (err?: Boom.BoomError): void;
-}
-/**
- * For source [See docs](https://github.com/hapijs/hapi/blob/v16.1.1/lib/response.js#L60-L65)
- * TODO Can value be typed with a useful generic?
- */
-export interface ContinuationValueFunction {
-    (err: Boom.BoomError): void;
-    (err: null | undefined, value: any): void;
-    (): void;
-}
-
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
- +                                                                           +
- +                                                                           +
- +                                                                           +
- +                           Reply functions                                 +
- +                                                                           +
- +                                                                           +
- +                                                                           +
- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-// TODO: move to separate file http://stackoverflow.com/questions/43276921
-
-/**
- * Typings listed explicitly here [See docs](https://hapijs.com/api/16.1.1#replyerr-result)
- * Typings also described in part here [See docs](https://hapijs.com/api/16.1.1#response-object)
- */
-export type ReplyValue = _ReplyValue | Promise<_ReplyValue>;
-export type _ReplyValue = null | undefined | string | number | boolean | Buffer | Error | stream.Stream | Object; // | array;
-
-/**
- * Reply interface
- * reply([err], [result])
- * Concludes the handler activity by setting a response and returning control over to the framework
- * When reply() is called with an error or result response, that value is used as the response sent to the client. When reply() is called within a prerequisite, the value is saved for future use and is not used as the response. In all other places except for the handler, calling reply() will be considered an error and will abort the request lifecycle, jumping directly to the 'onPreResponse' event.
- * To return control to the framework within an extension or other places other than the handler, without setting a response, the method reply.continue() must be called. Except when used within an authentication strategy, or in an 'onPostHandler' or 'onPreResponse' extension, the reply.continue() must not be passed any argument or an exception is thrown.
- * [See docs](https://hapijs.com/api/16.1.1#reply-interface)
- * [See docs](https://hapijs.com/api/16.1.1#replyerr-result)
- *
- * NOTE: modules should extend this interface to expose reply.Nnn methods
- */
-export interface Base_Reply {
-    (err?: ReplyValue): Response;
-    (err: null, result?: ReplyValue): Response;
-    /** the active realm associated with the route. */
-    realm: ServerRealm;
-    /** the request object */
-    request: Request;
-
-    /**
-     * reply.entity(options)
-     * Sets the response 'ETag' and 'Last-Modified' headers and checks for any conditional request headers to decide if the response is going to qualify for an HTTP 304 (Not Modified). If the entity values match the request conditions, reply.entity() returns control back to the framework with a 304 response. Otherwise, it sets the provided entity headers and returns null.
-     * Returns a response object if the reply is unmodified or null if the response has changed. If null is returned, the developer must call reply() to continue execution. If the response is not null, the developer must not call reply().
-     * [See docs](https://hapijs.com/api/16.1.1#replyentityoptions)
-     * @param options  a required configuration object with:
-     *      * etag - the ETag string. Required if modified is not present. Defaults to no header.
-     *      * modified - the Last-Modified header value. Required if etag is not present. Defaults to no header.
-     *      * vary - same as the response.etag() option. Defaults to true.
-     */
-    entity(options: {etag?: string, modified?: string, vary?: boolean}): Response | null;
-    /**
-     * reply.close([options])
-     * Concludes the handler activity by returning control over to the router and informing the router that a response has already been sent back directly via request.raw.res and that no further response action is needed. Supports the following optional options:
-     * The response flow control rules do not apply.
-     * [See docs](https://hapijs.com/api/16.1.1#replycloseoptions)
-     * @param options  options object:
-     *      * end - if false, the router will not call request.raw.res.end()) to ensure the response was ended. Defaults to true.
-     */
-    close(options?: {end?: boolean}): void;
-    /**
-     * reply.redirect(uri)
-     * Redirects the client to the specified uri. Same as calling reply().redirect(uri).
-     * The response flow control rules apply.
-     * Sets an HTTP redirection response (302) and decorates the response with additional methods for
-     * changing to a permanent or non-rewritable redirect is also available see response object redirect for more information.
-     * [See docs](https://hapijs.com/api/16.1.1#replyredirecturi)
-     * @param uri  an absolute or relative URI used to redirect the client to another resource.
-     */
-    redirect(uri: string): ResponseRedirect;
-    /**
-     * reply.response(result)
-     * Shorthand for calling `reply(null, result)`, replies with the response set to `result`.
-     * [See docs](https://hapijs.com/api/16.1.1#replyresponseresult)
-     * TODO likely to change.  Await approval of pull request to Hapi docs.
-     */
-    response(result: ReplyValue): Response;
-    /**
-     * Sets a cookie on the response
-     * [See docs](https://hapijs.com/api/16.1.1#reply)
-     * TODO likely to change.  Await approval of pull request to Hapi docs.
-     */
-    state(name: string, value: any, options?: any): void;
-    /**
-     * Clears a cookie on the response
-     * [See docs](https://hapijs.com/api/16.1.1#reply)
-     * TODO likely to change.  Await approval of pull request to Hapi docs.
-     */
-    unstate(name: string, options?: any): void;
-    /**
-     * The server.decorate('reply', ...) method can modify this prototype/interface.
-     * Have disabled these typings as there is a better alternative, see example in: tests/server/decorate.ts
-     * [And discussion here](https://github.com/DefinitelyTyped/DefinitelyTyped/issues/14517#issuecomment-298891630)
-     */
-    // [index: string]: any;
-}
-/**
- * reply.continue([result])
- * Returns control back to the framework without ending the request lifecycle
- * [See docs](https://hapijs.com/api/16.1.1#replycontinueresult)
- * [See docs](https://hapijs.com/api/16.1.1#replyerr-result) "With the exception of the handler function, all other methods provide the reply.continue() method which instructs the framework to continue processing the request without setting a response."
- * @param result  if called in the handler, prerequisites, or extension points other than the 'onPreHandler' and 'onPreResponse', the result argument is not allowed and will throw an exception if present. If called within an authentication strategy, it sets the authenticated credentials. If called by the 'onPreHandler' or 'onPreResponse' extensions, the result argument overrides the current response including all headers, and returns control back to the framework to continue processing any remaining extensions.
- */
-export interface Continue_Reply {
-    continue(result?: ReplyValue): Response | undefined;
-}
-
-/**
- * [See docs](https://hapijs.com/api/16.1.1#serverauthschemename-scheme) > authenticate.
- * Also [See docs](https://hapijs.com/api/16.1.1#replyerr-result).
- * TODO check it has Base_Reply methods and properties
- */
-export interface ReplySchemeAuth extends Base_Reply {
-    /**
-     * This function is called if authentication failed.
-     * TODO, check type the `response` parameter.  In https://hapijs.com/api/16.1.1#replyerr-result it is referred to as "null" but this seems to be for a third scenario where it is "used to return both an error and credentials in the authentication methods" then "reply() must be called with three arguments function(err, null, data)"
-     * @param err  any authentication error.
-     * @param response  any authentication response action such as redirection. Ignored if err is present, otherwise required.
-     * @param result  an object containing:
-     *      * credentials  the authenticated credentials.
-     *      * artifacts  optional authentication artifacts.
-     */
-    (err: Error | null, response: AnyAuthenticationResponseAction | null, result: AuthenticationResult): void;
-    /**
-     * is called if authentication succeeded
-     * @param result  same object as result above.
-     */
-    continue(result: AuthenticationResult): void;
-}
-/**
- * Typing as any as it's not yet clear what type this argument takes.
- * "any authentication response action such as redirection" is it equivalent to
- * `ReplyValue` ?
- * [See docs](https://hapijs.com/api/16.1.1#serverauthschemename-scheme)
- * TODO research hapi source and type this.
- */
-export type AnyAuthenticationResponseAction = any;
-/** [See docs](https://hapijs.com/api/16.1.1#serverauthschemename-scheme) */
-export interface AuthenticationResult {
-    credentials?: AuthenticatedCredentials;
-    artifacts?: any;
-}
-export interface AuthenticatedCredentials {
-    // Disabled to allow typing within a project
-    // [index: string]: any;
-}
-
-/**
- * [See docs](https://hapijs.com/api/16.1.1#serverauthschemename-scheme) > payload
- * TODO check it has Base_Reply methods and properties
- */
-export interface ReplySchemeAuthOfPayload extends Base_Reply {
-    /**
-     * function called to authenticate the request payload where:
-     * @param err  any authentication error.
-     * @param response  any authentication response action such as redirection. Ignored if err is present, otherwise required.
-     */
-    (err: Error | null, response: AnyAuthenticationResponseAction): void;
-    /** is called if payload authentication succeeded */
-    continue(): void;
-}
-
-/**
- * [See docs](https://hapijs.com/api/16.1.1#serverauthschemename-scheme) > response
- * TODO check it has Base_Reply methods and properties
- */
-export interface ReplySchemeAuthDecorateResponse extends Base_Reply {
-    /**
-     * is called if an error occurred
-     * @param err  any authentication error.
-     * @param response  any authentication response to send instead of the current response. Ignored if err is present, otherwise required.
-     */
-    (err?: Error, response?: ReplyValue): void;
-    /** is called if the operation succeeded. */
-    continue(): void;
-}
-
-export interface ReplyWithContinue extends Continue_Reply, Base_Reply {}
-
-export interface ReplyNoContinue extends Base_Reply {}
-
-// TODO assess use and usefulness of StrictReply
-
-// Concludes the handler activity by setting a response and returning control over to the framework where:
-//  erran optional error response.
-//     result an optional response payload.
-//     Since an request can only have one response regardless if it is an error or success, the reply() method can only result in a single response value. This means that passing both an err and result will only use the err. There is no requirement for either err or result to be (or not) an Error object. The framework will simply use the first argument if present, otherwise the second. The method supports two arguments to be compatible with the common callback pattern of error first.
-//     FLOW CONTROL:
-//     When calling reply(), the framework waits until process.nextTick() to continue processing the request and transmit the response. This enables making changes to the returned response object before the response is sent. This means the framework will resume as soon as the handler method exits. To suspend this behavior, the returned response object supports the following methods: hold(), send()
-/**
- *
- */
-// export interface Reply { // extends ReplyMethods {
-//     <T>(err: Error,
-//         result?: string | number | boolean | Buffer | stream.Stream | Promise<T> | T,
-//         /** Note that when used to return both an error and credentials in the authentication methods, reply() must be called with three arguments function(err, null, data) where data is the additional authentication information. */
-//         credentialData?: any): BoomError;
-//     /** Note that if result is a Stream with a statusCode property, that status code will be used as the default response code.  */
-//     <T>(result: string | number | boolean | Buffer | stream.Stream | Promise<T> | T): Response;
-// }
-
-/** Concludes the handler activity by setting a response and returning control over to the framework where:
- erran optional error response.
-    result an optional response payload.
-    Since an request can only have one response regardless if it is an error or success, the reply() method can only result in a single response value. This means that passing both an err and result will only use the err. There is no requirement for either err or result to be (or not) an Error object. The framework will simply use the first argument if present, otherwise the second. The method supports two arguments to be compatible with the common callback pattern of error first.
-    FLOW CONTROL:
-    When calling reply(), the framework waits until process.nextTick() to continue processing the request and transmit the response. This enables making changes to the returned response object before the response is sent. This means the framework will resume as soon as the handler method exits. To suspend this behavior, the returned response object supports the following methods: hold(), send() */
-// export interface StrictReply<T> extends ReplyMethods {
-//     (err: Error,
-//         result?: Promise<T> | T,
-//         /** Note that when used to return both an error and credentials in the authentication methods, reply() must be called with three arguments function(err, null, data) where data is the additional authentication information. */
-//         credentialData?: any): BoomError;
-//     /** Note that if result is a Stream with a statusCode property, that status code will be used as the default response code.  */
-//     (result: Promise<T> | T): Response;
-// }
-
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
- +                                                                           +
- +                                                                           +
- +                                                                           +
- +                                 Response                                  +
- +                                                                           +
- +                                                                           +
- +                                                                           +
- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-// TODO: move to separate file http://stackoverflow.com/questions/43276921
-
-/**
- * Response object
- * [See docs](https://hapijs.com/api/16.1.1#response-object)
- *
- * TODO, check extending from Podium is correct.  Extending because of "The response object supports the following events" [See docs](https://hapijs.com/api/16.1.1#response-events)
- *  * 'peek' - emitted for each chunk of data written back to the client connection. The event method signature is function(chunk, encoding).
- *  * 'finish' - emitted when the response finished writing but before the client response connection is ended. The event method signature is function ().
- */
-export interface Response extends Podium {
-    /** the HTTP response status code. Defaults to 200 (except for errors). */
-    statusCode: number;
-    /** an object containing the response headers where each key is a header field name. Note that this is an incomplete list of headers to be included with the response. Additional headers will be added once the response is prepared for transmission. */
-    headers: Dictionary<string>;
-    /** the value provided using the reply interface. */
-    source: ReplyValue;
-    /**
-     * a string indicating the type of source with available values:
-     *  * 'plain' - a plain response such as string, number, null, or simple object (e.g. not a Stream, Buffer, or view).
-     *  * 'buffer' - a Buffer.
-     *  * 'stream' - a Stream.
-     *  * 'promise' - a Promise object.
-     */
-    variety: 'plain' | 'buffer' | 'stream' | 'promise';
-    /** application-specific state. Provides a safe place to store application data without potential conflicts with the framework. Should not be used by plugins which should use plugins[name]. */
-    app: any;
-    /** plugin-specific state. Provides a place to store and pass request-level plugin data. The plugins is an object where each key is a plugin name and the value is the state. */
-    plugins: PluginsStates;
-    /** response handling flags: */
-    settings: {
-        /** the 'Content-Type' HTTP header 'charset' property. Defaults to 'utf-8'. */
-        charset: string;
-        /** the string encoding scheme used to serial data into the HTTP payload when source is a string or marshals into a string. Defaults to 'utf8'. */
-        encoding: string;
-        /** if true and source is a Stream, copies the statusCode and headers of the stream to the outbound response. Defaults to true. */
-        passThrough: boolean;
-        /** options used for source value requiring stringification. Defaults to no replacer and no space padding. */
-        stringify: Json.StringifyArguments;
-        /** if set, overrides the route cache expiration milliseconds value set in the route config. Defaults to no override. */
-        ttl: number | null;
-        /** if true, a suffix will be automatically added to the 'ETag' header at transmission time (separated by a '-' character) when the HTTP 'Vary' header is present. */
-        varyEtag: boolean;
-    };
-
-    /**
-     * The following attribute is present in one or more of the examples
-     * TODO update once Hapi docs describes explicitly
-     */
-    isBoom?: boolean;
-    /**
-     * The following attribute is present in one or more of the examples
-     * TODO update once Hapi docs describes explicitly
-     */
-    isMissing?: boolean;
-    /**
-     * The following attribute is present in one or more of the examples
-     * TODO update once Hapi docs describes explicitly
-     */
-    output?: Boom.Output;
-
-    /**
-     * sets the HTTP 'Content-Length' header (to avoid chunked transfer encoding)
-     * @param length  the header value. Must match the actual payload size.
-     */
-    bytes(length: number): Response;
-    /**
-     * sets the 'Content-Type' HTTP header 'charset' property
-     * @param charset  the charset property value.
-     */
-    charset(charset: string): Response;
-    /**
-     * sets the HTTP status code
-     * @param statusCode  the HTTP status code (e.g. 200).
-     */
-    code(statusCode: number): Response;
-    /**
-     * sets the HTTP status message
-     * @param httpMessage  the HTTP status message (e.g. 'Ok' for status code 200).
-     */
-    message(httpMessage: string): Response;
-    /**
-     * sets the HTTP status code to Created (201) and the HTTP 'Location' header
-     * @param uri  an absolute or relative URI used as the 'Location' header value.
-     */
-    created(uri: string): Response;
-    /**
-     * sets the string encoding scheme used to serial data into the HTTP payload
-     * @param encoding  the encoding property value (see node Buffer encoding [See docs](https://nodejs.org/api/buffer.html#buffer_buffers_and_character_encodings)).
-     *  * 'ascii' - for 7-bit ASCII data only. This encoding is fast and will strip the high bit if set.
-     *  * 'utf8' - Multibyte encoded Unicode characters. Many web pages and other document formats use UTF-8.
-     *  * 'utf16le' - 2 or 4 bytes, little-endian encoded Unicode characters. Surrogate pairs (U+10000 to U+10FFFF) are supported.
-     *  * 'ucs2' - Alias of 'utf16le'.
-     *  * 'base64' - Base64 encoding. When creating a Buffer from a string, this encoding will also correctly accept "URL and Filename Safe Alphabet" as specified in RFC4648, Section 5.
-     *  * 'latin1' - A way of encoding the Buffer into a one-byte encoded string (as defined by the IANA in RFC1345, page 63, to be the Latin-1 supplement block and C0/C1 control codes).
-     *  * 'binary' - Alias for 'latin1'.
-     *  * 'hex' - Encode each byte as two hexadecimal characters.
-     */
-    encoding(encoding: 'ascii' | 'utf8' | 'utf16le' | 'ucs2' | 'base64' | 'latin1' | 'binary' | 'hex'): Response;
-    /**
-     * sets the representation entity tag
-     * @param tag  the entity tag string without the double-quote.
-     * @param options  options object
-     *      * weak - if true, the tag will be prefixed with the 'W/' weak signifier. Weak tags will fail to match identical tags for the purpose of determining 304 response status. Defaults to false.
-     *      * vary - if true and content encoding is set or applied to the response (e.g 'gzip' or 'deflate'), the encoding name will be automatically added to the tag at transmission time (separated by a '-' character). Ignored when weak is true. Defaults to true.
-     */
-    etag(tag: string, options?: {weak: boolean, vary: boolean}): Response;
-    /**
-     * sets an HTTP header
-     * @param name  the header name.
-     * @param value  the header value.
-     */
-    header(name: string, value: string, options?: ResponseHeaderOptionsObject): Response;
-    /**
-     * sets the HTTP 'Location' header
-     * @param uri  an absolute or relative URI used as the 'Location' header value.
-     */
-    location(uri: string): Response;
-    /**
-     * sets an HTTP redirection response (302) and decorates the response with additional methods listed below,
-     * @param uri  an absolute or relative URI used to redirect the client to another resource.
-     */
-    redirect(uri: string): Response;
-    /**
-     * sets the JSON.stringify() replacer argument
-     * @param method  the replacer function or array. Defaults to none.
-     */
-    replacer(method: Json.StringifyReplacer): Response;
-    /**
-     * sets the JSON.stringify() space argument
-     * @param count  the number of spaces to indent nested object keys. Defaults to no indentation.
-     */
-    spaces(count: Json.StringifySpace): Response;
-    /**
-     * sets an HTTP cookie
-     * @param name  the cookie name.
-     * @param value  the cookie value. If no encoding is defined, must be a string.
-     * @param options  optional configuration. If the state was previously registered with the server using server.state(), the specified keys in options override those same keys in the server definition (but not others).
-     */
-    state(name: string, value: string | Object | any[], options?: ServerStateCookieConfiguationObject): Response;
-    /**
-     * sets a string suffix when the response is process via JSON.stringify().
-     */
-    suffix(suffix: string): Response;
-    /**
-     * overrides the default route cache expiration rule for this response instance
-     * @param msec  the time-to-live value in milliseconds.
-     */
-    ttl(msec: number): Response;
-    /**
-     * sets the HTTP 'Content-Type' header
-     * @param mimeType  is the mime type. Should only be used to override the built-in default for each response type.
-     */
-    type(mimeType: string): Response;
-    /**
-     * clears the HTTP cookie by setting an expired value
-     * @param name  the cookie name.
-     * @param options  optional configuration for expiring cookie. If the state was previously registered with the server using server.state(), the specified keys in options override those same keys in the server definition (but not others).
-     */
-    unstate(name: string, options?: ServerStateCookieConfiguationObject): Response;
-    /**
-     * adds the provided header to the list of inputs affected the response generation via the HTTP 'Vary' header
-     * @param header  the HTTP request header name.
-     */
-    vary(header: string): Response;
-
-    /**
-     * Flow control - hold()
-     * When calling reply(), the framework waits until process.nextTick() to continue processing the request and transmit the response. This enables making changes to the returned response object before the response is sent. This means the framework will resume as soon as the handler method exits. To suspend this behavior, the returned response object supports the following methods:
-     * puts the response on hold until response.send() is called. Available only after reply() is called and until response.hold() is invoked once.
-     * [See docs](https://hapijs.com/api/16.1.1#flow-control)
-     */
-    hold(): Response;
-    /**
-     * Flow control - send()
-     * When calling reply(), the framework waits until process.nextTick() to continue processing the request and transmit the response. This enables making changes to the returned response object before the response is sent. This means the framework will resume as soon as the handler method exits. To suspend this behavior, the returned response object supports the following methods:
-     * immediately resume the response. Available only after response.hold() is called and until response.send() is invoked once.
-     * [See docs](https://hapijs.com/api/16.1.1#flow-control)
-     */
-    send(): Response;
-
-    /**
-     * Mentioned here: "Note that prerequisites do not follow the same rules of the normal reply interface. In all other cases, calling reply() with or without a value will use the result as the response sent back to the client. In a prerequisite method, calling reply() will assign the returned value to the provided assign key. If the returned value is an error, the failAction setting determines the behavior. To force the return value as the response and skip any other prerequisites and the handler, use the reply().takeover() method."
-     * TODO prepare documentation PR and submit to hapi.
-     * [See docs](https://hapijs.com/api/16.1.1#route-prerequisites)
-     */
-    takeover(): Response;
-}
-
-/**
- * Response Object Redirect Methods
- * When using the redirect() method, the response object provides these additional methods:
- * [See docs](https://hapijs.com/api/16.1.1#response-object-redirect-methods)
- */
-export interface ResponseRedirect extends Response {
-    /**
-     * temporary
-     * sets the status code to 302 or 307 (based on the rewritable() setting) where:
-     * [See docs](https://hapijs.com/api/16.1.1#response-object-redirect-methods)
-     * @param isTemporary  if false, sets status to permanent. Defaults to true.
-     */
-    temporary(isTemporary: boolean): Response;
-    /**
-     * permanent
-     * sets the status code to 301 or 308 (based on the rewritable() setting) where:
-     * [See docs](https://hapijs.com/api/16.1.1#response-object-redirect-methods)
-     * @param isPermanent  if false, sets status to temporary. Defaults to true.
-     */
-    permanent(isPermanent: boolean): Response;
-    /**
-     * rewritable
-     * sets the status code to 301/302 for rewritable (allows changing the request method from 'POST' to 'GET') or 307/308 for non-rewritable (does not allow changing the request method from 'POST' to 'GET'). Exact code based on the temporary() or permanent() setting. Arguments:
-     * [See docs](https://hapijs.com/api/16.1.1#response-object-redirect-methods)
-     * @param isRewritable  if false, sets to non-rewritable. Defaults to true.
-     */
-    rewritable(isRewritable: boolean): Response;
-}
-
-/**
- * [See docs](https://hapijs.com/api/16.1.1#response-object) under "response object provides the following methods" > header > options
- */
-export interface ResponseHeaderOptionsObject {
-    /** if true, the value is appended to any existing header value using separator. Defaults to false. */
-    append?: boolean;
-    /** string used as separator when appending to an existing value. Defaults to ','. */
-    separator?: string;
-    /** if false, the header value is not set if an existing value present. Defaults to true. */
-    override?: boolean;
-    /** if false, the header value is not modified if the provided value is already included. Does not apply when append is false or if the name is 'set-cookie'. Defaults to true. */
-    duplicate?: boolean;
-}
-
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
- +                                                                           +
- +                                                                           +
- +                                                                           +
- +                           Plugins and register                            +
- +                                                                           +
- +                                                                           +
- +                                                                           +
- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-// TODO: move to separate file http://stackoverflow.com/questions/43276921
-
-/**
- * Plugins
- * Plugins provide a way to organize the application code by splitting the server logic into smaller components. Each plugin can manipulate the server and its connections through the standard server interface, but with the added ability to sandbox certain properties.
- * [See docs](https://hapijs.com/api/16.1.1#plugins)
- * @param server  the server object the plugin is being registered to.
- * @param options  an options object passed to the plugin during registration.
- * @param next  a callback method the function must call to return control back to the framework to complete the registration process with signature function(err)
- */
-export interface PluginFunction<OptionsPassedToPlugin> {
-    (server: Server, options: OptionsPassedToPlugin, next: (err?: Error) => void): void;
-    /**
-     * Note attributes is NOT optional but this type is easier to use.
-     */
-    attributes?: PluginAttributes;
-}
-
-/**
- * see Plugin
- * [See docs](https://hapijs.com/api/16.1.1#plugins)
- */
-export interface PluginAttributes {
-    /**
-     * required plugin name string. The name is used as a unique key. Published plugins should use the same name as the name field in the 'package.json' file. Names must be unique within each application.
-     * NOTE: marked as optional as `pkg` can be used instead.
-     */
-    name?: string;
-    /** optional plugin version. The version is only used informatively to enable other plugins to find out the versions loaded. The version should be the same as the one specified in the plugin's 'package.json' file. */
-    version?: string;
-    /** Alternatively, the name and version can be included via the pkg attribute containing the 'package.json' file for the module which already has the name and version included */
-    pkg?: any;
-    /** if true, allows the plugin to be registered multiple times with the same server. Defaults to false. */
-    multiple?: boolean;
-    /** optional string or array of string indicating a plugin dependency. Same as setting dependencies via server.dependency(). */
-    dependencies?: string | string[];
-    /** if false, does not allow the plugin to call server APIs that modify the connections such as adding a route or configuring state. This flag allows the plugin to be registered before connections are added and to pass dependency requirements. When set to 'conditional', the mode is based on the presence of selected connections (if the server has connections, it is the same as true, but if no connections are available, it is the same as false). Defaults to true. */
-    connections?: boolean | 'conditional';
-    /** if true, will only register the plugin once per connection (or once per server for a connectionless plugin). If set, overrides the once option passed to server.register(). Defaults to undefined (registration will be based on the server.register() option once). */
-    once?: boolean;
-}
-
-/**
- * Plugins State
- * Related [See docs](https://hapijs.com/api/16.1.1#serverplugins)
- * Related [See docs](https://hapijs.com/api/16.1.1#serverrealm)
- */
-export interface PluginsStates {
-    [pluginName: string]: any;
-}
-
-/**
- * once, select, routes - optional plugin-specific registration options as defined see PluginRegistrationOptions
- * [See docs](https://hapijs.com/api/16.1.1#serverregisterplugins-options-callback)
- */
-export interface PluginRegistrationObject<OptionsPassedToPlugin> extends PluginRegistrationOptions {
-    /** the plugin registration function. */
-    register: PluginFunction<OptionsPassedToPlugin>;
-    /** optional options passed to the registration function when called. */
-    options?: OptionsPassedToPlugin;
-}
-
-/**
- * registration options (different from the options passed to the registration function):
- *  * once - if true, the registration is skipped for any connection already registered with. Cannot be used with plugin options. If the plugin does not have a connections attribute set to false and the registration selection is empty, registration will be skipped as no connections are available to register once. Defaults to false.
- *  * routes - modifiers applied to each route added by the plugin:
- *      * prefix - string added as prefix to any route path (must begin with '/'). If a plugin registers a child plugin the prefix is passed on to the child or is added in front of the child-specific prefix.
- *      * vhost - virtual host string (or array of strings) applied to every route. The outer-most vhost overrides the any nested configuration.
- *  * select - a string or array of string labels used to pre-select connections for plugin registration.
- * [See docs](https://hapijs.com/api/16.1.1#serverregisterplugins-options-callback)
- */
-export interface PluginRegistrationOptions {
-    once?: boolean;
-    routes?: {prefix?: string, vhost?: string | string[]};
-    select?: string | string[];
-}
-
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
- +                                                                           +
- +                                                                           +
- +                                                                           +
- +                                    JSON                                   +
- +                                                                           +
- +                                                                           +
- +                                                                           +
- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-// This was in a seperate file and perhaps should move to some of the lib typings?
-// https://github.com/DefinitelyTyped/DefinitelyTyped/pull/16065#issuecomment-299443673
-//
-// json/json-tests.ts
-//
-// import * as JSON from './index';
-//
-// var a: JSON.StringifyReplacer = function(key, value) {
-//     if (key === "do not include") {
-//         return undefined;
-//     }
-//     return value;
-// };
-//
-
-export namespace Json {
-    /**
-     * @see {@link https://developer.mozilla.org/en/docs/Web/JavaScript/Reference/Global_Objects/JSON/stringify#The_replacer_parameter}
-     */
-    export type StringifyReplacer = ((key: string, value: any) => any) | (string | number)[] | undefined;
-
-    /**
-     * Any value greater than 10 is truncated.
-     */
-    export type StringifySpace = number | string;
-
-    export interface StringifyArguments {
-        /** the replacer function or array. Defaults to no action. */
-        replacer?: StringifyReplacer;
-        /** number of spaces to indent nested object keys. Defaults to no indentation. */
-        space?: StringifySpace;
-    }
-}
+/** PLUGIN */
+export * from './definitions/plugin/plugin';
+export * from './definitions/plugin/plugin-registered';
+
+/** REQUEST */
+export * from './definitions/request/request';
+export * from './definitions/request/request-auth';
+export * from './definitions/request/request-events';
+export * from './definitions/request/request-info';
+export * from './definitions/request/request-route';
+
+/** RESPONSE */
+export * from './definitions/response/response-events';
+export * from './definitions/response/response-object';
+export * from './definitions/response/response-settings';
+export * from './definitions/response/response-toolkit';
+
+/** ROUTE */
+export * from './definitions/route/route-options';
+export * from './definitions/route/route-options-access';
+export * from './definitions/route/route-options-cache';
+export * from './definitions/route/route-options-cors';
+export * from './definitions/route/route-options-payload';
+export * from './definitions/route/route-options-pre';
+export * from './definitions/route/route-options-response';
+export * from './definitions/route/route-options-secure';
+export * from './definitions/route/route-options-validate';
+
+/** SERVER */
+export * from './definitions/server/server';
+export * from './definitions/server/server-auth';
+export * from './definitions/server/server-auth-scheme';
+export * from './definitions/server/server-cache';
+export * from './definitions/server/server-events';
+export * from './definitions/server/server-ext';
+export * from './definitions/server/server-info';
+export * from './definitions/server/server-inject';
+export * from './definitions/server/server-method';
+export * from './definitions/server/server-options';
+export * from './definitions/server/server-options-cache';
+export * from './definitions/server/server-realm';
+export * from './definitions/server/server-register';
+export * from './definitions/server/server-route';
+export * from './definitions/server/server-state';
+export * from './definitions/server/server-state-options';
+
+/** UTIL */
+export * from './definitions/util/common';
+export * from './definitions/util/json';
+export * from './definitions/util/lifecycle';
+export * from './definitions/util/util';
diff --git a/types/hapi/test/request/catch-all.ts b/types/hapi/test/request/catch-all.ts
new file mode 100644
index 0000000000..55db8a548b
--- /dev/null
+++ b/types/hapi/test/request/catch-all.ts
@@ -0,0 +1,15 @@
+// https://github.com/hapijs/hapi/blob/master/API.md#catch-all-route
+import { Request, ResponseToolkit, Server, ServerOptions } from "hapi";
+
+const options: ServerOptions = {
+    port: 8000,
+};
+const server = new Server(options);
+
+const handler = (request: Request, h: ResponseToolkit) => {
+    return h.response('The page was not found').code(404);
+};
+server.route({ method: '*', path: '/{p*}', handler });
+
+server.start();
+console.log('Server started at: ' + server.info.uri);
diff --git a/types/hapi/test/request/event-types.ts b/types/hapi/test/request/event-types.ts
index 0946f0a0ed..b963340bb5 100644
--- a/types/hapi/test/request/event-types.ts
+++ b/types/hapi/test/request/event-types.ts
@@ -1,30 +1,65 @@
+// https://github.com/hapijs/hapi/blob/master/API.md#-servereventevents
+// https://github.com/hapijs/hapi/blob/master/API.md#-requestevents
+import { Lifecycle, Request, ResponseToolkit, RouteOptions, Server, ServerOptions, ServerRoute } from "hapi";
+import * as Crypto from 'crypto';
 
-// From https://hapijs.com/api/16.1.1#requestsetmethodmethod
+const options: ServerOptions = {
+    port: 8000,
+};
 
-import * as Hapi from 'hapi';
-const Crypto = require('crypto');
-const server = new Hapi.Server();
-server.connection({ port: 80 });
+const serverRoute: ServerRoute = {
+    path: '/',
+    method: 'GET',
+    handler: (request: Request, h: ResponseToolkit) => {
+        return 'ok: ' + request.path;
+    }
+};
 
-const onRequest: Hapi.ServerExtRequestHandler = function (request, reply) {
+const onRequest: Lifecycle.Method = (request: Request, h: ResponseToolkit) => {
+    /*
+     * Server events
+     */
+    request.server.events.on('request', (request: Request, event: any, tags: any) => {
+        console.log(request.paramsArray);
+        console.log(event);
+        console.log(tags);
+    });
 
+    request.server.events.on('response', (request: Request) => {
+        console.log('Response sent for request: ' + request.path);
+    });
+
+    request.server.events.on('start', (route: RouteOptions) => {
+        console.log('Server started');
+    });
+
+    request.server.events.once('stop', (route: RouteOptions) => {
+        console.log('Server stoped');
+    });
+
+    /*
+     * Request events
+     */
     const hash = Crypto.createHash('sha1');
-    request.on('peek', (chunk) => {
 
+    request.events.on("peek", (chunk: any) => {
         hash.update(chunk);
     });
 
-    request.once('finish', () => {
-
+    request.events.once("finish", () => {
         console.log(hash.digest('hex'));
     });
 
-    request.once('disconnect', () => {
-
+    request.events.once("disconnect", () => {
         console.error('request aborted');
     });
 
-    return reply.continue();
+    return h.continue;
 };
 
+const server = new Server(options);
+server.route(serverRoute);
 server.ext('onRequest', onRequest);
+
+server.start();
+console.log('Server started at: ' + server.info.uri);
diff --git a/types/hapi/test/request/get-log.ts b/types/hapi/test/request/get-log.ts
index 289bdd3282..731e8ea35c 100644
--- a/types/hapi/test/request/get-log.ts
+++ b/types/hapi/test/request/get-log.ts
@@ -1,12 +1,29 @@
+// https://github.com/hapijs/hapi/blob/master/API.md#-requestlogtags-data
+import { Lifecycle, Request, ResponseToolkit, Server, ServerOptions, ServerRoute } from "hapi";
 
-// From https://hapijs.com/api/16.1.1#requestgetlogtags-internal
+const options: ServerOptions = {
+    port: 8000,
+};
 
-import * as Hapi from 'hapi';
+const handlerFn: Lifecycle.Method = (request: Request, h: ResponseToolkit) => {
+    request.log(['test', 'error'], 'Test event');
+    return 'path: ' + request.path;
+};
 
-var request: Hapi.Request = <any> {};
+const serverRoute: ServerRoute = {
+    path: '/',
+    method: 'GET',
+    handler: handlerFn
+};
 
-request.getLog();
-request.getLog('error');
-request.getLog(['error', 'auth']);
-request.getLog(['error'], true);
-request.getLog(false);
+const server = new Server(options);
+server.route(serverRoute);
+server.start();
+console.log('Server started at: ' + server.info.uri);
+
+server.events.on('request', (request: Request, event: any, tags: any) => {
+    console.log(tags);
+    if (tags.error) {
+        console.log(event);
+    }
+});
diff --git a/types/hapi/test/request/parameters.ts b/types/hapi/test/request/parameters.ts
new file mode 100644
index 0000000000..1dadbcc1eb
--- /dev/null
+++ b/types/hapi/test/request/parameters.ts
@@ -0,0 +1,37 @@
+// https://github.com/hapijs/hapi/blob/master/API.md#-requestparams
+import { Lifecycle, Request, ResponseToolkit, Server, ServerOptions, ServerRoute } from "hapi";
+
+const options: ServerOptions = {
+    port: 8000,
+};
+
+// Example 1
+// http://localhost:8000/album-name/song-optional
+const getAlbum: Lifecycle.Method = (request: Request, h: ResponseToolkit) => {
+    console.log(request.params);
+    return 'ok: ' + request.path;
+};
+const serverRoute1: ServerRoute = {
+    path: '/{album}/{song?}',
+    method: 'GET',
+    handler: getAlbum
+};
+
+// Example 2
+// http://localhost:8000/person/rafael/fijalkowski
+const getPerson: Lifecycle.Method = (request: Request, h: ResponseToolkit) => {
+    const nameParts = request.params.name.split('/');
+    return { first: nameParts[0], last: nameParts[1] };
+};
+const serverRoute2: ServerRoute = {
+    path: '/person/{name*2}',
+    method: 'GET',
+    handler: getPerson
+};
+
+const server = new Server(options);
+server.route(serverRoute1);
+server.route(serverRoute2);
+
+server.start();
+console.log('Server started at: ' + server.info.uri);
diff --git a/types/hapi/test/request/query.ts b/types/hapi/test/request/query.ts
index c6507c2da0..1f8ea89c1b 100644
--- a/types/hapi/test/request/query.ts
+++ b/types/hapi/test/request/query.ts
@@ -1,14 +1,27 @@
 // Added test in addition to docs, for request.query
+import { Lifecycle, Request, ResponseToolkit, Server, ServerOptions, ServerRoute } from "hapi";
 
-import * as Hapi from 'hapi';
+const options: ServerOptions = {
+    port: 8000,
+};
+
+const handlerFn: Lifecycle.Method = (request: Request, h: ResponseToolkit) => {
+    const query = request.query as GetThingQuery;
+    // http://localhost:8000/?name=test
+    return `You asked for ${query.name}`;
+};
+
+const serverRoute: ServerRoute = {
+    path: '/',
+    method: 'GET',
+    handler: handlerFn
+};
 
 interface GetThingQuery {
     name: string;
 }
 
-const handler: Hapi.RouteHandler = function (request, reply) {
-
-    const query = request.query as GetThingQuery;
-
-    return reply(`You asked for ${query.name}`);
-};
+const server = new Server(options);
+server.route(serverRoute);
+server.start();
+console.log('Server started at: ' + server.info.uri);
diff --git a/types/hapi/test/response/continue.ts b/types/hapi/test/response/continue.ts
new file mode 100644
index 0000000000..00bdbc9ff2
--- /dev/null
+++ b/types/hapi/test/response/continue.ts
@@ -0,0 +1,25 @@
+// https://github.com/hapijs/hapi/blob/master/API.md#-serverextevent-method-options
+import { Request, ResponseToolkit, Server, ServerOptions, ServerRoute } from "hapi";
+
+const options: ServerOptions = {
+    port: 8000,
+};
+
+const serverRoute: ServerRoute = {
+    path: '/test',
+    method: 'GET',
+    handler: (request: Request, h: ResponseToolkit) => {
+        return 'ok: ' + request.path;
+    }
+};
+
+const server = new Server(options);
+server.route(serverRoute);
+
+server.ext("onRequest", (request: Request, h: ResponseToolkit) => {
+    request.setUrl('/test');
+    return h.continue;
+});
+
+server.start();
+console.log('Server started at: ' + server.info.uri);
diff --git a/types/hapi/test/response/error.ts b/types/hapi/test/response/error.ts
index 0ef503df12..52937eaa4a 100644
--- a/types/hapi/test/response/error.ts
+++ b/types/hapi/test/response/error.ts
@@ -1,25 +1,30 @@
+// https://github.com/hapijs/hapi/blob/master/API.md#errors
+import { Request, ResponseToolkit, Server, ServerOptions, ServerRoute } from "hapi";
+import * as Boom from "boom";
 
-// From https://hapijs.com/api/16.1.1#error-response
+const options: ServerOptions = {
+    port: 8000,
+};
 
-import * as Hapi from 'hapi';
-const Boom = require('boom');
+const serverRoutes: ServerRoute[] = [
+    {
+        path: '/badRequest',
+        method: 'GET',
+        handler: (request: Request, h: ResponseToolkit) => {
+            throw Boom.badRequest('Unsupported parameter');
+        }
+    },
+    {
+        path: '/internal',
+        method: 'GET',
+        handler: (request: Request, h: ResponseToolkit) => {
+            throw new Error('unexpect error');
+        }
+    },
+];
 
-const server = new Hapi.Server();
+const server = new Server(options);
+server.route(serverRoutes);
 
-server.route({
-    method: 'GET',
-    path: '/badRequest',
-    handler: function (request, reply) {
-
-        return reply(Boom.badRequest('Unsupported parameter'));
-    }
-});
-
-server.route({
-    method: 'GET',
-    path: '/internal',
-    handler: function (request, reply) {
-
-        return reply(new Error('unexpect error'));
-    }
-});
+server.start();
+console.log('Server started at: ' + server.info.uri);
diff --git a/types/hapi/test/response/redirect.ts b/types/hapi/test/response/redirect.ts
new file mode 100644
index 0000000000..d7503fd5f9
--- /dev/null
+++ b/types/hapi/test/response/redirect.ts
@@ -0,0 +1,20 @@
+// https://github.com/hapijs/hapi/blob/master/API.md#-hredirecturi
+import { Request, ResponseToolkit, Server, ServerOptions, ServerRoute } from "hapi";
+
+const options: ServerOptions = {
+    port: 8000,
+};
+
+const serverRoute: ServerRoute = {
+    path: '/',
+    method: 'GET',
+    handler: (request: Request, h: ResponseToolkit) => {
+        return h.redirect('http://example.com');
+    }
+};
+
+const server = new Server(options);
+server.route(serverRoute);
+
+server.start();
+console.log('Server started at: ' + server.info.uri);
diff --git a/types/hapi/test/response/response-events.ts b/types/hapi/test/response/response-events.ts
new file mode 100644
index 0000000000..0680f7f7f8
--- /dev/null
+++ b/types/hapi/test/response/response-events.ts
@@ -0,0 +1,28 @@
+// https://github.com/hapijs/hapi/blob/master/API.md#-responseevents
+import { Request, ResponseObject, ResponseToolkit, Server, ServerOptions, ServerRoute } from "hapi";
+import * as Crypto from "crypto";
+
+const preResponse = (request: Request, h: ResponseToolkit) => {
+    // In onPreResponse, the response object will be defined.
+    const response: ResponseObject = request.response!;
+
+    const hash = Crypto.createHash('sha1');
+    response.events.on('peek', (chunk: any) => {
+        hash.update(chunk);
+    });
+
+    response.events.once('finish', () => {
+        console.log(hash.digest('hex'));
+    });
+
+    return h.continue;
+};
+
+const server = new Server({
+    port: 8000,
+});
+
+server.ext('onPreResponse', preResponse);
+
+server.start();
+console.log('Server started at: ' + server.info.uri);
diff --git a/types/hapi/test/response/response.ts b/types/hapi/test/response/response.ts
new file mode 100644
index 0000000000..593eddb0fb
--- /dev/null
+++ b/types/hapi/test/response/response.ts
@@ -0,0 +1,36 @@
+// https://github.com/hapijs/hapi/blob/master/API.md#-hresponsevalue
+import { Request, ResponseToolkit, Server, ServerOptions, ServerRoute } from "hapi";
+
+const options: ServerOptions = {
+    port: 8000,
+};
+
+const serverRoutes: ServerRoute[] = [
+    // Detailed notation
+    {
+        path: '/test1',
+        method: 'GET',
+        handler: (request: Request, h: ResponseToolkit) => {
+            const response = h.response('success');
+            response.type('text/plain');
+            response.header('X-Custom', 'some-value');
+            return response;
+        }
+    },
+    // Chained notation
+    {
+        path: '/test2',
+        method: 'GET',
+        handler: (request: Request, h: ResponseToolkit) => {
+            return h.response('success')
+            .type('text/plain')
+            .header('X-Custom', 'some-value');
+        }
+    },
+];
+
+const server = new Server(options);
+server.route(serverRoutes);
+
+server.start();
+console.log('Server started at: ' + server.info.uri);
diff --git a/types/hapi/test/route/adding-routes.ts b/types/hapi/test/route/adding-routes.ts
new file mode 100644
index 0000000000..55c58d1437
--- /dev/null
+++ b/types/hapi/test/route/adding-routes.ts
@@ -0,0 +1,38 @@
+// from https://hapijs.com/tutorials/getting-started#adding-routes
+import { Request, ResponseToolkit, Server, ServerOptions, ServerRoute } from "hapi";
+
+const options: ServerOptions = {
+    port: 8000,
+};
+
+const serverRoute: ServerRoute = {
+    path: '/',
+    method: 'GET',
+    handler: (request: Request, h: ResponseToolkit) => {
+        return 'ok: ' + request.path;
+    }
+};
+
+const serverRoutes: ServerRoute[] = [
+    {
+        path: '/test1',
+        method: 'GET',
+        handler: (request: Request, h: ResponseToolkit) => {
+            return 'ok: ' + request.path;
+        }
+    },
+    {
+        path: '/test2',
+        method: 'GET',
+        handler: (request: Request, h: ResponseToolkit) => {
+            return 'ok: ' + request.path;
+        }
+    },
+];
+
+const server = new Server(options);
+server.route(serverRoute);
+server.route(serverRoutes);
+
+server.start();
+console.log('Server started at: ' + server.info.uri);
diff --git a/types/hapi/test/route/config.ts b/types/hapi/test/route/config.ts
index 16457395f8..8272e767f1 100644
--- a/types/hapi/test/route/config.ts
+++ b/types/hapi/test/route/config.ts
@@ -1,46 +1,52 @@
-'use strict';
+import { Request, ResponseToolkit, RouteOptions, Server, ServerOptions, ServerRoute } from "hapi";
 
-import * as Hapi from 'hapi';
+const options: ServerOptions = {
+    port: 8000,
+};
 
 // different methods
-var routeConfig: Hapi.RouteConfiguration = {
+const routeConfig: ServerRoute = {
   path: '/signin',
   method: 'PUT',
   vhost: 'site.coms',
 };
-var routeConfig: Hapi.RouteConfiguration = {
+const routeConfigTest1: ServerRoute = {
   path: '/signin',
   method: '*'
 };
-var routeConfig: Hapi.RouteConfiguration = {
+const routeConfigTest2: ServerRoute = {
   path: '/signin',
   method: ['OPTIONS', '*']
 };
 
 // different handlers
-var routeConfig: Hapi.RouteConfiguration = {
+const routeConfigTest3: ServerRoute = {
   path: '/signin',
   method: 'PUT',
-  handler: 'some registered handler'
+  handler: (request: Request, h: ResponseToolkit) => {
+    return 'ok';
+  }
 };
-var routeConfig: Hapi.RouteConfiguration = {
+const routeConfigTest4: ServerRoute = {
   path: '/signin',
   method: 'PUT',
-  handler: function (request, reply) {
-    return reply('ok');
+  handler: (request: Request, h: ResponseToolkit) => {
+    return 'ok';
   }
 };
 
-const server = new Hapi.Server();
+const server = new Server(options);
 server.route(routeConfig);
 
 // Handler in config
-const user: Hapi.RouteAdditionalConfigurationOptions = {
+const user: RouteOptions = {
     cache: { expiresIn: 5000 },
-    handler: function (request, reply) {
-
-        return reply({ name: 'John' });
+    handler: (request: Request, h: ResponseToolkit) => {
+        return { name: 'John' };
     }
 };
 
-server.route({method: 'GET', path: '/user', config: user });
+server.route({method: 'GET', path: '/user', options: user });
+
+server.start();
+console.log('Server started at: ' + server.info.uri);
diff --git a/types/hapi/test/route/handler.ts b/types/hapi/test/route/handler.ts
index c66d17018e..b9354f00d8 100644
--- a/types/hapi/test/route/handler.ts
+++ b/types/hapi/test/route/handler.ts
@@ -1,10 +1,9 @@
-'use strict';
+import { Lifecycle, Request, ResponseToolkit } from "hapi";
 
-import * as Hapi from 'hapi';
+const handler: Lifecycle.Method = (request: Request, h: ResponseToolkit) => {
+    return 'success';
+};
 
-var handler: Hapi.RouteHandler = function(request, reply) {
-    reply('success');
-}
-var strictHandler: Hapi.RouteHandler = function(request, reply) {
-    reply(123);
-}
+const strictHandler: Lifecycle.Method = (request: Request, h: ResponseToolkit) => {
+    return 123;
+};
diff --git a/types/hapi/test/route/route-options-pre.ts b/types/hapi/test/route/route-options-pre.ts
new file mode 100644
index 0000000000..139e93a0f8
--- /dev/null
+++ b/types/hapi/test/route/route-options-pre.ts
@@ -0,0 +1,42 @@
+// https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionspre
+import { Request, ResponseToolkit, Server } from "hapi";
+
+const server = new Server({
+    port: 8000,
+});
+
+const pre1 = (request: Request, h: ResponseToolkit) => {
+    return 'Hello';
+};
+
+const pre2 = (request: Request, h: ResponseToolkit) => {
+    return 'World';
+};
+
+const pre3 = (request: Request, h: ResponseToolkit) => {
+    return `request.pre.m1 request.pre.m2`;
+};
+
+server.route({
+    method: 'GET',
+    path: '/',
+    config: {
+        pre: [
+            [
+                // m1 and m2 executed in parallel
+                { method: pre1, assign: 'm1' },
+                { method: pre2, assign: 'm2' }
+            ],
+            { method: pre3, assign: 'm3' },
+        ],
+        handler: (request: Request, h: ResponseToolkit) => {
+            return request.pre.m3 + '!\n';
+        }
+    }
+});
+
+server.start();
+
+server.events.on('start', () => {
+    console.log('Server started at: ' + server.info.uri);
+});
diff --git a/types/hapi/test/route/route-options.ts b/types/hapi/test/route/route-options.ts
new file mode 100644
index 0000000000..b5a9f87ce1
--- /dev/null
+++ b/types/hapi/test/route/route-options.ts
@@ -0,0 +1,168 @@
+// https://github.com/hapijs/hapi/blob/master/API.md#route-options
+import {
+    Request,
+    ResponseToolkit,
+    RouteOptions,
+    RouteOptionsAccess,
+    RouteOptionsCors,
+    RouteOptionsPayload,
+    RouteOptionsResponse,
+    RouteOptionsValidate,
+    Server
+} from "hapi";
+
+const routeOptionsAccess: RouteOptionsAccess = {
+    access: [
+        {
+            scope: false
+        },
+        {
+            entity: 'user'
+        }
+    ],
+    scope: false,
+    entity: 'user',
+    mode: 'optional',
+    payload: 'optional',
+    strategies: ['', ''],
+    strategy: ''
+};
+
+const corsOption: RouteOptionsCors = {
+    origin: 'ignore',
+    maxAge: 5000,
+    headers: ['test', 'test', 'test'],
+    additionalHeaders: ['test', 'test', 'test'],
+    exposedHeaders: ['test', 'test', 'test'],
+    additionalExposedHeaders: ['test', 'test', 'test'],
+    credentials: false
+};
+
+const payloadOptions: RouteOptionsPayload = {
+    allow: 'string',
+    compression: {
+        test1: {
+            test: 2
+        }
+    },
+    defaultContentType: 'application/json',
+    failAction: (request: Request, h: ResponseToolkit) => {
+        return 'ok: ' + request.path;
+    },
+    maxBytes: 1048576,
+    multipart: {
+        output: 'annotated'
+    },
+    output: 'stream',
+    override: '',
+    parse: 'gunzip',
+    timeout: 5000,
+    uploads: 'dir/'
+};
+
+const pre1 = (request: Request, h: ResponseToolkit) => {
+    return 'Hello';
+};
+
+const pre2 = (request: Request, h: ResponseToolkit) => {
+    return 'World';
+};
+
+const pre3 = (request: Request, h: ResponseToolkit) => {
+    return `request.pre.m1 request.pre.m2`;
+};
+
+const routeOptionsResponse: RouteOptionsResponse = {
+    emptyStatusCode: 200,
+    failAction: (request: Request, h: ResponseToolkit) => {
+        return 'ok: ' + request.path;
+    },
+    modify: false,
+    options: undefined,
+    ranges: true,
+    sample: 100,
+    schema: true,
+    status: {
+        200: true,
+        302: true,
+        404: false,
+    }
+};
+
+const routeOptionsValidate: RouteOptionsValidate = {
+    errorFields: {},
+    failAction: (request: Request, h: ResponseToolkit) => {
+        return 'ok: ' + request.path;
+    },
+    headers: false,
+    options: {},
+    params: false,
+    payload: true,
+    query: true,
+};
+
+const routeOptions: RouteOptions = {
+    app: {},
+    auth: routeOptionsAccess,
+    bind: null,
+    cache: {
+        privacy: 'default',
+        statuses: [200],
+        otherwise: 'no-cache'
+    },
+    compression: {
+        test1: {
+            test: 2
+        }
+    },
+    cors: corsOption,
+    description: 'description here',
+    ext: undefined,
+    files: { relativeTo: '.' },
+    handler: (request: Request, h: ResponseToolkit) => {
+        return 'ok: ' + request.path;
+    },
+    id: 'test',
+    isInternal: false,
+    json: undefined,
+    jsonp: 'callback',
+    log: { collect: false },
+    notes:  ['test', 'test', 'test'],
+    payload: payloadOptions,
+    plugins: {
+        plugin1: {},
+        plugin2: {},
+    },
+    pre: [
+        [
+            // m1 and m2 executed in parallel
+            { method: pre1, assign: 'm1' },
+            { method: pre2, assign: 'm2' }
+        ],
+        { method: pre3, assign: 'm3' },
+    ],
+    response: routeOptionsResponse,
+    security: false,
+    state: {
+        parse: true,
+        failAction: (request: Request, h: ResponseToolkit) => {
+            return 'ok: ' + request.path;
+        },
+    },
+    tags: ['test', 'test', 'test'],
+    timeout: {
+        server: 10000,
+        socket: false
+    },
+    validate: routeOptionsValidate
+};
+
+const server = new Server({
+    port: 8000,
+    routes: routeOptions
+});
+server.start();
+
+server.events.on('start', () => {
+    console.log('Server started at: ' + server.info.uri);
+});
diff --git a/types/hapi/test/route/validation.ts b/types/hapi/test/route/validation.ts
new file mode 100644
index 0000000000..5296183e87
--- /dev/null
+++ b/types/hapi/test/route/validation.ts
@@ -0,0 +1,30 @@
+// from https://hapijs.com/tutorials/validation?lang=en_US
+import { ServerRouteConfig, Request, ResponseToolkit, Server, ServerOptions, ServerRoute } from "hapi";
+import * as Joi from "joi";
+
+const options: ServerOptions = {
+    port: 8000,
+};
+
+const configObject: ServerRouteConfig = {
+    validate: {
+        params: {
+            name: Joi.string().min(3).max(10)
+        }
+    }
+};
+
+const serverRoute: ServerRoute = {
+    path: '/',
+    method: 'GET',
+    handler: (request: Request, h: ResponseToolkit) => {
+        return 'ok: ' + request.path;
+    },
+    config: configObject
+};
+
+const server = new Server(options);
+server.route(serverRoute);
+
+server.start();
+console.log('Server started at: ' + server.info.uri);
diff --git a/types/hapi/test/server/server-app.ts b/types/hapi/test/server/server-app.ts
new file mode 100644
index 0000000000..57298a4672
--- /dev/null
+++ b/types/hapi/test/server/server-app.ts
@@ -0,0 +1,29 @@
+// https://github.com/hapijs/hapi/blob/master/API.md#-serverapp
+import { Request, ResponseToolkit, Server, ServerOptions, ServerRoute } from "hapi";
+
+const options: ServerOptions = {
+    port: 8000,
+};
+
+declare module "hapi" {
+	// Demonstrate augmenting the application state.
+	interface ApplicationState {
+		key: string;
+	}
+}
+
+const server = new Server(options);
+server.app!.key = 'value2';
+
+const serverRoute: ServerRoute = {
+    path: '/',
+    method: 'GET',
+    handler: (request: Request, h: ResponseToolkit) => {
+        return 'key: ' + request.server.app!.key;
+    }
+};
+
+server.route(serverRoute);
+
+server.start();
+console.log('Server started at: ' + server.info.uri);
diff --git a/types/hapi/test/server/server-auth-api.ts b/types/hapi/test/server/server-auth-api.ts
new file mode 100644
index 0000000000..3b80dc7e47
--- /dev/null
+++ b/types/hapi/test/server/server-auth-api.ts
@@ -0,0 +1,36 @@
+// https://github.com/hapijs/hapi/blob/master/API.md#-serverauthapi
+import {
+    Request,
+    ResponseToolkit,
+    Server,
+    ServerAuthScheme,
+    ServerAuthSchemeObject,
+    ServerAuthSchemeOptions
+} from "hapi";
+import * as Boom from "boom";
+
+const scheme: ServerAuthScheme = (server: Server, options: ServerAuthSchemeOptions): ServerAuthSchemeObject => {
+    return {
+        api: {
+            settings: {
+                x: 5
+            }
+        },
+        authenticate: (request: Request, h: ResponseToolkit) => {
+            const authorization = request.headers.authorization;
+            if (!authorization) {
+                throw Boom.unauthorized(null, 'Custom');
+            }
+            return h.authenticated({ credentials: { user: 'john' } });
+        }
+    };
+};
+
+const server = new Server({
+    port: 8000,
+});
+server.auth.scheme('custom', scheme);
+server.auth.strategy('default', 'custom');
+server.start();
+
+console.log(server.auth.api.default.settings.x);    // 5
diff --git a/types/hapi/test/server/server-auth-default.ts b/types/hapi/test/server/server-auth-default.ts
new file mode 100644
index 0000000000..3ec9919150
--- /dev/null
+++ b/types/hapi/test/server/server-auth-default.ts
@@ -0,0 +1,35 @@
+// https://github.com/hapijs/hapi/blob/master/API.md#-serverauthdefaultoptions
+//      https://github.com/hapijs/hapi/blob/master/API.md#-serverauthschemename-scheme
+import { Request, ResponseToolkit, Server, ServerAuthScheme, ServerAuthSchemeOptions } from "hapi";
+import * as Boom from "boom";
+
+const server = new Server({
+    port: 8000,
+});
+
+const scheme: ServerAuthScheme = (server: Server, options: ServerAuthSchemeOptions) => {
+    return {
+        authenticate: (request: Request, h: ResponseToolkit) => {
+            const req = request.raw.req;
+            const authorization = req.headers.authorization;
+            if (!authorization) {
+                throw Boom.unauthorized(null, 'Custom');
+            }
+            return h.authenticated({ credentials: { user: 'john' } });
+        }
+    };
+};
+
+server.auth.scheme('custom', scheme);
+server.auth.strategy('default', 'custom');
+server.auth.default('default');
+
+server.route({
+    method: 'GET',
+    path: '/',
+    handler: (request: Request, h: ResponseToolkit) => {
+        return request.auth.credentials.user;
+    }
+});
+
+server.start();
diff --git a/types/hapi/test/server/server-auth-test.ts b/types/hapi/test/server/server-auth-test.ts
new file mode 100644
index 0000000000..ae77089ddf
--- /dev/null
+++ b/types/hapi/test/server/server-auth-test.ts
@@ -0,0 +1,39 @@
+// https://github.com/hapijs/hapi/blob/master/API.md#-await-serverauthteststrategy-request
+//      https://github.com/hapijs/hapi/blob/master/API.md#-serverauthschemename-scheme
+import { Request, ResponseToolkit, Server, ServerAuthScheme, ServerAuthSchemeOptions } from "hapi";
+import * as Boom from "boom";
+
+const server = new Server({
+    port: 8000,
+});
+
+const scheme: ServerAuthScheme = (server: Server, options: ServerAuthSchemeOptions) => {
+    return {
+        authenticate: (request: Request, h: ResponseToolkit) => {
+            const req = request.raw.req;
+            const authorization = req.headers.authorization;
+            if (!authorization) {
+                throw Boom.unauthorized(null, 'Custom');
+            }
+            return h.authenticated({ credentials: { user: 'john' } });
+        }
+    };
+};
+
+server.auth.scheme('custom', scheme);
+server.auth.strategy('default', 'custom');
+
+server.route({
+    method: 'GET',
+    path: '/',
+    handler: async (request: Request, h: ResponseToolkit) => {
+        try {
+            const credentials = await request.server.auth.test('default', request);
+            return { status: true, user: credentials.name };
+        } catch (err) {
+            return { status: false };
+        }
+    }
+});
+
+server.start();
diff --git a/types/hapi/test/server/server-bind.ts b/types/hapi/test/server/server-bind.ts
new file mode 100644
index 0000000000..9bec0ec5f9
--- /dev/null
+++ b/types/hapi/test/server/server-bind.ts
@@ -0,0 +1,27 @@
+// https://github.com/hapijs/hapi/blob/master/API.md#-serverbindcontext
+import { Plugin, Request, ResponseToolkit, Server, ServerRegisterOptions } from "hapi";
+
+const server = new Server({
+    port: 8000,
+});
+const handler = (request: Request, h: ResponseToolkit) => {
+    return h.context.message;    // Or h.context.message
+};
+
+const plugin: Plugin<any> = {
+    name: 'example',
+    register: async (server: Server, options: ServerRegisterOptions) => {
+        const bind = {
+            message: 'hello'
+        };
+        server.bind(bind);
+        server.route({ method: 'GET', path: '/', handler });
+    }
+};
+
+server.start();
+server.register(plugin);
+
+server.events.on('start', () => {
+    console.log('Server started at: ' + server.info.uri);
+});
diff --git a/types/hapi/test/server/server-cache-provision.ts b/types/hapi/test/server/server-cache-provision.ts
new file mode 100644
index 0000000000..f30ce65cd6
--- /dev/null
+++ b/types/hapi/test/server/server-cache-provision.ts
@@ -0,0 +1,19 @@
+// https://github.com/hapijs/hapi/blob/master/API.md#-await-servercacheprovisionoptions
+import { Server } from "hapi";
+import * as catbox from "catbox";
+
+const server = new Server({
+    port: 8000,
+});
+server.initialize();
+server.cache.provision({engine: require('catbox-memory'), name: 'countries' });
+
+const cache: catbox.Policy = server.cache({segment: 'countries', cache: 'countries', expiresIn: 60 * 60 * 1000 });
+cache.set('norway', 'oslo', 10 * 1000, () => {});
+const value = cache.get('norway', () => {});
+
+server.start();
+
+server.events.on('start', () => {
+    console.log('Server started at: ' + server.info.uri);
+});
diff --git a/types/hapi/test/server/server-cache.ts b/types/hapi/test/server/server-cache.ts
new file mode 100644
index 0000000000..64f8c85e80
--- /dev/null
+++ b/types/hapi/test/server/server-cache.ts
@@ -0,0 +1,23 @@
+// https://github.com/hapijs/hapi/blob/master/API.md#-servercacheoptions
+import { Server, ServerOptionsCache } from "hapi";
+import * as catbox from "catbox";
+
+const server = new Server({
+    port: 8000,
+});
+
+const catboxOptions: ServerOptionsCache = {
+    segment: 'countries',
+    expiresIn: 60 * 60 * 1000
+};
+const cache: catbox.Policy = server.cache(catboxOptions);
+cache.set('norway', 'oslo', 10 * 1000, () => {});
+
+const value = cache.get('norway', () => {});
+console.log("Value: " + value);
+
+server.start();
+
+server.events.on('start', () => {
+    console.log('Server started at: ' + server.info.uri);
+});
diff --git a/types/hapi/test/server/server-decoder.ts b/types/hapi/test/server/server-decoder.ts
new file mode 100644
index 0000000000..965745ee7c
--- /dev/null
+++ b/types/hapi/test/server/server-decoder.ts
@@ -0,0 +1,8 @@
+// https://github.com/hapijs/hapi/blob/master/API.md#-serverdecoderencoding-decoder
+import { Server } from "hapi";
+import * as Zlib from "zlib";
+
+const server = new Server({ port: 80, routes: { payload: { compression: { special: { chunkSize: 16 * 1024 } } } } });
+server.decoder('special', (options) => Zlib.createGunzip(options));
+
+server.start();
diff --git a/types/hapi/test/server/server-decorations.ts b/types/hapi/test/server/server-decorations.ts
new file mode 100644
index 0000000000..8ee7dfaaa3
--- /dev/null
+++ b/types/hapi/test/server/server-decorations.ts
@@ -0,0 +1,15 @@
+// https://github.com/hapijs/hapi/blob/master/API.md#-serverdecoratetype-property-method-options
+import { ResponseToolkit, Server } from "hapi";
+
+const server = new Server({
+    port: 8000,
+});
+
+const success = (h: ResponseToolkit) => {
+    return h.response({ status: 'ok' });
+};
+
+server.start();
+server.decorate('toolkit', 'success', success);
+
+console.log(server.decorations.toolkit);
diff --git a/types/hapi/test/server/server-encoder.ts b/types/hapi/test/server/server-encoder.ts
new file mode 100644
index 0000000000..dd9f12f4db
--- /dev/null
+++ b/types/hapi/test/server/server-encoder.ts
@@ -0,0 +1,8 @@
+// https://github.com/hapijs/hapi/blob/master/API.md#-serverencoderencoding-encoder
+import { Server } from "hapi";
+import * as Zlib from "zlib";
+
+const server = new Server({ port: 80, routes: { payload: { compression: { special: { chunkSize: 16 * 1024 } } } } });
+server.encoder('special', (options) => Zlib.createGzip(options));
+
+server.start();
diff --git a/types/hapi/test/server/server-events-once.ts b/types/hapi/test/server/server-events-once.ts
new file mode 100644
index 0000000000..06261e8aae
--- /dev/null
+++ b/types/hapi/test/server/server-events-once.ts
@@ -0,0 +1,24 @@
+// from https://github.com/hapijs/hapi/blob/master/API.md#-servereventsoncecriteria-listener
+import { Request, ResponseToolkit, Server, ServerRoute } from "hapi";
+
+const serverRoute: ServerRoute = {
+    path: '/',
+    method: 'GET',
+    handler: (request: Request, h: ResponseToolkit) => {
+        return 'oks: ' + request.path;
+    }
+};
+
+const server = new Server({
+    port: 8000,
+});
+server.route(serverRoute);
+server.event('test1');
+server.event('test2');
+server.events.once('test1', (update: any) => { console.log(update); });
+server.events.once('test2', (...args: any[]) => { console.log(args); });
+server.events.emit('test1', 'hello-1');
+server.events.emit('test2', 'hello-2');       // Ignored
+
+server.start();
+console.log('Server started at: ' + server.info.uri);
diff --git a/types/hapi/test/server/server-events.ts b/types/hapi/test/server/server-events.ts
new file mode 100644
index 0000000000..d17af569ae
--- /dev/null
+++ b/types/hapi/test/server/server-events.ts
@@ -0,0 +1,11 @@
+// https://github.com/hapijs/hapi/blob/master/API.md#-servereventevents
+import { Server } from "hapi";
+
+const server = new Server({
+    port: 8000,
+});
+server.event('test');
+server.events.on('test', (update: any) => console.log(update));
+server.events.emit('test', 'hello');
+
+server.start();
diff --git a/types/hapi/test/server/server-expose.ts b/types/hapi/test/server/server-expose.ts
new file mode 100644
index 0000000000..2f1424b2ba
--- /dev/null
+++ b/types/hapi/test/server/server-expose.ts
@@ -0,0 +1,24 @@
+// https://github.com/hapijs/hapi/blob/master/API.md#-serverplugins
+import { Plugin, Server, ServerRegisterOptions } from "hapi";
+
+const plugin1: Plugin<any> = {
+    name: 'example1',
+    register: async (server: Server, options: ServerRegisterOptions) => {
+        server.expose('util', () => console.log('something'));
+    }
+};
+
+const plugin2: Plugin<any> = {
+    name: 'example2',
+    register: async (server: Server, options: ServerRegisterOptions) => {
+        server.expose('util', () => console.log('something'));
+    }
+};
+
+const server = new Server({
+    port: 8000,
+});
+
+server.start();
+server.register(plugin1);
+server.register(plugin2);
diff --git a/types/hapi/test/server/server-info.ts b/types/hapi/test/server/server-info.ts
new file mode 100644
index 0000000000..58045b19da
--- /dev/null
+++ b/types/hapi/test/server/server-info.ts
@@ -0,0 +1,10 @@
+// https://github.com/hapijs/hapi/blob/master/API.md#-serverinfo
+import { Server } from "hapi";
+
+const server = new Server({
+    port: 8000,
+});
+server.start();
+
+console.log(server.info);
+console.log('Server started at: ' + server.info.uri);
diff --git a/types/hapi/test/server/server-inject.ts b/types/hapi/test/server/server-inject.ts
new file mode 100644
index 0000000000..477a3b2ec4
--- /dev/null
+++ b/types/hapi/test/server/server-inject.ts
@@ -0,0 +1,19 @@
+// https://github.com/hapijs/hapi/blob/master/API.md#-await-serverinjectoptions
+import { Request, ResponseToolkit, Server, ServerRoute } from "hapi";
+
+const server = new Server({
+    port: 8000,
+});
+
+const serverRoute: ServerRoute = {
+    path: '/',
+    method: 'GET',
+    handler: (request: Request, h: ResponseToolkit) => {
+        return 'Success!';
+    }
+};
+
+server.route(serverRoute);
+server.start();
+
+server.inject('/').then(res => console.log(res.result));
diff --git a/types/hapi/test/server/server-listener.ts b/types/hapi/test/server/server-listener.ts
new file mode 100644
index 0000000000..160821f505
--- /dev/null
+++ b/types/hapi/test/server/server-listener.ts
@@ -0,0 +1,14 @@
+// https://github.com/hapijs/hapi/blob/master/API.md#-serverlistener
+import { Server } from "hapi";
+import * as SocketIO from "socket.io";
+
+const server = new Server({
+    port: 8000,
+});
+
+const io = SocketIO.listen(server.listener);
+io.sockets.on('connection', (socket) => {
+    socket.emit('welcome');
+});
+
+server.start();
diff --git a/types/hapi/test/server/server-load.ts b/types/hapi/test/server/server-load.ts
new file mode 100644
index 0000000000..d2ae11848a
--- /dev/null
+++ b/types/hapi/test/server/server-load.ts
@@ -0,0 +1,14 @@
+// https://github.com/hapijs/hapi/blob/master/API.md#-serverload
+import { Server } from "hapi";
+
+const server = new Server({
+    port: 8000,
+    load: { sampleInterval: 1000 }
+});
+server.start();
+
+setTimeout(() => {
+    console.log(server.load.rss);
+    console.log(server.load.eventLoopDelay);
+    console.log(server.load.heapUsed);
+}, 5 * 1000);
diff --git a/types/hapi/test/server/server-lookup.ts b/types/hapi/test/server/server-lookup.ts
new file mode 100644
index 0000000000..651ba0cd8b
--- /dev/null
+++ b/types/hapi/test/server/server-lookup.ts
@@ -0,0 +1,20 @@
+// https://github.com/hapijs/hapi/blob/master/API.md#-serverlookupid
+import { RequestRoute, Server } from "hapi";
+
+const server = new Server({
+    port: 8000,
+});
+
+server.route({
+    path: '/',
+    method: 'GET',
+    config: {
+        id: 'root',
+        handler: () => 'ok'
+    }
+});
+
+const route: RequestRoute | null = server.lookup('root');
+console.log(route);
+
+server.start();
diff --git a/types/hapi/test/server/server-match.ts b/types/hapi/test/server/server-match.ts
new file mode 100644
index 0000000000..27f59991b5
--- /dev/null
+++ b/types/hapi/test/server/server-match.ts
@@ -0,0 +1,23 @@
+// https://github.com/hapijs/hapi/blob/master/API.md#-servermatchmethod-path-host
+import { RequestRoute, Server } from "hapi";
+
+const server = new Server({
+    port: 8000,
+});
+
+server.route({
+    path: '/',
+    method: 'GET',
+    config: {
+        id: 'root',
+        handler: () => 'ok'
+    }
+});
+
+const route: RequestRoute | null = server.match('get', '/');
+
+if (route !== null) {
+	console.log(route.path);
+}
+
+server.start();
diff --git a/types/hapi/test/server/server-method.ts b/types/hapi/test/server/server-method.ts
new file mode 100644
index 0000000000..2d2b3bdf58
--- /dev/null
+++ b/types/hapi/test/server/server-method.ts
@@ -0,0 +1,24 @@
+// https://github.com/hapijs/hapi/blob/master/API.md#-servermethodmethods
+import { Server, ServerMethodConfigurationObject } from "hapi";
+
+const server = new Server({
+    port: 8000,
+});
+server.start();
+
+const add = (a: any, b: any) => {
+    return a + b;
+};
+
+const methodObject: ServerMethodConfigurationObject = {
+    name: 'sum',
+    method: add,
+    options: {
+        cache: {
+            expiresIn: 2000,
+            generateTimeout: 100
+        }
+    }
+};
+
+server.method(methodObject);
diff --git a/types/hapi/test/server/server-methods.ts b/types/hapi/test/server/server-methods.ts
new file mode 100644
index 0000000000..f9a2d08e6c
--- /dev/null
+++ b/types/hapi/test/server/server-methods.ts
@@ -0,0 +1,11 @@
+// https://github.com/hapijs/hapi/blob/master/API.md#-servermethods
+import { Server } from "hapi";
+
+const server = new Server({
+    port: 8000,
+});
+server.start();
+
+server.method('add', (a, b) => (a + b));
+const result = server.methods.add(1, 2);    // 3
+console.log(result);
diff --git a/types/hapi/test/server/server-mime.ts b/types/hapi/test/server/server-mime.ts
new file mode 100644
index 0000000000..3a50da2154
--- /dev/null
+++ b/types/hapi/test/server/server-mime.ts
@@ -0,0 +1,22 @@
+// https://github.com/hapijs/hapi/blob/master/API.md#-servermime
+import { Server, ServerOptions } from "hapi";
+
+const options: ServerOptions = {
+    port: 8000,
+    mime: {
+        override: {
+            'node/module': {
+                source: 'steve',
+                compressible: false,
+                extensions: ['node', 'module', 'npm'],
+                type: 'node/module'
+            }
+        }
+    }
+};
+
+const server = new Server(options);
+console.log(server.mime.path('code.js').type);        // 'application/javascript'
+console.log(server.mime.path('file.npm').type);        // 'node/module'
+
+server.start();
diff --git a/types/hapi/test/server/server-options.ts b/types/hapi/test/server/server-options.ts
new file mode 100644
index 0000000000..ce487bbb20
--- /dev/null
+++ b/types/hapi/test/server/server-options.ts
@@ -0,0 +1,106 @@
+// https://github.com/hapijs/hapi/blob/master/API.md#-server-options
+import { Plugin, RouteOptions, Server, ServerOptions, ServerRegisterOptions } from "hapi";
+import { MimosOptions, MimosOptionsValue } from "mimos";
+
+const mimeOptions: MimosOptions = {
+    override: {
+        'node/module': {
+            source: 'iana',
+            compressible: true,
+            extensions: ['node', 'modsule', 'npm'],
+            type: 'node/module'
+        },
+        'application/javascript': {
+            source: 'iana',
+            charset: 'UTF-8',
+            compressible: true,
+            extensions: ['js', 'javascript'],
+            type: 'text/javascript'
+        },
+        'text/html': {
+            predicate: (mime: MimosOptionsValue) => {
+                if (1 === 1) {
+                    // mime.foo = 'test';
+                } else {
+                    // mime.foo = 'bar';
+                }
+                return mime;
+            }
+        }
+    }
+};
+
+const plugin: Plugin<any> = {
+    name: 'example',
+    register: async (server: Server, options: ServerRegisterOptions) => {
+        server.expose('key', 'value');
+        server.plugins.example.other = 'other';
+        console.log(server.plugins.example.key);      // 'value'
+        console.log(server.plugins.example.other);    // 'other'
+    }
+};
+
+const routeOptions: RouteOptions = {
+    compression: {
+        test: {
+            some: 'option'
+        }
+    },
+    files: {
+        relativeTo: __dirname
+    },
+    cors: {
+        origin: ['http://test.example.com', 'http://www.example.com', 'http://*.a.com']
+    },
+};
+
+const options: ServerOptions = {
+    address: '0.0.0.0',
+    app: {
+        key1: 'value1',
+        key2: 'value2',
+        any_thing: 'any_value',
+    },
+    autoListen: true,
+    cache: {
+        engine: require('catbox-memory'),
+        name: 'test',
+        shared: true,
+        partition: 'hapi-cache',
+        any_thing_1: 'any_thing_1',
+        any_thing_2: 'any_thing_2'
+    },
+    compression: {
+        minBytes: 1024
+    },
+    debug: {
+        request: ['implementation']
+    },
+    host: 'localhost',
+    listener: undefined,
+    load: { sampleInterval: 0 },
+    mime: mimeOptions,
+    plugins: plugin,
+    port: 8000,
+    router: {
+        isCaseSensitive: true,
+        stripTrailingSlash: false
+    },
+    routes: routeOptions,
+    state: {
+        strictHeader: true,
+        ignoreErrors: false,
+        isSecure: true,
+        isHttpOnly: true,
+        isSameSite: 'Strict',
+        encoding: 'none'
+    },
+    tls: undefined
+};
+
+const server = new Server(options);
+server.start();
+
+server.events.on('start', () => {
+    console.log('Server started at: ' + server.info.uri);
+});
diff --git a/types/hapi/test/server/server-path.ts b/types/hapi/test/server/server-path.ts
new file mode 100644
index 0000000000..36f346cb10
--- /dev/null
+++ b/types/hapi/test/server/server-path.ts
@@ -0,0 +1,30 @@
+// https://github.com/hapijs/hapi/blob/master/API.md#-serverpathrelativeto
+import { Plugin, Server, ServerRegisterOptions, ServerRoute } from "hapi";
+
+const server = new Server({
+    port: 8000,
+});
+
+const serverRouteOption: ServerRoute = {
+    path: '/file',
+    method: 'GET',
+    handler: {
+        file: './test.html'
+    }
+};
+
+const plugin: Plugin<any> = {
+    name: 'example',
+    register: async (server: Server, options: ServerRegisterOptions) => {
+        // Assuming the Inert plugin was registered previously
+        server.path(__dirname + '../static');
+        server.route(serverRouteOption);
+    }
+};
+
+server.start();
+server.register(plugin);
+
+server.events.on('start', () => {
+    console.log('Server started at: ' + server.info.uri);
+});
diff --git a/types/hapi/test/server/server-plugins.ts b/types/hapi/test/server/server-plugins.ts
new file mode 100644
index 0000000000..970b53fb6d
--- /dev/null
+++ b/types/hapi/test/server/server-plugins.ts
@@ -0,0 +1,85 @@
+// https://github.com/hapijs/hapi/blob/master/API.md#-serverplugins
+import { Plugin, Server, ServerRegisterOptions } from "hapi";
+
+interface Plugin1 {
+	one: 1;
+}
+
+interface Plugin2 {
+	two: 2;
+}
+
+interface Plugin3 {
+	three: 3;
+}
+
+const plugin1: Plugin<Plugin1> = {
+    name: 'plugin1',
+    register: async (server: Server, options: Plugin1) => {
+        server.expose('key', 'value');
+        server.plugins.example.other = 'other';
+        console.log(server.plugins.example.key);      // 'value'
+        console.log(server.plugins.example.other);    // 'other'
+    }
+};
+
+const plugin2: Plugin<Plugin2> = {
+	name: 'plugin2',
+	register: async (server: Server, options: Plugin2) => {}
+};
+
+const plugin3: Plugin<Plugin3> = {
+	name: 'plugin3',
+	register: async (server: Server, options: Plugin3) => {}
+};
+
+const server = new Server({
+    port: 8000,
+});
+
+server.start();
+server.register(plugin1);
+
+server.register({
+	plugin: plugin1,
+	options: {one: 1}
+});
+
+server.register([
+	{
+		plugin: plugin2,
+		options: {two: 2}
+	},
+	{
+		plugin: plugin3,
+		options: {three: 3}
+	},
+	{
+		plugin: plugin1,
+		options: {one: 1}
+	},
+	{
+		plugin: plugin2,
+		options: {two: 2}
+	},
+	{
+		plugin: plugin3,
+		options: {three: 3}
+	},
+	{
+		plugin: plugin1,
+		options: {one: 1}
+	},
+	{
+		plugin: plugin2,
+		options: {two: 2}
+	},
+	{
+		plugin: plugin3,
+		options: {three: 3}
+	},
+	{
+		plugin: plugin1,
+		options: {one: 1}
+	}
+]);
diff --git a/types/hapi/test/server/server-settings.ts b/types/hapi/test/server/server-settings.ts
new file mode 100644
index 0000000000..488e31629b
--- /dev/null
+++ b/types/hapi/test/server/server-settings.ts
@@ -0,0 +1,12 @@
+// https://github.com/hapijs/hapi/blob/master/API.md#-serversettings
+import { Server } from "hapi";
+
+const server = new Server({
+    port: 8000,
+    app: {
+        key: 'value'
+    }
+});
+server.start();
+
+console.log(server.settings.app);   // { key: 'value' }
diff --git a/types/hapi/test/server/server-start.ts b/types/hapi/test/server/server-start.ts
new file mode 100644
index 0000000000..f41349e88c
--- /dev/null
+++ b/types/hapi/test/server/server-start.ts
@@ -0,0 +1,11 @@
+// https://github.com/hapijs/hapi/blob/master/API.md#-await-serverstart
+import { Server } from "hapi";
+
+const server = new Server({
+    port: 8000,
+});
+server.start();
+
+server.events.on('start', () => {
+    console.log('Server started at: ' + server.info.uri);
+});
diff --git a/types/hapi/test/server/server-state.ts b/types/hapi/test/server/server-state.ts
new file mode 100644
index 0000000000..9c51ee4748
--- /dev/null
+++ b/types/hapi/test/server/server-state.ts
@@ -0,0 +1,27 @@
+// from https://hapijs.com/tutorials/cookies?lang=en_US
+import { Request, ResponseToolkit, Server, ServerOptions, ServerRoute, ServerStateCookieOptions } from "hapi";
+
+const options: ServerOptions = {
+    port: 8000,
+};
+
+const serverRoute: ServerRoute = {
+    path: '/say-hello',
+    method: 'GET',
+    handler: (request: Request, h: ResponseToolkit) => {
+        return h.response('Hello').state('data', { firstVisit: false });
+    }
+};
+
+const server = new Server(options);
+server.route(serverRoute);
+
+const stateOption: ServerStateCookieOptions = {
+    ttl: 24 * 60 * 60 * 1000, // One day
+    isSecure: false,
+    isHttpOnly: false,
+    encoding: 'base64json',
+};
+server.state('data', stateOption);
+server.start();
+console.log('Server started at: ' + server.info.uri);
diff --git a/types/hapi/test/server/server-stop.ts b/types/hapi/test/server/server-stop.ts
new file mode 100644
index 0000000000..7922fa944e
--- /dev/null
+++ b/types/hapi/test/server/server-stop.ts
@@ -0,0 +1,17 @@
+// https://github.com/hapijs/hapi/blob/master/API.md#-await-serverstopoptions
+import { Server } from "hapi";
+
+const server = new Server({
+    port: 8000,
+});
+
+server.start();
+server.events.on('start', () => {
+    console.log('Server started at: ' + server.info.uri);
+});
+server.events.on('stop', () => {
+    console.log('Server stoped.');
+});
+setTimeout(() => {
+    server.stop({ timeout: 10 * 1000 });
+}, 5 * 1000);
diff --git a/types/hapi/test/server/server-table.ts b/types/hapi/test/server/server-table.ts
new file mode 100644
index 0000000000..02f83e90fd
--- /dev/null
+++ b/types/hapi/test/server/server-table.ts
@@ -0,0 +1,22 @@
+// https://github.com/hapijs/hapi/blob/master/API.md#-servertablehost
+import { Request, ResponseToolkit, Server, ServerOptions } from "hapi";
+
+const options: ServerOptions = {
+    port: 8000,
+};
+
+const server = new Server(options);
+server.app!.key = 'value2';
+
+server.route({
+    path: '/',
+    method: 'GET',
+    handler: (request: Request, h: ResponseToolkit) => {
+        return h.response("Hello World");
+    }
+});
+
+server.start();
+const table = server.table();
+console.log(table);
+console.log('Server started at: ' + server.info.uri);
diff --git a/types/hapi/test/server/server-version.ts b/types/hapi/test/server/server-version.ts
new file mode 100644
index 0000000000..b8e59497fc
--- /dev/null
+++ b/types/hapi/test/server/server-version.ts
@@ -0,0 +1,9 @@
+// https://github.com/hapijs/hapi/blob/master/API.md#-serverversion
+import { Server } from "hapi";
+
+const server = new Server({
+    port: 8000,
+});
+
+server.start();
+console.log(server.version);        // 17.x.x
diff --git a/types/hapi/tsconfig.json b/types/hapi/tsconfig.json
index 96790b3bff..54ac999c95 100644
--- a/types/hapi/tsconfig.json
+++ b/types/hapi/tsconfig.json
@@ -14,87 +14,61 @@
         ],
         "types": [],
         "paths": {
-            "boom": ["boom/v4"]
+            "boom": [
+                "boom/v4"
+            ]
         },
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     },
     "files": [
         "index.d.ts",
-        "test/connection/table.ts",
-        "test/continuation/errors.ts",
-        "test/getting-started/01-creating-a-server.ts",
-        "test/getting-started/02-adding-routes.ts",
-        "test/getting-started/03-serving-static-content.ts",
-        "test/getting-started/04-using-plugins.ts",
-        "test/path/catch-all.ts",
-        "test/path/parameters.ts",
-        "test/plugins/options.ts",
-        "test/reply/continue.ts",
-        "test/reply/entity.ts",
-        "test/reply/redirect.ts",
-        "test/reply/reply.ts",
-        "test/reply/state_cookie.ts",
+        "test/request/catch-all.ts",
         "test/request/event-types.ts",
-        "test/request/generate-response.ts",
         "test/request/get-log.ts",
-        "test/request/log.ts",
+        "test/request/parameters.ts",
         "test/request/query.ts",
-        "test/request/set-method.ts",
-        "test/request/set-url.ts",
-        "test/request/tail.ts",
-        "test/response/error-representation.ts",
+        "test/response/continue.ts",
         "test/response/error.ts",
-        "test/response/events.ts",
-        "test/response/flow-control.ts",
-        "test/route/additional-options.ts",
-        "test/route/auth.ts",
+        "test/response/redirect.ts",
+        "test/response/response.ts",
+        "test/response/response-events.ts",
+        "test/route/adding-routes.ts",
         "test/route/config.ts",
         "test/route/handler.ts",
-        "test/route/plugins.ts",
-        "test/route/prerequisites.ts",
-        "test/route/public-interface.ts",
-        "test/route/validate.ts",
-        "test/server/app.ts",
-        "test/server/auth.ts",
-        "test/server/bind.ts",
-        "test/server/cache.ts",
-        "test/server/connection-options.ts",
-        "test/server/connections.ts",
-        "test/server/decoder.ts",
-        "test/server/decorate.ts",
-        "test/server/dependency.ts",
-        "test/server/emit.ts",
-        "test/server/encoder.ts",
-        "test/server/event.ts",
-        "test/server/expose.ts",
-        "test/server/ext.ts",
-        "test/server/handler.ts",
-        "test/server/info.ts",
-        "test/server/initialize.ts",
-        "test/server/inject.ts",
-        "test/server/listener.ts",
-        "test/server/load.ts",
-        "test/server/log.ts",
-        "test/server/lookup.ts",
-        "test/server/match.ts",
-        "test/server/method.ts",
-        "test/server/methods.ts",
-        "test/server/mime.ts",
-        "test/server/new.ts",
-        "test/server/on.ts",
-        "test/server/once.ts",
-        "test/server/path.ts",
-        "test/server/plugins.ts",
-        "test/server/realm.ts",
-        "test/server/register.ts",
-        "test/server/route.ts",
-        "test/server/select.ts",
-        "test/server/settings.ts",
-        "test/server/start.ts",
-        "test/server/state.ts",
-        "test/server/stop.ts",
-        "test/server/table.ts",
-        "test/server/version.ts"
+        "test/route/route-options.ts",
+        "test/route/route-options-pre.ts",
+        "test/route/validation.ts",
+        "test/server/server-app.ts",
+        "test/server/server-auth-api.ts",
+        "test/server/server-auth-default.ts",
+        "test/server/server-auth-test.ts",
+        "test/server/server-bind.ts",
+        "test/server/server-cache.ts",
+        "test/server/server-cache-provision.ts",
+        "test/server/server-decoder.ts",
+        "test/server/server-decorations.ts",
+        "test/server/server-encoder.ts",
+        "test/server/server-events.ts",
+        "test/server/server-events-once.ts",
+        "test/server/server-expose.ts",
+        "test/server/server-info.ts",
+        "test/server/server-inject.ts",
+        "test/server/server-listener.ts",
+        "test/server/server-load.ts",
+        "test/server/server-lookup.ts",
+        "test/server/server-match.ts",
+        "test/server/server-method.ts",
+        "test/server/server-methods.ts",
+        "test/server/server-mime.ts",
+        "test/server/server-options.ts",
+        "test/server/server-path.ts",
+        "test/server/server-plugins.ts",
+        "test/server/server-settings.ts",
+        "test/server/server-start.ts",
+        "test/server/server-state.ts",
+        "test/server/server-stop.ts",
+        "test/server/server-table.ts",
+        "test/server/server-version.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/hapi/tslint.json b/types/hapi/tslint.json
index a41bf5d19a..f93cf8562a 100644
--- a/types/hapi/tslint.json
+++ b/types/hapi/tslint.json
@@ -1,79 +1,3 @@
 {
-    "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/hapi/v16/index.d.ts b/types/hapi/v16/index.d.ts
new file mode 100644
index 0000000000..ee22f1dea7
--- /dev/null
+++ b/types/hapi/v16/index.d.ts
@@ -0,0 +1,2723 @@
+// Type definitions for hapi 16.1
+// Project: https://github.com/hapijs/hapi
+// Definitions by: Jason Swearingen <https://github.com/jasonswearingen>, AJP <https://github.com/AJamesPhillips>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +                                                                           +
+ +                                                                           +
+ +                                                                           +
+ +                      WARNING: BACKWARDS INCOMPATIBLE                      +
+ +                                                                           +
+ +                                                                           +
+ +                                                                           +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + *
+ *
+ * Removal of IPromise replaced with Promise
+ * Removal of IReplyStrict<>
+ * Removal of IReply replaced with different interfaces like:
+ *      ReplyWithContinue
+ *      ReplyNoContinue, etc.
+ * Renaming of all interfaces to remove preceding I in preparation of dtslint
+ */
+
+/// <reference types="node" />
+
+import Events = require("events");
+import stream = require("stream");
+import http = require("http");
+import https = require("https");
+import url = require("url");
+import zlib = require("zlib");
+import domain = require("domain");
+
+import * as Boom from 'boom';
+import {
+    ValidationOptions as JoiValidationOptions,
+    SchemaMap as JoiSchemaMap,
+    Schema as JoiSchema,
+} from 'joi';
+// TODO check JoiValidationObject is correct for "a Joi validation object"
+type JoiValidationObject = JoiSchema | JoiSchemaMap | (JoiSchema | JoiSchemaMap)[];
+
+import * as Catbox from 'catbox';
+import { MimosOptions } from 'mimos';
+import Podium = require('podium');
+import * as Shot from 'shot';
+
+export interface Dictionary<T> {
+    [key: string]: T;
+}
+
+/**
+ * Server
+ * The Server object is the main application container. The server manages all incoming connections along with all the facilities provided by the framework. A server can contain more than one connection (e.g. listen to port 80 and 8080).
+ * [See docs](https://hapijs.com/api/16.1.1#server)
+ * [See docs](https://hapijs.com/api/16.1.1#server-properties)
+ * [See docs](https://hapijs.com/api/16.1.1#server-events)
+ */
+export class Server extends Podium {
+    /**
+     * Creates a new Server object
+     */
+    constructor(options?: ServerOptions);
+
+    /**
+     * Provides a safe place to store server-specific run-time application data without potential conflicts with the framework internals. The data can be accessed whenever the server is accessible. Initialized with an empty object.
+     * [See docs](https://hapijs.com/api/16.1.1#serverapp)
+     */
+    app?: any;
+    /**
+     * An array containing the server's connections. When the server object is returned from server.select(), the connections array only includes the connections matching the selection criteria.
+     * [See docs](https://hapijs.com/api/16.1.1#serverconnections)
+     */
+    connections: ServerConnection[];
+    /**
+     * When the server contains exactly one connection, info is an object containing information about the sole connection
+     * When the server contains more than one connection, each server.connections array member provides its own connection.info.
+     * [See docs](https://hapijs.com/api/16.1.1#serverinfo)
+     */
+    info: ServerConnectionInfo | null;
+    /**
+     * An object containing the process load metrics (when load.sampleInterval is enabled):
+     * [See docs](https://hapijs.com/api/16.1.1#serverload)
+     */
+    load: {
+        /** event loop delay milliseconds. */
+        eventLoopDelay: number;
+        /** V8 heap usage. */
+        heapUsed: number;
+        /** RSS memory usage. */
+        rss: number;
+    };
+    /**
+     * When the server contains exactly one connection, listener is the node HTTP server object of the sole connection.
+     * When the server contains more than one connection, each server.connections array member provides its own connection.listener.
+     * [See docs](https://hapijs.com/api/16.1.1#serverlistener)
+     */
+    listener: ServerListener | null;
+    /**
+     * An object providing access to the server methods cs://hapijs.com/api/16.1.1#servermethodname-method-options} where each server method name is an object property.
+     * [See docs](https://hapijs.com/api/16.1.1#servermethods)
+     */
+    methods: Dictionary<ServerMethod>;
+    /**
+     * Provides access to the server MIME database used for setting content-type information. The object must not be modified directly but only through the mime server setting.
+     * [See docs](https://hapijs.com/api/16.1.1#servermime)
+     */
+    readonly mime: {path(path: string): {type: string}};
+    /**
+     * An object containing the values exposed by each plugin registered where each key is a plugin name and the values are the exposed properties by each plugin using server.expose(). Plugins may set the value of the server.plugins[name] object directly or via the server.expose() method.
+     * [See docs](https://hapijs.com/api/16.1.1#serverplugins)
+     */
+    plugins: PluginsStates;
+    /**
+     * The realm object contains server-wide or plugin-specific state that can be shared across various methods. For example, when calling server.bind(), the active realm settings.bind property is set which is then used by routes and extensions added at the same level (server root or plugin). Realms are a limited version of a sandbox where plugins can maintain state used by the framework when adding routes, extensions, and other properties.
+     * [See docs](https://hapijs.com/api/16.1.1#serverrealm)
+     */
+    readonly realm: ServerRealm;
+    /**
+     * When the server contains exactly one connection, registrations is an object where each key is a registered plugin name
+     * When the server contains more than one connection, each server.connections array member provides its own connection.registrations.
+     * TODO check and offer PR to update Hapi docs: Assuming readonly.
+     * [See docs](https://hapijs.com/api/16.1.1#serverregistrations)
+     */
+    readonly registrations: ServerRegisteredPlugins;
+    /**
+     * The root server object containing all the connections and the root server methods (e.g. start(), stop(), connection()).
+     * TODO, check and offer PR to update Hapi docs: Marked as optional as presumably root server does not reference itself.
+     * [See docs](https://hapijs.com/api/16.1.1#serverroot)
+     */
+    root?: Server;
+    /**
+     * The server configuration object after defaults applied.
+     * [See docs](https://hapijs.com/api/16.1.1#serversettings)
+     */
+    settings: ServerOptions;
+    /**
+     * The hapi module version number.
+     * [See docs](https://hapijs.com/api/16.1.1#serverversion)
+     */
+    version: string;
+
+    /**
+     * [See docs](https://hapijs.com/api/16.1.1#serverauthapi)
+     * [See docs](https://hapijs.com/api/16.1.1#serverauthdefaultoptions)
+     * [See docs](https://hapijs.com/api/16.1.1#serverauthschemename-scheme)
+     * [See docs](https://hapijs.com/api/16.1.1#serverauthstrategyname-scheme-mode-options)
+     * [See docs](https://hapijs.com/api/16.1.1#serverauthteststrategy-request-next)
+     */
+    auth: ServerAuth;
+
+    /**
+     * Sets a global context used as the default bind object when adding a route or an extension
+     * When setting context inside a plugin, the context is applied only to methods set up by the plugin. Note that the context applies only to routes and extensions added after it has been set. Ignored if the method being bound is an arrow function.
+     * @param context  the object used to bind this in handler and extension methods.
+     * [See docs](https://hapijs.com/api/16.1.1#serverbindcontext)
+     */
+    bind(context: any): void;
+    /**
+     * [See docs](https://hapijs.com/api/16.1.1#servercacheoptions)
+     * [See docs](https://hapijs.com/api/16.1.1#servercacheprovisionoptions-callback)
+     */
+    cache: ServerCacheMethod;
+    /**
+     * Adds an incoming server connection
+     * Returns a server object with the new connections selected.
+     * Must be called before any other server method that modifies connections is called for it to apply to the new connection (e.g. server.state())
+     * Note that the options object is deeply cloned (with the exception of listener which is shallowly copied) and cannot contain any values that are unsafe to perform deep copy on.
+     *
+     * [See docs](https://hapijs.com/api/16.1.1#serverconnectionoptions) for various advantage topics covering usage and caveats around use of the function in plugin register(), connectionless plugins calling connection(), etc.
+     * @param connection  a connection configuration object or array of objects
+     */
+    connection(options?: ServerConnectionOptions[]): Server;
+    connection(options?: ServerConnectionOptions): Server;
+    // connection: (options: ServerConnectionOptions[] | ServerConnectionOptions) => Server;
+    /**
+     * Registers a custom content decoding compressor to extend the built-in support for 'gzip' and 'deflate'
+     * [See docs](https://hapijs.com/api/16.1.1#serverdecoderencoding-decoder)
+     * @param encoding  the decoder name string.
+     * @param decoder  a function using the signature function(options) where options are the encoding specific options configured in the route payload.compression configuration option, and the return value is an object compatible with the output of node's zlib.createGunzip().
+     */
+    decoder(encoding: string, decoder: ((options: CompressionDecoderSettings) => zlib.Gunzip)): void;
+    /**
+     * Extends various framework interfaces with custom methods
+     * Note that decorations apply to the entire server and all its connections regardless of current selection.
+     * [See docs](https://hapijs.com/api/16.1.1#serverdecoratetype-property-method-options)
+     *
+     * NOTE: it's not possible to type the result of this action.
+     * It's advised that in a custom definition file, you extend the ReplyNoContinue
+     * and ReplyWithContinue functions.  See Inert `.file` for an example.
+     * Or if it is not part of a library / plugin then you use a namespace within
+     * your code to type the request, server and or reply.  See
+     * [tests/server/decorate.ts](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/hapi/tests/server/decorate.ts)
+     * for examples.
+     * @param type  the interface being decorated. Supported types:
+     *      * 'request' - adds methods to the Request object.
+     *      * 'reply' - adds methods to the reply interface.
+     *      * 'server' - adds methods to the Server object.
+     * @param property  the object decoration key name.
+     * @param method  the extension function or other value.
+     * @param options  if the type is 'request', supports the following optional settings:
+     *      * apply - if true, the method function is invoked using the signature function(request) where request is the current request object and the returned value is assigned as the decoration.
+     */
+    decorate(type: 'request' | 'reply' | 'server', property: string, method: Function): void;
+    decorate(type: 'request', property: string, method: Function, options?: {apply: false}): void;
+    decorate(type: 'request', property: string, method: (request: Request) => Function, options: {apply: true}): void;
+    /**
+     * The server.decorate('server', ...) method can modify this prototype/interface.
+     * Have disabled these typings as there is a better alternative, see example in: tests/server/decorate.ts
+     * [And discussion here](https://github.com/DefinitelyTyped/DefinitelyTyped/issues/14517#issuecomment-298891630)
+     */
+    // [index: string]: any;
+    /**
+     * Used within a plugin to declare a required dependency on other plugins
+     * The after method is identical to setting a server extension point on 'onPreStart'. Connectionless plugins (those with attributes.connections set to false) can only depend on other connectionless plugins (server initialization will fail even of the dependency is loaded but is not connectionless).
+     * Dependencies can also be set via the register attributes property (does not support setting after).
+     * [See docs](https://hapijs.com/api/16.1.1#serverdependencydependencies-after)
+     * @param dependencies  a single string or array of plugin name strings which must be registered in order for this plugin to operate. Plugins listed must be registered before the server is initialized or started. Does not provide version dependency which should be implemented using npm peer dependencies.
+     * @param after  an optional function called after all the specified dependencies have been registered and before the server starts. The function is only called if the server is initialized or started. If a circular dependency is detected, an exception is thrown (e.g. two plugins each has an after function to be called after the other). The function signature is function(server, next)
+     */
+    dependency(dependencies: string | string[], after?: AfterDependencyLoadCallback): void;
+    /**
+     * Emits a custom application event update to all the subscribed listeners
+     * Note that events must be registered before they can be emitted or subscribed to by calling server.event(events). This is done to detect event name misspelling and invalid event activities.
+     * [See docs](https://hapijs.com/api/16.1.1#serveremitcriteria-data-callback)
+     * @param criteria  the event update criteria which if an object can have the following optional keys (unless noted otherwise):
+     *      * name - the event name string (required).
+     *      * channel - the channel name string.
+     *      * tags - a tag string or array of tag strings.
+     * @param data  the value emitted to the subscribers. If data is a function, the function signature is function() and it called once to generate (return value) the actual data emitted to the listeners. If no listeners match the event, the data function is not invoked.
+     * @param callback  an optional callback method invoked when all subscribers have been notified using the signature function(). The callback is called only after all the listeners have been notified, including any event updates emitted earlier (the order of event updates are guaranteed to be in the order they were emitted).
+     */
+    emit(criteria: string | {name: string, channel?: string, tags?: string | string[]}, data: any, callback?: () => void): void;
+    /**
+     * Registers a custom content encoding compressor to extend the built-in support for 'gzip' and 'deflate'
+     * [See docs](https://hapijs.com/api/16.1.1#serverencoderencoding-encoder)
+     * @param encoding  the encoder name string.
+     * @param encoder  a function using the signature function(options) where options are the encoding specific options configured in the route compression configuration option, and the return value is an object compatible with the output of node's zlib.createGzip().
+     */
+    encoder(encoding: string, encoder: ((options: CompressionEncoderSettings) => zlib.Gzip)): void;
+    /**
+     * Register custom application events
+     * [See docs](https://hapijs.com/api/16.1.1#servereventevents)
+     * @param events  see ApplicationEvent
+     */
+    event(events: ApplicationEvent[]): void;
+    event(events: ApplicationEvent): void;
+    /**
+     * Used within a plugin to expose a property via server.plugins[name]
+     * [See docs](https://hapijs.com/api/16.1.1#serverexposekey-value)
+     * @param key  the key assigned (server.plugins[name][key]).
+     * @param value  the value assigned.
+     */
+    expose(key: string, value: any): void;
+    /**
+     * Merges an object into to the existing content of server.plugins[name]
+     * Note that all properties of obj are deeply cloned into server.plugins[name], so you should avoid using this method for exposing large objects that may be expensive to clone or singleton objects such as database client objects. Instead favor the server.expose(key, value) form, which only copies a reference to value.
+     * [See docs](https://hapijs.com/api/16.1.1#serverexposeobj)
+     * @param obj  the object merged into the exposed properties container.
+     */
+    expose(obj: Object): void;
+    /**
+     * Registers an extension function in one of the available extension points
+     * [See docs](https://hapijs.com/api/16.1.1#serverextevents)
+     * @param events  see @ServerExtConfigurationObject
+     */
+    ext(events: ServerStartExtConfigurationObject): void;
+    ext(events: ServerStartExtConfigurationObject[]): void;
+    ext(events: ServerRequestExtConfigurationObjectWithRequest): void;
+    ext(events: ServerRequestExtConfigurationObjectWithRequest[]): void;
+    /**
+     * Registers a single extension event using the same properties as used in server.ext(events), but passed as arguments.
+     * [See docs](https://hapijs.com/api/16.1.1#serverextevent-method-options)
+     * @param event  the extension point event name.
+     * @param method  a function or an array of functions to be executed at a specified point during request processing.
+     * @param options
+     */
+    ext(event: ServerStartExtPoints, method: ServerExtFunction[], options?: ServerExtOptions): void;
+    ext(event: ServerStartExtPoints, method: ServerExtFunction, options?: ServerExtOptions): void;
+    ext(event: ServerRequestExtPoints, method: ServerExtRequestHandler[], options?: ServerExtOptions): void;
+    ext(event: ServerRequestExtPoints, method: ServerExtRequestHandler, options?: ServerExtOptions): void;
+    /**
+     * Registers a new handler type to be used in routes
+     * The method function can have a defaults object or function property. If the property is set to an object, that object is used as the default route config for routes using this handler. If the property is set to a function, the function uses the signature function(method) and returns the route default configuration.
+     * [See docs](https://hapijs.com/api/16.1.1#serverhandlername-method)
+     * @param name  string name for the handler being registered. Cannot override any previously registered type.
+     * @param method  the function used to generate the route handler using the signature function(route, options) where:
+     *      * route - the route public interface object.
+     *      * options - the configuration object provided in the handler config.
+     */
+    handler(name: string, method: MakeRouteHandler): void;
+    /**
+     * Initializes the server (starts the caches, finalizes plugin registration) but does not start listening on the connection ports
+     * Note that if the method fails and the callback includes an error, the server is considered to be in an undefined state and should be shut down. In most cases it would be impossible to fully recover as the various plugins, caches, and other event listeners will get confused by repeated attempts to start the server or make assumptions about the healthy state of the environment. It is recommended to assert that no error has been returned after calling initialize() to abort the process when the server fails to start properly. If you must try to resume after an error, call server.stop() first to reset the server state.
+     * [See docs](https://hapijs.com/api/16.1.1#serverinitializecallback)
+     * @param callback  the callback method when server initialization is completed or failed with the signature function(err)
+     */
+    initialize(callback: (err: Error) => void): void;
+    initialize(): Promise<Error>;
+    /**
+     * When the server contains exactly one connection, injects a request into the sole connection simulating an incoming HTTP request without making an actual socket connection. Injection is useful for testing purposes as well as for invoking routing logic internally without the overhead or limitations of the network stack. Utilizes the shot module for performing injections, with some additional options and response properties
+     * If no callback is provided, a Promise object is returned.
+     * When the server contains more than one connection, each server.connections array member provides its own connection.inject().
+     * [See docs](https://hapijs.com/api/16.1.1#serverinjectoptions-callback)
+     * @param options  can be assigned a string with the requested URI, or an object
+     * @param callback  the callback function with signature function(res)
+     */
+    inject(options: string | InjectedRequestOptions, callback: (res: InjectedResponseObject) => void): void;
+    inject(options: string | InjectedRequestOptions, ): Promise<InjectedResponseObject>;
+    /**
+     * Logs server events that cannot be associated with a specific request. When called the server emits a 'log' event which can be used by other listeners or plugins to record the information or output to the console.
+     * [See docs](https://hapijs.com/api/16.1.1#serverlogtags-data-timestamp)
+     * @param tags  a string or an array of strings (e.g. ['error', 'database', 'read']) used to identify the event. Tags are used instead of log levels and provide a much more expressive mechanism for describing and filtering events. Any logs generated by the server internally include the 'hapi' tag along with event-specific information.
+     * @param data  an optional message string or object with the application data being logged. If data is a function, the function signature is function() and it called once to generate (return value) the actual data emitted to the listeners. If no listeners match the event, the data function is not invoked.
+     * @param timestamp  an optional timestamp expressed in milliseconds. Defaults to Date.now() (now).
+     */
+    log(tags: string | string[], data?: string | Object | Function, timestamp?: number): void;
+    /**
+     * When the server contains exactly one connection, looks up a route configuration.
+     * When the server contains more than one connection, each server.connections array member provides its own connection.lookup() method.
+     * [See docs](https://hapijs.com/api/16.1.1#serverlookupid)
+     * @param id  the route identifier as set in the route options.
+     * @return  the route public interface object if found, otherwise null.
+     */
+    lookup(id: string): RoutePublicInterface | null;
+    /**
+     * When the server contains exactly one connection, looks up a route configuration
+     * When the server contains more than one connection, each server.connections array member provides its own connection.match() method.
+     * [See docs](https://hapijs.com/api/16.1.1#servermatchmethod-path-host)
+     * @param method  the HTTP method (e.g. 'GET', 'POST').  TODO check if it allows HEAD
+     * @param path  the requested path (must begin with '/').
+     * @param host  optional hostname (to match against routes with vhost).
+     * @return  the route public interface object if found, otherwise null.
+     */
+    match(method: HTTP_METHODS, path: string, host?: string): RoutePublicInterface | null;
+    /**
+     * Registers a server method. Server methods are functions registered with the server and used throughout the application as a common utility. Their advantage is in the ability to configure them to use the built-in cache and share across multiple request handlers without having to create a common module.
+     * [See docs](https://hapijs.com/api/16.1.1#servermethodname-method-options)
+     * @param name  a unique method name used to invoke the method via server.methods[name]. Supports using nested names such as utils.users.get which will automatically create the missing path under server.methods and can be accessed for the previous example via server.methods.utils.users.get. When configured with caching enabled, server.methods[name].cache will be an object see ServerMethodNameCacheObject
+     * @param method  the method function
+     * @param options  optional configuration
+     */
+    method(name: string, method: ServerMethod, options?: ServerMethodOptions): void;
+    /**
+     * Registers a server method function as described in server.method() using a configuration object
+     * [See docs](https://hapijs.com/api/16.1.1#servermethodmethods)
+     */
+    method(methods: ServerMethodConfigurationObject[]): void;
+    method(methods: ServerMethodConfigurationObject): void;
+    /**
+     * Subscribe a handler to an event
+     * [See docs](https://hapijs.com/api/16.1.1#serveroncriteria-listener)
+     * @param criteria  the subscription criteria which can be an event name string which can be any of the built-in server events or a custom application event registered with server.event(events).
+     * Or an see ServerEventCriteria.
+     * If 'start' - emitted when the server is started using server.start().
+     * If 'stop' - emitted when the server is stopped using server.stop().
+     * @param listener
+     */
+    on(criteria: 'start' | 'stop' | string | ServerEventCriteria, listener: Function): void;
+    /**
+     * The 'log' event includes the event object and a tags object (where each tag is a key with the value true)
+     * [See docs](https://hapijs.com/api/16.1.1#server-events)
+     */
+    on(criteria: 'log', listener: (event: ServerEventObject, tags: Podium.Tags) => void): void;
+    /**
+     * The 'request' and 'request-internal' events include the request object, the event object, and a tags object (where each tag is a key with the value true)
+     * [See docs](https://hapijs.com/api/16.1.1#server-events)
+     * TODO submit issue to TypeScript.  Using 'request' | 'request-internal' removes the type
+     * interference when using code like: `server.on('request', (request, event, tags) => {...}`
+     * Same for 'response' | 'tail'.
+     */
+    on(criteria: 'request', listener: (request: Request, event: ServerEventObject, tags: Podium.Tags) => void): void;
+    on(criteria: 'request-internal', listener: (request: Request, event: ServerEventObject, tags: Podium.Tags) => void): void;
+    /**
+     * The 'request-error' event includes the request object and the causing error err object
+     * [See docs](https://hapijs.com/api/16.1.1#server-events)
+     */
+    on(criteria: 'request-error', listener: (request: Request, err: Error) => void): void;
+    /**
+     * The 'response' and 'tail' events include the request object
+     * [See docs](https://hapijs.com/api/16.1.1#server-events)
+     * See 'request' and 'request-internal'
+     */
+    on(criteria: 'response', listener: (request: Request) => void): void;
+    on(criteria: 'tail', listener: (request: Request) => void): void;
+    /**
+     * The 'route' event includes the route public interface, the connection, and the server object used to add the route (e.g. the result of a plugin select operation)
+     * [See docs](https://hapijs.com/api/16.1.1#server-events)
+     */
+    on(criteria: 'route', listener: (route: RoutePublicInterface, connection: ServerConnection, server: Server) => void): void;
+    /**
+     * Same as calling server.on() with the count option set to 1.
+     * TODO type this to copy the server.on specific types for 'route', 'tail', etc.
+     * [See docs](https://hapijs.com/api/16.1.1#serveroncecriteria-listener)
+     * @param criteria
+     * @param listener
+     */
+    once(criteria: string | ServerEventCriteria, listener: Function): void;
+    /**
+     * Sets the path prefix used to locate static resources (files and view templates) when relative paths are used
+     * Note that setting a path within a plugin only applies to resources accessed by plugin methods. If no path is set, the connection files.relativeTo configuration is used. The path only applies to routes added after it has been set.
+     * [See docs](https://hapijs.com/api/16.1.1#serverpathrelativeto)
+     * @param relativeTo  the path prefix added to any relative file path starting with '.'.
+     */
+    path(relativeTo: string): void;
+    /**
+     * Registers a plugin
+     * If no callback is provided, a Promise object is returned.
+     * Note that plugin registration are recorded on each of the available connections. When plugins express a dependency on other plugins, both have to be loaded into the same connections for the dependency requirement to be fulfilled. It is recommended that plugin registration happen after all the server connections are created via server.connection().
+     * [See docs](https://hapijs.com/api/16.1.1#serverregisterplugins-options-callback)
+     * @param plugins
+     * @param options
+     * @param callback  with signature function(err) where err an error returned from the registration function. Note that exceptions thrown by the registration function are not handled by the framework.
+     * A note on typings.  Common use case is:
+     *     register(Plugin, (err) => {// do more stuff})
+     * so these typings save passing empty `options` object or having to
+     * explicity type the Error in the Callback e.g.:
+     *     register(Plugin, {}, (err) => {// do more stuff})  or
+     *     register(Plugin, (err: Error) => {// do more stuff})
+     */
+    register<OptionsPassedToPlugin>(plugins: Array<(PluginFunction<OptionsPassedToPlugin> | PluginRegistrationObject<OptionsPassedToPlugin>)>, callback: (err: Error | null) => void): void;
+    register<OptionsPassedToPlugin>(plugins: Array<(PluginFunction<OptionsPassedToPlugin> | PluginRegistrationObject<OptionsPassedToPlugin>)>): Promise<Error | null>;
+    register<OptionsPassedToPlugin>(plugins: PluginFunction<OptionsPassedToPlugin> | PluginRegistrationObject<OptionsPassedToPlugin>, callback: (err: Error | null) => void): void;
+    register<OptionsPassedToPlugin>(plugins: PluginFunction<OptionsPassedToPlugin> | PluginRegistrationObject<OptionsPassedToPlugin>): Promise<Error | null>;
+    register<OptionsPassedToPlugin>(plugins: Array<(PluginFunction<OptionsPassedToPlugin> | PluginRegistrationObject<OptionsPassedToPlugin>)>, options: PluginRegistrationOptions, callback: (err: Error | null) => void): void;
+    register<OptionsPassedToPlugin>(plugins: Array<(PluginFunction<OptionsPassedToPlugin> | PluginRegistrationObject<OptionsPassedToPlugin>)>, options: PluginRegistrationOptions): Promise<Error | null>;
+    register<OptionsPassedToPlugin>(plugins: PluginFunction<OptionsPassedToPlugin> | PluginRegistrationObject<OptionsPassedToPlugin>, options: PluginRegistrationOptions, callback: (err: Error | null) => void): void;
+    register<OptionsPassedToPlugin>(plugins: PluginFunction<OptionsPassedToPlugin> | PluginRegistrationObject<OptionsPassedToPlugin>, options: PluginRegistrationOptions): Promise<Error | null>;
+    /**
+     * Adds a connection route
+     * [See docs](https://hapijs.com/api/16.1.1#serverrouteoptions)
+     * @param options  a route configuration object [See docs](https://hapijs.com/api/16.1.1#route-configuration) or an array of configuration objects.
+     */
+    route(options: RouteConfiguration[]): void;
+    route(options: RouteConfiguration): void;
+    /**
+     * Selects a subset of the server's connections
+     * Returns a server object with connections set to the requested subset. Selecting again on a selection operates as a logic AND statement between the individual selections.
+     * [See docs](https://hapijs.com/api/16.1.1#serverselectlabels)
+     * @param labels  a single string or array of strings of labels used as a logical OR statement to select all the connections with matching labels in their configuration.
+     */
+    select(labels: string | string[]): Server;
+    /**
+     * Starts the server connections by listening for incoming requests on the configured port of each listener (unless the connection was configured with autoListen set to false)
+     * If no callback is provided, a Promise object is returned.
+     * Note that if the method fails and the callback includes an error, the server is considered to be in an undefined state and should be shut down. In most cases it would be impossible to fully recover as the various plugins, caches, and other event listeners will get confused by repeated attempts to start the server or make assumptions about the healthy state of the environment. It is recommended to assert that no error has been returned after calling start() to abort the process when the server fails to start properly. If you must try to resume after a start error, call server.stop() first to reset the server state.
+     * If a started server is started again, the second call to start() will only start new connections added after the initial start() was called. No events will be emitted and no extension points invoked.
+     * [See docs](https://hapijs.com/api/16.1.1#serverstartcallback)
+     * @param callback  the callback method when server startup is completed or failed with the signature function(err) where:
+     *      * err - any startup error condition.
+     */
+    start(callback: (err?: Error) => void): void;
+    start(): Promise<Error | null>;
+    /**
+     * HTTP state management [See docs](https://tools.ietf.org/html/rfc6265) uses client cookies to persist a state across multiple requests. Registers a cookie definitions
+     * [See docs](https://hapijs.com/api/16.1.1#serverstatename-options)
+     * @param name  the cookie name string.
+     * @param options  optional cookie settings
+     */
+    state(name: string, options?: ServerStateCookieConfiguationObject): void;
+    /**
+     * Stops the server's connections by refusing to accept any new connections or requests (existing connections will continue until closed or timeout)
+     * If no callback is provided, a Promise object is returned.
+     * [See docs](https://hapijs.com/api/16.1.1#serverstopoptions-callback)
+     * @param options  options object with:
+     *      * timeout - overrides the timeout in millisecond before forcefully terminating a connection. Defaults to 5000 (5 seconds).
+     * @param callback  optional callback method which is called once all the connections have ended and it is safe to exit the process with signature function(err) where:
+     *      * err - any termination error condition.
+     */
+    stop(options: {timeout: number} | null, callback: (err?: Error) => void): void;
+    stop(options?: {timeout: number}): Promise<Error | null>;
+    /**
+     * Returns a copy of the routing table
+     * Note that if the server has not been started and multiple connections use port 0, the table items will override each other and will produce an incomplete result.
+     * When calling connection.table() directly on each connection, the return value is the same as the array table item value of an individual connection
+     * [See docs](https://hapijs.com/api/16.1.1#servertablehost)
+     * @param host  optional host to filter routes matching a specific virtual host. Defaults to all virtual hosts.
+     */
+    table(host?: string): RoutingTableEntry[];
+}
+
+export interface PluginSpecificConfiguration {}
+
+/**
+ * Server Options
+ * Note that the options object is deeply cloned and cannot contain any values that are unsafe to perform deep copy on.
+ * [See docs](https://hapijs.com/api/16.1.1#new-serveroptions)
+ */
+export interface ServerOptions {
+    /** app - application-specific configuration which can later be accessed via server.settings.app. Note the difference between server.settings.app which is used to store static configuration values and server.app which is meant for storing run-time state. Defaults to {}.  */
+    app?: any;
+    /**
+     * cache - sets up server-side caching. Every server includes a default cache for storing application state. By default, a simple memory-based cache is created which has limited capacity and capabilities. hapi uses catbox for its cache which includes support for common storage solutions (e.g. Redis, MongoDB, Memcached, Riak, among others). Caching is only utilized if methods and plugins explicitly store their state in the cache. The server cache configuration only defines the storage container itself. cache can be assigned:
+     *  * a prototype function (usually obtained by calling require() on a catbox strategy such as require('catbox-redis')). A new catbox client will be created internally using this function.
+     *  * a CatboxServerOptionsCacheConfiguration configuration object
+     *  * an array of the above object for configuring multiple cache instances, each with a unique name. When an array of objects is provided, multiple cache connections are established and each array item (except one) must include a name.
+     */
+    cache?: Catbox.EnginePrototype | CatboxServerOptionsCacheConfiguration | CatboxServerOptionsCacheConfiguration[];
+    /** sets the default connections configuration which can be overridden by each connection */
+    connections?: ConnectionConfigurationServerDefaults;
+    /** determines which logged events are sent to the console (this should only be used for development and does not affect which events are actually logged internally and recorded). Set to false to disable all console logging, or to an object with: */
+    debug?: false | {
+        /** a string array of server log tags to be displayed via console.error() when the events are logged via server.log() as well as internally generated server logs. For example, to display all errors, set the option to ['error']. To turn off all console debug messages set it to false. Defaults to uncaught errors thrown in external code (these errors are handled automatically and result in an Internal Server Error response) or runtime errors due to developer error. */
+        log?: string[] | false;
+        /** a string array of request log tags to be displayed via console.error() when the events are logged via request.log() as well as internally generated request logs. For example, to display all errors, set the option to ['error']. To turn off all console debug messages set it to false. Defaults to uncaught errors thrown in external code (these errors are handled automatically and result in an Internal Server Error response) or runtime errors due to developer error. */
+        request?: string[] | false;
+    };
+    /** process load monitoring */
+    load?: {
+        /** the frequency of sampling in milliseconds. Defaults to 0 (no sampling). */
+        sampleInterval?: number;
+    };
+    /** options passed to the mimos module (https://github.com/hapijs/mimos) when generating the mime database used by the server and accessed via server.mime. */
+    mime?: MimosOptions;
+    /** plugin-specific configuration which can later be accessed via server.settings.plugins. plugins is an object where each key is a plugin name and the value is the configuration. Note the difference between server.settings.plugins which is used to store static configuration values and server.plugins which is meant for storing run-time state. Defaults to {}. */
+    plugins?: PluginSpecificConfiguration;
+    /** if false, will not use node domains to protect against exceptions thrown in handlers and other external code. Defaults to true. */
+    useDomains?: boolean;
+}
+
+/**
+ * The server event object
+ * [See docs](https://hapijs.com/api/16.1.1#server-events)
+ */
+export interface ServerEventObject {
+    /** the event timestamp. */
+    timestamp: number;
+    /** if the event relates to a request, the request id. */
+    request: string;
+    /** if the event relates to a server, the server.info.uri. */
+    server: string;
+    /** an array of tags (e.g. ['error', 'http']). */
+    tags: string[];
+    /** optional event-specific information. */
+    data: any;
+    /** true if the event was generated internally by the framework. */
+    internal: boolean;
+}
+
+/**
+ * [See docs](https://hapijs.com/api/16.1.1#serveroncriteria-listener)
+ */
+export interface ServerEventCriteria {
+    /** the event name string (required). */
+    name: string;
+    /** if true, the listener method receives an additional callback argument which must be called when the method completes. No other event will be emitted until the callback methods is called. The method signature is function(). If block is set to a positive integer, the value is used to set a timeout after which any pending events will be emitted, ignoring the eventual call to callback. Defaults to false (non blocking). */
+    block?: boolean;
+    /** a string or array of strings specifying the event channels to subscribe to. If the event registration specified a list of allowed channels, the channels array must match the allowed channels. If channels are specified, event updates without any channel designation will not be included in the subscription. Defaults to no channels filter. */
+    channels?: string | string[];
+    /** if true, the data object passed to server.emit() is cloned before it is passed to the listener method. Defaults to the event registration option (which defaults to false). */
+    clone?: boolean;
+    /** a positive integer indicating the number of times the listener can be called after which the subscription is automatically removed. A count of 1 is the same as calling server.once(). Defaults to no limit. */
+    count?: number;
+    /**
+     * the event tags (if present) to subscribe to
+     * If the object is given:
+     *  * tags - a tag string or array of tag strings.
+     *  * all - if true, all tags must be present for the event update to match the subscription. Defaults to false (at least one matching tag).
+     */
+    filter?: string | string[] | {tags: string | string[], all?: boolean};
+    /** if true, and the data object passed to server.emit() is an array, the listener method is called with each array element passed as a separate argument. This should only be used when the emitted data structure is known and predictable. Defaults to the event registration option (which defaults to false). */
+    spread?: boolean;
+    /** if true and the criteria object passed to server.emit() includes tags, the tags are mapped to an object (where each tag string is the key and the value is true) which is appended to the arguments list at the end (but before the callback argument if block is set). Defaults to the event registration option (which defaults to false). */
+    tags?: boolean;
+}
+
+/**
+ * Server methods, user configured
+ * Related to [See docs](https://hapijs.com/api/16.1.1#servermethods)
+ * Related to [See docs](https://hapijs.com/api/16.1.1#servermethodname-method-options)
+ */
+export interface ServerMethod {
+    /** the method must return a value (result, Error, or a promise) or throw an Error. */
+    (...args: any[]): any | Error | Promise<any>;
+    /** Not possible to improve this typing due to this unresolvable issue:  https://github.com/Microsoft/TypeScript/issues/15190 */
+    (...args: (any | ServerMethodNext)[]): void;
+    /** When configured with caching enabled, server.methods[name].cache will be an object see ServerMethodNameCacheObject */
+    cache?: ServerMethodNameCacheObject;
+}
+
+/**
+ * Related to [See docs](https://hapijs.com/api/16.1.1#servermethodname-method-options)
+ * @param err  error response if the method failed.
+ * @param result  the return value.
+ * @param ttl  0 if result is valid but cannot be cached. Defaults to cache policy.
+ */
+export interface ServerMethodNext {
+    (err: Error | null, result: any, ttl?: number): void;
+}
+
+/** For context [See docs](https://hapijs.com/api/16.1.1#servermethodname-method-options) */
+export interface ServerMethodNameCacheObject {
+    /**
+     * function that can be used to clear the cache for a given key.
+     * @param ...args  any number of string, number or boolean.  If other types then generateKey function must be specified.
+     * @param callback  last argument is a callback.
+     * Not possible to improve this typing due to this unresolvable issue:  https://github.com/Microsoft/TypeScript/issues/15190
+     */
+    drop(...args: (any | Function)[]): void;
+    /** an object with cache statistics, see stats documentation for catbox. */
+    stats: Catbox.CacheStatisticsObject;
+}
+
+/** For context [See docs](https://hapijs.com/api/16.1.1#servermethodname-method-options) */
+export interface ServerMethodOptions {
+    /** a context object passed back to the method function (via this) when called. Defaults to active context (set via server.bind() when the method is registered. Ignored if the method is an arrow function. */
+    bind?: any;
+    /** the same cache configuration used in server.cache(). The generateTimeout option is required. */
+    cache?: CatboxServerCacheConfiguration;
+    /**
+     * if false, expects the method to be a synchronous function. Note that using a synchronous function with caching will convert the method interface to require a callback as an additional argument with the signature function(err, result, cached, report) since the cache interface cannot return values synchronously. Defaults to true.
+     * TODO: understand and type "an additional argument with the signature function(err, result, cached, report)" if appropriate.
+     */
+    callback?: boolean;
+    /** a function used to generate a unique key (for caching) from the arguments passed to the method function (the callback argument is not passed as input). The server will automatically generate a unique key if the function's arguments are all of types 'string', 'number', or 'boolean'. However if the method uses other types of arguments, a key generation function must be provided which takes the same arguments as the function and returns a unique string (or null if no key can be generated). */
+    generateKey?(args: any[]): string | null;
+}
+
+/** For context [See docs](https://hapijs.com/api/16.1.1#servermethodmethods) */
+export interface ServerMethodConfigurationObject {
+    name: string;
+    method: ServerMethod;
+    options: ServerMethodOptions;
+}
+
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +                                                                           +
+ +                                                                           +
+ +                                                                           +
+ +                          Caching with Catbox                              +
+ +                                                                           +
+ +                                                                           +
+ +                                                                           +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
+// TODO: move to separate file http://stackoverflow.com/questions/43276921
+
+/**
+ * TODO confirm this is the same as CatboxServerCacheConfiguration
+ *
+ * **
+ * Server instantiation options configuration for Catbox cache
+ * TODO: check it extends Catbox.PolicyOptions and this is what "other options passed to the catbox strategy used." means.
+ * For context [See docs](https://hapijs.com/api/16.1.1#new-serveroptions) under: options > cache > a configuration object
+ * **
+ *    export interface CatboxServerOptionsCacheConfiguration extends Catbox.IPolicyOptions {
+ *        // a prototype function or catbox engine object.
+ *        engine: Catbox.EnginePrototypeOrObject;
+ *        // an identifier used later when provisioning or configuring caching for server methods or plugins. Each cache name must be unique. A single item may omit the name option which defines the default cache. If every cache includes a name, a default memory cache is provisioned as well.
+ *        name?: string;
+ *        // if true, allows multiple cache users to share the same segment (e.g. multiple methods using the same cache storage container). Default to false.
+ *        shared?: boolean;
+ *    }
+ */
+export type CatboxServerOptionsCacheConfiguration = CatboxServerCacheConfiguration;
+
+/**
+ * Server cache method configuration for Catbox cache
+ * Used for "Provisions a cache segment within the server cache facility"
+ * For context [See docs](https://hapijs.com/api/16.1.1#servercacheoptions)
+ * Also used in [See docs](https://hapijs.com/api/16.1.1#servermethodname-method-options) > options.cache
+ */
+export interface CatboxServerCacheConfiguration extends Catbox.PolicyOptions {
+    /** the cache name configured in server.cache. Defaults to the default cache. */
+    cache?: string;
+    /** string segment name, used to isolate cached items within the cache partition. When called within a plugin, defaults to '!name' where 'name' is the plugin name. When called within a server method, defaults to '#name' where 'name' is the server method name. Required when called outside of a plugin. */
+    segment?: string;
+    /** if true, allows multiple cache provisions to share the same segment. Default to false. */
+    shared?: boolean;
+    /**
+     * a prototype function or catbox engine object.
+     * [See docs](https://hapijs.com/api/16.1.1#servercacheprovisionoptions-callback) example code includes use of `engine` option.  But server.cache.provision of `options` says "same as the server cache configuration options.".
+     * TODO confirm once PR to hapi docs accepted / rejected.
+     */
+    engine?: Catbox.EnginePrototypeOrObject;
+    /**
+     * an identifier used later when provisioning or configuring caching for server methods or plugins. Each cache name must be unique. A single item may omit the name option which defines the default cache. If every cache includes a name, a default memory cache is provisioned as well.
+     * [See docs](https://hapijs.com/api/16.1.1#servercacheprovisionoptions-callback) example code includes use of `name` option.  But server.cache.provision of `options` says "same as the server cache configuration options.".
+     */
+    name?: string;
+    /**
+     * Additional options to be passed to the Catbox strategy
+     */
+    [s: string]: any;
+}
+
+/**
+ * Additional notes
+ * payload - In case of an object it will be converted to a string for you. Defaults to no payload. Note that payload processing defaults to 'application/json' if no 'Content-Type' header provided.
+ * [See docs](https://hapijs.com/api/16.1.1#serverinjectoptions-callback)
+ */
+export interface InjectedRequestOptions extends Shot.RequestOptions {
+    /** an optional credentials object containing authentication information. The credentials are used to bypass the default authentication strategies, and are validated directly as if they were received via an authentication scheme. Defaults to no credentials. */
+    credentials?: any;
+    /** an optional artifacts object containing authentication artifact information. The artifacts are used to bypass the default authentication strategies, and are validated directly as if they were received via an authentication scheme. Ignored if set without credentials. Defaults to no artifacts. */
+    artifacts?: any;
+    /** sets the initial value of request.app. */
+    app?: any;
+    /** sets the initial value of request.plugins. */
+    plugins?: PluginsStates;
+    /** allows access to routes with config.isInternal set to true. Defaults to false. */
+    allowInternals?: boolean;
+}
+
+/**
+ * the response object from server.inject
+ * [See docs](https://hapijs.com/api/16.1.1#serverinjectoptions-callback)
+ */
+export interface InjectedResponseObject extends Shot.ResponseObject {
+    /** the raw handler response (e.g. when not a stream or a view) before it is serialized for transmission. If not available, the value is set to payload. Useful for inspection and reuse of the internal objects returned (instead of parsing the response string). */
+    result: Object | string;
+    /** the request object. */
+    request: InjectedRequestOptions;
+}
+
+/**
+ * For context [See docs](https://hapijs.com/api/16.1.1#new-serveroptions) under: options > connections
+ */
+export interface ConnectionConfigurationServerDefaults {
+    /** application-specific connection configuration which can be accessed via connection.settings.app. Provides a safe place to store application configuration without potential conflicts with the framework internals. Should not be used to configure plugins which should use plugins[name]. Note the difference between connection.settings.app which is used to store configuration values and connection.app which is meant for storing run-time state.  */
+    app?: any;
+    /** if false, response content encoding is disabled. Defaults to true */
+    compression?: boolean;
+    /** connection load limits configuration where:  */
+    load?: {
+        /** maximum V8 heap size over which incoming requests are rejected with an HTTP Server Timeout (503) response. Defaults to 0 (no limit).  */
+        maxHeapUsedBytes?: number;
+        /** maximum process RSS size over which incoming requests are rejected with an HTTP Server Timeout (503) response. Defaults to 0 (no limit).  */
+        maxRssBytes?: number;
+        /** maximum event loop delay duration in milliseconds over which incoming requests are rejected with an HTTP Server Timeout (503) response. Defaults to 0 (no limit).  */
+        maxEventLoopDelay?: number;
+    };
+    /** plugin-specific configuration which can later be accessed via connection.settings.plugins. Provides a place to store and pass connection-specific plugin configuration. plugins is an object where each key is a plugin name and the value is the configuration. Note the difference between connection.settings.plugins which is used to store configuration values and connection.plugins which is meant for storing run-time state. */
+    plugins?: PluginSpecificConfiguration;
+    /** controls how incoming request URIs are matched against the routing table: */
+    router?: {
+        /** determines whether the paths '/example' and '/EXAMPLE' are considered different resources. Defaults to true.  */
+        isCaseSensitive?: boolean;
+        /** removes trailing slashes on incoming paths. Defaults to false.  */
+        stripTrailingSlash?: boolean;
+    };
+    /** a route options object used to set the default configuration for every route. */
+    routes?: RouteAdditionalConfigurationOptions;
+    /** sets the default configuration for every state (cookie) set explicitly via server.state() or implicitly (without definition) using the [state configuration object](https://hapijs.com/api/16.1.1#serverstatename-options). */
+    state?: ServerStateCookieConfiguationObject;
+}
+
+/**
+ * a connection configuration object or array of objects with the following optional keys.
+ * Any connections configuration server defaults can be included to override and customize the individual connection.
+ * [See docs](https://hapijs.com/api/16.1.1#serverconnectionoptions)
+ */
+export interface ServerConnectionOptions extends ConnectionConfigurationServerDefaults {
+    /** host - the public hostname or IP address. Used only to set server.info.host and server.info.uri. If not configured, defaults to the operating system hostname and if not available, to 'localhost'. */
+    host?: string;
+    /** address - sets the host name or IP address the connection will listen on. If not configured, defaults to host if present, otherwise to all available network interfaces (i.e. '0.0.0.0'). Set to 127.0.0.1 or localhost to restrict connection to only those coming from the same machine. */
+    address?: string;
+    /** port - the TCP port the connection will listen to. Defaults to an ephemeral port (0) which uses an available port when the server is started (and assigned to server.info.port). If port is a string containing a '/' character, it is used as a UNIX domain socket path and if it starts with '\.\pipe' as a Windows named pipe. */
+    port?: string | number;
+    /** uri - the full public URI without the path (e.g. 'http://example.com:8080'). If present, used as the connection info.uri otherwise constructed from the connection settings. */
+    uri?: string;
+    /** listener - optional node.js HTTP (or HTTPS) http.Server object or any compatible object. If the listener needs to be manually started, set autoListen to false. If the listener uses TLS, set tls to true. */
+    listener?: http.Server;
+    /** autoListen - indicates that the connection.listener will be started manually outside the framework. Cannot be specified with a port setting. Defaults to true. */
+    autoListen?: boolean;
+    /** labels - a string or string array of labels used to server.select() specific connections matching the specified labels. Defaults to an empty array [] (no labels). */
+    labels?: string | string[];
+    /** tls - used to create an HTTPS connection. The tls object is passed unchanged as options to the node.js HTTPS server as described in the node.js HTTPS [documentation](https://nodejs.org/api/https.html#https_https_createserver_options_requestlistener})  . Set to true when passing a listener object that has been configured to use TLS directly. */
+    tls?: true | https.RequestOptions;
+}
+
+/**
+ * For context see RouteAdditionalConfigurationOptions > compression
+ * For context [See docs](https://hapijs.com/api/16.1.1#serverencoderencoding-encoder)
+ */
+export type CompressionEncoderSettings = any;
+
+/**
+ * For context see RouteAdditionalConfigurationOptions > payload > compression
+ * For context [See docs](https://hapijs.com/api/16.1.1#serverdecoderencoding-decoder)
+ */
+export type CompressionDecoderSettings = any;
+
+/**
+ * an optional function called after all the specified dependencies have been registered and before the server starts. The function is only called if the server is initialized or started. If a circular dependency is detected, an exception is thrown (e.g. two plugins each has an after function to be called after the other). The function signature is function(server, next) where:
+ * [See docs](https://hapijs.com/api/16.1.1#serverdependencydependencies-after)
+ * Also see Server.dependency
+ * @param server  the server the dependency() method was called on.
+ * @param next  the callback function the method must call to return control over to the application and complete the registration process. The function signature is function(err) where:
+ *      * err - internal error condition, which is returned back via the server.initialize() or server.start() callback.
+ */
+export interface AfterDependencyLoadCallback {
+    (server: Server, next: (err?: Error) => void): void;
+}
+
+/** For context see RouteAdditionalConfigurationOptions > auth */
+export interface AuthOptions {
+    /**
+     * the authentication mode. Defaults to 'required' if a server authentication strategy is configured, otherwise defaults to no authentication. Available values:
+     *  * 'required' - authentication is required.
+     *  * 'optional' - authentication is optional (must be valid if present).
+     *  * 'try' - same as 'optional' but allows for invalid authentication.
+     */
+    mode?: 'required' | 'optional' | 'try';
+    /** a string array of strategy names in order they should be attempted. If only one strategy is used, strategy can be used instead with the single string value. Defaults to the default authentication strategy which is available only when a single strategy is configured.  */
+    strategies?: string[];
+    strategy?: string;
+    /**
+     * if set, the payload (in requests other than 'GET' and 'HEAD') is authenticated after it is processed. Requires a strategy with payload authentication support (e.g. Hawk). Cannot be set to a value other than 'required' when the scheme sets the options.payload to true. Available values:
+     *  * false - no payload authentication. This is the default value.
+     *  * 'required' - payload authentication required. This is the default value when the scheme sets options.payload to true.
+     *  * 'optional' - payload authentication performed only when the client includes payload authentication information (e.g. hash attribute in Hawk).
+     */
+    payload?: false | 'required' | 'optional';
+    /** specifying the route access rules. */
+    access?: RouteAuthAccessConfiguationObject | RouteAuthAccessConfiguationObject[];
+    /** (undocumented) Convenience way of setting access.scope, will over write all values in `access` */
+    scope?: false | string | string[];
+    /** (undocumented) Convenience way of setting access.entity, will over write all values in `access` */
+    entity?: 'any' | 'user' | 'app';
+}
+
+/**
+ * Each rule is evaluated against an incoming request and access is granted if at least one rule matches. Each rule object must include at least one of:
+ * For context see RouteAdditionalConfigurationOptions > auth > an object > access
+ */
+export interface RouteAuthAccessConfiguationObject {
+    /** the application scope required to access the route. Value can be a scope string or an array of scope strings. The authenticated credentials object scope property must contain at least one of the scopes defined to access the route. If a scope string begins with a + character, that scope is required. If a scope string begins with a ! character, that scope is forbidden. For example, the scope ['!a', '+b', 'c', 'd'] means the incoming request credentials' scope must not include 'a', must include 'b', and must include one of 'c' or 'd'. You may also access properties on the request object (query and params) to populate a dynamic scope by using {} characters around the property name, such as 'user-{params.id}'. Defaults to false (no scope requirements). */
+    scope?: false | string | string[];
+    /**
+     * the required authenticated entity type. If set, must match the entity value of the authentication credentials. Available values:
+     *  * any - the authentication can be on behalf of a user or application. This is the default value.
+     *  * user - the authentication must be on behalf of a user which is identified by the presence of a user attribute in the credentials object returned by the authentication strategy.
+     *  * app - the authentication must be on behalf of an application which is identified by the lack of presence of a user attribute in the credentials object returned by the authentication strategy.
+     */
+    entity?: 'any' | 'user' | 'app';
+}
+
+/**
+ * For context see RouteAdditionalConfigurationOptions > cache
+ */
+export type RouteCacheOptions = {
+    /**
+     * determines the privacy flag included in client-side caching using the 'Cache-Control' header. Values are:
+     *  * 'default' - no privacy flag. This is the default setting.
+     *  * 'public' - mark the response as suitable for public caching.
+     *  * 'private' - mark the response as suitable only for private caching.
+     */
+    privacy?: 'default' | 'public' | 'private';
+    /** an array of HTTP response status codes (e.g. 200) which are allowed to include a valid caching directive. Defaults to [200]. */
+    statuses?: number[];
+    /** a string with the value of the 'Cache-Control' header when caching is disabled. Defaults to 'no-cache'. */
+    otherwise?: string;
+} & ({
+    /** relative expiration expressed in the number of milliseconds since the item was saved in the cache. Cannot be used together with expiresAt. */
+    expiresIn?: number;
+    /** time of day expressed in 24h notation using the 'HH:MM' format, at which point all cache records for the route expire. Cannot be used together with expiresIn. */
+    expiresAt?: undefined;
+} | {
+    /** relative expiration expressed in the number of milliseconds since the item was saved in the cache. Cannot be used together with expiresAt. */
+    expiresIn?: undefined;
+    /** time of day expressed in 24h notation using the 'HH:MM' format, at which point all cache records for the route expire. Cannot be used together with expiresIn. */
+    expiresAt?: string;
+} | {
+    /** relative expiration expressed in the number of milliseconds since the item was saved in the cache. Cannot be used together with expiresAt. */
+    expiresIn?: undefined;
+    /** time of day expressed in 24h notation using the 'HH:MM' format, at which point all cache records for the route expire. Cannot be used together with expiresIn. */
+    expiresAt?: undefined;
+});
+
+/**
+ * For context see RouteAdditionalConfigurationOptions > cors
+ */
+export interface CorsConfigurationObject {
+    /** a strings array of allowed origin servers ('Access-Control-Allow-Origin'). The array can contain any combination of fully qualified origins along with origin strings containing a wildcard '*' character, or a single '*' origin string. Defaults to any origin ['*']. */
+    origin?: string[] | '*';
+    /** number of seconds the browser should cache the CORS response ('Access-Control-Max-Age'). The greater the value, the longer it will take before the browser checks for changes in policy. Defaults to 86400 (one day). */
+    maxAge?: number;
+    /** a strings array of allowed headers ('Access-Control-Allow-Headers'). Defaults to ['Accept', 'Authorization', 'Content-Type', 'If-None-Match'] */
+    headers?: string[];
+    /** a strings array of additional headers to headers. Use this to keep the default headers in place. */
+    additionalHeaders?: string[];
+    /** a strings array of exposed headers ('Access-Control-Expose-Headers'). Defaults to ['WWW-Authenticate', 'Server-Authorization']. */
+    exposedHeaders?: string[];
+    /** a strings array of additional headers to exposedHeaders. Use this to keep the default headers in place. */
+    additionalExposedHeaders?: string[];
+    /** if true, allows user credentials to be sent ('Access-Control-Allow-Credentials'). Defaults to false. */
+    credentials?: boolean;
+}
+
+/**
+ * An object describing the extension function used whilst registering the extension function in one of the available extension points
+ * [See docs](https://hapijs.com/api/16.1.1#serverextevents)
+ * For context see RouteAdditionalConfigurationOptions > ext
+ */
+export interface ServerStartExtConfigurationObject {
+    /** the extension point event name. */
+    type: ServerStartExtPoints;
+    /**
+     * a function or an array of functions to be executed at a specified point during request processing. The required extension function signature is see ServerExtFunction or see ServerExtRequestHandler
+     */
+    method: ServerExtFunction | ServerExtFunction[];
+    options?: ServerExtOptions;
+}
+
+/**
+ * An object describing the extension function used whilst registering the extension function in one of the available extension points
+ * [See docs](https://hapijs.com/api/16.1.1#serverextevents)
+ * For context see RouteAdditionalConfigurationOptions > ext
+ */
+export interface ServerRequestExtConfigurationObject {
+    /** the extension point event name. */
+    type: ServerRequestExtPointsBase;
+    /**
+     * a function or an array of functions to be executed at a specified point during request processing. The required extension function signature is see ServerExtFunction or see ServerExtRequestHandler
+     */
+    method: ServerExtRequestHandler | ServerExtRequestHandler[]
+    options?: ServerExtOptions;
+}
+
+/**
+ * An object describing the extension function used whilst registering the extension function in one of the available extension points
+ * [See docs](https://hapijs.com/api/16.1.1#serverextevents)
+ * For context see RouteAdditionalConfigurationOptions > ext
+ */
+export interface ServerRequestExtConfigurationObjectWithRequest {
+    /** the extension point event name. */
+    type: ServerRequestExtPoints;
+    /**
+     * a function or an array of functions to be executed at a specified point during request processing. The required extension function signature is see ServerExtFunction or see ServerExtRequestHandler
+     */
+    method: ServerExtRequestHandler | ServerExtRequestHandler[];
+    options?: ServerExtOptions;
+}
+
+/**
+ * [See docs](https://hapijs.com/api/16.1.1#route-configuration) > ext
+ */
+export type RouteExtConfigurationObject = ServerStartExtConfigurationObject | ServerRequestExtConfigurationObject;
+
+/**
+ * [See docs](https://hapijs.com/api/16.1.1#serverextevents) > events > method
+ */
+export type ServerExtMethod = ServerExtFunction | ServerExtRequestHandler;
+
+/**
+ * [See docs](https://hapijs.com/api/16.1.1#serverextevents) > events > options
+ */
+export interface ServerExtOptions {
+    /** before - a string or array of strings of plugin names this method must execute before (on the same event). Otherwise, extension methods are executed in the order added. */
+    before: string | string[];
+    /** after - a string or array of strings of plugin names this method must execute after (on the same event). Otherwise, extension methods are executed in the order added. */
+    after: string | string[];
+    /** bind - a context object passed back to the provided method (via this) when called. Ignored if the method is an arrow function. */
+    bind: any;
+    /** sandbox - if set to 'plugin' when adding a request extension points the extension is only added to routes defined by the current plugin. Not allowed when configuring route-level extensions, or when adding server extensions. Defaults to 'connection' which applies to any route added to the connection the extension is added to. */
+    sandbox?: 'connection' | 'plugin';
+}
+
+/**
+ * [See docs](https://hapijs.com/api/16.1.1#serverextevents) > events > type
+ *  * 'onPreStart' - called before the connection listeners are started.
+ *  * 'onPostStart' - called after the connection listeners are started.
+ *  * 'onPreStop' - called before the connection listeners are stopped.
+ *  * 'onPostStop' - called after the connection listeners are stopped.
+ */
+export type ServerStartExtPoints = 'onPreStart' | 'onPostStart' | 'onPreStop' | 'onPostStop';
+/**
+ * [See docs](https://hapijs.com/api/16.1.1#request-lifecycle)
+ *  * The available extension points include the request extension points as well as the following server extension points:
+ */
+export type ServerRequestExtPointsBase = 'onPreResponse' | 'onPreAuth' | 'onPostAuth' | 'onPreHandler' | 'onPostHandler' | 'onPreResponse';
+
+export type ServerRequestExtPoints = ServerRequestExtPointsBase | 'onRequest';
+
+/**
+ * Server extension function registered an one of the server extension points
+ * [See docs](https://hapijs.com/api/16.1.1#serverextevents)
+ * For context see ServerExtConfigurationObject
+ * @param server - the server object.
+ * @param next - the continuation method with signature function(err).
+ * @param this - the object provided via options.bind or the current active context set with server.bind().
+ */
+export interface ServerExtFunction {
+    (server: Server, next: ContinuationFunction): void;
+}
+
+/**
+ * For context see RouteAdditionalConfigurationOptions > payload
+ */
+export interface RoutePayloadConfigurationObject {
+    /**
+     * the type of payload representation requested. The value must be one of:
+     *  * 'data' - the incoming payload is read fully into memory. If parse is true, the payload is parsed (JSON, form-decoded, multipart) based on the 'Content-Type' header. If parse is false, the raw Buffer is returned. This is the default value except when a proxy handler is used.
+     *  * 'stream' - the incoming payload is made available via a Stream.Readable interface. If the payload is 'multipart/form-data' and parse is true, fields values are presented as text while files are provided as streams. File streams from a 'multipart/form-data' upload will also have a property hapi containing filename and headers properties.
+     *  * 'file' - the incoming payload is written to temporary file in the directory specified by the server's payload.uploads settings. If the payload is 'multipart/form-data' and parse is true, fields values are presented as text while files are saved. Note that it is the sole responsibility of the application to clean up the files generated by the framework. This can be done by keeping track of which files are used (e.g. using the request.app object), and listening to the server 'response' event to perform any needed cleanup.
+     */
+    output?: PayLoadOutputOption;
+    /**
+     * can be true, false, or gunzip; determines if the incoming payload is processed or presented raw. true and gunzip includes gunzipping when the appropriate 'Content-Encoding' is specified on the received request. If parsing is enabled and the 'Content-Type' is known (for the whole payload as well as parts), the payload is converted into an object when possible. If the format is unknown, a Bad Request (400) error response is sent. Defaults to true, except when a proxy handler is used. The supported mime types are:
+     *  * 'application/json'
+     *  * 'application/x-www-form-urlencoded'
+     *  * 'application/octet-stream'
+     *  * 'text/*'
+     *  * 'multipart/form-data'
+     */
+    parse?: 'gunzip' | boolean;
+    /**
+     * overrides payload processing for multipart requests. Value can be one of:
+     *  * false - disables multipart processing.
+     *  * object with the following required options:
+     *      * output - same as the payload.output option with an additional value option:
+     *          * annotated - wraps each multipart part in an object with the following keys: // TODO type this?
+     *              * headers - the part headers.
+     *              * filename - the part file name.
+     *              * payload - the processed part payload.
+     */
+    multipart?: false | {
+        output: PayLoadOutputOption | 'annotated';
+    };
+    /** a string or an array of strings with the allowed mime types for the endpoint. Defaults to any of the supported mime types listed above. Note that allowing other mime types not listed will not enable them to be parsed, and that if parsing mode is 'parse', the request will result in an error response. */
+    allow?: string | string[];
+    /** a mime type string overriding the 'Content-Type' header value received. Defaults to no override. */
+    override?: string;
+    /** limits the size of incoming payloads to the specified byte count. Allowing very large payloads may cause the server to run out of memory. Defaults to 1048576 (1MB). */
+    maxBytes?: number;
+    /** payload reception timeout in milliseconds. Sets the maximum time allowed for the client to transmit the request payload (body) before giving up and responding with a Request Timeout (408) error response. Set to false to disable. Defaults to 10000 (10 seconds). */
+    timeout?: number | false;
+    /** the directory used for writing file uploads. Defaults to os.tmpdir(). */
+    uploads?: string;
+    /**
+     * determines how to handle payload parsing errors. Allowed values are:
+     *  * 'error' - return a Bad Request (400) error response. This is the default value.
+     *  * 'log' - report the error but continue processing the request.
+     *  * 'ignore' - take no action and continue processing the request.
+     */
+    failAction?: 'error' | 'log' | 'ignore';
+    /** the default 'Content-Type' HTTP header value is not present. Defaults to 'application/json'. */
+    defaultContentType?: string;
+    /** an object where each key is a content-encoding name and each value is an object with the desired decoder settings. Note that encoder settings are set in the root option compression. */
+    compression?: Dictionary<CompressionDecoderSettings>;
+}
+
+export type PayLoadOutputOption = 'data' | 'stream' | 'file';
+
+/**
+ * events must be one of:
+ *  * an event name string.
+ *  * an event options object see ApplicationEventOptionsObject
+ * * a podium [See docs](https://github.com/hapijs/podium) emitter object.
+ * For context [See docs](https://hapijs.com/api/16.1.1#servereventevents) > events parameter
+ */
+export type ApplicationEvent = string | ApplicationEventOptionsObject | Podium;
+
+/**
+ * an event options object
+ * For context see ApplicationEvent
+ * For context [See docs](https://hapijs.com/api/16.1.1#servereventevents) > events parameter
+ */
+export interface ApplicationEventOptionsObject {
+    /** the event name string (required). */
+    name: string;
+    /** a string or array of strings specifying the event channels available. Defaults to no channel restrictions (event updates can specify a channel or not). */
+    channels?: string | string[];
+    /** if true, the data object passed to server.emit() is cloned before it is passed to the listeners (unless an override specified by each listener). Defaults to false (data is passed as-is). */
+    clone?: boolean;
+    /** if true, the data object passed to server.emit() must be an array and the listener method is called with each array element passed as a separate argument (unless an override specified by each listener). This should only be used when the emitted data structure is known and predictable. Defaults to false (data is emitted as a single argument regardless of its type). */
+    spread?: boolean;
+    /** if true and the criteria object passed to server.emit() includes tags, the tags are mapped to an object (where each tag string is the key and the value is true) which is appended to the arguments list at the end (but before the callback argument if block is set). A configuration override can be set by each listener. Defaults to false. */
+    tags?: boolean;
+    /** if true, the same event name can be registered multiple times where the second registration is ignored. Note that if the registration config is changed between registrations, only the first configuration is used. Defaults to false (a duplicate registration will throw an error). */
+    shared?: boolean;
+}
+
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +                                                                           +
+ +                                                                           +
+ +                                                                           +
+ +                                  Route                                    +
+ +                                                                           +
+ +                                                                           +
+ +                                                                           +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
+// TODO: move to separate file http://stackoverflow.com/questions/43276921
+
+/**
+ * Route configuration
+ * The route configuration object
+ *
+ * [See docs](https://hapijs.com/api/16.1.1#route-configuration)
+ *
+ * TODO typings check that the following refers to RouteAdditionalConfigurationOptions "Note that the options object is deeply cloned (with the exception of bind which is shallowly copied) and cannot contain any values that are unsafe to perform deep copy on."
+ */
+export interface RouteConfiguration {
+    /** the absolute path used to match incoming requests (must begin with '/'). Incoming requests are compared to the configured paths based on the connection router configuration option. The path can include named parameters enclosed in {} which will be matched against literal values in the request as described in Path parameters. */
+    path: string;
+    /** the HTTP method. Typically one of 'GET', 'POST', 'PUT', 'PATCH', 'DELETE', or 'OPTIONS'. Any HTTP method is allowed, except for 'HEAD'. Use '*' to match against any HTTP method (only when an exact match was not found, and any match with a specific method will be given a higher priority over a wildcard match). Can be assigned an array of methods which has the same result as adding the same route with different methods manually. */
+    method: HTTP_METHODS_PARTIAL | '*' | (HTTP_METHODS_PARTIAL | '*')[];
+    /** an optional domain string or an array of domain strings for limiting the route to only requests with a matching host header field. Matching is done against the hostname part of the header only (excluding the port). Defaults to all hosts. */
+    vhost?: string;
+    /** the function called to generate the response after successful authentication and validation. The handler function is described in Route handler. If set to a string, the value is parsed the same way a prerequisite server method string shortcut is processed. Alternatively, handler can be assigned an object with a single key using the name of a registered handler type and value with the options passed to the registered handler. */
+    handler?: string | RouteHandler | RouteHandlerPlugins;
+    /** additional route options. The config value can be an object or a function that returns an object using the signature function(server) where server is the server the route is being added to and this is bound to the current realm's bind option. */
+    config?: RouteAdditionalConfigurationOptions | ((server: Server) => RouteAdditionalConfigurationOptions);
+}
+
+/**
+ * Route options
+ * Each route can be customize to change the default behavior of the request lifecycle using the following options:
+ * [See docs](https://hapijs.com/api/16.1.1#route-options)
+ */
+export interface RouteAdditionalConfigurationOptions {
+    /** application specific configuration.Should not be used by plugins which should use plugins[name] instead. */
+    app?: any;
+    /**
+     * Authentication configuration.  Value can be:
+     *  * false to disable authentication if a default strategy is set.
+     *  * a string with the name of an authentication strategy registered with server.auth.strategy().
+     *  * an object
+     */
+    auth?: false | string | AuthOptions;
+    /** an object passed back to the provided handler (via this) when called. Ignored if the method is an arrow function. */
+    bind?: any;
+    /**
+     * Route cache options
+     * if the route method is 'GET', the route can be configured to include caching directives in the response. The default Cache-Control: no-cache header can be disabled by setting cache to false. Caching can be customized using an object
+     * TODO check: the default is to have 'Cache-Control: no-cache', but on first reading is a contridiction as you can disabled cache and disabled no-cache by setting RouteCacheOptions to false?
+     */
+    cache?: boolean | RouteCacheOptions;
+    /** an object where each key is a content-encoding name and each value is an object with the desired encoder settings. Note that decoder settings are set in payload.compression. */
+    compression?: Dictionary<CompressionEncoderSettings>;
+    /** the Cross-Origin Resource Sharing protocol allows browsers to make cross-origin API calls. CORS is required by web applications running inside a browser which are loaded from a different domain than the API server. CORS headers are disabled by default (false). To enable, set cors to true, or to an object */
+    cors?: boolean | CorsConfigurationObject;
+    /** defined a route-level request extension points by setting the option to an object with a key for each of the desired extension points ('onRequest' is not allowed), and the value is the same as the [server.ext(events)](https://hapijs.com/api/16.1.1#serverextevents) event argument. */
+    ext?: RouteExtConfigurationObject | RouteExtConfigurationObject[];
+    /** defines the behavior for accessing files: */
+    files?: {
+        /** determines the folder relative paths are resolved against. */
+        relativeTo: string;
+    };
+    /** an alternative location for the route.handler option. */
+    handler?: string | RouteHandler;
+    /** an optional unique identifier used to look up the route using server.lookup(). Cannot be assigned to routes with an array of methods. */
+    id?: string;
+    /** if true, the route cannot be accessed through the HTTP connection but only through the server.inject() interface with the allowInternals option set to true. Used for internal routes that should not be accessible to the outside world. Defaults to false. */
+    isInternal?: boolean;
+    /** optional arguments passed to JSON.stringify() when converting an object or error response to a string payload. Supports the following: */
+    json?: Json.StringifyArguments & {
+        /** string suffix added after conversion to JSON string. Defaults to no suffix. */
+        suffix?: string;
+    };
+    /** enables JSONP support by setting the value to the query parameter name containing the function name used to wrap the response payload. For example, if the value is 'callback', a request comes in with 'callback=me', and the JSON response is '{ "a":"b" }', the payload will be 'me({ "a":"b" });'. Does not work with stream responses. Headers content-type and x-content-type-options are set to text/javascript and nosniff respectively, and will override those headers even if explicitly set by response.type() */
+    jsonp?: string;
+    /** if true, request level logging is enabled (accessible via request.getLog()). */
+    log?: boolean;
+    /**
+     * determines how the request payload is processed
+     * [See docs](https://hapijs.com/api/16.1.1#route-options)
+     */
+    payload?: RoutePayloadConfigurationObject;
+    /** plugin-specific configuration. plugins is an object where each key is a plugin name and the value is the plugin configuration. */
+    plugins?: PluginSpecificConfiguration;
+    /** an array with [route prerequisites](https://hapijs.com/api/16.1.1#route-prerequisites) methods which are executed in serial or in parallel before the handler is called. */
+    pre?: RoutePrerequisitesArray;
+    /** processing rules for the outgoing response */
+    response?: RouteResponseConfigurationObject;
+    /** sets common security headers (disabled by default). To enable set security to true or to an object with the following options: See RouteSecurityConfigurationObject */
+    security?: boolean | RouteSecurityConfigurationObject;
+    /** HTTP state management (cookies) allows the server to store information on the client which is sent back to the server with every request (as defined in RFC 6265). state supports the following options: */
+    state?: {
+        /** determines if incoming 'Cookie' headers are parsed and stored in the request.state object. Defaults to true. */
+        parse?: boolean;
+        /**
+         * determines how to handle cookie parsing errors. Allowed values are:
+         *  * 'error' - return a Bad Request (400) error response. This is the default value.
+         *  * 'log' - report the error but continue processing the request.
+         *  * 'ignore' - take no action.
+         */
+        failAction: 'error' | 'log' | 'ignore';
+    };
+    /** request input validation rules for various request components. When using a Joi validation object, the values of the other inputs (i.e. headers, query, params, payload, and auth) are made available under the validation context (accessible in rules as Joi.ref('$query.key')). Note that validation is performed in order (i.e. headers, params, query, payload) and if type casting is used (converting a string to number), the value of inputs not yet validated will reflect the raw, unvalidated and unmodified values. If the validation rules for headers, params, query, and payload are defined at both the routes defaults level and an individual route, the individual route settings override the routes defaults (the rules are not merged). The validate object supports: */
+    validate?: RouteValidationConfigurationObject;
+    /** define timeouts for processing durations: */
+    timeout?: {
+        /** response timeout in milliseconds. Sets the maximum time allowed for the server to respond to an incoming client request before giving up and responding with a Service Unavailable (503) error response. Disabled by default (false). */
+        server?: boolean | number;
+        /** by default, node sockets automatically timeout after 2 minutes. Use this option to override this behavior. Defaults to undefined which leaves the node default unchanged. Set to false to disable socket timeouts. */
+        socket?: boolean | number;
+    };
+
+    /**
+     * TODO decide on moving these to an extended interface of RouteAdditionalConfigurationOptions
+     */
+    /**
+     * ONLY WHEN ADDING NEW ROUTES (not when setting defaults).
+     * route description used for generating documentation
+     */
+    description?: string;
+    /**
+     * ONLY WHEN ADDING NEW ROUTES (not when setting defaults).
+     * route notes used for generating documentation
+     */
+    notes?: string | string[];
+    /**
+     * ONLY WHEN ADDING NEW ROUTES (not when setting defaults).
+     * route tags used for generating documentation
+     */
+    tags?: string[];
+}
+
+/**
+ * Route public interface
+ * When route information is returned or made available as a property, it is an object with the following:
+ * [See docs](https://hapijs.com/api/16.1.1#route-public-interface)
+ */
+export interface RoutePublicInterface {
+    /** the route HTTP method. */
+    method: string;
+    /** the route path. */
+    path: string;
+    /** the route vhost option if configured. */
+    vhost?: string | string[];
+    /** the [active realm] [See docs](https://hapijs.com/api/16.1.1#serverrealm) associated with the route.*/
+    realm: ServerRealm;
+    /** the [route options] [See docs](https://hapijs.com/api/16.1.1#route-options) object with all defaults applied. */
+    settings: RouteAdditionalConfigurationOptions;
+    /** the route internal normalized string representing the normalized path. */
+    fingerprint: string;
+    /** route authentication utilities: */
+    auth: {
+        /** authenticates the passed request argument against the route's authentication access configuration. Returns true if the request would have passed the route's access requirements. Note that the route's authentication mode and strategies are ignored. The only match is made between the request.auth.credentials scope and entity information and the route access configuration. Also, if the route uses dynamic scopes, the scopes are constructed against the request.query and request.params which may or may not match between the route and the request's route. If this method is called using a request that has not been authenticated (yet or at all), it will return false if the route requires any authentication. */
+        access(request: Request): boolean;
+    };
+}
+
+export type RouteHandlerConfig = any;
+
+/**
+ * For context [See docs](https://hapijs.com/api/16.1.1#serverhandlername-method)
+ * For source [See docs](https://github.com/hapijs/hapi/blob/v16.1.1/lib/handler.js#L103)
+ * For source [See docs](https://github.com/hapijs/hapi/blob/v16.1.1/lib/route.js#L56-L60)
+ * TODO check the type of `RouteHandlerConfig` is correct for `defaults`.
+ */
+export interface MakeRouteHandler {
+    (route: RoutePublicInterface, options: RouteHandlerConfig): RouteHandler;
+    defaults?: RouteHandlerConfig | ((method: HTTP_METHODS_PARTIAL_lowercase) => RouteHandlerConfig);
+}
+
+/**
+ * [See docs](https://hapijs.com/api/16.1.1#servertablehost) > return value
+ */
+export interface RoutingTableEntry {
+    /** the connection.info the connection the table was generated for. */
+    info: ServerConnectionInfo;
+    /** the connection labels. */
+    labels: string[];
+    /** an array of routes where each route contains: */
+    table: Route[];
+}
+
+/**
+ * [See docs](https://hapijs.com/api/16.1.1#servertablehost) > return value
+ * For source [See source](https://github.com/hapijs/hapi/blob/v16.1.1/lib/route.js#L71)
+ */
+export interface Route {
+    /**
+     * the route config with defaults applied.
+     * TODO check type of RouteConfiguration here is correct
+     */
+    settings: RouteAdditionalConfigurationOptions;
+    /**
+     * the HTTP method in lower case.
+     * TODO, check if it can contain 'head' or not.
+     */
+    method: HTTP_METHODS_PARTIAL_lowercase;
+    /** the route path. */
+    path: string;
+
+    params: string[];
+
+    connection: ServerConnection;
+
+    fingerprint: string;
+
+    plugin?: any;
+
+    public: RoutePublicInterface;
+
+    server: Server;
+}
+
+/**
+ * Route Prerequisites
+ * It is often necessary to perform prerequisite actions before the handler is called (e.g. load required reference data from a database). The route pre option allows defining such pre-handler methods. The methods are called in order. If the pre array contains another array, those methods are called in parallel. pre can be assigned a mixed array of:
+ *  * arrays containing the elements listed below, which are executed in parallel.
+ *  * objects see RoutePrerequisiteObjects
+ *  * functions - same as including an object with a single method key.
+ *  * strings - special short-hand notation for registered server methods using the format 'name(args)' (e.g. 'user(params.id)') where:
+ *      * 'name' - the method name. The name is also used as the default value of assign.
+ *      * 'args' - the method arguments (excluding next) where each argument is a property of the request object
+ * [See docs](https://hapijs.com/api/16.1.1#route-prerequisites)
+ * For context see RouteAdditionalConfigurationOptions > pre
+ *
+ * TODO follow up on "server methods" in "special short-hand notation for registered server methods" at https://hapijs.com/api/16.1.1#servermethodname-method-options
+ * TODO follow up on "request object" in "each argument is a property of the request object" at https://hapijs.com/api/16.1.1#request-object
+ */
+export type RoutePrerequisitesArray = RoutePrerequisitesPart[] | (RoutePrerequisitesPart[] | RoutePrerequisitesPart)[];
+export type RoutePrerequisitesPart = RoutePrerequisiteObjects | RoutePrerequisiteRequestHandler | string;
+
+/**
+ * see RoutePrerequisites > objects
+ */
+export interface RoutePrerequisiteObjects {
+    /** the function to call (or short-hand method string as described below [see RoutePrerequisitesArray]). the function signature is identical to a route handler as described in Route handler. */
+    method: RoutePrerequisiteRequestHandler | string;
+    /** key name to assign the result of the function to within request.pre. */
+    assign: string;
+    /*
+     * determines how to handle errors returned by the method. Allowed values are:
+     *  * 'error' - returns the error response back to the client. This is the default value.
+     *  * 'log' - logs the error but continues processing the request. If assign is used, the error will be assigned.
+     *  * 'ignore' - takes no special action. If assign is used, the error will be assigned.
+     */
+    failAction?: 'error' | 'log' | 'ignore';
+}
+
+/**
+ * For context see RouteAdditionalConfigurationOptions > response
+ */
+export interface RouteResponseConfigurationObject<ValidationOptions = JoiValidationOptions> {
+    /** the default HTTP status code when the payload is empty. Value can be 200 or 204. Note that a 200 status code is converted to a 204 only at the time or response transmission (the response status code will remain 200 throughout the request lifecycle unless manually set). Defaults to 200. */
+    emptyStatusCode?: number;
+    /**
+     * defines what to do when a response fails payload validation. Options are:
+     *  * 'error' - return an Internal Server Error (500) error response. This is the default value.
+     *  * 'log' - log the error but send the response.
+     *  * a custom error handler function with the signature function(request, reply, source, error) where:
+     *      * 'request' - the request object.
+     *      * 'reply' - the continuation reply interface.
+     *      * 'error' - the error returned from the validation schema.
+     * TODO update type of source once PR to hapi is concluded.
+     */
+    failAction?: 'error' | 'log' | ((request: Request, reply: ReplyWithContinue, source: string, error: Boom.BoomError) => void);
+    /** if true, applies the validation rule changes to the response payload. Defaults to false. */
+    modify?: boolean;
+    /**
+     * options to pass to Joi. Useful to set global options such as stripUnknown or abortEarly (the complete list is available [here](https://github.com/hapijs/joi/blob/master/API.md#validatevalue-schema-options-callback) ).
+     * If a custom validation function (see `schema` or `status` below) is defined then `options` can an arbitrary object that will be passed to this function as the second parameter.
+     * Defaults to no options.
+     */
+    options?: ValidationOptions;
+    /** if false, payload range support is disabled. Defaults to true. */
+    ranges?: boolean;
+    /** the percent of response payloads validated (0 - 100). Set to 0 to disable all validation. Defaults to 100 (all response payloads). */
+    sample?: number;
+    /** the default response payload validation rules (for all non-error responses) */
+    schema?: RouteResponseConfigurationScheme<ValidationOptions>;
+    /** HTTP status-code-specific payload validation rules. The status key is set to an object where each key is a 3 digit HTTP status code and the value has the same definition as schema. If a response status code is not present in the status object, the schema definition is used, except for errors which are not validated by default. */
+    status?: Dictionary<RouteResponseConfigurationScheme<ValidationOptions>>;
+}
+
+/**
+ * the default response payload validation rules (for all non-error responses) expressed as one of:
+ *  * true - any payload allowed (no validation performed). This is the default.
+ *  * false - no payload allowed.
+ *  * a Joi validation object. This will receive the request's headers, params, query, payload, and auth credentials and isAuthenticated flags as context.
+ *  * a validation function
+ *
+ * TODO check JoiValidationObject is correct for "a Joi validation object"
+ *
+ * For context see RouteAdditionalConfigurationOptions > response > schema
+ * and
+ * For context see RouteAdditionalConfigurationOptions > response > status
+ */
+export type RouteResponseConfigurationScheme<ValidationOptions> = boolean | JoiValidationObject | ValidationFunctionForRouteResponse<ValidationOptions>;
+
+/**
+ * see RouteResponseConfigurationScheme
+ *
+ * a validation function using the signature function(value, options, next) where:
+ *  * value - the value of the response passed to `reply(value)` in the handler.
+ *  * options - the server validation options, merged with an object containing the request's headers, params, payload, and auth credentials object and `isAuthenticated` flag.
+ *  * next([err, [value]]) - the callback function called when validation is completed.  `value` will be used as the response value when `err` is falsy, when `value` is not `undefined`, and when `route.settings.response.modify` is `true`.   If the response is already a `Boom` error it will be set as its `message` value.
+ */
+export interface ValidationFunctionForRouteResponse<ValidationOptions = {}> {
+    (value: any, options: RouteResponseValidationContext & ValidationOptions, next: ContinuationValueFunction): void;
+}
+
+/**
+ * A context for route input validation via a Joi schema or validation function.
+ *
+ * This object is merged with the route response options and passed into the validation function.
+ *
+ * See https://github.com/hapijs/hapi/blob/v16.1.1/lib/validation.js#L217
+ */
+export interface RouteResponseValidationContext {
+    context: {
+        /** The request headers */
+        headers: Dictionary<string>;
+        /** The request path parameters */
+        params: any;
+        /** The request query parameters */
+        query: any;
+        /** The request payload parameters */
+        payload: any;
+
+        /** Partial request authentication information */
+        auth: {
+            /** true if the request has been successfully authenticated, otherwise false. */
+            isAuthenticated: boolean;
+            /** the credential object received during the authentication process. The presence of an object does not mean successful authentication. */
+            credentials: AuthenticatedCredentials;
+        };
+    }
+}
+
+/**
+ * For context see RouteAdditionalConfigurationOptions > security
+ */
+export interface RouteSecurityConfigurationObject {
+    /** controls the 'Strict-Transport-Security' header. If set to true the header will be set to max-age=15768000, if specified as a number the maxAge parameter will be set to that number. Defaults to true. You may also specify an object with the following fields: */
+    hsts?: boolean | number | {
+        /** the max-age portion of the header, as a number. Default is 15768000. */
+        maxAge?: number;
+        /** a boolean specifying whether to add the includeSubDomains flag to the header. */
+        includeSubdomains?: boolean;
+        /** a boolean specifying whether to add the 'preload' flag (used to submit domains inclusion in Chrome's HTTP Strict Transport Security (HSTS) preload list) to the header. */
+        preload?: boolean;
+    };
+    /** controls the 'X-Frame-Options' header. When set to true the header will be set to DENY, you may also specify a string value of 'deny' or 'sameorigin'. Defaults to true. To use the 'allow-from' rule, you must set this to an object with the following fields: */
+    xframe?: true | 'deny' | 'sameorigin' | {
+        /** may also be 'deny' or 'sameorigin' but set directly as a string for xframe */
+        rule: 'allow-from';
+        /** when rule is 'allow-from' this is used to form the rest of the header, otherwise this field is ignored. If rule is 'allow-from' but source is unset, the rule will be automatically changed to 'sameorigin'. */
+        source: string;
+    };
+    /** boolean that controls the 'X-XSS-PROTECTION' header for IE. Defaults to true which sets the header to equal '1; mode=block'. NOTE: This setting can create a security vulnerability in versions of IE below 8, as well as unpatched versions of IE8. See [here](https://hackademix.net/2009/11/21/ies-xss-filter-creates-xss-vulnerabilities/) and [here](https://technet.microsoft.com/library/security/ms10-002) for more information. If you actively support old versions of IE, it may be wise to explicitly set this flag to false. [Kept typing non optional to force this security related documentation to be read.] */
+    xss: boolean;
+    /** boolean controlling the 'X-Download-Options' header for IE, preventing downloads from executing in your context. Defaults to true setting the header to 'noopen'. */
+    noOpen?: boolean;
+    /** boolean controlling the 'X-Content-Type-Options' header. Defaults to true setting the header to its only and default option, 'nosniff' */
+    noSniff?: boolean;
+}
+
+/**
+ * request input validation rules for various request components. When using a Joi validation object, the values of the other inputs (i.e. headers, query, params, payload, and auth) are made available under the validation context (accessible in rules as Joi.ref('$query.key')). Note that validation is performed in order (i.e. headers, params, query, payload) and if type casting is used (converting a string to number), the value of inputs not yet validated will reflect the raw, unvalidated and unmodified values. If the validation rules for headers, params, query, and payload are defined at both the routes defaults level and an individual route, the individual route settings override the routes defaults (the rules are not merged). The validate object supports:
+ * For context see RouteAdditionalConfigurationOptions > validate
+ * TODO check JoiValidationObject is correct for "a Joi validation object"
+ */
+export interface RouteValidationConfigurationObject<ValidationOptions = JoiValidationOptions> {
+    /**
+     * validation rules for incoming request headers (note that all header field names must be in lowercase to match the headers normalized by node). Values allowed:
+     *  * true - any headers allowed (no validation performed). This is the default.
+     *  * false - no headers allowed (this will cause all valid HTTP requests to fail).
+     *  * a Joi validation object.
+     *  * a validation function using the signature function(value, options, next) where:
+     *      * value - the object containing the request headers.
+     *      * options - the server validation options.
+     *      * next(err, value) - the callback function called when validation is completed.  `value` will be used as the `headers` value when `err` is falsy.  If `next` is called with `undefined` or no arguments then the original value of `value` will be used.
+     */
+    headers?: boolean | JoiValidationObject | ValidationFunctionForRouteInput<ValidationOptions>;
+    /**
+     * validation rules for incoming request path parameters, after matching the path against the route and extracting any parameters then stored in request.params. Values allowed:
+     * Same as `headers`, see above.
+     */
+    params?: boolean | JoiValidationObject | ValidationFunctionForRouteInput<ValidationOptions>;
+    /**
+     * validation rules for an incoming request URI query component (the key-value part of the URI between '?' and '#'). The query is parsed into its individual key-value pairs and stored in request.query prior to validation. Values allowed:
+     * Same as `headers`, see above.
+     */
+    query?: boolean | JoiValidationObject | ValidationFunctionForRouteInput<ValidationOptions>;
+    /**
+     * validation rules for an incoming request payload (request body). Values allowed:
+     * Same as `headers`, see above, with the addition that:
+     *  * a Joi validation object. Note that empty payloads are represented by a null value. If a validation schema is provided and empty payload are supported, it must be explicitly defined by setting the payload value to a joi schema with null allowed (e.g. Joi.object({ /* keys here  * / }).allow(null)).
+     */
+    payload?: boolean | JoiValidationObject | ValidationFunctionForRouteInput<ValidationOptions>;
+    /** an optional object with error fields copied into every validation error response. */
+    errorFields?: any;
+    /**
+     * determines how to handle invalid requests. Allowed values are:
+     *  * 'error' - return a Bad Request (400) error response. This is the default value.
+     *  * 'log' - log the error but continue processing the request.
+     *  * 'ignore' - take no action.
+     *  * a custom error handler function with the signature function(request, reply, source, error) see RouteFailFunction
+     */
+    failAction?: 'error' | 'log' | 'ignore' | RouteFailFunction;
+    /**
+     * options to pass to Joi. Useful to set global options such as stripUnknown or abortEarly (the complete list is [available here](https://github.com/hapijs/joi/blob/master/API.md#validatevalue-schema-options-callback)).
+     * If a custom validation function (see `headers`, `params`, `query`, or `payload` above) is defined then `options` can an arbitrary object that will be passed to this function as the second parameter.
+     * Defaults to no options.
+     */
+    options?: ValidationOptions;
+}
+
+/**
+ * a validation function using the signature function(value, options, next) where:
+ * For context see RouteAdditionalConfigurationOptions > validate (RouteValidationConfigurationObject)
+ *
+ * Also see ValidationFunctionForRouteResponse
+ * @param value - the object containing the request headers, query, path params or payload.
+ * @param options - the server validation options.
+ * @param next([err, [value]]) - the callback function called when validation is completed.
+ */
+export interface ValidationFunctionForRouteInput<ValidationOptions = {}> {
+    (value: any, options: RouteInputValidationContext & ValidationOptions, next: ContinuationValueFunction): void;
+}
+
+/**
+ * A context for route input validation via a Joi schema or validation function.
+ *
+ * This object is merged with the route validation options and passed into the validation function.
+ *
+ * See https://github.com/hapijs/hapi/blob/v16.1.1/lib/validation.js#L122
+ */
+export interface RouteInputValidationContext {
+    context: {
+        // These are only set when *not* validating the respective source (e.g. params, query and payload are set when validating headers):
+        // See https://github.com/hapijs/hapi/blob/v16.1.1/lib/validation.js#L132
+        headers?: Dictionary<string>;
+        params?: any;
+        query?: any;
+        payload?: any;
+
+        /** The request authentication information */
+        auth: RequestAuthenticationInformation;
+    }
+}
+
+/**
+ * a custom error handler function with the signature 'function(request, reply, source, error)`
+ * @param request - the request object.
+ * @param reply - the continuation reply interface.
+ * @param source - the source of the invalid field (e.g. 'headers', 'params', 'query', 'payload').
+ * @param error - the error object prepared for the client response (including the validation function error under error.data).
+ */
+export interface RouteFailFunction {
+    (request: Request, reply: ReplyWithContinue, source: string, error: any): void;
+}
+
+/**
+ * optional cookie settings
+ * [See docs](https://hapijs.com/api/16.1.1#serverstatename-options)
+ * Related to see ConnectionConfigurationServerDefaults
+ */
+export interface ServerStateCookieConfiguationObject {
+    /** time-to-live in milliseconds. Defaults to null (session time-life - cookies are deleted when the browser is closed). */
+    ttl?: number | null;
+    /** sets the 'Secure' flag. Defaults to true. */
+    isSecure?: boolean;
+    /** sets the 'HttpOnly' flag. Defaults to true. */
+    isHttpOnly?: boolean;
+    /**
+     * sets the 'SameSite' flag where the value must be one of:
+     *  * false - no flag.
+     *  * 'Strict' - sets the value to 'Strict' (this is the default value).
+     *  * 'Lax' - sets the value to 'Lax'.
+     */
+    isSameSite?: false | 'Strict' | 'Lax';
+    /** the path scope. Defaults to null (no path). */
+    path?: string | null;
+    /** the domain scope. Defaults to null (no domain). */
+    domain?: string | null;
+    /**
+     * if present and the cookie was not received from the client or explicitly set by the route handler, the cookie is automatically added to the response with the provided value. The value can be a function with signature function(request, next) where:
+     *  * request - the request object.
+     *  * next - the continuation function using the function(err, value) signature.
+     */
+    autoValue?(request: Request, next: ContinuationValueFunction): void;
+    /**
+     * encoding performs on the provided value before serialization. Options are:
+     *  * 'none' - no encoding. When used, the cookie value must be a string. This is the default value.
+     *  * 'base64' - string value is encoded using Base64.
+     *  * 'base64json' - object value is JSON-stringified then encoded using Base64.
+     *  * 'form' - object value is encoded using the x-www-form-urlencoded method.
+     *  * 'iron' - Encrypts and sign the value using iron.
+     */
+    encoding?: 'none' | 'base64' | 'base64json' | 'form' | 'iron';
+    /**
+     * an object used to calculate an HMAC for cookie integrity validation. This does not provide privacy, only a mean to verify that the cookie value was generated by the server. Redundant when 'iron' encoding is used. Options are:
+     *  * integrity - algorithm options. Defaults to require('iron').defaults.integrity.
+     *  * password - password used for HMAC key generation (must be at least 32 characters long).
+     */
+    sign?: {
+        integrity?: any;  // TODO make iron definitions and getting typing from iron
+        password: string;
+    };
+    /** password used for 'iron' encoding (must be at least 32 characters long). */
+    password?: string;
+    /** options for 'iron' encoding. Defaults to require('iron').defaults. */
+    iron?: any;  // TODO make iron definitions and getting typing from iron
+    /** if true, errors are ignored and treated as missing cookies. */
+    ignoreErrors?: boolean;
+    /** if true, automatically instruct the client to remove invalid cookies. Defaults to false. */
+    clearInvalid?: boolean;
+    /** if false, allows any cookie value including values in violation of RFC 6265. Defaults to true. */
+    strictHeader?: boolean;
+    /** used by proxy plugins (e.g. h2o2). */
+    passThrough?: any;
+}
+
+/**
+ * [See docs](https://hapijs.com/api/16.1.1#serverconnections)
+ */
+export interface ServerConnection {
+    /** settings - the connection configuration object passed to server.connection() after applying the server defaults. */
+    settings: ServerConnectionOptions;
+    /** server - the connection's Server object. */
+    server: Server;
+    /** type - set to 'tcp' is the connection is listening on a TCP port, otherwise to 'socket'(a UNIX domain socket or a Windows named pipe). */
+    type: 'tcp' | 'socket';
+    /**
+     * registrations
+     * Described [See docs](https://hapijs.com/api/16.1.1#serverregistrations) "When the server contains more than one connection, each server.connections array member provides its own connection.registrations."
+     */
+    registrations: ServerRegisteredPlugins;
+    /** states - TODO contribute docs to hapi if they want, and then update type here */
+    states: any;
+    /** auth - TODO contribute docs to hapi if they want, and then update type here */
+    auth: any;
+    /**
+     * plugins
+     * TODO contribute docs to hapi if they want.  Assuming similar to `registrations`, `listener`, `info`, etc
+     */
+    plugins: PluginsStates;
+    /**
+     * app
+     * TODO contribute docs to hapi if they want.  Assuming similar to `registrations`, `listener`, `info`, etc
+     */
+    app: any;
+    /** Described in server.listener [See docs](https://hapijs.com/api/16.1.1#serverlistener) */
+    listener: ServerListener;
+    /** Described in server.info [See docs](https://hapijs.com/api/16.1.1#serverinfo) */
+    info: ServerConnectionInfo;
+    /** Described in server.inject [See docs](https://hapijs.com/api/16.1.1#serverinjectoptions-callback) */
+    inject(options: string | InjectedRequestOptions, callback: (res: InjectedResponseObject) => void): void;
+    inject(options: string | InjectedRequestOptions, ): Promise<InjectedResponseObject>;
+    /** Mentioned but not documented under server.connections [See docs](https://hapijs.com/api/16.1.1#serverconnections) */
+    table(host?: string): Route[];
+    /** Described in server.table [See docs](https://hapijs.com/api/16.1.1#serverlookupid) */
+    lookup(id: string): RoutePublicInterface | null;
+    /** Described in server.table [See docs](https://hapijs.com/api/16.1.1#servermatchmethod-path-host) */
+    match(method: HTTP_METHODS, path: string, host?: string): RoutePublicInterface | null;
+}
+
+/**
+ * [See docs](https://hapijs.com/api/16.1.1#serverinfo)
+ */
+export interface ServerConnectionInfo {
+    /** a unique connection identifier (using the format '{hostname}:{pid}:{now base36}'). */
+    id: string;
+    /** the connection creation timestamp. */
+    created: number;
+    /** the connection start timestamp (0 when stopped). */
+    started: number;
+    /**
+     * the connection port based on the following rules:
+     *  * the configured port value before the server has been started.
+     *  * the actual port assigned when no port is configured or set to 0 after the server has been started.
+     * TODO check this type.  What happens when socket is a UNIX domain socket or Windows named pipe?
+     */
+    port: number | string;
+    /** the host name the connection was configured to. Defaults to the operating system hostname when available, otherwise 'localhost'. */
+    host: string;
+    /** the active IP address the connection was bound to after starting. Set to undefined until the server has been started or when using a non TCP port (e.g. UNIX domain socket). */
+    address: undefined | string;
+    /** the protocol used.  'socket' when UNIX domain socket or Windows named pipe. */
+    protocol: 'http' | 'https' | 'socket';
+    /** a string representing the connection (e.g. 'http://example.com:8080' or 'socket:/unix/domain/socket/path'). Contains the uri setting if provided, otherwise constructed from the available settings. If no port is available or set to 0, the uri will not include a port component. */
+    uri: string;
+}
+
+/**
+ * [See docs](https://hapijs.com/api/16.1.1#serverlistener)
+ */
+export type ServerListener = http.Server;
+
+/**
+ * server.realm
+ * The realm object contains server-wide or plugin-specific state that can be shared across various methods. For example, when calling server.bind(), the active realm settings.bind property is set which is then used by routes and extensions added at the same level (server root or plugin). Realms are a limited version of a sandbox where plugins can maintain state used by the framework when adding routes, extensions, and other properties.
+ * [See docs](https://hapijs.com/api/16.1.1#serverrealm)
+ */
+export interface ServerRealm {
+    /** when the server object is provided as an argument to the plugin register() method, modifiers provides the registration preferences passed the server.register() method and includes: */
+    modifiers: {
+        /** routes preferences: */
+        route: {
+            /** the route path prefix used by any calls to server.route() from the server. Note that if a prefix is used and the route path is set to '/', the resulting path will not include the trailing slash. */
+            prefix: string;
+            /** the route virtual host settings used by any calls to server.route() from the server. */
+            vhost: string;
+        }
+    };
+    /** the active plugin name (empty string if at the server root). */
+    plugin: string;
+    /** the plugin options object passed at registration. */
+    pluginOptions: any;  // OptionsPassedToPlugin;
+    /** plugin-specific state to be shared only among activities sharing the same active state. plugins is an object where each key is a plugin name and the value is the plugin state. */
+    plugins: PluginsStates;
+    /** settings overrides (from RouteAdditionalConfigurationOptions) */
+    settings: {
+        files: {
+            relativeTo: string;
+        };
+        bind: any;
+    };
+}
+
+/**
+ * [See docs](https://hapijs.com/api/16.1.1#serverregistrations)
+ */
+export interface ServerRegisteredPlugins {
+    [pluginName: string]: ServerRegisteredPlugin;
+}
+
+/**
+ * [See docs](https://hapijs.com/api/16.1.1#serverregistrations)
+ */
+export interface ServerRegisteredPlugin {
+    /** the plugin version. */
+    version: string;
+    /** the plugin name. */
+    name: string;
+    /**
+     * options used to register the plugin.
+     * TODO update with outcome of: https://github.com/hapijs/hapi/pull/3479
+     */
+    options: any;  // OptionsPassedToPlugin;
+    /** plugin registration attributes. */
+    attributes: PluginAttributes;
+}
+
+export interface ServerAuth {
+    /**
+     * server.auth.api
+     * An object where each key is a strategy name and the value is the exposed strategy API. Available on when the authentication scheme exposes an API by returning an api key in the object returned from its implementation function.
+     * When the server contains more than one connection, each server.connections array member provides its own connection.auth.api object.
+     * [See docs](https://hapijs.com/api/16.1.1#serverauthapi)
+     */
+    api: Dictionary<Strategy>;
+    /**
+     * server.auth.default
+     * Sets a default strategy which is applied to every route
+     * The default does not apply when the route config specifies auth as false, or has an authentication strategy configured (contains the strategy or strategies authentication settings). Otherwise, the route authentication config is applied to the defaults.
+     * Note that if the route has authentication config, the default only applies at the time of adding the route, not at runtime. This means that calling default() after adding a route with some authentication config will have no impact on the routes added prior. However, the default will apply to routes added before default() is called if those routes lack any authentication config.
+     * The default auth strategy configuration can be accessed via connection.auth.settings.default. To obtain the active authentication configuration of a route, use connection.auth.lookup(request.route).
+     * [See docs](https://hapijs.com/api/16.1.1#serverauthdefaultoptions)
+     */
+    default(options: string | AuthOptions): void;
+    /**
+     * server.auth.scheme
+     * Registers an authentication scheme
+     * [See docs](https://hapijs.com/api/16.1.1#serverauthschemename-scheme)
+     * @param name the scheme name.
+     * @param scheme the method implementing the scheme with signature function(server, options) see ServerAuthScheme
+     */
+    scheme(name: string, scheme: ServerAuthScheme): void;
+    /**
+     * Registers an authentication strategy
+     * [See docs](https://hapijs.com/api/16.1.1#serverauthstrategyname-scheme-mode-options)
+     * @param name  the strategy name.
+     * @param scheme  the scheme name (must be previously registered using server.auth.scheme()).
+     * @param mode  if set to true (which is the same as 'required') or to a valid authentication mode ('required', 'optional', 'try'), the scheme is automatically assigned as the default strategy for any route without an auth config. Can only be assigned to a single server strategy. Defaults to false (no default settings).
+     * @param options  scheme options based on the scheme requirements.
+     */
+    strategy(name: string, scheme: string, options?: any): void;
+    strategy(name: string, scheme: string, mode: boolean | 'required' | 'optional' | 'try', options?: any): void;
+    /**
+     * Tests a request against an authentication strategy
+     * Note that the test() method does not take into account the route authentication configuration. It also does not perform payload authentication. It is limited to the basic strategy authentication execution. It does not include verifying scope, entity, or other route properties.
+     * [See docs](https://hapijs.com/api/16.1.1#serverauthteststrategy-request-next)
+     * @param strategy - the strategy name registered with server.auth.strategy().
+     * @param request - the request object.
+     * @param next - the callback function with signature function(err, credentials) where:
+     *      * err - the error if authentication failed.
+     *      * credentials - the authentication credentials object if authentication was successful.
+     */
+    test(strategy: string, request: Request, next: (err: Error | null, credentials: AuthenticatedCredentials) => void): void;
+}
+
+export type Strategy = any;
+export type SchemeSettings = any;
+
+/**
+ * the method implementing the scheme with signature function(server, options) where:
+ * [See docs](https://hapijs.com/api/16.1.1#serverauthschemename-scheme)
+ * @param server  a reference to the server object the scheme is added to.
+ * @param options  optional scheme settings used to instantiate a strategy.
+ */
+export interface ServerAuthScheme {
+    (server: Server, options: SchemeSettings): SchemeMethodResult;
+}
+
+/**
+ * The scheme method must return an object with the following
+ * [See docs](https://hapijs.com/api/16.1.1#serverauthschemename-scheme)
+ */
+export interface SchemeMethodResult {
+    /** optional object which is exposed via the server.auth.api object. */
+    api?: Strategy;
+    /**
+     * required function called on each incoming request configured with the authentication scheme
+     * When the scheme authenticate() method implementation calls reply() with an error condition, the specifics of the error affect whether additional authentication strategies will be attempted (if configured for the route). If the err passed to the reply() method includes a message, no additional strategies will be attempted. If the err does not include a message but does include the scheme name (e.g. Boom.unauthorized(null, 'Custom')), additional strategies will be attempted in the order of preference (defined in the route configuration). If authentication fails the scheme names will be present in the 'WWW-Authenticate' header.
+     * @param request  the request object.
+     * @param reply  the reply interface the authentication method must call when done authenticating the request
+     */
+    authenticate(request: Request, reply: ReplySchemeAuth): void;
+    /**
+     * optional function called to authenticate the request payload
+     * When the scheme payload() method returns an error with a message, it means payload validation failed due to bad payload. If the error has no message but includes a scheme name (e.g. Boom.unauthorized(null, 'Custom')), authentication may still be successful if the route auth.payload configuration is set to 'optional'.
+     * @param request  the request object.
+     * @param reply  is called if authentication failed
+     */
+    payload?(request: Request, reply: ReplySchemeAuthOfPayload): void;
+    /**
+     * optional function called to decorate the response with authentication headers before the response headers or payload is written where:
+     * @param request  the request object.
+     * @param reply  is called if an error occured
+     */
+    response?(request: Request, reply: ReplySchemeAuthDecorateResponse): void;
+    /** an optional object with the following keys: */
+    options?: {
+        /** if true, requires payload validation as part of the scheme and forbids routes from disabling payload auth validation. Defaults to false. */
+        payload?: boolean;
+    };
+}
+
+export interface ServerCacheMethod {
+    /**
+     * Provisions a cache segment within the server cache facility
+     * [See docs](https://hapijs.com/api/16.1.1#servercacheoptions)
+     */
+    (options: CatboxServerCacheConfiguration): Catbox.Policy;
+    /**
+     * Provisions a server cache as described in server.cache
+     * If no callback is provided, a Promise object is returned.
+     * Note that if the server has been initialized or started, the cache will be automatically started to match the state of any other provisioned server cache.
+     * [See docs](https://hapijs.com/api/16.1.1#servercacheprovisionoptions-callback)
+     * @param options  same as the server cache configuration options.
+     * @param callback  the callback method when cache provisioning is completed or failed with the signature function(err) where:
+     *      * err - any cache startup error condition.
+     */
+    provision(options: CatboxServerCacheConfiguration): Promise<any>;
+    provision(options: CatboxServerCacheConfiguration, callback: (err?: Error) => void): void;
+}
+
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +                                                                           +
+ +                                                                           +
+ +                                                                           +
+ +                               Request                                     +
+ +                                                                           +
+ +                                                                           +
+ +                                                                           +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
+// TODO: move to separate file http://stackoverflow.com/questions/43276921
+
+/**
+ * Request object
+ * The request object is created internally for each incoming request. It is different from the node.js request object received from the HTTP server callback (which is available in request.raw.req). The request object methods and properties change throughout the request lifecycle.
+ * [See docs](https://hapijs.com/api/16.1.1#request-object)
+ * [See docs](https://hapijs.com/api/16.1.1#request-properties)
+ */
+export class Request extends Podium {
+    /** application-specific state. Provides a safe place to store application data without potential conflicts with the framework. Should not be used by plugins which should use plugins[name]. */
+    app: any;
+    /** authentication information */
+    auth: RequestAuthenticationInformation;
+    /** the connection the request was received by. */
+    connection: ServerConnection;
+    /**  the node domain object used to protect against exceptions thrown in extensions, handlers and route prerequisites. Can be used to manually bind callback functions otherwise bound to other domains. Set to null when the server useDomains options is false. */
+    domain: domain.Domain | null;
+    /** the raw request headers (references request.raw.headers). */
+    headers: Dictionary<string>;
+    /** a unique request identifier (using the format '{now}:{connection.info.id}:{5 digits counter}').*/
+    id: string;
+    /** request information */
+    info: {
+        /** the request preferred encoding. */
+        acceptEncoding: string;
+        /** if CORS is enabled for the route, contains the following: */
+        cors: {
+            /**
+             * true if the request 'Origin' header matches the configured CORS restrictions. Set to false if no 'Origin' header is found or if it does not match. Note that this is only available after the 'onRequest' extension point as CORS is configured per-route and no routing decisions are made at that point in the request lifecycle.
+             * Note: marking as optional as "... this is only available after ..."
+             */
+            isOriginMatch?: boolean;
+        };
+        /** content of the HTTP 'Host' header (e.g. 'example.com:8080'). */
+        host: string;
+        /** the hostname part of the 'Host' header (e.g. 'example.com'). */
+        hostname: string;
+        /** request reception timestamp. */
+        received: number;
+        /** content of the HTTP 'Referrer' (or 'Referer') header. */
+        referrer: string;
+        /** remote client IP address. */
+        remoteAddress: string;
+        /**
+         * remote client port.
+         * Set to string in casethey're requesting from a UNIX domain socket.
+         * TODO, what type does Hapi return, should this be number | string?
+         */
+        remotePort: string;
+        /** request response timestamp (0 is not responded yet). */
+        responded: number;
+    };
+    /** the request method in lower case (e.g. 'get', 'post'). */
+    method: string;
+    /** the parsed content-type header. Only available when payload parsing enabled and no payload error occurred. */
+    mime: string;
+    /** an object containing the values of params, query, and payload before any validation modifications made. Only set when input validation is performed. */
+    orig: {
+        params: any;
+        query: any;
+        payload: any;
+    };
+    /** an object where each key is a path parameter name with matching value as described in Path parameters [See docs](https://hapijs.com/api/16.1.1#path-parameters). */
+    params: Dictionary<string>;
+    /** an array containing all the path params values in the order they appeared in the path. */
+    paramsArray: string[];
+    /** the request URI's pathname [See docs](https://nodejs.org/api/url.html#url_urlobject_pathname) component. */
+    path: string;
+    /**
+     * the request payload based on the route payload.output and payload.parse settings.
+     * TODO check this typing and add references / links.
+     */
+    payload: stream.Readable | Buffer | any;
+    /** plugin-specific state. Provides a place to store and pass request-level plugin data. The plugins is an object where each key is a plugin name and the value is the state. */
+    plugins: PluginsStates;
+    /** an object where each key is the name assigned by a route prerequisites function. The values are the raw values provided to the continuation function as argument. For the wrapped response object, use responses. */
+    pre: Object;
+    /** the response object when set. The object can be modified but must not be assigned another object. To replace the response with another from within an extension point, use reply(response) to override with a different response. Contains null when no response has been set (e.g. when a request terminates prematurely when the client disconnects). */
+    response: Response | null;
+    /** same as pre but represented as the response object created by the pre method. */
+    preResponses: Object;
+    /**
+     * by default the object outputted from [node's URL parse()](https://nodejs.org/docs/latest/api/url.html#url_urlobject_query) method.
+     * Might also be set indirectly via [request.setUrl](https://github.com/DefinitelyTyped/DefinitelyTyped/pull/17354#requestseturlurl-striptrailingslash) in which case it may be
+     * a string (if url is set to an object with the query attribute as an unparsed string).
+     */
+    query: any;
+    /** an object containing the Node HTTP server objects. **Direct interaction with these raw objects is not recommended.** */
+    raw: {
+        req: http.IncomingMessage; // Or http.ClientRequest http://www.apetuts.com/tutorial/node-js-http-client-request-class/ ?
+        res: http.ServerResponse;
+    };
+    /**
+     * the route public interface.
+     * Optional due to "request.route is not yet populated at this point." [See docs](https://hapijs.com/api/16.1.1#request-lifecycle)
+     */
+    route?: RoutePublicInterface;
+    /** the server object. */
+    server: Server;
+    /** an object containing parsed HTTP state information (cookies) where each key is the cookie name and value is the matching cookie content after processing using any registered cookie definition. */
+    state: Dictionary<any>;
+    /** the parsed request URI */
+    url: url.Url;
+
+    /**
+     * request.setUrl(url, [stripTrailingSlash])
+     * Available only in 'onRequest' extension methods.
+     * Changes the request URI before the router begins processing the request
+     * [See docs](https://hapijs.com/api/16.1.1#requestseturlurl-striptrailingslash)
+     * @param url  the new request URI. If url is a string, it is parsed with node's URL parse() method. url can also be set to an object compatible with node's URL parse() method output.
+     * @param stripTrailingSlash  if true, strip the trailing slash from the path. Defaults to false.
+     */
+    setUrl(url: string | url.Url, stripTrailingSlash?: boolean): void;
+    /**
+     * request.setMethod(method)
+     * Available only in 'onRequest' extension methods.
+     * Changes the request method before the router begins processing the request
+     * [See docs](https://hapijs.com/api/16.1.1#requestsetmethodmethod)
+     * @param method  is the request HTTP method (e.g. 'GET').
+     */
+    setMethod(method: HTTP_METHODS): void;
+    /**
+     * request.generateResponse(source, [options])
+     * Always available.
+     * Returns a response which you can pass into the reply interface where:
+     * [See docs](https://hapijs.com/api/16.1.1#requestgenerateresponsesource-options)
+     * @param source  the object to set as the source of the reply interface.  TODO, submit a PR to clarify this doc, from the source code it's clear that "the object to set" refers to something of type `ReplyValue` i.e. that can be null, string, number, object, Stream, Promise, or Buffer.
+     * @param options  options for the method, optional.  Not documented yet, perhaps not very important.
+     */
+    generateResponse(source?: ReplyValue, options?: {marshal?: any; prepare?: any; close?: any; variety?: any}): Response;
+    /**
+     * request.log(tags, [data, [timestamp]])
+     * Always available.
+     * Logs request-specific events. When called, the server emits a 'request' event which can be used by other listeners or plugins.
+     * Any logs generated by the server internally will be emitted only on the 'request-internal' channel and will include the event.internal flag set to true.
+     * [See docs](https://hapijs.com/api/16.1.1#requestlogtags-data-timestamp)
+     * @param tags  a string or an array of strings (e.g. ['error', 'database', 'read']) used to identify the event. Tags are used instead of log levels and provide a much more expressive mechanism for describing and filtering events.
+     * @param data  an optional message string or object with the application data being logged. If data is a function, the function signature is function() and it called once to generate (return value) the actual data emitted to the listeners.
+     * @param timestamp  an optional timestamp expressed in milliseconds. Defaults to Date.now() (now).
+     */
+    log(tags: string | string[], data?: string | Object | (() => string | Object), timestamp?: number): void;
+    /**
+     * request.getLog([tags], [internal])
+     * Always available.
+     * Returns an array containing the events matching any of the tags specified (logical OR)
+     * Note that this methods requires the route log configuration set to true.
+     * [See docs](https://hapijs.com/api/16.1.1#requestgetlogtags-internal)
+     * @param tags  is a single tag string or array of tag strings. If no tags specified, returns all events.
+     * @param internal  filters the events to only those with a matching event.internal value. If true, only internal logs are included. If false, only user event are included. Defaults to all events (undefined).
+     */
+    getLog(tags?: string | string[], internal?: boolean): string[];
+    getLog(internal?: boolean): string[];
+    /**
+     * request.tail([name])
+     * Available until immediately after the 'response' event is emitted.
+     * Adds a request tail which has to complete before the request lifecycle is complete.
+     * Returns a tail function which must be called when the tail activity is completed.
+     * Tails are actions performed throughout the request lifecycle, but which may end after a response is sent back to the client. For example, a request may trigger a database update which should not delay sending back a response. However, it is still desirable to associate the activity with the request when logging it (or an error associated with it).
+     * When all tails completed, the server emits a 'tail' event.
+     * [See docs](https://hapijs.com/api/16.1.1#requesttailname)
+     * @param name  an optional tail name used for logging purposes.
+     */
+    tail(name?: string): (() => void);
+    /**
+     * The server.decorate('request', ...) method can modify this prototype/interface.
+     * Have disabled these typings as there is a better alternative, see example in: tests/server/decorate.ts
+     * [And discussion here](https://github.com/DefinitelyTyped/DefinitelyTyped/issues/14517#issuecomment-298891630)
+     */
+    // [index: string]: any;
+}
+
+export interface RequestAuthenticationInformation {
+    /** true if the request has been successfully authenticated, otherwise false. */
+    isAuthenticated: boolean;
+    /** the credential object received during the authentication process. The presence of an object does not mean successful authentication. */
+    credentials: any;
+    /** an artifact object received from the authentication strategy and used in authentication-related actions. */
+    artifacts: any;
+    /** the route authentication mode. */
+    mode: string;
+    /** the authentication error is failed and mode set to 'try'. */
+    error: Error;
+}
+
+export type HTTP_METHODS_PARTIAL_lowercase = 'get' | 'post' | 'put' | 'patch' | 'delete' | 'options';
+export type HTTP_METHODS_PARTIAL = 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE' | 'OPTIONS' | HTTP_METHODS_PARTIAL_lowercase;
+export type HTTP_METHODS = 'HEAD' | 'head' | HTTP_METHODS_PARTIAL;
+
+/**
+ * Request events
+ * The request object supports the following events:
+ *  * 'peek' - emitted for each chunk of payload data read from the client connection. The event method signature is function(chunk, encoding).
+ *  * 'finish' - emitted when the request payload finished reading. The event method signature is function ().
+ *  * 'disconnect' - emitted when a request errors or aborts unexpectedly.
+ * [See docs](https://hapijs.com/api/16.1.1#request-events)
+ */
+export type RequestEventTypes = 'peek' | 'finish' | 'disconnect';
+
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +                                                                           +
+ +                                                                           +
+ +                                                                           +
+ +                         Handler functions                                 +
+ +                                                                           +
+ +                                                                           +
+ +                                                                           +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
+// TODO: move to separate file http://stackoverflow.com/questions/43276921
+
+/**
+ * Extending RouteConfiguration.handler
+ *
+ * The hapi documentation allows for the RouteConfiguration.handler type to have
+ * `{[pluginName: string]: pluginOptions}`
+ * "handler can be assigned an object with a single key using the name of a registered handler type and value with the options passed to the registered handler"
+ * This can be provided by extending the hapi module definition as follows,
+ * see h2o2 for example:
+ *
+ *      declare module 'hapi' {
+ *        interface RouteHandlerPlugins {
+ *          proxy?: ...
+ */
+export interface RouteHandlerPlugins {
+}
+/**
+ * The route handler function uses the signature function(request, reply) (NOTE: do not use a fat arrow style function for route handlers as they do not allow context binding and will cause problems when used in conjunction with server.bind) where:
+ *  * request - is the incoming request object (this is not the node.js request object).
+ *  * reply - the reply interface the handler must call to set a response and return control back to the framework.
+ * [See docs](https://hapijs.com/api/16.1.1#route-handler)
+ * Same function signature used by request extension point used in server.ext(event), see ServerExtConfigurationObject.method
+ */
+export interface RouteHandler {
+    (request: Request, reply: ReplyNoContinue): void;
+    // <T>(request: Request, reply: StrictReply<T>): void;
+}
+
+/**
+ * "the function to call, the function signature is identical to a route handler as described in Route handler."
+ * [See docs](https://hapijs.com/api/16.1.1#route-prerequisites) Route prerequisites
+ */
+export type RoutePrerequisiteRequestHandler = RouteHandler;
+
+/**
+ * request extension points: function(request, reply) where
+ * this - the object provided via options.bind or the current active context set with server.bind().
+ * [See docs](https://hapijs.com/api/16.1.1#serverextevents)
+ * @param request  the request object.
+ * @param reply  the reply interface which is used to return control back to the framework. To continue normal execution of the request lifecycle, reply.continue() must be called. If the extension type is 'onPostHandler' or 'onPreResponse', a single argument passed to reply.continue() will override the current set response (including all headers) but will not stop the request lifecycle execution. To abort processing and return a response to the client, call reply(value) where value is an error or any other valid response.
+ */
+export interface ServerExtRequestHandler {
+    (request: Request, reply: ReplyWithContinue): void;
+}
+
+/**
+ * Used by various extensions to handle a request and
+ * synchronously return a result of some form.
+ *
+ * Left in for backwards compatibility of typings but according to the
+ * [DefinitelyTyped Readme under common mistakes](https://github.com/DefinitelyTyped/DefinitelyTyped#common-mistakes)
+ * it talks about not using generic types unless the type was used in typing one
+ * or more of the function arguments. Using it to type the return was suggested
+ * to be the same as a type assertion.
+ */
+export interface RequestHandler<T> {
+    (request: Request): T;
+}
+
+/**
+ * Used by server extension points
+ * err can be `Boom` error or Error that will be wrapped as a `Boom` error
+ * For source [See code](https://github.com/hapijs/hapi/blob/v16.1.1/lib/reply.js#L109-L118)
+ * For source [See code](https://github.com/hapijs/hapi/blob/v16.1.1/lib/response.js#L60-L65)
+ */
+export interface ContinuationFunction {
+    (err?: Boom.BoomError): void;
+}
+/**
+ * For source [See docs](https://github.com/hapijs/hapi/blob/v16.1.1/lib/response.js#L60-L65)
+ * TODO Can value be typed with a useful generic?
+ */
+export interface ContinuationValueFunction {
+    (err: Boom.BoomError): void;
+    (err: null | undefined, value: any): void;
+    (): void;
+}
+
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +                                                                           +
+ +                                                                           +
+ +                                                                           +
+ +                           Reply functions                                 +
+ +                                                                           +
+ +                                                                           +
+ +                                                                           +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
+// TODO: move to separate file http://stackoverflow.com/questions/43276921
+
+/**
+ * Typings listed explicitly here [See docs](https://hapijs.com/api/16.1.1#replyerr-result)
+ * Typings also described in part here [See docs](https://hapijs.com/api/16.1.1#response-object)
+ */
+export type ReplyValue = _ReplyValue | Promise<_ReplyValue>;
+export type _ReplyValue = null | undefined | string | number | boolean | Buffer | Error | stream.Stream | Object; // | array;
+
+/**
+ * Reply interface
+ * reply([err], [result])
+ * Concludes the handler activity by setting a response and returning control over to the framework
+ * When reply() is called with an error or result response, that value is used as the response sent to the client. When reply() is called within a prerequisite, the value is saved for future use and is not used as the response. In all other places except for the handler, calling reply() will be considered an error and will abort the request lifecycle, jumping directly to the 'onPreResponse' event.
+ * To return control to the framework within an extension or other places other than the handler, without setting a response, the method reply.continue() must be called. Except when used within an authentication strategy, or in an 'onPostHandler' or 'onPreResponse' extension, the reply.continue() must not be passed any argument or an exception is thrown.
+ * [See docs](https://hapijs.com/api/16.1.1#reply-interface)
+ * [See docs](https://hapijs.com/api/16.1.1#replyerr-result)
+ *
+ * NOTE: modules should extend this interface to expose reply.Nnn methods
+ */
+export interface Base_Reply {
+    (err?: ReplyValue): Response;
+    (err: null, result?: ReplyValue): Response;
+    /** the active realm associated with the route. */
+    realm: ServerRealm;
+    /** the request object */
+    request: Request;
+
+    /**
+     * reply.entity(options)
+     * Sets the response 'ETag' and 'Last-Modified' headers and checks for any conditional request headers to decide if the response is going to qualify for an HTTP 304 (Not Modified). If the entity values match the request conditions, reply.entity() returns control back to the framework with a 304 response. Otherwise, it sets the provided entity headers and returns null.
+     * Returns a response object if the reply is unmodified or null if the response has changed. If null is returned, the developer must call reply() to continue execution. If the response is not null, the developer must not call reply().
+     * [See docs](https://hapijs.com/api/16.1.1#replyentityoptions)
+     * @param options  a required configuration object with:
+     *      * etag - the ETag string. Required if modified is not present. Defaults to no header.
+     *      * modified - the Last-Modified header value. Required if etag is not present. Defaults to no header.
+     *      * vary - same as the response.etag() option. Defaults to true.
+     */
+    entity(options: {etag?: string, modified?: string, vary?: boolean}): Response | null;
+    /**
+     * reply.close([options])
+     * Concludes the handler activity by returning control over to the router and informing the router that a response has already been sent back directly via request.raw.res and that no further response action is needed. Supports the following optional options:
+     * The response flow control rules do not apply.
+     * [See docs](https://hapijs.com/api/16.1.1#replycloseoptions)
+     * @param options  options object:
+     *      * end - if false, the router will not call request.raw.res.end()) to ensure the response was ended. Defaults to true.
+     */
+    close(options?: {end?: boolean}): void;
+    /**
+     * reply.redirect(uri)
+     * Redirects the client to the specified uri. Same as calling reply().redirect(uri).
+     * The response flow control rules apply.
+     * Sets an HTTP redirection response (302) and decorates the response with additional methods for
+     * changing to a permanent or non-rewritable redirect is also available see response object redirect for more information.
+     * [See docs](https://hapijs.com/api/16.1.1#replyredirecturi)
+     * @param uri  an absolute or relative URI used to redirect the client to another resource.
+     */
+    redirect(uri: string): ResponseRedirect;
+    /**
+     * reply.response(result)
+     * Shorthand for calling `reply(null, result)`, replies with the response set to `result`.
+     * [See docs](https://hapijs.com/api/16.1.1#replyresponseresult)
+     * TODO likely to change.  Await approval of pull request to Hapi docs.
+     */
+    response(result: ReplyValue): Response;
+    /**
+     * Sets a cookie on the response
+     * [See docs](https://hapijs.com/api/16.1.1#reply)
+     * TODO likely to change.  Await approval of pull request to Hapi docs.
+     */
+    state(name: string, value: any, options?: any): void;
+    /**
+     * Clears a cookie on the response
+     * [See docs](https://hapijs.com/api/16.1.1#reply)
+     * TODO likely to change.  Await approval of pull request to Hapi docs.
+     */
+    unstate(name: string, options?: any): void;
+    /**
+     * The server.decorate('reply', ...) method can modify this prototype/interface.
+     * Have disabled these typings as there is a better alternative, see example in: tests/server/decorate.ts
+     * [And discussion here](https://github.com/DefinitelyTyped/DefinitelyTyped/issues/14517#issuecomment-298891630)
+     */
+    // [index: string]: any;
+}
+/**
+ * reply.continue([result])
+ * Returns control back to the framework without ending the request lifecycle
+ * [See docs](https://hapijs.com/api/16.1.1#replycontinueresult)
+ * [See docs](https://hapijs.com/api/16.1.1#replyerr-result) "With the exception of the handler function, all other methods provide the reply.continue() method which instructs the framework to continue processing the request without setting a response."
+ * @param result  if called in the handler, prerequisites, or extension points other than the 'onPreHandler' and 'onPreResponse', the result argument is not allowed and will throw an exception if present. If called within an authentication strategy, it sets the authenticated credentials. If called by the 'onPreHandler' or 'onPreResponse' extensions, the result argument overrides the current response including all headers, and returns control back to the framework to continue processing any remaining extensions.
+ */
+export interface Continue_Reply {
+    continue(result?: ReplyValue): Response | undefined;
+}
+
+/**
+ * [See docs](https://hapijs.com/api/16.1.1#serverauthschemename-scheme) > authenticate.
+ * Also [See docs](https://hapijs.com/api/16.1.1#replyerr-result).
+ * TODO check it has Base_Reply methods and properties
+ */
+export interface ReplySchemeAuth extends Base_Reply {
+    /**
+     * This function is called if authentication failed.
+     * TODO, check type the `response` parameter.  In https://hapijs.com/api/16.1.1#replyerr-result it is referred to as "null" but this seems to be for a third scenario where it is "used to return both an error and credentials in the authentication methods" then "reply() must be called with three arguments function(err, null, data)"
+     * @param err  any authentication error.
+     * @param response  any authentication response action such as redirection. Ignored if err is present, otherwise required.
+     * @param result  an object containing:
+     *      * credentials  the authenticated credentials.
+     *      * artifacts  optional authentication artifacts.
+     */
+    (err: Error | null, response: AnyAuthenticationResponseAction | null, result: AuthenticationResult): void;
+    /**
+     * is called if authentication succeeded
+     * @param result  same object as result above.
+     */
+    continue(result: AuthenticationResult): void;
+}
+/**
+ * Typing as any as it's not yet clear what type this argument takes.
+ * "any authentication response action such as redirection" is it equivalent to
+ * `ReplyValue` ?
+ * [See docs](https://hapijs.com/api/16.1.1#serverauthschemename-scheme)
+ * TODO research hapi source and type this.
+ */
+export type AnyAuthenticationResponseAction = any;
+/** [See docs](https://hapijs.com/api/16.1.1#serverauthschemename-scheme) */
+export interface AuthenticationResult {
+    credentials?: AuthenticatedCredentials;
+    artifacts?: any;
+}
+export interface AuthenticatedCredentials {
+    // Disabled to allow typing within a project
+    // [index: string]: any;
+}
+
+/**
+ * [See docs](https://hapijs.com/api/16.1.1#serverauthschemename-scheme) > payload
+ * TODO check it has Base_Reply methods and properties
+ */
+export interface ReplySchemeAuthOfPayload extends Base_Reply {
+    /**
+     * function called to authenticate the request payload where:
+     * @param err  any authentication error.
+     * @param response  any authentication response action such as redirection. Ignored if err is present, otherwise required.
+     */
+    (err: Error | null, response: AnyAuthenticationResponseAction): void;
+    /** is called if payload authentication succeeded */
+    continue(): void;
+}
+
+/**
+ * [See docs](https://hapijs.com/api/16.1.1#serverauthschemename-scheme) > response
+ * TODO check it has Base_Reply methods and properties
+ */
+export interface ReplySchemeAuthDecorateResponse extends Base_Reply {
+    /**
+     * is called if an error occurred
+     * @param err  any authentication error.
+     * @param response  any authentication response to send instead of the current response. Ignored if err is present, otherwise required.
+     */
+    (err?: Error, response?: ReplyValue): void;
+    /** is called if the operation succeeded. */
+    continue(): void;
+}
+
+export interface ReplyWithContinue extends Continue_Reply, Base_Reply {}
+
+export interface ReplyNoContinue extends Base_Reply {}
+
+// TODO assess use and usefulness of StrictReply
+
+// Concludes the handler activity by setting a response and returning control over to the framework where:
+//  erran optional error response.
+//     result an optional response payload.
+//     Since an request can only have one response regardless if it is an error or success, the reply() method can only result in a single response value. This means that passing both an err and result will only use the err. There is no requirement for either err or result to be (or not) an Error object. The framework will simply use the first argument if present, otherwise the second. The method supports two arguments to be compatible with the common callback pattern of error first.
+//     FLOW CONTROL:
+//     When calling reply(), the framework waits until process.nextTick() to continue processing the request and transmit the response. This enables making changes to the returned response object before the response is sent. This means the framework will resume as soon as the handler method exits. To suspend this behavior, the returned response object supports the following methods: hold(), send()
+/**
+ *
+ */
+// export interface Reply { // extends ReplyMethods {
+//     <T>(err: Error,
+//         result?: string | number | boolean | Buffer | stream.Stream | Promise<T> | T,
+//         /** Note that when used to return both an error and credentials in the authentication methods, reply() must be called with three arguments function(err, null, data) where data is the additional authentication information. */
+//         credentialData?: any): BoomError;
+//     /** Note that if result is a Stream with a statusCode property, that status code will be used as the default response code.  */
+//     <T>(result: string | number | boolean | Buffer | stream.Stream | Promise<T> | T): Response;
+// }
+
+/** Concludes the handler activity by setting a response and returning control over to the framework where:
+ erran optional error response.
+    result an optional response payload.
+    Since an request can only have one response regardless if it is an error or success, the reply() method can only result in a single response value. This means that passing both an err and result will only use the err. There is no requirement for either err or result to be (or not) an Error object. The framework will simply use the first argument if present, otherwise the second. The method supports two arguments to be compatible with the common callback pattern of error first.
+    FLOW CONTROL:
+    When calling reply(), the framework waits until process.nextTick() to continue processing the request and transmit the response. This enables making changes to the returned response object before the response is sent. This means the framework will resume as soon as the handler method exits. To suspend this behavior, the returned response object supports the following methods: hold(), send() */
+// export interface StrictReply<T> extends ReplyMethods {
+//     (err: Error,
+//         result?: Promise<T> | T,
+//         /** Note that when used to return both an error and credentials in the authentication methods, reply() must be called with three arguments function(err, null, data) where data is the additional authentication information. */
+//         credentialData?: any): BoomError;
+//     /** Note that if result is a Stream with a statusCode property, that status code will be used as the default response code.  */
+//     (result: Promise<T> | T): Response;
+// }
+
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +                                                                           +
+ +                                                                           +
+ +                                                                           +
+ +                                 Response                                  +
+ +                                                                           +
+ +                                                                           +
+ +                                                                           +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
+// TODO: move to separate file http://stackoverflow.com/questions/43276921
+
+/**
+ * Response object
+ * [See docs](https://hapijs.com/api/16.1.1#response-object)
+ *
+ * TODO, check extending from Podium is correct.  Extending because of "The response object supports the following events" [See docs](https://hapijs.com/api/16.1.1#response-events)
+ *  * 'peek' - emitted for each chunk of data written back to the client connection. The event method signature is function(chunk, encoding).
+ *  * 'finish' - emitted when the response finished writing but before the client response connection is ended. The event method signature is function ().
+ */
+export interface Response extends Podium {
+    /** the HTTP response status code. Defaults to 200 (except for errors). */
+    statusCode: number;
+    /** an object containing the response headers where each key is a header field name. Note that this is an incomplete list of headers to be included with the response. Additional headers will be added once the response is prepared for transmission. */
+    headers: Dictionary<string>;
+    /** the value provided using the reply interface. */
+    source: ReplyValue;
+    /**
+     * a string indicating the type of source with available values:
+     *  * 'plain' - a plain response such as string, number, null, or simple object (e.g. not a Stream, Buffer, or view).
+     *  * 'buffer' - a Buffer.
+     *  * 'stream' - a Stream.
+     *  * 'promise' - a Promise object.
+     */
+    variety: 'plain' | 'buffer' | 'stream' | 'promise';
+    /** application-specific state. Provides a safe place to store application data without potential conflicts with the framework. Should not be used by plugins which should use plugins[name]. */
+    app: any;
+    /** plugin-specific state. Provides a place to store and pass request-level plugin data. The plugins is an object where each key is a plugin name and the value is the state. */
+    plugins: PluginsStates;
+    /** response handling flags: */
+    settings: {
+        /** the 'Content-Type' HTTP header 'charset' property. Defaults to 'utf-8'. */
+        charset: string;
+        /** the string encoding scheme used to serial data into the HTTP payload when source is a string or marshals into a string. Defaults to 'utf8'. */
+        encoding: string;
+        /** if true and source is a Stream, copies the statusCode and headers of the stream to the outbound response. Defaults to true. */
+        passThrough: boolean;
+        /** options used for source value requiring stringification. Defaults to no replacer and no space padding. */
+        stringify: Json.StringifyArguments;
+        /** if set, overrides the route cache expiration milliseconds value set in the route config. Defaults to no override. */
+        ttl: number | null;
+        /** if true, a suffix will be automatically added to the 'ETag' header at transmission time (separated by a '-' character) when the HTTP 'Vary' header is present. */
+        varyEtag: boolean;
+    };
+
+    /**
+     * The following attribute is present in one or more of the examples
+     * TODO update once Hapi docs describes explicitly
+     */
+    isBoom?: boolean;
+    /**
+     * The following attribute is present in one or more of the examples
+     * TODO update once Hapi docs describes explicitly
+     */
+    isMissing?: boolean;
+    /**
+     * The following attribute is present in one or more of the examples
+     * TODO update once Hapi docs describes explicitly
+     */
+    output?: Boom.Output;
+
+    /**
+     * sets the HTTP 'Content-Length' header (to avoid chunked transfer encoding)
+     * @param length  the header value. Must match the actual payload size.
+     */
+    bytes(length: number): Response;
+    /**
+     * sets the 'Content-Type' HTTP header 'charset' property
+     * @param charset  the charset property value.
+     */
+    charset(charset: string): Response;
+    /**
+     * sets the HTTP status code
+     * @param statusCode  the HTTP status code (e.g. 200).
+     */
+    code(statusCode: number): Response;
+    /**
+     * sets the HTTP status message
+     * @param httpMessage  the HTTP status message (e.g. 'Ok' for status code 200).
+     */
+    message(httpMessage: string): Response;
+    /**
+     * sets the HTTP status code to Created (201) and the HTTP 'Location' header
+     * @param uri  an absolute or relative URI used as the 'Location' header value.
+     */
+    created(uri: string): Response;
+    /**
+     * sets the string encoding scheme used to serial data into the HTTP payload
+     * @param encoding  the encoding property value (see node Buffer encoding [See docs](https://nodejs.org/api/buffer.html#buffer_buffers_and_character_encodings)).
+     *  * 'ascii' - for 7-bit ASCII data only. This encoding is fast and will strip the high bit if set.
+     *  * 'utf8' - Multibyte encoded Unicode characters. Many web pages and other document formats use UTF-8.
+     *  * 'utf16le' - 2 or 4 bytes, little-endian encoded Unicode characters. Surrogate pairs (U+10000 to U+10FFFF) are supported.
+     *  * 'ucs2' - Alias of 'utf16le'.
+     *  * 'base64' - Base64 encoding. When creating a Buffer from a string, this encoding will also correctly accept "URL and Filename Safe Alphabet" as specified in RFC4648, Section 5.
+     *  * 'latin1' - A way of encoding the Buffer into a one-byte encoded string (as defined by the IANA in RFC1345, page 63, to be the Latin-1 supplement block and C0/C1 control codes).
+     *  * 'binary' - Alias for 'latin1'.
+     *  * 'hex' - Encode each byte as two hexadecimal characters.
+     */
+    encoding(encoding: 'ascii' | 'utf8' | 'utf16le' | 'ucs2' | 'base64' | 'latin1' | 'binary' | 'hex'): Response;
+    /**
+     * sets the representation entity tag
+     * @param tag  the entity tag string without the double-quote.
+     * @param options  options object
+     *      * weak - if true, the tag will be prefixed with the 'W/' weak signifier. Weak tags will fail to match identical tags for the purpose of determining 304 response status. Defaults to false.
+     *      * vary - if true and content encoding is set or applied to the response (e.g 'gzip' or 'deflate'), the encoding name will be automatically added to the tag at transmission time (separated by a '-' character). Ignored when weak is true. Defaults to true.
+     */
+    etag(tag: string, options?: {weak: boolean, vary: boolean}): Response;
+    /**
+     * sets an HTTP header
+     * @param name  the header name.
+     * @param value  the header value.
+     */
+    header(name: string, value: string, options?: ResponseHeaderOptionsObject): Response;
+    /**
+     * sets the HTTP 'Location' header
+     * @param uri  an absolute or relative URI used as the 'Location' header value.
+     */
+    location(uri: string): Response;
+    /**
+     * sets an HTTP redirection response (302) and decorates the response with additional methods listed below,
+     * @param uri  an absolute or relative URI used to redirect the client to another resource.
+     */
+    redirect(uri: string): Response;
+    /**
+     * sets the JSON.stringify() replacer argument
+     * @param method  the replacer function or array. Defaults to none.
+     */
+    replacer(method: Json.StringifyReplacer): Response;
+    /**
+     * sets the JSON.stringify() space argument
+     * @param count  the number of spaces to indent nested object keys. Defaults to no indentation.
+     */
+    spaces(count: Json.StringifySpace): Response;
+    /**
+     * sets an HTTP cookie
+     * @param name  the cookie name.
+     * @param value  the cookie value. If no encoding is defined, must be a string.
+     * @param options  optional configuration. If the state was previously registered with the server using server.state(), the specified keys in options override those same keys in the server definition (but not others).
+     */
+    state(name: string, value: string | Object | any[], options?: ServerStateCookieConfiguationObject): Response;
+    /**
+     * sets a string suffix when the response is process via JSON.stringify().
+     */
+    suffix(suffix: string): Response;
+    /**
+     * overrides the default route cache expiration rule for this response instance
+     * @param msec  the time-to-live value in milliseconds.
+     */
+    ttl(msec: number): Response;
+    /**
+     * sets the HTTP 'Content-Type' header
+     * @param mimeType  is the mime type. Should only be used to override the built-in default for each response type.
+     */
+    type(mimeType: string): Response;
+    /**
+     * clears the HTTP cookie by setting an expired value
+     * @param name  the cookie name.
+     * @param options  optional configuration for expiring cookie. If the state was previously registered with the server using server.state(), the specified keys in options override those same keys in the server definition (but not others).
+     */
+    unstate(name: string, options?: ServerStateCookieConfiguationObject): Response;
+    /**
+     * adds the provided header to the list of inputs affected the response generation via the HTTP 'Vary' header
+     * @param header  the HTTP request header name.
+     */
+    vary(header: string): Response;
+
+    /**
+     * Flow control - hold()
+     * When calling reply(), the framework waits until process.nextTick() to continue processing the request and transmit the response. This enables making changes to the returned response object before the response is sent. This means the framework will resume as soon as the handler method exits. To suspend this behavior, the returned response object supports the following methods:
+     * puts the response on hold until response.send() is called. Available only after reply() is called and until response.hold() is invoked once.
+     * [See docs](https://hapijs.com/api/16.1.1#flow-control)
+     */
+    hold(): Response;
+    /**
+     * Flow control - send()
+     * When calling reply(), the framework waits until process.nextTick() to continue processing the request and transmit the response. This enables making changes to the returned response object before the response is sent. This means the framework will resume as soon as the handler method exits. To suspend this behavior, the returned response object supports the following methods:
+     * immediately resume the response. Available only after response.hold() is called and until response.send() is invoked once.
+     * [See docs](https://hapijs.com/api/16.1.1#flow-control)
+     */
+    send(): Response;
+
+    /**
+     * Mentioned here: "Note that prerequisites do not follow the same rules of the normal reply interface. In all other cases, calling reply() with or without a value will use the result as the response sent back to the client. In a prerequisite method, calling reply() will assign the returned value to the provided assign key. If the returned value is an error, the failAction setting determines the behavior. To force the return value as the response and skip any other prerequisites and the handler, use the reply().takeover() method."
+     * TODO prepare documentation PR and submit to hapi.
+     * [See docs](https://hapijs.com/api/16.1.1#route-prerequisites)
+     */
+    takeover(): Response;
+}
+
+/**
+ * Response Object Redirect Methods
+ * When using the redirect() method, the response object provides these additional methods:
+ * [See docs](https://hapijs.com/api/16.1.1#response-object-redirect-methods)
+ */
+export interface ResponseRedirect extends Response {
+    /**
+     * temporary
+     * sets the status code to 302 or 307 (based on the rewritable() setting) where:
+     * [See docs](https://hapijs.com/api/16.1.1#response-object-redirect-methods)
+     * @param isTemporary  if false, sets status to permanent. Defaults to true.
+     */
+    temporary(isTemporary: boolean): Response;
+    /**
+     * permanent
+     * sets the status code to 301 or 308 (based on the rewritable() setting) where:
+     * [See docs](https://hapijs.com/api/16.1.1#response-object-redirect-methods)
+     * @param isPermanent  if false, sets status to temporary. Defaults to true.
+     */
+    permanent(isPermanent: boolean): Response;
+    /**
+     * rewritable
+     * sets the status code to 301/302 for rewritable (allows changing the request method from 'POST' to 'GET') or 307/308 for non-rewritable (does not allow changing the request method from 'POST' to 'GET'). Exact code based on the temporary() or permanent() setting. Arguments:
+     * [See docs](https://hapijs.com/api/16.1.1#response-object-redirect-methods)
+     * @param isRewritable  if false, sets to non-rewritable. Defaults to true.
+     */
+    rewritable(isRewritable: boolean): Response;
+}
+
+/**
+ * [See docs](https://hapijs.com/api/16.1.1#response-object) under "response object provides the following methods" > header > options
+ */
+export interface ResponseHeaderOptionsObject {
+    /** if true, the value is appended to any existing header value using separator. Defaults to false. */
+    append?: boolean;
+    /** string used as separator when appending to an existing value. Defaults to ','. */
+    separator?: string;
+    /** if false, the header value is not set if an existing value present. Defaults to true. */
+    override?: boolean;
+    /** if false, the header value is not modified if the provided value is already included. Does not apply when append is false or if the name is 'set-cookie'. Defaults to true. */
+    duplicate?: boolean;
+}
+
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +                                                                           +
+ +                                                                           +
+ +                                                                           +
+ +                           Plugins and register                            +
+ +                                                                           +
+ +                                                                           +
+ +                                                                           +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
+// TODO: move to separate file http://stackoverflow.com/questions/43276921
+
+/**
+ * Plugins
+ * Plugins provide a way to organize the application code by splitting the server logic into smaller components. Each plugin can manipulate the server and its connections through the standard server interface, but with the added ability to sandbox certain properties.
+ * [See docs](https://hapijs.com/api/16.1.1#plugins)
+ * @param server  the server object the plugin is being registered to.
+ * @param options  an options object passed to the plugin during registration.
+ * @param next  a callback method the function must call to return control back to the framework to complete the registration process with signature function(err)
+ */
+export interface PluginFunction<OptionsPassedToPlugin> {
+    (server: Server, options: OptionsPassedToPlugin, next: (err?: Error) => void): void;
+    /**
+     * Note attributes is NOT optional but this type is easier to use.
+     */
+    attributes?: PluginAttributes;
+}
+
+/**
+ * see Plugin
+ * [See docs](https://hapijs.com/api/16.1.1#plugins)
+ */
+export interface PluginAttributes {
+    /**
+     * required plugin name string. The name is used as a unique key. Published plugins should use the same name as the name field in the 'package.json' file. Names must be unique within each application.
+     * NOTE: marked as optional as `pkg` can be used instead.
+     */
+    name?: string;
+    /** optional plugin version. The version is only used informatively to enable other plugins to find out the versions loaded. The version should be the same as the one specified in the plugin's 'package.json' file. */
+    version?: string;
+    /** Alternatively, the name and version can be included via the pkg attribute containing the 'package.json' file for the module which already has the name and version included */
+    pkg?: any;
+    /** if true, allows the plugin to be registered multiple times with the same server. Defaults to false. */
+    multiple?: boolean;
+    /** optional string or array of string indicating a plugin dependency. Same as setting dependencies via server.dependency(). */
+    dependencies?: string | string[];
+    /** if false, does not allow the plugin to call server APIs that modify the connections such as adding a route or configuring state. This flag allows the plugin to be registered before connections are added and to pass dependency requirements. When set to 'conditional', the mode is based on the presence of selected connections (if the server has connections, it is the same as true, but if no connections are available, it is the same as false). Defaults to true. */
+    connections?: boolean | 'conditional';
+    /** if true, will only register the plugin once per connection (or once per server for a connectionless plugin). If set, overrides the once option passed to server.register(). Defaults to undefined (registration will be based on the server.register() option once). */
+    once?: boolean;
+}
+
+/**
+ * Plugins State
+ * Related [See docs](https://hapijs.com/api/16.1.1#serverplugins)
+ * Related [See docs](https://hapijs.com/api/16.1.1#serverrealm)
+ */
+export interface PluginsStates {
+    [pluginName: string]: any;
+}
+
+/**
+ * once, select, routes - optional plugin-specific registration options as defined see PluginRegistrationOptions
+ * [See docs](https://hapijs.com/api/16.1.1#serverregisterplugins-options-callback)
+ */
+export interface PluginRegistrationObject<OptionsPassedToPlugin> extends PluginRegistrationOptions {
+    /** the plugin registration function. */
+    register: PluginFunction<OptionsPassedToPlugin>;
+    /** optional options passed to the registration function when called. */
+    options?: OptionsPassedToPlugin;
+}
+
+/**
+ * registration options (different from the options passed to the registration function):
+ *  * once - if true, the registration is skipped for any connection already registered with. Cannot be used with plugin options. If the plugin does not have a connections attribute set to false and the registration selection is empty, registration will be skipped as no connections are available to register once. Defaults to false.
+ *  * routes - modifiers applied to each route added by the plugin:
+ *      * prefix - string added as prefix to any route path (must begin with '/'). If a plugin registers a child plugin the prefix is passed on to the child or is added in front of the child-specific prefix.
+ *      * vhost - virtual host string (or array of strings) applied to every route. The outer-most vhost overrides the any nested configuration.
+ *  * select - a string or array of string labels used to pre-select connections for plugin registration.
+ * [See docs](https://hapijs.com/api/16.1.1#serverregisterplugins-options-callback)
+ */
+export interface PluginRegistrationOptions {
+    once?: boolean;
+    routes?: {prefix?: string, vhost?: string | string[]};
+    select?: string | string[];
+}
+
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +                                                                           +
+ +                                                                           +
+ +                                                                           +
+ +                                    JSON                                   +
+ +                                                                           +
+ +                                                                           +
+ +                                                                           +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
+// This was in a seperate file and perhaps should move to some of the lib typings?
+// https://github.com/DefinitelyTyped/DefinitelyTyped/pull/16065#issuecomment-299443673
+//
+// json/json-tests.ts
+//
+// import * as JSON from './index';
+//
+// var a: JSON.StringifyReplacer = function(key, value) {
+//     if (key === "do not include") {
+//         return undefined;
+//     }
+//     return value;
+// };
+//
+
+export namespace Json {
+    /**
+     * @see {@link https://developer.mozilla.org/en/docs/Web/JavaScript/Reference/Global_Objects/JSON/stringify#The_replacer_parameter}
+     */
+    export type StringifyReplacer = ((key: string, value: any) => any) | (string | number)[] | undefined;
+
+    /**
+     * Any value greater than 10 is truncated.
+     */
+    export type StringifySpace = number | string;
+
+    export interface StringifyArguments {
+        /** the replacer function or array. Defaults to no action. */
+        replacer?: StringifyReplacer;
+        /** number of spaces to indent nested object keys. Defaults to no indentation. */
+        space?: StringifySpace;
+    }
+}
diff --git a/types/hapi/test/connection/table.ts b/types/hapi/v16/test/connection/table.ts
similarity index 94%
rename from types/hapi/test/connection/table.ts
rename to types/hapi/v16/test/connection/table.ts
index 24eaa28ddc..3ead170c90 100644
--- a/types/hapi/test/connection/table.ts
+++ b/types/hapi/v16/test/connection/table.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#servertablehost
 
-import * as Hapi from 'hapi';
+import * as Hapi from '../../';
 const server = new Hapi.Server();
 server.connection({ port: 80, host: 'example.com' });
 server.route({ method: 'GET', path: '/example', handler: function (request, reply) { return reply(); } });
diff --git a/types/hapi/test/continuation/errors.ts b/types/hapi/v16/test/continuation/errors.ts
similarity index 100%
rename from types/hapi/test/continuation/errors.ts
rename to types/hapi/v16/test/continuation/errors.ts
diff --git a/types/hapi/test/getting-started/01-creating-a-server.ts b/types/hapi/v16/test/getting-started/01-creating-a-server.ts
similarity index 100%
rename from types/hapi/test/getting-started/01-creating-a-server.ts
rename to types/hapi/v16/test/getting-started/01-creating-a-server.ts
diff --git a/types/hapi/test/getting-started/02-adding-routes.ts b/types/hapi/v16/test/getting-started/02-adding-routes.ts
similarity index 100%
rename from types/hapi/test/getting-started/02-adding-routes.ts
rename to types/hapi/v16/test/getting-started/02-adding-routes.ts
diff --git a/types/hapi/test/getting-started/03-serving-static-content.ts b/types/hapi/v16/test/getting-started/03-serving-static-content.ts
similarity index 100%
rename from types/hapi/test/getting-started/03-serving-static-content.ts
rename to types/hapi/v16/test/getting-started/03-serving-static-content.ts
diff --git a/types/hapi/test/getting-started/04-using-plugins.ts b/types/hapi/v16/test/getting-started/04-using-plugins.ts
similarity index 100%
rename from types/hapi/test/getting-started/04-using-plugins.ts
rename to types/hapi/v16/test/getting-started/04-using-plugins.ts
diff --git a/types/hapi/test/path/catch-all.ts b/types/hapi/v16/test/path/catch-all.ts
similarity index 89%
rename from types/hapi/test/path/catch-all.ts
rename to types/hapi/v16/test/path/catch-all.ts
index c9002392b1..e38a67ec96 100644
--- a/types/hapi/test/path/catch-all.ts
+++ b/types/hapi/v16/test/path/catch-all.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#catch-all-route
 
-import * as Hapi from 'hapi';
+import * as Hapi from '../../';
 const server = new Hapi.Server();
 server.connection({ port: 80 });
 
diff --git a/types/hapi/test/path/parameters.ts b/types/hapi/v16/test/path/parameters.ts
similarity index 95%
rename from types/hapi/test/path/parameters.ts
rename to types/hapi/v16/test/path/parameters.ts
index 62bbfcc638..6bbba522db 100644
--- a/types/hapi/test/path/parameters.ts
+++ b/types/hapi/v16/test/path/parameters.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#path-parameters
 
-import * as Hapi from 'hapi';
+import * as Hapi from '../../';
 const server = new Hapi.Server();
 server.connection({ port: 80 });
 
diff --git a/types/hapi/test/plugins/options.ts b/types/hapi/v16/test/plugins/options.ts
similarity index 95%
rename from types/hapi/test/plugins/options.ts
rename to types/hapi/v16/test/plugins/options.ts
index cd192f1996..7f6ad6c13c 100644
--- a/types/hapi/test/plugins/options.ts
+++ b/types/hapi/v16/test/plugins/options.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#serverinfo
 
-import * as Hapi from 'hapi';
+import * as Hapi from '../../';
 
 // added in addition to code from docs
 interface PluginOptions {
diff --git a/types/hapi/test/reply/continue.ts b/types/hapi/v16/test/reply/continue.ts
similarity index 91%
rename from types/hapi/test/reply/continue.ts
rename to types/hapi/v16/test/reply/continue.ts
index de6994fbd0..5f23cb039a 100644
--- a/types/hapi/test/reply/continue.ts
+++ b/types/hapi/v16/test/reply/continue.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#replycontinueresult
 
-import * as Hapi from 'hapi';
+import * as Hapi from '../../';
 const server = new Hapi.Server();
 server.connection({ port: 80 });
 
diff --git a/types/hapi/test/reply/entity.ts b/types/hapi/v16/test/reply/entity.ts
similarity index 93%
rename from types/hapi/test/reply/entity.ts
rename to types/hapi/v16/test/reply/entity.ts
index cfcce6de25..5cb187fa1e 100644
--- a/types/hapi/test/reply/entity.ts
+++ b/types/hapi/v16/test/reply/entity.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#replyentityoptions
 
-import * as Hapi from 'hapi';
+import * as Hapi from '../../';
 const server = new Hapi.Server();
 server.connection({ port: 80 });
 
diff --git a/types/hapi/test/reply/redirect.ts b/types/hapi/v16/test/reply/redirect.ts
similarity index 84%
rename from types/hapi/test/reply/redirect.ts
rename to types/hapi/v16/test/reply/redirect.ts
index 5baf892ac1..934092868b 100644
--- a/types/hapi/test/reply/redirect.ts
+++ b/types/hapi/v16/test/reply/redirect.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#replyredirecturi
 
-import * as Hapi from 'hapi';
+import * as Hapi from '../../';
 const handler: Hapi.RouteHandler = function (request, reply) {
 
     return reply.redirect('http://example.com');
diff --git a/types/hapi/test/reply/reply.ts b/types/hapi/v16/test/reply/reply.ts
similarity index 92%
rename from types/hapi/test/reply/reply.ts
rename to types/hapi/v16/test/reply/reply.ts
index 31f3bff9b4..bf92621986 100644
--- a/types/hapi/test/reply/reply.ts
+++ b/types/hapi/v16/test/reply/reply.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#replyerr-result
 
-import * as Hapi from 'hapi';
+import * as Hapi from '../../';
 
 // verbose notation
 
@@ -19,4 +19,4 @@ const handler2: Hapi.RouteHandler = function (request, reply) {
     return reply('success')
         .type('text/plain')
         .header('X-Custom', 'some-value');
-};
\ No newline at end of file
+};
diff --git a/types/hapi/test/reply/state_cookie.ts b/types/hapi/v16/test/reply/state_cookie.ts
similarity index 95%
rename from types/hapi/test/reply/state_cookie.ts
rename to types/hapi/v16/test/reply/state_cookie.ts
index bf94219311..8a0be7da34 100644
--- a/types/hapi/test/reply/state_cookie.ts
+++ b/types/hapi/v16/test/reply/state_cookie.ts
@@ -1,7 +1,7 @@
 
 // from https://hapijs.com/tutorials/cookies?lang=en_US
 
-import * as Hapi from 'hapi';
+import * as Hapi from '../../';
 
 const server = new Hapi.Server();
 server.connection({ port: 80 });
diff --git a/types/hapi/v16/test/request/event-types.ts b/types/hapi/v16/test/request/event-types.ts
new file mode 100644
index 0000000000..d9ee4dab33
--- /dev/null
+++ b/types/hapi/v16/test/request/event-types.ts
@@ -0,0 +1,30 @@
+
+// From https://hapijs.com/api/16.1.1#requestsetmethodmethod
+
+import * as Hapi from '../../';
+const Crypto = require('crypto');
+const server = new Hapi.Server();
+server.connection({ port: 80 });
+
+const onRequest: Hapi.ServerExtRequestHandler = function (request, reply) {
+
+    const hash = Crypto.createHash('sha1');
+    request.on('peek', (chunk) => {
+
+        hash.update(chunk);
+    });
+
+    request.once('finish', () => {
+
+        console.log(hash.digest('hex'));
+    });
+
+    request.once('disconnect', () => {
+
+        console.error('request aborted');
+    });
+
+    return reply.continue();
+};
+
+server.ext('onRequest', onRequest);
diff --git a/types/hapi/test/request/generate-response.ts b/types/hapi/v16/test/request/generate-response.ts
similarity index 93%
rename from types/hapi/test/request/generate-response.ts
rename to types/hapi/v16/test/request/generate-response.ts
index c30c3a7be5..f731961a68 100644
--- a/types/hapi/test/request/generate-response.ts
+++ b/types/hapi/v16/test/request/generate-response.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#requestgenerateresponsesource-options
 
-import * as Hapi from 'hapi';
+import * as Hapi from '../../';
 
 // Added in addition to code from docs
 function promiseMethod() {
diff --git a/types/hapi/v16/test/request/get-log.ts b/types/hapi/v16/test/request/get-log.ts
new file mode 100644
index 0000000000..53568ba734
--- /dev/null
+++ b/types/hapi/v16/test/request/get-log.ts
@@ -0,0 +1,12 @@
+
+// From https://hapijs.com/api/16.1.1#requestgetlogtags-internal
+
+import * as Hapi from '../../';
+
+var request: Hapi.Request = <any> {};
+
+request.getLog();
+request.getLog('error');
+request.getLog(['error', 'auth']);
+request.getLog(['error'], true);
+request.getLog(false);
diff --git a/types/hapi/test/request/log.ts b/types/hapi/v16/test/request/log.ts
similarity index 93%
rename from types/hapi/test/request/log.ts
rename to types/hapi/v16/test/request/log.ts
index 1c2da1f3b0..f9b044eafc 100644
--- a/types/hapi/test/request/log.ts
+++ b/types/hapi/v16/test/request/log.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#requestlogtags-data-timestamp
 
-import * as Hapi from 'hapi';
+import * as Hapi from '../../';
 const server = new Hapi.Server();
 server.connection({ port: 80, routes: { log: true, security: false } });
 
diff --git a/types/hapi/v16/test/request/query.ts b/types/hapi/v16/test/request/query.ts
new file mode 100644
index 0000000000..1aa801b69d
--- /dev/null
+++ b/types/hapi/v16/test/request/query.ts
@@ -0,0 +1,14 @@
+// Added test in addition to docs, for request.query
+
+import * as Hapi from '../../';
+
+interface GetThingQuery {
+    name: string;
+}
+
+const handler: Hapi.RouteHandler = function (request, reply) {
+
+    const query = request.query as GetThingQuery;
+
+    return reply(`You asked for ${query.name}`);
+};
diff --git a/types/hapi/test/request/set-method.ts b/types/hapi/v16/test/request/set-method.ts
similarity index 91%
rename from types/hapi/test/request/set-method.ts
rename to types/hapi/v16/test/request/set-method.ts
index 7269e6255f..aa78eeaecf 100644
--- a/types/hapi/test/request/set-method.ts
+++ b/types/hapi/v16/test/request/set-method.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#requestsetmethodmethod
 
-import * as Hapi from 'hapi';
+import * as Hapi from '../../';
 const server = new Hapi.Server();
 server.connection({ port: 80 });
 
diff --git a/types/hapi/test/request/set-url.ts b/types/hapi/v16/test/request/set-url.ts
similarity index 90%
rename from types/hapi/test/request/set-url.ts
rename to types/hapi/v16/test/request/set-url.ts
index 4add3c5a17..1c3a0a047b 100644
--- a/types/hapi/test/request/set-url.ts
+++ b/types/hapi/v16/test/request/set-url.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#requestseturlurl-striptrailingslash
 
-import * as Hapi from 'hapi';
+import * as Hapi from '../../';
 const server = new Hapi.Server();
 server.connection({ port: 80 });
 
@@ -17,7 +17,7 @@ server.ext('onRequest', onRequest);
 // Example 2
 
 const Url = require('url');
-const Qs = require('qs');
+const Qs = require('../../../../qs');
 
 onRequest = function (request, reply) {
 
diff --git a/types/hapi/test/request/tail.ts b/types/hapi/v16/test/request/tail.ts
similarity index 94%
rename from types/hapi/test/request/tail.ts
rename to types/hapi/v16/test/request/tail.ts
index 9c68ccb8f2..426c0cd835 100644
--- a/types/hapi/test/request/tail.ts
+++ b/types/hapi/v16/test/request/tail.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#requestsetmethodmethod
 
-import * as Hapi from 'hapi';
+import * as Hapi from '../../';
 const server = new Hapi.Server();
 server.connection({ port: 80 });
 
diff --git a/types/hapi/test/response/error-representation.ts b/types/hapi/v16/test/response/error-representation.ts
similarity index 84%
rename from types/hapi/test/response/error-representation.ts
rename to types/hapi/v16/test/response/error-representation.ts
index f0fb62eb30..7eacfdfaf3 100644
--- a/types/hapi/test/response/error-representation.ts
+++ b/types/hapi/v16/test/response/error-representation.ts
@@ -1,13 +1,13 @@
 
 // From https://hapijs.com/api/16.1.1#error-transformation
 
-import * as Hapi from 'hapi';
-import Vision from 'vision';
+import * as Hapi from '../../';
+import Vision from '../../../../vision';
 const server = new Hapi.Server();
 server.register(Vision, {}, (err) => {
     server.views({
         engines: {
-            html: require('handlebars')
+            html: require('../../../../handlebars')
         }
   });
 });
diff --git a/types/hapi/v16/test/response/error.ts b/types/hapi/v16/test/response/error.ts
new file mode 100644
index 0000000000..f426de66e0
--- /dev/null
+++ b/types/hapi/v16/test/response/error.ts
@@ -0,0 +1,25 @@
+
+// From https://hapijs.com/api/16.1.1#error-response
+
+import * as Hapi from '../../';
+const Boom = require('../../../../boom');
+
+const server = new Hapi.Server();
+
+server.route({
+    method: 'GET',
+    path: '/badRequest',
+    handler: function (request, reply) {
+
+        return reply(Boom.badRequest('Unsupported parameter'));
+    }
+});
+
+server.route({
+    method: 'GET',
+    path: '/internal',
+    handler: function (request, reply) {
+
+        return reply(new Error('unexpect error'));
+    }
+});
diff --git a/types/hapi/test/response/events.ts b/types/hapi/v16/test/response/events.ts
similarity index 95%
rename from types/hapi/test/response/events.ts
rename to types/hapi/v16/test/response/events.ts
index 2d1658087b..07d4e0a65b 100644
--- a/types/hapi/test/response/events.ts
+++ b/types/hapi/v16/test/response/events.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#response-events
 
-import * as Hapi from 'hapi';
+import * as Hapi from '../../';
 const Crypto = require('crypto');
 const server = new Hapi.Server();
 server.connection({ port: 80 });
diff --git a/types/hapi/test/response/flow-control.ts b/types/hapi/v16/test/response/flow-control.ts
similarity index 88%
rename from types/hapi/test/response/flow-control.ts
rename to types/hapi/v16/test/response/flow-control.ts
index bc18a36aff..321d198825 100644
--- a/types/hapi/test/response/flow-control.ts
+++ b/types/hapi/v16/test/response/flow-control.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#flow-control
 
-import * as Hapi from 'hapi';
+import * as Hapi from '../../';
 
 const handler = function (request: Hapi.Request, reply: Hapi.ReplyWithContinue) {
 
diff --git a/types/hapi/test/route/additional-options.ts b/types/hapi/v16/test/route/additional-options.ts
similarity index 98%
rename from types/hapi/test/route/additional-options.ts
rename to types/hapi/v16/test/route/additional-options.ts
index 189dc488de..ccbb36af15 100644
--- a/types/hapi/test/route/additional-options.ts
+++ b/types/hapi/v16/test/route/additional-options.ts
@@ -1,6 +1,6 @@
 'use strict';
 
-import * as Hapi from 'hapi';
+import * as Hapi from '../../';
 
 var authConfig: Hapi.RouteAdditionalConfigurationOptions = {
     app: {},
diff --git a/types/hapi/test/route/auth.ts b/types/hapi/v16/test/route/auth.ts
similarity index 94%
rename from types/hapi/test/route/auth.ts
rename to types/hapi/v16/test/route/auth.ts
index e5239322da..e8d41cf47d 100644
--- a/types/hapi/test/route/auth.ts
+++ b/types/hapi/v16/test/route/auth.ts
@@ -1,6 +1,6 @@
 'use strict';
 
-import * as Hapi from 'hapi';
+import * as Hapi from '../../';
 
 var routeMoreConfig: Hapi.RouteAdditionalConfigurationOptions = {
     auth: false,
diff --git a/types/hapi/v16/test/route/config.ts b/types/hapi/v16/test/route/config.ts
new file mode 100644
index 0000000000..680ee4c043
--- /dev/null
+++ b/types/hapi/v16/test/route/config.ts
@@ -0,0 +1,46 @@
+'use strict';
+
+import * as Hapi from '../../';
+
+// different methods
+var routeConfig: Hapi.RouteConfiguration = {
+  path: '/signin',
+  method: 'PUT',
+  vhost: 'site.coms',
+};
+var routeConfig: Hapi.RouteConfiguration = {
+  path: '/signin',
+  method: '*'
+};
+var routeConfig: Hapi.RouteConfiguration = {
+  path: '/signin',
+  method: ['OPTIONS', '*']
+};
+
+// different handlers
+var routeConfig: Hapi.RouteConfiguration = {
+  path: '/signin',
+  method: 'PUT',
+  handler: 'some registered handler'
+};
+var routeConfig: Hapi.RouteConfiguration = {
+  path: '/signin',
+  method: 'PUT',
+  handler: function (request, reply) {
+    return reply('ok');
+  }
+};
+
+const server = new Hapi.Server();
+server.route(routeConfig);
+
+// Handler in config
+const user: Hapi.RouteAdditionalConfigurationOptions = {
+    cache: { expiresIn: 5000 },
+    handler: function (request, reply) {
+
+        return reply({ name: 'John' });
+    }
+};
+
+server.route({method: 'GET', path: '/user', config: user });
diff --git a/types/hapi/v16/test/route/handler.ts b/types/hapi/v16/test/route/handler.ts
new file mode 100644
index 0000000000..401bf35eab
--- /dev/null
+++ b/types/hapi/v16/test/route/handler.ts
@@ -0,0 +1,10 @@
+'use strict';
+
+import * as Hapi from '../../';
+
+var handler: Hapi.RouteHandler = function(request, reply) {
+    reply('success');
+}
+var strictHandler: Hapi.RouteHandler = function(request, reply) {
+    reply(123);
+}
diff --git a/types/hapi/test/route/plugins.ts b/types/hapi/v16/test/route/plugins.ts
similarity index 92%
rename from types/hapi/test/route/plugins.ts
rename to types/hapi/v16/test/route/plugins.ts
index 2449fc84c0..ba7abdb777 100644
--- a/types/hapi/test/route/plugins.ts
+++ b/types/hapi/v16/test/route/plugins.ts
@@ -1,9 +1,9 @@
 // Added in addition to code from https://hapijs.com/api/16.1.1#route-options > plugins
 
-import * as Hapi from 'hapi';
+import * as Hapi from '../../';
 
 // In the plugin code
-declare module 'hapi' {
+declare module '../../' {
     interface PluginSpecificConfiguration {
         coolPlugin: {
             optionA: string;
diff --git a/types/hapi/test/route/prerequisites.ts b/types/hapi/v16/test/route/prerequisites.ts
similarity index 97%
rename from types/hapi/test/route/prerequisites.ts
rename to types/hapi/v16/test/route/prerequisites.ts
index c4ca7650fa..15a16af2c0 100644
--- a/types/hapi/test/route/prerequisites.ts
+++ b/types/hapi/v16/test/route/prerequisites.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#route-prerequisites
 
-import * as Hapi from 'hapi';
+import * as Hapi from '../../';
 const server = new Hapi.Server();
 server.connection({ port: 80 });
 
diff --git a/types/hapi/test/route/public-interface.ts b/types/hapi/v16/test/route/public-interface.ts
similarity index 93%
rename from types/hapi/test/route/public-interface.ts
rename to types/hapi/v16/test/route/public-interface.ts
index e61fb8275f..f3878cea48 100644
--- a/types/hapi/test/route/public-interface.ts
+++ b/types/hapi/v16/test/route/public-interface.ts
@@ -1,6 +1,6 @@
 'use strict';
 
-import * as Hapi from 'hapi';
+import * as Hapi from '../../';
 
 var route = <Hapi.RoutePublicInterface> {};
 
diff --git a/types/hapi/test/route/validate.ts b/types/hapi/v16/test/route/validate.ts
similarity index 96%
rename from types/hapi/test/route/validate.ts
rename to types/hapi/v16/test/route/validate.ts
index cb5c5527ee..06fefcc62e 100644
--- a/types/hapi/test/route/validate.ts
+++ b/types/hapi/v16/test/route/validate.ts
@@ -1,8 +1,8 @@
 
 // Added from: https://github.com/DefinitelyTyped/DefinitelyTyped/pull/16065#issuecomment-302216131
 
-import * as Hapi from 'hapi';
-import * as Joi from 'joi';
+import * as Hapi from '../../';
+import * as Joi from '../../../../joi';
 
 const validate: Hapi.RouteValidationConfigurationObject = {
     headers: true,
diff --git a/types/hapi/test/server/app.ts b/types/hapi/v16/test/server/app.ts
similarity index 87%
rename from types/hapi/test/server/app.ts
rename to types/hapi/v16/test/server/app.ts
index dac8921c20..7ed57fe6e8 100644
--- a/types/hapi/test/server/app.ts
+++ b/types/hapi/v16/test/server/app.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#serverapp
 
-import * as Hapi from 'hapi';
+import * as Hapi from '../../';
 var server = new Hapi.Server();
 server.app.key = 'value';
 
diff --git a/types/hapi/test/server/auth.ts b/types/hapi/v16/test/server/auth.ts
similarity index 96%
rename from types/hapi/test/server/auth.ts
rename to types/hapi/v16/test/server/auth.ts
index 3f28732d42..c699a63c1b 100644
--- a/types/hapi/test/server/auth.ts
+++ b/types/hapi/v16/test/server/auth.ts
@@ -1,8 +1,8 @@
 
 // From https://hapijs.com/api/16.1.1#serverauthapi
 
-import * as Hapi from 'hapi';
-import * as Boom from 'boom';
+import * as Hapi from '../../';
+import * as Boom from '../../../../boom';
 const server = new Hapi.Server();
 server.connection({ port: 80 });
 
diff --git a/types/hapi/test/server/bind.ts b/types/hapi/v16/test/server/bind.ts
similarity index 93%
rename from types/hapi/test/server/bind.ts
rename to types/hapi/v16/test/server/bind.ts
index 2741e16c82..c8e0ba0016 100644
--- a/types/hapi/test/server/bind.ts
+++ b/types/hapi/v16/test/server/bind.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#serverbindcontext
 
-import * as Hapi from 'hapi';
+import * as Hapi from '../../';
 
 interface HandlerThis {
     message: string;
diff --git a/types/hapi/test/server/cache.ts b/types/hapi/v16/test/server/cache.ts
similarity index 96%
rename from types/hapi/test/server/cache.ts
rename to types/hapi/v16/test/server/cache.ts
index 4cb9eaa4b7..18d7cbbd3a 100644
--- a/types/hapi/test/server/cache.ts
+++ b/types/hapi/v16/test/server/cache.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#servercacheoptions
 
-import * as Hapi from 'hapi';
+import * as Hapi from '../../';
 const server = new Hapi.Server();
 server.connection({ port: 80 });
 
diff --git a/types/hapi/test/server/connection-options.ts b/types/hapi/v16/test/server/connection-options.ts
similarity index 96%
rename from types/hapi/test/server/connection-options.ts
rename to types/hapi/v16/test/server/connection-options.ts
index 3a526307db..e4b5582598 100644
--- a/types/hapi/test/server/connection-options.ts
+++ b/types/hapi/v16/test/server/connection-options.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#serverconnectionoptions
 
-import * as Hapi from 'hapi';
+import * as Hapi from '../../';
 const server = new Hapi.Server();
 
 const web = server.connection({ port: 8000, host: 'example.com', labels: ['web'] });
diff --git a/types/hapi/test/server/connections.ts b/types/hapi/v16/test/server/connections.ts
similarity index 89%
rename from types/hapi/test/server/connections.ts
rename to types/hapi/v16/test/server/connections.ts
index fb2f9f303e..0674c3b72f 100644
--- a/types/hapi/test/server/connections.ts
+++ b/types/hapi/v16/test/server/connections.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#serverconnections
 
-import * as Hapi from 'hapi';
+import * as Hapi from '../../';
 var server = new Hapi.Server();
 server.connection({ port: 80, labels: 'a' });
 server.connection({ port: 8080, labels: 'b' });
diff --git a/types/hapi/test/server/decoder.ts b/types/hapi/v16/test/server/decoder.ts
similarity index 90%
rename from types/hapi/test/server/decoder.ts
rename to types/hapi/v16/test/server/decoder.ts
index edd52485ea..7a9eadd1e6 100644
--- a/types/hapi/test/server/decoder.ts
+++ b/types/hapi/v16/test/server/decoder.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#serverdecoderencoding-decoder
 
-import * as Hapi from 'hapi';
+import * as Hapi from '../../';
 import * as Zlib from 'zlib';
 const server = new Hapi.Server();
 server.connection({ port: 80, routes: { payload: { compression: { special: { chunkSize: 16 * 1024 } } } } });
diff --git a/types/hapi/test/server/decorate.ts b/types/hapi/v16/test/server/decorate.ts
similarity index 92%
rename from types/hapi/test/server/decorate.ts
rename to types/hapi/v16/test/server/decorate.ts
index 540e29c951..d946f6132e 100644
--- a/types/hapi/test/server/decorate.ts
+++ b/types/hapi/v16/test/server/decorate.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#serverdecoratetype-property-method-options
 
-import * as Hapi from 'hapi';
+import * as Hapi from '../../';
 const server = new Hapi.Server();
 server.connection({ port: 80 });
 
@@ -12,7 +12,7 @@ const success = function (this: Hapi.ReplyNoContinue) {
 
 server.decorate('reply', 'success', success);
 
-declare module 'hapi' {
+declare module '../../' {
     interface Base_Reply {
         success: () => Response;
     }
@@ -36,7 +36,7 @@ server.decorate('request', 'some_request_method', (request) => {
     }
 }, {apply: true});
 
-declare module 'hapi' {
+declare module '../../' {
     interface Request {
         some_request_method(): void;
     }
@@ -59,7 +59,7 @@ server.decorate('server', 'some_server_method', (server: Hapi.Server) => {
     }
 });
 
-declare module 'hapi' {
+declare module '../../' {
     interface Server {
         some_server_method(arg1: number): string;
     }
diff --git a/types/hapi/test/server/dependency.ts b/types/hapi/v16/test/server/dependency.ts
similarity index 93%
rename from types/hapi/test/server/dependency.ts
rename to types/hapi/v16/test/server/dependency.ts
index 1d63397cf2..175b3242b9 100644
--- a/types/hapi/test/server/dependency.ts
+++ b/types/hapi/v16/test/server/dependency.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#serverdependencydependencies-after
 
-import * as Hapi from 'hapi';
+import * as Hapi from '../../';
 
 const after: Hapi.AfterDependencyLoadCallback = function (server, next) {
 
diff --git a/types/hapi/test/server/emit.ts b/types/hapi/v16/test/server/emit.ts
similarity index 90%
rename from types/hapi/test/server/emit.ts
rename to types/hapi/v16/test/server/emit.ts
index d248f7d4ab..0f1f37de2d 100644
--- a/types/hapi/test/server/emit.ts
+++ b/types/hapi/v16/test/server/emit.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#serveremitcriteria-data-callback
 
-import * as Hapi from 'hapi';
+import * as Hapi from '../../';
 const server = new Hapi.Server();
 server.connection({ port: 80 });
 
diff --git a/types/hapi/test/server/encoder.ts b/types/hapi/v16/test/server/encoder.ts
similarity index 90%
rename from types/hapi/test/server/encoder.ts
rename to types/hapi/v16/test/server/encoder.ts
index f35102b776..cacc5f2c8b 100644
--- a/types/hapi/test/server/encoder.ts
+++ b/types/hapi/v16/test/server/encoder.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#serverencoderencoding-encoder
 
-import * as Hapi from 'hapi';
+import * as Hapi from '../../';
 import * as Zlib from 'zlib';
 const server = new Hapi.Server();
 server.connection({ port: 80, routes: { compression: { special: { chunkSize: 16 * 1024 } } } });
diff --git a/types/hapi/test/server/event.ts b/types/hapi/v16/test/server/event.ts
similarity index 90%
rename from types/hapi/test/server/event.ts
rename to types/hapi/v16/test/server/event.ts
index f0c2215f12..cbe7128de3 100644
--- a/types/hapi/test/server/event.ts
+++ b/types/hapi/v16/test/server/event.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#servereventevents
 
-import * as Hapi from 'hapi';
+import * as Hapi from '../../';
 const server = new Hapi.Server();
 server.connection({ port: 80 });
 
diff --git a/types/hapi/test/server/expose.ts b/types/hapi/v16/test/server/expose.ts
similarity index 92%
rename from types/hapi/test/server/expose.ts
rename to types/hapi/v16/test/server/expose.ts
index effbc1ae49..abaade677c 100644
--- a/types/hapi/test/server/expose.ts
+++ b/types/hapi/v16/test/server/expose.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#serverexposekey-value
 
-import * as Hapi from 'hapi';
+import * as Hapi from '../../';
 var register: Hapi.PluginFunction<{}> = function (server, options, next) {
 
     server.expose('util', function () { console.log('something'); });
diff --git a/types/hapi/test/server/ext.ts b/types/hapi/v16/test/server/ext.ts
similarity index 96%
rename from types/hapi/test/server/ext.ts
rename to types/hapi/v16/test/server/ext.ts
index 500ac1d4af..318fe3fe0b 100644
--- a/types/hapi/test/server/ext.ts
+++ b/types/hapi/v16/test/server/ext.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#serverextevents
 
-import * as Hapi from 'hapi';
+import * as Hapi from '../../';
 const server = new Hapi.Server();
 server.connection({ port: 80 });
 
diff --git a/types/hapi/test/server/handler.ts b/types/hapi/v16/test/server/handler.ts
similarity index 94%
rename from types/hapi/test/server/handler.ts
rename to types/hapi/v16/test/server/handler.ts
index 713fe7f114..20fb003ce4 100644
--- a/types/hapi/test/server/handler.ts
+++ b/types/hapi/v16/test/server/handler.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#serverhandlername-method
 
-import * as Hapi from 'hapi';
+import * as Hapi from '../../';
 const server = new Hapi.Server();
 server.connection({ host: 'localhost', port: 8000 });
 
@@ -20,7 +20,7 @@ interface TestPluginConfig {
     msg: string;
 }
 
-declare module 'hapi' {
+declare module '../../' {
     interface RouteHandlerPlugins {
         test?: TestPluginConfig;
     }
diff --git a/types/hapi/test/server/info.ts b/types/hapi/v16/test/server/info.ts
similarity index 92%
rename from types/hapi/test/server/info.ts
rename to types/hapi/v16/test/server/info.ts
index eaf1b39747..aa0bc7014d 100644
--- a/types/hapi/test/server/info.ts
+++ b/types/hapi/v16/test/server/info.ts
@@ -2,7 +2,7 @@
 // From https://hapijs.com/api/16.1.1#serverinfo
 
 import assert = require('assert');
-import * as Hapi from 'hapi';
+import * as Hapi from '../../';
 const server = new Hapi.Server();
 var options: Hapi.ServerConnectionOptions = { port: 80 };
 server.connection(options);
diff --git a/types/hapi/test/server/initialize.ts b/types/hapi/v16/test/server/initialize.ts
similarity index 72%
rename from types/hapi/test/server/initialize.ts
rename to types/hapi/v16/test/server/initialize.ts
index 7ef4b51527..f7a1482fac 100644
--- a/types/hapi/test/server/initialize.ts
+++ b/types/hapi/v16/test/server/initialize.ts
@@ -1,8 +1,8 @@
 
 // From https://hapijs.com/api/16.1.1#serverinitializecallback
 
-import * as Hapi from 'hapi';
-const Hoek = require('hoek');
+import * as Hapi from '../../';
+const Hoek = require('../../../../hoek');
 const server = new Hapi.Server();
 server.connection({ port: 80 });
 
diff --git a/types/hapi/test/server/inject.ts b/types/hapi/v16/test/server/inject.ts
similarity index 93%
rename from types/hapi/test/server/inject.ts
rename to types/hapi/v16/test/server/inject.ts
index 7010faa3dc..a9fc0bdf5e 100644
--- a/types/hapi/test/server/inject.ts
+++ b/types/hapi/v16/test/server/inject.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#serverinjectoptions-callback
 
-import * as Hapi from 'hapi';
+import * as Hapi from '../../';
 const server = new Hapi.Server();
 server.connection({ port: 80 });
 
diff --git a/types/hapi/test/server/listener.ts b/types/hapi/v16/test/server/listener.ts
similarity index 95%
rename from types/hapi/test/server/listener.ts
rename to types/hapi/v16/test/server/listener.ts
index d7bb6fc5ea..85ddb18bc6 100644
--- a/types/hapi/test/server/listener.ts
+++ b/types/hapi/v16/test/server/listener.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#serverlistener
 
-import * as Hapi from 'hapi';
+import * as Hapi from '../../';
 import SocketIO = require('socket.io');
 
 const server = new Hapi.Server();
diff --git a/types/hapi/test/server/load.ts b/types/hapi/v16/test/server/load.ts
similarity index 82%
rename from types/hapi/test/server/load.ts
rename to types/hapi/v16/test/server/load.ts
index ee204c864f..7ecb25fce7 100644
--- a/types/hapi/test/server/load.ts
+++ b/types/hapi/v16/test/server/load.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#serverload
 
-import * as Hapi from 'hapi';
+import * as Hapi from '../../';
 const server = new Hapi.Server({ load: { sampleInterval: 1000 } });
 
 var d: number = server.load.rss;
diff --git a/types/hapi/test/server/log.ts b/types/hapi/v16/test/server/log.ts
similarity index 89%
rename from types/hapi/test/server/log.ts
rename to types/hapi/v16/test/server/log.ts
index 4507358d60..1a89b2149b 100644
--- a/types/hapi/test/server/log.ts
+++ b/types/hapi/v16/test/server/log.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#serverlogtags-data-timestamp
 
-import * as Hapi from 'hapi';
+import * as Hapi from '../../';
 const server = new Hapi.Server();
 server.connection({ port: 80 });
 
diff --git a/types/hapi/test/server/lookup.ts b/types/hapi/v16/test/server/lookup.ts
similarity index 91%
rename from types/hapi/test/server/lookup.ts
rename to types/hapi/v16/test/server/lookup.ts
index 89ce852700..2d3729b210 100644
--- a/types/hapi/test/server/lookup.ts
+++ b/types/hapi/v16/test/server/lookup.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#serverlookupid
 
-import * as Hapi from 'hapi';
+import * as Hapi from '../../';
 const server = new Hapi.Server();
 server.connection();
 server.route({
diff --git a/types/hapi/test/server/match.ts b/types/hapi/v16/test/server/match.ts
similarity index 91%
rename from types/hapi/test/server/match.ts
rename to types/hapi/v16/test/server/match.ts
index f322a31494..f446dd0e7e 100644
--- a/types/hapi/test/server/match.ts
+++ b/types/hapi/v16/test/server/match.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#servermatchmethod-path-host
 
-import * as Hapi from 'hapi';
+import * as Hapi from '../../';
 const server = new Hapi.Server();
 server.connection();
 server.route({
diff --git a/types/hapi/test/server/method.ts b/types/hapi/v16/test/server/method.ts
similarity index 98%
rename from types/hapi/test/server/method.ts
rename to types/hapi/v16/test/server/method.ts
index e1cc2ce487..9e3efbf7c7 100644
--- a/types/hapi/test/server/method.ts
+++ b/types/hapi/v16/test/server/method.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#servermethodname-method-options
 
-import * as Hapi from 'hapi';
+import * as Hapi from '../../';
 const server = new Hapi.Server();
 server.connection({ port: 80 });
 
diff --git a/types/hapi/test/server/methods.ts b/types/hapi/v16/test/server/methods.ts
similarity index 91%
rename from types/hapi/test/server/methods.ts
rename to types/hapi/v16/test/server/methods.ts
index 1e2060c3e8..0595d522de 100644
--- a/types/hapi/test/server/methods.ts
+++ b/types/hapi/v16/test/server/methods.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#servermethods
 
-import * as Hapi from 'hapi';
+import * as Hapi from '../../';
 const server = new Hapi.Server();
 
 const add = function (a: number, b: number, next: (err: Error | null, result: number) => void) {
diff --git a/types/hapi/test/server/mime.ts b/types/hapi/v16/test/server/mime.ts
similarity index 94%
rename from types/hapi/test/server/mime.ts
rename to types/hapi/v16/test/server/mime.ts
index e2dd25529b..a97af5de7a 100644
--- a/types/hapi/test/server/mime.ts
+++ b/types/hapi/v16/test/server/mime.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#servermime
 
-import * as Hapi from 'hapi';
+import * as Hapi from '../../';
 
 const options: Hapi.ServerOptions = {
     mime: {
diff --git a/types/hapi/test/server/new.ts b/types/hapi/v16/test/server/new.ts
similarity index 96%
rename from types/hapi/test/server/new.ts
rename to types/hapi/v16/test/server/new.ts
index 95f1ce9006..59f0a8f189 100644
--- a/types/hapi/test/server/new.ts
+++ b/types/hapi/v16/test/server/new.ts
@@ -1,6 +1,6 @@
 'use strict';
 
-import * as Hapi from 'hapi';
+import * as Hapi from '../../';
 
 new Hapi.Server();
 new Hapi.Server({
@@ -45,7 +45,7 @@ new Hapi.Server({
 });
 
 //+ Code added in addition to docs
-declare module 'hapi' {
+declare module '../../' {
     interface PluginSpecificConfiguration {
         // Set this to non optional if plugin config is non optional
         'some-plugin-name'?: {options: string;};
diff --git a/types/hapi/test/server/on.ts b/types/hapi/v16/test/server/on.ts
similarity index 96%
rename from types/hapi/test/server/on.ts
rename to types/hapi/v16/test/server/on.ts
index 08802fda96..301cc0b423 100644
--- a/types/hapi/test/server/on.ts
+++ b/types/hapi/v16/test/server/on.ts
@@ -2,7 +2,7 @@
 // From https://hapijs.com/api/16.1.1#serveroncriteria-listener
 // From https://hapijs.com/api/16.1.1#server-events
 
-import * as Hapi from 'hapi';
+import * as Hapi from '../../';
 
 const server = new Hapi.Server();
 server.connection({ port: 80 });
diff --git a/types/hapi/test/server/once.ts b/types/hapi/v16/test/server/once.ts
similarity index 91%
rename from types/hapi/test/server/once.ts
rename to types/hapi/v16/test/server/once.ts
index 55fdb08ec2..59465a41ec 100644
--- a/types/hapi/test/server/once.ts
+++ b/types/hapi/v16/test/server/once.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#serveroncecriteria-listener
 
-import * as Hapi from 'hapi';
+import * as Hapi from '../../';
 
 const server = new Hapi.Server();
 server.connection({ port: 80 });
diff --git a/types/hapi/test/server/path.ts b/types/hapi/v16/test/server/path.ts
similarity index 91%
rename from types/hapi/test/server/path.ts
rename to types/hapi/v16/test/server/path.ts
index 20479a795f..cdbf8a14a9 100644
--- a/types/hapi/test/server/path.ts
+++ b/types/hapi/v16/test/server/path.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#serverpathrelativeto
 
-import * as Hapi from 'hapi';
+import * as Hapi from '../../';
 
 var register: Hapi.PluginFunction<{}> = function (server, options, next) {
 
diff --git a/types/hapi/test/server/plugins.ts b/types/hapi/v16/test/server/plugins.ts
similarity index 90%
rename from types/hapi/test/server/plugins.ts
rename to types/hapi/v16/test/server/plugins.ts
index 2ce13ffb2f..02488a1d5a 100644
--- a/types/hapi/test/server/plugins.ts
+++ b/types/hapi/v16/test/server/plugins.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#serverplugins
 
-import * as Hapi from 'hapi';
+import * as Hapi from '../../';
 
 var registerFunction: Hapi.PluginFunction<{}> = function(server, options, next) {
 
diff --git a/types/hapi/test/server/realm.ts b/types/hapi/v16/test/server/realm.ts
similarity index 86%
rename from types/hapi/test/server/realm.ts
rename to types/hapi/v16/test/server/realm.ts
index 31f764b7ef..4a2eceffd0 100644
--- a/types/hapi/test/server/realm.ts
+++ b/types/hapi/v16/test/server/realm.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#serverrealm
 
-import * as Hapi from 'hapi';
+import * as Hapi from '../../';
 
 var registerFunction: Hapi.PluginFunction<{}> = function(server, options, next) {
 
diff --git a/types/hapi/test/server/register.ts b/types/hapi/v16/test/server/register.ts
similarity index 90%
rename from types/hapi/test/server/register.ts
rename to types/hapi/v16/test/server/register.ts
index c04e0b16bc..1d0ab5a2e7 100644
--- a/types/hapi/test/server/register.ts
+++ b/types/hapi/v16/test/server/register.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#serverregisterplugins-options-callback
 
-import * as Hapi from 'hapi';
+import * as Hapi from '../../';
 
 const server = new Hapi.Server();
 
diff --git a/types/hapi/test/server/route.ts b/types/hapi/v16/test/server/route.ts
similarity index 93%
rename from types/hapi/test/server/route.ts
rename to types/hapi/v16/test/server/route.ts
index 0402fd3e89..0fa9fd8cc8 100644
--- a/types/hapi/test/server/route.ts
+++ b/types/hapi/v16/test/server/route.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#serverrouteoptions
 
-import * as Hapi from 'hapi';
+import * as Hapi from '../../';
 const server = new Hapi.Server();
 server.connection({ port: 80 });
 
diff --git a/types/hapi/test/server/select.ts b/types/hapi/v16/test/server/select.ts
similarity index 91%
rename from types/hapi/test/server/select.ts
rename to types/hapi/v16/test/server/select.ts
index 8a25f45abd..03af599fcc 100644
--- a/types/hapi/test/server/select.ts
+++ b/types/hapi/v16/test/server/select.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#serverselectlabels
 
-import * as Hapi from 'hapi';
+import * as Hapi from '../../';
 const server = new Hapi.Server();
 server.connection({ port: 80, labels: ['a', 'b'] });
 server.connection({ port: 8080, labels: ['a', 'c'] });
diff --git a/types/hapi/test/server/settings.ts b/types/hapi/v16/test/server/settings.ts
similarity index 84%
rename from types/hapi/test/server/settings.ts
rename to types/hapi/v16/test/server/settings.ts
index c2ec9ce3ed..f250c8e8fd 100644
--- a/types/hapi/test/server/settings.ts
+++ b/types/hapi/v16/test/server/settings.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#serversettings
 
-import * as Hapi from 'hapi';
+import * as Hapi from '../../';
 const server = new Hapi.Server({
     app: {
         key: 'value'
diff --git a/types/hapi/test/server/start.ts b/types/hapi/v16/test/server/start.ts
similarity index 76%
rename from types/hapi/test/server/start.ts
rename to types/hapi/v16/test/server/start.ts
index a15bb79740..a9408a57aa 100644
--- a/types/hapi/test/server/start.ts
+++ b/types/hapi/v16/test/server/start.ts
@@ -1,8 +1,8 @@
 
 // From https://hapijs.com/api/16.1.1#serverstartcallback
 
-import * as Hapi from 'hapi';
-import * as Hoek from 'hoek';
+import * as Hapi from '../../';
+import * as Hoek from '../../../../hoek';
 const server = new Hapi.Server();
 server.connection({ port: 80 });
 
diff --git a/types/hapi/test/server/state.ts b/types/hapi/v16/test/server/state.ts
similarity index 95%
rename from types/hapi/test/server/state.ts
rename to types/hapi/v16/test/server/state.ts
index 2035343a17..19c10cfae3 100644
--- a/types/hapi/test/server/state.ts
+++ b/types/hapi/v16/test/server/state.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#serverstatename-options
 
-import * as Hapi from 'hapi';
+import * as Hapi from '../../';
 const server = new Hapi.Server();
 server.connection({ port: 80 });
 
diff --git a/types/hapi/test/server/stop.ts b/types/hapi/v16/test/server/stop.ts
similarity index 87%
rename from types/hapi/test/server/stop.ts
rename to types/hapi/v16/test/server/stop.ts
index ddfd07aa8f..ca14a70dfa 100644
--- a/types/hapi/test/server/stop.ts
+++ b/types/hapi/v16/test/server/stop.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#serverstopoptions-callback
 
-import * as Hapi from 'hapi';
+import * as Hapi from '../../';
 const server = new Hapi.Server();
 server.connection({ port: 80 });
 
diff --git a/types/hapi/test/server/table.ts b/types/hapi/v16/test/server/table.ts
similarity index 89%
rename from types/hapi/test/server/table.ts
rename to types/hapi/v16/test/server/table.ts
index abe0707c76..c1410f95db 100644
--- a/types/hapi/test/server/table.ts
+++ b/types/hapi/v16/test/server/table.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#servertablehost
 
-import * as Hapi from 'hapi';
+import * as Hapi from '../../';
 const server = new Hapi.Server();
 server.connection({ port: 80, host: 'example.com' });
 server.route({ method: 'GET', path: '/example', handler: function (request, reply) { return reply(); } });
diff --git a/types/hapi/test/server/version.ts b/types/hapi/v16/test/server/version.ts
similarity index 77%
rename from types/hapi/test/server/version.ts
rename to types/hapi/v16/test/server/version.ts
index 064e87e3cd..2ee1f57841 100644
--- a/types/hapi/test/server/version.ts
+++ b/types/hapi/v16/test/server/version.ts
@@ -1,6 +1,6 @@
 
 // From http://hapijs.com/api#serversettings
 
-import * as Hapi from 'hapi';
+import * as Hapi from '../../';
 const server = new Hapi.Server();
 server.version === '8.0.0'
diff --git a/types/hapi/v16/tsconfig.json b/types/hapi/v16/tsconfig.json
new file mode 100644
index 0000000000..12b95c134d
--- /dev/null
+++ b/types/hapi/v16/tsconfig.json
@@ -0,0 +1,105 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": false,
+        "baseUrl": "../../",
+        "typeRoots": [
+            "../../"
+        ],
+        "types": [],
+        "paths": {
+            "boom": [
+                "boom/v4"
+            ],
+            "hapi": [
+                "hapi/v16"
+            ]
+        },
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "test/connection/table.ts",
+        "test/continuation/errors.ts",
+        "test/getting-started/01-creating-a-server.ts",
+        "test/getting-started/02-adding-routes.ts",
+        "test/getting-started/03-serving-static-content.ts",
+        "test/getting-started/04-using-plugins.ts",
+        "test/path/catch-all.ts",
+        "test/path/parameters.ts",
+        "test/plugins/options.ts",
+        "test/reply/continue.ts",
+        "test/reply/entity.ts",
+        "test/reply/redirect.ts",
+        "test/reply/reply.ts",
+        "test/reply/state_cookie.ts",
+        "test/request/event-types.ts",
+        "test/request/generate-response.ts",
+        "test/request/get-log.ts",
+        "test/request/log.ts",
+        "test/request/query.ts",
+        "test/request/set-method.ts",
+        "test/request/set-url.ts",
+        "test/request/tail.ts",
+        "test/response/error-representation.ts",
+        "test/response/error.ts",
+        "test/response/events.ts",
+        "test/response/flow-control.ts",
+        "test/route/additional-options.ts",
+        "test/route/auth.ts",
+        "test/route/config.ts",
+        "test/route/handler.ts",
+        "test/route/plugins.ts",
+        "test/route/prerequisites.ts",
+        "test/route/public-interface.ts",
+        "test/route/validate.ts",
+        "test/server/app.ts",
+        "test/server/auth.ts",
+        "test/server/bind.ts",
+        "test/server/cache.ts",
+        "test/server/connection-options.ts",
+        "test/server/connections.ts",
+        "test/server/decoder.ts",
+        "test/server/decorate.ts",
+        "test/server/dependency.ts",
+        "test/server/emit.ts",
+        "test/server/encoder.ts",
+        "test/server/event.ts",
+        "test/server/expose.ts",
+        "test/server/ext.ts",
+        "test/server/handler.ts",
+        "test/server/info.ts",
+        "test/server/initialize.ts",
+        "test/server/inject.ts",
+        "test/server/listener.ts",
+        "test/server/load.ts",
+        "test/server/log.ts",
+        "test/server/lookup.ts",
+        "test/server/match.ts",
+        "test/server/method.ts",
+        "test/server/methods.ts",
+        "test/server/mime.ts",
+        "test/server/new.ts",
+        "test/server/on.ts",
+        "test/server/once.ts",
+        "test/server/path.ts",
+        "test/server/plugins.ts",
+        "test/server/realm.ts",
+        "test/server/register.ts",
+        "test/server/route.ts",
+        "test/server/select.ts",
+        "test/server/settings.ts",
+        "test/server/start.ts",
+        "test/server/state.ts",
+        "test/server/stop.ts",
+        "test/server/table.ts",
+        "test/server/version.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/fuse/tslint.json b/types/hapi/v16/tslint.json
similarity index 100%
rename from types/fuse/tslint.json
rename to types/hapi/v16/tslint.json
diff --git a/types/hbs/hbs-tests.ts b/types/hbs/hbs-tests.ts
index a1baa73ca7..c1d355daea 100644
--- a/types/hbs/hbs-tests.ts
+++ b/types/hbs/hbs-tests.ts
@@ -1,4 +1,4 @@
-import * as express from 'express';
+import express = require('express');
 
 const app = express();
 
diff --git a/types/heapdump/tsconfig.json b/types/heapdump/tsconfig.json
index a15a306b41..5e17c15567 100644
--- a/types/heapdump/tsconfig.json
+++ b/types/heapdump/tsconfig.json
@@ -22,4 +22,4 @@
         "index.d.ts",
         "heapdump-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/hedron/index.d.ts b/types/hedron/index.d.ts
index 142b9cf47a..6eb34e3638 100644
--- a/types/hedron/index.d.ts
+++ b/types/hedron/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/JSBros/hedron
 // Definitions by: Dmytro Borysov <https://github.com/dborysov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.4
+// TypeScript Version: 2.6
 
 import * as React from 'react';
 
diff --git a/types/hex-rgba/tsconfig.json b/types/hex-rgba/tsconfig.json
index 82f2e3808e..3ede3bac4f 100644
--- a/types/hex-rgba/tsconfig.json
+++ b/types/hex-rgba/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "hex-rgba-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/highcharts/index.d.ts b/types/highcharts/index.d.ts
index 48c0c614c2..c63c99a3c5 100644
--- a/types/highcharts/index.d.ts
+++ b/types/highcharts/index.d.ts
@@ -1486,6 +1486,13 @@ declare namespace Highcharts {
          * @since 1.2.0
          */
         redraw?(event: Event): void;
+        /**
+         * Fires after initial load of the chart (directly after the load
+         * event), and after each redraw (directly after the redraw event).
+         *
+         * @since 5.0.7
+         */
+        render?(event: Event): void;
         /**
          * Fires when an area of the chart has been selected. Selection is enabled by setting the chart's zoomType. One
          * parameter, event, is passed to the function. This contains common event information based on jQuery or MooTools
diff --git a/types/highcharts/js/highcharts/index.d.ts b/types/highcharts/js/highcharts/index.d.ts
new file mode 100644
index 0000000000..0c6cf2427f
--- /dev/null
+++ b/types/highcharts/js/highcharts/index.d.ts
@@ -0,0 +1,2 @@
+import Highcharts = require('../..');
+export = Highcharts;
diff --git a/types/highcharts/tsconfig.json b/types/highcharts/tsconfig.json
index ed1e69ef0c..24b0cf2dd7 100644
--- a/types/highcharts/tsconfig.json
+++ b/types/highcharts/tsconfig.json
@@ -26,6 +26,7 @@
         "modules/offline-exporting.d.ts",
         "highcharts-more.d.ts",
         "highstock.d.ts",
+        "js/highcharts/index.d.ts",
         "test/boost.ts",
         "test/exporting.ts",
         "test/highstock.ts",
diff --git a/types/holderjs/tsconfig.json b/types/holderjs/tsconfig.json
index 6cf9415ee2..1e1e58be2f 100644
--- a/types/holderjs/tsconfig.json
+++ b/types/holderjs/tsconfig.json
@@ -21,4 +21,4 @@
         "index.d.ts",
         "holderjs-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/hpp/hpp-tests.ts b/types/hpp/hpp-tests.ts
index 21432f3d3f..8786ab702d 100644
--- a/types/hpp/hpp-tests.ts
+++ b/types/hpp/hpp-tests.ts
@@ -1,5 +1,5 @@
-import * as express from 'express';
-import * as hpp from 'hpp';
+import express = require('express');
+import hpp = require('hpp');
 
 const app = express();
 
diff --git a/types/html-minifier/v1/tsconfig.json b/types/html-minifier/v1/tsconfig.json
index 8def52b67d..dd9586e561 100644
--- a/types/html-minifier/v1/tsconfig.json
+++ b/types/html-minifier/v1/tsconfig.json
@@ -13,8 +13,12 @@
             "../../"
         ],
         "paths": {
-            "html-minifier": ["html-minifier/v1"],
-            "html-minifier/*": ["html-minifier/v1/*"]
+            "html-minifier": [
+                "html-minifier/v1"
+            ],
+            "html-minifier/*": [
+                "html-minifier/v1/*"
+            ]
         },
         "types": [],
         "noEmit": true,
diff --git a/types/html-webpack-plugin/html-webpack-plugin-tests.ts b/types/html-webpack-plugin/html-webpack-plugin-tests.ts
index 7a1e5f20bc..b80ea9e6b0 100644
--- a/types/html-webpack-plugin/html-webpack-plugin-tests.ts
+++ b/types/html-webpack-plugin/html-webpack-plugin-tests.ts
@@ -1,4 +1,4 @@
-import * as HtmlWebpackPlugin from 'html-webpack-plugin';
+import HtmlWebpackPlugin = require('html-webpack-plugin');
 
 new HtmlWebpackPlugin();
 
diff --git a/types/html-webpack-plugin/index.d.ts b/types/html-webpack-plugin/index.d.ts
index dc23e020d7..35774c1ac6 100644
--- a/types/html-webpack-plugin/index.d.ts
+++ b/types/html-webpack-plugin/index.d.ts
@@ -4,6 +4,7 @@
 //                 Benjamin Lim <https://github.com/bumbleblym>
 //                 Tomek Łaziuk <https://github.com/tlaziuk>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 import { Plugin } from 'webpack';
 import { Options as HtmlMinifierOptions } from 'html-minifier';
diff --git a/types/html-webpack-template/html-webpack-template-tests.ts b/types/html-webpack-template/html-webpack-template-tests.ts
index 4407af69eb..0108aa39d8 100644
--- a/types/html-webpack-template/html-webpack-template-tests.ts
+++ b/types/html-webpack-template/html-webpack-template-tests.ts
@@ -1,4 +1,4 @@
-import * as HtmlWebpackPlugin from 'html-webpack-plugin';
+import HtmlWebpackPlugin = require('html-webpack-plugin');
 import * as template from 'html-webpack-template';
 
 const optionsArray: template.Options[] = [
diff --git a/types/html-webpack-template/index.d.ts b/types/html-webpack-template/index.d.ts
index f1b57fa331..b02be3c463 100644
--- a/types/html-webpack-template/index.d.ts
+++ b/types/html-webpack-template/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/jaketrent/html-webpack-template
 // Definitions by: Benjamin Lim <https://github.com/bumbleblym>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 import { Options as HtmlWebpackPluginOptions } from 'html-webpack-plugin';
 
diff --git a/types/http-assert/http-assert-tests.ts b/types/http-assert/http-assert-tests.ts
index bfb12e650a..a0e159aeed 100644
--- a/types/http-assert/http-assert-tests.ts
+++ b/types/http-assert/http-assert-tests.ts
@@ -1,4 +1,4 @@
-import * as httpAssert from 'http-assert';
+import httpAssert = require('http-assert');
 import { HttpError } from 'http-errors';
 
 try {
diff --git a/types/http-context/tsconfig.json b/types/http-context/tsconfig.json
index 51422e3199..a17901c227 100644
--- a/types/http-context/tsconfig.json
+++ b/types/http-context/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "http-context-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/http-errors/http-errors-tests.ts b/types/http-errors/http-errors-tests.ts
index c3677fd5f9..583223d6a4 100644
--- a/types/http-errors/http-errors-tests.ts
+++ b/types/http-errors/http-errors-tests.ts
@@ -1,5 +1,5 @@
-import * as create from 'http-errors';
-import * as express from 'express';
+import create = require('http-errors');
+import express = require('express');
 import * as util from 'util';
 
 const app = express();
diff --git a/types/http-proxy-agent/tsconfig.json b/types/http-proxy-agent/tsconfig.json
index 626d4eaa4c..4c4a92955f 100644
--- a/types/http-proxy-agent/tsconfig.json
+++ b/types/http-proxy-agent/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "http-proxy-agent-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/http-proxy/http-proxy-tests.ts b/types/http-proxy/http-proxy-tests.ts
index e691b48ed0..70ea803da6 100644
--- a/types/http-proxy/http-proxy-tests.ts
+++ b/types/http-proxy/http-proxy-tests.ts
@@ -1,5 +1,5 @@
 import * as http from "http";
-import * as HttpProxy from "http-proxy";
+import HttpProxy = require("http-proxy");
 
 const proxy = new HttpProxy({
   changeOrigin: true
diff --git a/types/http-proxy/index.d.ts b/types/http-proxy/index.d.ts
index 811789af33..e9ef9a572d 100644
--- a/types/http-proxy/index.d.ts
+++ b/types/http-proxy/index.d.ts
@@ -1,6 +1,6 @@
-// Type definitions for node-http-proxy 1.12
+// Type definitions for node-http-proxy 1.16
 // Project: https://github.com/nodejitsu/node-http-proxy
-// Definitions by: Maxime LUCE <https://github.com/SomaticIT>
+// Definitions by: Maxime LUCE <https://github.com/SomaticIT>, Florian Oellerich <https://github.com/Raigen>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />
@@ -189,6 +189,8 @@ declare namespace Server {
     localAddress?: boolean;
     /** Changes the origin of the host header to the target URL. */
     changeOrigin?: boolean;
+    /** specify whether you want to keep letter case of response header key */
+    preserveHeaderKeyCase?: boolean;
     /** Basic authentication i.e. 'user:password' to compute an Authorization header. */
     auth?: string;
     /** Rewrites the location hostname on (301 / 302 / 307 / 308) redirects, Default: null. */
@@ -197,6 +199,10 @@ declare namespace Server {
     autoRewrite?: boolean;
     /** Rewrites the location protocol on (301 / 302 / 307 / 308) redirects to 'http' or 'https'.Default: null. */
     protocolRewrite?: string;
+    /** rewrites domain of set-cookie headers. */
+    cookieDomainRewrite?: false | string | {[oldDomain: string]: string};
+    /** object with extra headers to be added to target requests. */
+    headers?: {[header: string]: string};
     /** Timeout (in milliseconds) when proxy receives no response from target. Default: 120000 (2 minutes) */
     proxyTimeout?: number;
   }
diff --git a/types/http-server/tsconfig.json b/types/http-server/tsconfig.json
index 98f006389c..24ee3e9d0f 100644
--- a/types/http-server/tsconfig.json
+++ b/types/http-server/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "http-server-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/humanize-string/tsconfig.json b/types/humanize-string/tsconfig.json
index a0ec92be13..715a620e55 100644
--- a/types/humanize-string/tsconfig.json
+++ b/types/humanize-string/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "humanize-string-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/hystrixjs/tsconfig.json b/types/hystrixjs/tsconfig.json
index 480476e8d1..c20199706f 100644
--- a/types/hystrixjs/tsconfig.json
+++ b/types/hystrixjs/tsconfig.json
@@ -22,4 +22,4 @@
         "index.d.ts",
         "hystrixjs-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/i18n-js/tsconfig.json b/types/i18n-js/tsconfig.json
index 4a9e4d110b..1ab98fadce 100644
--- a/types/i18n-js/tsconfig.json
+++ b/types/i18n-js/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "i18n-js-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/i18next-express-middleware/i18next-express-middleware-tests.ts b/types/i18next-express-middleware/i18next-express-middleware-tests.ts
index d56f7a9207..9959cf9dad 100644
--- a/types/i18next-express-middleware/i18next-express-middleware-tests.ts
+++ b/types/i18next-express-middleware/i18next-express-middleware-tests.ts
@@ -1,4 +1,4 @@
-import * as express from "express";
+import express = require("express");
 import * as i18next from "i18next";
 import middleware = require("i18next-express-middleware");
 
diff --git a/types/ignore-styles/tsconfig.json b/types/ignore-styles/tsconfig.json
index aed3487cf4..8dd316cb95 100644
--- a/types/ignore-styles/tsconfig.json
+++ b/types/ignore-styles/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "ignore-styles-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/iltorb/tsconfig.json b/types/iltorb/tsconfig.json
index c12ff988ba..6c079ff3f7 100644
--- a/types/iltorb/tsconfig.json
+++ b/types/iltorb/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "iltorb-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/image-size/image-size-tests.ts b/types/image-size/image-size-tests.ts
index 983389091e..058ed7934f 100644
--- a/types/image-size/image-size-tests.ts
+++ b/types/image-size/image-size-tests.ts
@@ -1,7 +1,6 @@
-
 import * as url from "url";
 import * as http from "http";
-import * as sizeOf from "image-size";
+import sizeOf = require("image-size");
 
 // Synchronous
 const dimensions = sizeOf("images/funny-cats.png");
diff --git a/types/images/images-tests.ts b/types/images/images-tests.ts
index f7ba58d68d..9b6db2d1b2 100644
--- a/types/images/images-tests.ts
+++ b/types/images/images-tests.ts
@@ -1,4 +1,4 @@
-import * as images from "images";
+import images = require("images");
 
 // from https://github.com/zhangyuanwei/node-images/blob/master/demo/uploadServer.js
 const tmp_path = "tmp_path";
diff --git a/types/inert/tsconfig.json b/types/inert/tsconfig.json
index da982b9122..c96c356741 100644
--- a/types/inert/tsconfig.json
+++ b/types/inert/tsconfig.json
@@ -14,7 +14,12 @@
         ],
         "types": [],
         "paths": {
-            "boom": ["boom/v4"]
+            "boom": [
+                "boom/v4"
+            ],
+            "hapi": [
+                "hapi/v16"
+            ]
         },
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
@@ -23,4 +28,4 @@
         "index.d.ts",
         "inert-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/ioredis/ioredis-tests.ts b/types/ioredis/ioredis-tests.ts
index 2e80cd80e4..d8106ecdea 100644
--- a/types/ioredis/ioredis-tests.ts
+++ b/types/ioredis/ioredis-tests.ts
@@ -1,4 +1,4 @@
-import * as Redis from "ioredis";
+import Redis = require("ioredis");
 const redis = new Redis();
 
 redis.set('foo', 'bar');
diff --git a/types/iota.lib.js/tsconfig.json b/types/iota.lib.js/tsconfig.json
index b206b83455..65e6fc26ae 100644
--- a/types/iota.lib.js/tsconfig.json
+++ b/types/iota.lib.js/tsconfig.json
@@ -1,23 +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",
-      "iota.lib.js-tests.ts"
-   ]
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "iota.lib.js-tests.ts"
+    ]
 }
\ No newline at end of file
diff --git a/types/iron/tsconfig.json b/types/iron/tsconfig.json
index bddeeac5c0..219dc88d81 100644
--- a/types/iron/tsconfig.json
+++ b/types/iron/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "iron-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/is-glob/tsconfig.json b/types/is-glob/tsconfig.json
index 1a408fe456..575fa07fe6 100644
--- a/types/is-glob/tsconfig.json
+++ b/types/is-glob/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "is-glob-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/is-hotkey/index.d.ts b/types/is-hotkey/index.d.ts
new file mode 100644
index 0000000000..a41521fcc1
--- /dev/null
+++ b/types/is-hotkey/index.d.ts
@@ -0,0 +1,58 @@
+// Type definitions for is-hotkey 0.1
+// Project: https://github.com/ianstormtaylor/is-hotkey#readme
+// Definitions by: Pierre-Marc Airoldi <https://github.com/petester42>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export interface HotKeyOptions {
+    byKey: boolean;
+}
+
+export interface HotKey {
+    which?: number;
+    key?: string;
+    altKey: boolean;
+    ctrlKey: boolean;
+    metaKey: boolean;
+    shiftKey: boolean;
+}
+
+/**
+ * Is hotkey?
+ */
+export function isHotkey(
+    hotkey: string,
+    options?: HotKeyOptions
+): (event: KeyboardEvent) => boolean;
+
+export function isHotkey(
+    hotkey: string,
+    options?: HotKeyOptions | KeyboardEvent,
+    event?: KeyboardEvent
+): boolean;
+
+export function isCodeHotkey(hotkey: string): (event: KeyboardEvent) => boolean;
+export function isCodeHotkey(hotkey: string, event: KeyboardEvent): boolean;
+
+export function isKeyHotkey(hotkey: string): (event: KeyboardEvent) => boolean;
+export function isKeyHotkey(hotkey: string, event: KeyboardEvent): boolean;
+
+/**
+ * Parse.
+ */
+export function parseHotkey(hotkey: string, options?: HotKeyOptions): HotKey;
+
+/**
+ * Compare.
+ */
+export function compareHotkey(object: HotKey, event: KeyboardEvent): boolean;
+
+/**
+ * Utils.
+ */
+export function toKeyCode(name: string): number;
+export function toKeyName(name: string): string;
+
+/**
+ * Export.
+ */
+export default isHotkey;
diff --git a/types/is-hotkey/is-hotkey-tests.ts b/types/is-hotkey/is-hotkey-tests.ts
new file mode 100644
index 0000000000..6973d87de6
--- /dev/null
+++ b/types/is-hotkey/is-hotkey-tests.ts
@@ -0,0 +1,32 @@
+import {
+    isHotkey,
+    isCodeHotkey,
+    isKeyHotkey,
+    toKeyName,
+    toKeyCode,
+    parseHotkey,
+    compareHotkey
+} from "is-hotkey";
+
+const event = new KeyboardEvent("");
+
+isHotkey("mod+s")(event); // $ExpectType boolean
+isHotkey("mod+s", { byKey: true })(event); // $ExpectType boolean
+
+isHotkey("mod+s", event); // $ExpectType boolean
+isHotkey("mod+s", { byKey: true }, event); // $ExpectType boolean
+
+isCodeHotkey("mod+s")(event); // $ExpectType boolean
+isKeyHotkey("mod+s")(event); // $ExpectType boolean
+
+isCodeHotkey("mod+s", event); // $ExpectType boolean
+isKeyHotkey("mod+s", event); // $ExpectType boolean
+
+toKeyName("cmd"); // $ExpectType string
+
+toKeyCode("shift"); // $ExpectType number
+
+parseHotkey("cmd+s"); // $ExpectType HotKey
+parseHotkey("cmd+s", { byKey: true }); // $ExpectType HotKey
+
+compareHotkey(parseHotkey("cmd+s"), event); // $ExpectType boolean
diff --git a/types/is-hotkey/tsconfig.json b/types/is-hotkey/tsconfig.json
new file mode 100644
index 0000000000..329012fed8
--- /dev/null
+++ b/types/is-hotkey/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "is-hotkey-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/is-hotkey/tslint.json b/types/is-hotkey/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/is-hotkey/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/is-negated-glob/tsconfig.json b/types/is-negated-glob/tsconfig.json
index 9f8db73020..b1b957a04e 100644
--- a/types/is-negated-glob/tsconfig.json
+++ b/types/is-negated-glob/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "is-negated-glob-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/is-object/tsconfig.json b/types/is-object/tsconfig.json
index b3aae5340b..ccf24a171f 100644
--- a/types/is-object/tsconfig.json
+++ b/types/is-object/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "is-object-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/is-scoped/tsconfig.json b/types/is-scoped/tsconfig.json
index e6ffa2ab86..2b6374b9f0 100644
--- a/types/is-scoped/tsconfig.json
+++ b/types/is-scoped/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "is-scoped-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/ismobilejs/tsconfig.json b/types/ismobilejs/tsconfig.json
index ae9975d94e..e35d648c53 100644
--- a/types/ismobilejs/tsconfig.json
+++ b/types/ismobilejs/tsconfig.json
@@ -21,4 +21,4 @@
         "index.d.ts",
         "ismobilejs-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/jasmine-enzyme/index.d.ts b/types/jasmine-enzyme/index.d.ts
index 2d07ac3afe..fd52c65ed8 100644
--- a/types/jasmine-enzyme/index.d.ts
+++ b/types/jasmine-enzyme/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/blainekasten/enzyme-matchers/blob/master/packages/jasmine-enzyme/README.md
 // Definitions by: Umar Bolatov <https://github.com/bolatovumar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.4
+// TypeScript Version: 2.6
 
 /// <reference types="jasmine" />
 /// <reference types="react" />
diff --git a/types/jasmine/tsconfig.json b/types/jasmine/tsconfig.json
index 55b83c6d3a..0f9f9d3fbe 100644
--- a/types/jasmine/tsconfig.json
+++ b/types/jasmine/tsconfig.json
@@ -21,4 +21,4 @@
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     }
-}
+}
\ No newline at end of file
diff --git a/types/jenkins/jenkins-tests.ts b/types/jenkins/jenkins-tests.ts
index 98b30d4b73..9f45c7053b 100644
--- a/types/jenkins/jenkins-tests.ts
+++ b/types/jenkins/jenkins-tests.ts
@@ -1,4 +1,4 @@
-import * as J from 'jenkins';
+import J = require('jenkins');
 
 const jenkins = J({ baseUrl: 'http://user:pass@localhost:8080', crumbIssuer: true });
 
diff --git a/types/jest-diff/tsconfig.json b/types/jest-diff/tsconfig.json
index 3624e1778b..47bd8d3f9b 100644
--- a/types/jest-diff/tsconfig.json
+++ b/types/jest-diff/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "jest-diff-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/jest-get-type/tsconfig.json b/types/jest-get-type/tsconfig.json
index d1e6fac5ee..95278a69ce 100644
--- a/types/jest-get-type/tsconfig.json
+++ b/types/jest-get-type/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "jest-get-type-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/jest-in-case/tsconfig.json b/types/jest-in-case/tsconfig.json
index a561ae813a..5e4ec60fd2 100644
--- a/types/jest-in-case/tsconfig.json
+++ b/types/jest-in-case/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "jest-in-case-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/jest-json-schema/tsconfig.json b/types/jest-json-schema/tsconfig.json
index e8d55cbd89..894638d9ca 100644
--- a/types/jest-json-schema/tsconfig.json
+++ b/types/jest-json-schema/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "jest-json-schema-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/jest-matcher-utils/tsconfig.json b/types/jest-matcher-utils/tsconfig.json
index 115b762386..33b27e6305 100644
--- a/types/jest-matcher-utils/tsconfig.json
+++ b/types/jest-matcher-utils/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "jest-matcher-utils-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/jest/index.d.ts b/types/jest/index.d.ts
index e3cac9b881..e0d73d5c9e 100644
--- a/types/jest/index.d.ts
+++ b/types/jest/index.d.ts
@@ -548,6 +548,16 @@ declare namespace jest {
 // Relevant parts of Jasmine's API are below so they can be changed and removed over time.
 // This file can't reference jasmine.d.ts since the globals aren't compatible.
 
+declare function spyOn(object: any, method: string): jasmine.Spy;
+/**
+ * If you call the function pending anywhere in the spec body,
+ * no matter the expectations, the spec will be marked pending.
+ */
+declare function pending(reason?: string): void;
+/**
+ * Fails a test when called within one.
+ */
+declare function fail(error?: any): void;
 declare namespace jasmine {
     let DEFAULT_TIMEOUT_INTERVAL: number;
     function clock(): Clock;
diff --git a/types/joi/tsconfig.json b/types/joi/tsconfig.json
index 57e6c47881..f6b8f170dc 100644
--- a/types/joi/tsconfig.json
+++ b/types/joi/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "joi-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/joi/v10/tsconfig.json b/types/joi/v10/tsconfig.json
index 1bd530aff0..c87b685d74 100644
--- a/types/joi/v10/tsconfig.json
+++ b/types/joi/v10/tsconfig.json
@@ -25,4 +25,4 @@
         "index.d.ts",
         "joi-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/joigoose/joigoose-tests.ts b/types/joigoose/joigoose-tests.ts
index 91e36d827c..50cb29deef 100644
--- a/types/joigoose/joigoose-tests.ts
+++ b/types/joigoose/joigoose-tests.ts
@@ -1,4 +1,4 @@
-import * as Joigoose from "joigoose";
+import Joigoose = require("joigoose");
 import * as Mongoose from "mongoose";
 import * as Joi from "joi";
 
diff --git a/types/josa/tsconfig.json b/types/josa/tsconfig.json
index 0c56aa9a72..db8d436a42 100644
--- a/types/josa/tsconfig.json
+++ b/types/josa/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "josa-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/jquery-countdown/index.d.ts b/types/jquery-countdown/index.d.ts
new file mode 100644
index 0000000000..38a411c524
--- /dev/null
+++ b/types/jquery-countdown/index.d.ts
@@ -0,0 +1,147 @@
+// Type definitions for jQuery Countdown 2.2
+// Project: https://github.com/hilios/jQuery.countdown
+// Definitions by: Anderson Friaça <https://github.com/AndersonFriaca>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+/// <reference types="jquery" />
+
+declare namespace jQueryCountdown {
+    interface Options {
+        /**
+         * Allow to continue after finishes
+         */
+        elapse?: boolean;
+
+        /**
+         * The update rate in milliseconds
+         */
+        precision?: number;
+
+        /**
+         * Deferred initialization mode
+         */
+        defer?: boolean;
+    }
+
+    interface Event extends JQuery.Event {
+        /**
+         * The namespaced event type
+         */
+        type: string;
+
+        /**
+         * The formatter function
+         */
+        strftime: ((format: string) => string);
+
+        /**
+         * The parsed final date native object
+         */
+        finalDate: Date;
+
+        /**
+         * Passed away the final date?
+         */
+        elapsed: boolean;
+
+        offset: OffsetEvent;
+    }
+
+    interface OffsetEvent {
+        /**
+         * Seconds left for the next minute
+         */
+        seconds: number;
+
+        /**
+         * Minutes left for the next hour
+         */
+        minutes: number;
+
+        /**
+         * Hours left until next day
+         */
+        hours: number;
+
+        /**
+         * Days left until next week
+         */
+        days: number;
+
+        /**
+         * Days left until next week
+         */
+        daysToWeek: number;
+
+        /**
+         * Days left until next month
+         */
+        daysToMonth: number;
+
+        /**
+         * Weeks left until the final date
+         */
+        weeks: number;
+
+        /**
+         * Weeks left until the next month
+         */
+        weeksToMonth: number;
+
+        /**
+         * Months left until final date
+         */
+        months: number;
+
+        /**
+         * Years left until final date
+         */
+        years: number;
+
+        /**
+         * Total amount of days left until final date
+         */
+        totalDays: number;
+
+        /**
+         * Total amount of hours left until final date
+         */
+        totalHours: number;
+
+        /**
+         * Total amount of minutes left until final date
+         */
+        totalMinutes: number;
+
+        /**
+         * Total amount of seconds left until final date
+         */
+        totalSeconds: number;
+    }
+
+    type Methods = 'update.countdown' | 'finish.countdown' | 'stop.countdown';
+
+    type Controls = 'start' | 'stop' | 'pause' | 'resume';
+}
+interface JQuery {
+    /**
+     * Initialize the countdown
+     */
+    countdown(finalDate: string, callback?: ((event: jQueryCountdown.Event) => void)): JQuery;
+
+    /**
+     * Initialize the countdown with options
+     */
+    countdown(finalDate: string, options: jQueryCountdown.Options, callback?: ((event: jQueryCountdown.Event) => void)): JQuery;
+
+    /**
+     * Methods to control the execution flow of countdown
+     */
+    countdown(control: jQueryCountdown.Controls): JQuery;
+
+    /**
+     * Trigger an event whenever some state change
+     */
+    on(method: jQueryCountdown.Methods, callback: ((event: jQueryCountdown.Event) => void)): JQuery;
+}
diff --git a/types/jquery-countdown/jquery-countdown-tests.ts b/types/jquery-countdown/jquery-countdown-tests.ts
new file mode 100644
index 0000000000..a93b734659
--- /dev/null
+++ b/types/jquery-countdown/jquery-countdown-tests.ts
@@ -0,0 +1,33 @@
+// basic usage
+$(document).ready(() => {
+    $('#countdown').countdown('2019/01/01');
+
+    // with options
+    $('#countdown').countdown('2019/01/01', {
+        elapse: true
+    });
+
+    // with options and callback
+    $('#countdown').countdown('2019/01/01', {
+        elapse: true
+    }, event => {
+        $('#countdown').html(event.strftime('%w weeks %d days %H:%M:%S'));
+    });
+
+    // Methods
+    $('#countdown').on('update.countdown', (event => {
+        $('#countdown').html(event.strftime('%w weeks %d days %H:%M:%S'));
+    }));
+    $('#countdown').on('finish.countdown', (event => {
+        $('#countdown').html(event.strftime('%w weeks %d days %H:%M:%S'));
+    }));
+    $('#countdown').on('stop.countdown', (event => {
+        $('#countdown').html(event.strftime('%w weeks %d days %H:%M:%S'));
+    }));
+
+    // Controls
+    $('#countdown').countdown('start');
+    $('#countdown').countdown('stop');
+    $('#countdown').countdown('pause');
+    $('#countdown').countdown('resume');
+});
diff --git a/types/jquery-countdown/tsconfig.json b/types/jquery-countdown/tsconfig.json
new file mode 100644
index 0000000000..7c927d6429
--- /dev/null
+++ b/types/jquery-countdown/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery-countdown-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/jquery-countdown/tslint.json b/types/jquery-countdown/tslint.json
new file mode 100644
index 0000000000..d04fe2e1fa
--- /dev/null
+++ b/types/jquery-countdown/tslint.json
@@ -0,0 +1 @@
+{"extends": "dtslint/dt.json"}
\ No newline at end of file
diff --git a/types/jquery-jcrop/tsconfig.json b/types/jquery-jcrop/tsconfig.json
index add23691c0..930b4f28af 100644
--- a/types/jquery-jcrop/tsconfig.json
+++ b/types/jquery-jcrop/tsconfig.json
@@ -1,24 +1,24 @@
 {
-  "compilerOptions": {
-      "module": "commonjs",
-      "lib": [
-          "es6",
-          "dom"
-      ],
-      "noImplicitAny": true,
-      "noImplicitThis": true,
-      "strictNullChecks": true,
-      "strictFunctionTypes": true,
-      "baseUrl": "../",
-      "typeRoots": [
-          "../"
-      ],
-      "types": [],
-      "noEmit": true,
-      "forceConsistentCasingInFileNames": true
-  },
-  "files": [
-      "index.d.ts",
-      "jquery-jcrop-tests.ts"
-  ]
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery-jcrop-tests.ts"
+    ]
 }
\ No newline at end of file
diff --git a/types/jquery-maskmoney/index.d.ts b/types/jquery-maskmoney/index.d.ts
new file mode 100644
index 0000000000..dc5795dc90
--- /dev/null
+++ b/types/jquery-maskmoney/index.d.ts
@@ -0,0 +1,68 @@
+// Type definitions for jQuery maskMoney 3.0
+// Project: https://github.com/plentz/jquery-maskmoney
+// Definitions by: Anderson Friaça <https://github.com/AndersonFriaca>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+/// <reference types="jquery" />
+
+declare namespace jQueryMaskMoney {
+    interface Options {
+        /**
+         * The prefix to be displayed before the value entered
+         */
+        prefix?: string;
+
+        /**
+         * The prefix to be displayed after the value entered
+         */
+        suffix?: string;
+
+        /**
+         * Set if the prefix and suffix will stay in the field's value after the user exits the field
+         */
+        affixesStay?: boolean;
+
+        /**
+         * The thousands separator
+         */
+        thousands?: string;
+
+        /**
+         * The decimal separator
+         */
+        decimal?: string;
+
+        /**
+         * How many decimal places are allowed
+         */
+        precision?: number;
+
+        /**
+         * Setting to prevent users from inputing zero
+         */
+        allowZero?: boolean;
+
+        /**
+         * Setting to prevent negative values
+         */
+        allowNegative?: boolean;
+    }
+}
+interface JQuery {
+    /**
+     * Apply mask to input, can be pass default value to it
+     */
+    maskMoney(methodName: 'mask', defaultValue?: number): JQuery;
+
+    /**
+     * Returns a float value from input field masked
+     */
+    maskMoney(method?: 'unmasked'): number[];
+
+    /**
+     * Apply mask to input when the argument are options
+     * Remove maskMoney from an element when the argument is "destroy"
+     */
+    maskMoney(methodOrOption?: 'destroy' | jQueryMaskMoney.Options): JQuery;
+}
diff --git a/types/jquery-maskmoney/jquery-maskmoney-tests.ts b/types/jquery-maskmoney/jquery-maskmoney-tests.ts
new file mode 100644
index 0000000000..77da50e7bd
--- /dev/null
+++ b/types/jquery-maskmoney/jquery-maskmoney-tests.ts
@@ -0,0 +1,21 @@
+// basic usage
+$(document).ready(() => {
+	$('#input').maskMoney();
+	$('#input').maskMoney('mask');
+	$('#input').maskMoney('mask', 1999.99);
+	$('#input').maskMoney('unmasked');
+	$('#input').maskMoney('destroy');
+
+	// with options
+	const options: jQueryMaskMoney.Options = {
+		prefix: 'R$ ',
+		suffix: ' R$',
+		affixesStay: false,
+		thousands: '.',
+		decimal: ',',
+		precision: 3,
+		allowZero: true,
+		allowNegative: true
+	};
+	$('#input').maskMoney(options);
+});
diff --git a/types/jquery-maskmoney/tsconfig.json b/types/jquery-maskmoney/tsconfig.json
new file mode 100644
index 0000000000..c15d7578ab
--- /dev/null
+++ b/types/jquery-maskmoney/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery-maskmoney-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/jquery-maskmoney/tslint.json b/types/jquery-maskmoney/tslint.json
new file mode 100644
index 0000000000..d04fe2e1fa
--- /dev/null
+++ b/types/jquery-maskmoney/tslint.json
@@ -0,0 +1 @@
+{"extends": "dtslint/dt.json"}
\ No newline at end of file
diff --git a/types/jquery-notifier/tsconfig.json b/types/jquery-notifier/tsconfig.json
index b2178bf718..3044613c27 100644
--- a/types/jquery-notifier/tsconfig.json
+++ b/types/jquery-notifier/tsconfig.json
@@ -21,4 +21,4 @@
         "index.d.ts",
         "jquery-notifier-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/jquery.colorpicker/index.d.ts b/types/jquery.colorpicker/index.d.ts
index 05ee2cf5d2..1ece8a3c66 100644
--- a/types/jquery.colorpicker/index.d.ts
+++ b/types/jquery.colorpicker/index.d.ts
@@ -31,7 +31,7 @@ interface JQueryColorpickerOptions {
     closeOnOutside?: boolean;
     color?: string;
     colorFormat?: string;
-    disabled: boolean;
+    disabled?: boolean;
     draggable?: boolean;
     duration?: string;
     format?: string;
diff --git a/types/jquery.colorpicker/jquery.colorpicker-tests.ts b/types/jquery.colorpicker/jquery.colorpicker-tests.ts
index 4d2adfb69b..7d6e5c7ce3 100644
--- a/types/jquery.colorpicker/jquery.colorpicker-tests.ts
+++ b/types/jquery.colorpicker/jquery.colorpicker-tests.ts
@@ -70,6 +70,9 @@ colorpicker.colorpicker("destroy");
 colorpicker.colorpicker("setColor", "#deadbeef");
 colorpicker.colorpicker("option", "disabled", true);
 
+// check if all options are optional
+let defaultColorpicker = $("<input type=\"text\"/>").colorpicker({});
+
 // example plugins provided
 
 $.colorpicker.parts["memory"] = function (inst) {
diff --git a/types/jquery.stickem/index.d.ts b/types/jquery.stickem/index.d.ts
new file mode 100644
index 0000000000..50e759635e
--- /dev/null
+++ b/types/jquery.stickem/index.d.ts
@@ -0,0 +1,53 @@
+// Type definitions for jquery.stickem.js 1.4
+// Project: https://github.com/davist11/jQuery-Stickem
+// Definitions by: David Paz <https://github.com/davidmpaz>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+/// <reference types="jquery"/>
+
+interface StickemSettings {
+    /**
+     * selector for element to make sticky
+     */
+    item?: string;
+
+    /**
+     * selector for content container, sizes matched with `item`
+     */
+    container?: string;
+
+    /**
+     * css class used to apply
+     */
+    stickClass?: string;
+
+    /**
+     * css class used to apply when ending sticky
+     */
+    endStickClass?: string;
+
+    /**
+     * offset to use for the sticky element in the parent element
+     */
+    offset?: number | string;
+
+    /**
+     * where to place sticky element
+     */
+    start?: number | string;
+
+    /**
+     * Callback to execute when in stick state
+     */
+    onStick?: () => void;
+
+    /**
+     * Callback to execute when getting out of stick state
+     */
+    onUnstick?: () => void;
+}
+
+interface JQuery {
+    stickem(settings?: StickemSettings): JQuery;
+}
diff --git a/types/jquery.stickem/jquery.stickem-tests.ts b/types/jquery.stickem/jquery.stickem-tests.ts
new file mode 100644
index 0000000000..572bdf7773
--- /dev/null
+++ b/types/jquery.stickem/jquery.stickem-tests.ts
@@ -0,0 +1,19 @@
+// without options
+$('div').stickem();
+
+jQuery('div').stickem();
+
+// with options
+$('div').stickem({item:
+    '.stickem',
+    container: '.stickem-container',
+    stickClass: 'stickit',
+    endStickClass: 'stickit-end'
+});
+
+jQuery('div').stickem({
+    item: '.stickem',
+    container: '.stickem-container',
+    stickClass: 'stickit',
+    endStickClass: 'stickit-end'
+});
diff --git a/types/jquery.stickem/tsconfig.json b/types/jquery.stickem/tsconfig.json
new file mode 100644
index 0000000000..cadc467df6
--- /dev/null
+++ b/types/jquery.stickem/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery.stickem-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/jquery.stickem/tslint.json b/types/jquery.stickem/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/jquery.stickem/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/jqueryui/index.d.ts b/types/jqueryui/index.d.ts
index e3f390a4a2..a02e3ceb73 100644
--- a/types/jqueryui/index.d.ts
+++ b/types/jqueryui/index.d.ts
@@ -726,6 +726,7 @@ declare namespace JQueryUI {
 
     interface SortableOptions extends SortableEvents {
         appendTo?: any; // jQuery, Element, Selector or string
+        attribute?: string;
         axis?: string;
         cancel?: any; // Selector
         connectWith?: any; // Selector
diff --git a/types/js-base64/tsconfig.json b/types/js-base64/tsconfig.json
index 2e325222f7..00168e1dfa 100644
--- a/types/js-base64/tsconfig.json
+++ b/types/js-base64/tsconfig.json
@@ -1,13 +1,17 @@
 {
     "compilerOptions": {
         "module": "commonjs",
-        "lib": ["es6"],
+        "lib": [
+            "es6"
+        ],
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
-        "typeRoots": ["../"],
+        "typeRoots": [
+            "../"
+        ],
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
@@ -17,4 +21,4 @@
         "test/js-base64-module.test.ts",
         "test/js-base64-global.test.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/js-sha512/index.d.ts b/types/js-sha512/index.d.ts
new file mode 100644
index 0000000000..ad7c0844b1
--- /dev/null
+++ b/types/js-sha512/index.d.ts
@@ -0,0 +1,40 @@
+// Type definitions for js-sha512 0.7
+// Project: https://github.com/emn178/js-sha512
+// Definitions by: Nico Jansen <https://github.com/nicojs>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+interface Hash {
+    update(messageToHash: string): Hash;
+    hex(): string;
+    array(): number[];
+    digest(): number[];
+    arrayBuffer(): ArrayBuffer;
+}
+
+interface HashStatic {
+    (messageToHash: string): string;
+    hex(messageToHash: string): string;
+    array(messageToHash: string): number[];
+    digest(messageToHash: string): number[];
+    arrayBuffer(messageToHash: string): ArrayBuffer;
+    create(): Hash;
+    update(messageToHash: string): Hash;
+    hmac: HmacStatic;
+}
+
+interface JSSha512Static extends HashStatic {
+    sha512: HashStatic;
+    sha384: HashStatic;
+    sha512_224: HashStatic;
+    sha512_256: HashStatic;
+    create(): Hash;
+}
+
+interface HmacStatic {
+    (key: string, messageToHash: string): string;
+    create(key: string): Hash;
+    update(key: string, messageToHash: string): Hash;
+}
+
+declare const jsSha512: JSSha512Static;
+export = jsSha512;
diff --git a/types/js-sha512/js-sha512-tests.ts b/types/js-sha512/js-sha512-tests.ts
new file mode 100644
index 0000000000..8d1ce687c5
--- /dev/null
+++ b/types/js-sha512/js-sha512-tests.ts
@@ -0,0 +1,53 @@
+import jsSha512 = require('js-sha512');
+import { sha384, sha512, sha512_224, sha512_256 } from 'js-sha512';
+
+sha512('Message to hash');
+sha384('Message to hash');
+sha512_256('Message to hash');
+sha512_224('Message to hash');
+
+const hash = sha512.create();
+hash.update('Message to hash');
+hash.hex();
+
+const hash2 = sha512.update('Message to hash');
+hash2.update('Message2 to hash');
+hash2.array();
+
+// HMAC
+sha512.hmac('key', 'Message to hash');
+sha384.hmac('key', 'Message to hash');
+
+const hash3 = sha512.hmac.create('key');
+hash3.update('Message to hash');
+hash3.hex();
+
+const hash4 = sha512.hmac.update('key', 'Message to hash');
+hash4.update('Message2 to hash');
+hash4.array();
+
+sha512(''); // cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e
+sha512('The quick brown fox jumps over the lazy dog'); // 07e547d9586f6a73f73fbac0435ed76951218fb7d0c8d788a309d785436bbb642e93a252a954f23912547d1e8a3b5ed6e1bfd7097821233fa0538f3db854fee6
+sha512('The quick brown fox jumps over the lazy dog.'); // 91ea1245f20d46ae9a037a989f54f1f790f0a47607eeb8a14d12890cea77a1bbc6c7ed9cf205e67b7f2b8fd4c7dfd3a7a8617e45f3c463d481c7e586c39ac1ed
+sha384(''); // 38b060a751ac96384cd9327eb1b1e36a21fdb71114be07434c0cc7bf63f6e1da274edebfe76f65fbd51ad2f14898b95b
+sha384('The quick brown fox jumps over the lazy dog'); // ca737f1014a48f4c0b6dd43cb177b0afd9e5169367544c494011e3317dbf9a509cb1e5dc1e85a941bbee3d7f2afbc9b1
+sha384('The quick brown fox jumps over the lazy dog.'); // ed892481d8272ca6df370bf706e4d7bc1b5739fa2177aae6c50e946678718fc67a7af2819a021c2fc34e91bdb63409d7
+sha512_256(''); // c672b8d1ef56ed28ab87c3622c5114069bdd3ad7b8f9737498d0c01ecef0967a
+sha512_256('The quick brown fox jumps over the lazy dog'); // dd9d67b371519c339ed8dbd25af90e976a1eeefd4ad3d889005e532fc5bef04d
+sha512_256('The quick brown fox jumps over the lazy dog.'); // 1546741840f8a492b959d9b8b2344b9b0eb51b004bba35c0aebaac86d45264c3
+sha512_224(''); // 6ed0dd02806fa89e25de060c19d3ac86cabb87d6a0ddd05c333b84f4
+sha512_224('The quick brown fox jumps over the lazy dog'); // 944cd2847fb54558d4775db0485a50003111c8e5daa63fe722c6aa37
+sha512_224('The quick brown fox jumps over the lazy dog.'); // 6d6a9279495ec4061769752e7ff9c68b6b0b3c5a281b7917ce0572de
+
+// It also supports UTF-8 encoding
+sha512('中文'); // 8b88efc2ebbcbdad5ac2d65af05bec57bda25e71fd5fb25bbd892057a2755fbd05d8d8491cb2946febd5b0f124ffdfbaecf7e34946353c4f1b5ab29545895468
+sha384('中文'); // 93422ceb8291a69b22f02dc1114c39a287493ad525dcebc77e4019a44eaee2633a85d0f29cd298ee6799048c33a4be0c
+sha512_256('中文'); // b6dab29c16ec35ab34a5d92ff135b58de96741dda78b1009a2181cf8b45d2f72
+sha512_224('中文'); // 0f46a0ae7f226517dd66ece0ce1efa29ffb7ced05ac4566fdcaed188
+
+// Different output
+sha512(''); // cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e
+sha512.hex(''); // cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e
+sha512.array(''); // [207, 131, ..., 62]
+sha512.digest(''); // [207, 131, ..., 62]
+sha512.arrayBuffer(''); // ArrayBuffer
diff --git a/types/js-sha512/tsconfig.json b/types/js-sha512/tsconfig.json
new file mode 100644
index 0000000000..029e3929be
--- /dev/null
+++ b/types/js-sha512/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",
+        "js-sha512-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/js-sha512/tslint.json b/types/js-sha512/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/js-sha512/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/js-yaml/tsconfig.json b/types/js-yaml/tsconfig.json
index c36931fa61..970534b505 100644
--- a/types/js-yaml/tsconfig.json
+++ b/types/js-yaml/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "js-yaml-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/js.spec/index.d.ts b/types/js.spec/index.d.ts
index e7b3dfe753..cf3b095443 100644
--- a/types/js.spec/index.d.ts
+++ b/types/js.spec/index.d.ts
@@ -27,18 +27,29 @@ export interface Spec {
 
     /**
      * Explain why a value does not conform to this spec.
+     * @param path the path to the value
+     * @param via the containing specs, if any
      * @param value the value to examine
      * @returns list of problems or null if none
      */
-    explain(value: any): Problem[];
+    explain(path: string[], via: string[], value: any): Problem[];
+
+    /**
+     * Describe the specification. Used in explain strings and Problems.
+     * @returns the human-readable description of this spec
+     */
+    toString(): string;
 }
 
 /**
- * A Spec with a boolean conform function. Test the value and return true if it conforms.
+ * Predicate function definition to describe a predicate function.
  */
-export interface Predicate extends Spec {
-    (value: any): boolean;
-}
+export type PredFn = (value: any) => boolean;
+
+/**
+ * Defines an input to a js.spec method. Can be a Spec instance or a predicate function.
+ */
+export type SpecInput = PredFn | Spec;
 
 /**
  * An explanation of why a part of a value does not conform to a spec.
@@ -62,7 +73,7 @@ export interface Problem {
     /**
      * A predicate function to test new values for conformance.
      */
-    readonly predicate: Predicate;
+    readonly predicate: PredFn;
 }
 
 /**
@@ -71,7 +82,7 @@ export interface Problem {
  * @param value the value to test
  * @returns true if valid
  */
-export function valid(spec: spec.SpecInput, value: any): boolean;
+export function valid(spec: SpecInput, value: any): boolean;
 
 /**
  * Returns the conformed value to this spec.
@@ -79,7 +90,7 @@ export function valid(spec: spec.SpecInput, 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.SpecInput, value: any): any;
+export function conform(spec: SpecInput, value: any): any;
 
 /**
  * Like explain(), but returns Problems array.
@@ -87,21 +98,21 @@ export function conform(spec: spec.SpecInput, value: any): any;
  * @param value the value to test
  * @returns list of problems or null if none
  */
-export function explainData(spec: spec.SpecInput, value: any): Problem[];
+export function explainData(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.SpecInput, value: any): void;
+export function explain(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.SpecInput, value: any): string;
+export function explainStr(spec: SpecInput, value: any): string;
 
 /**
  * Returns a string with the problem statement from the given Problem.
@@ -114,7 +125,7 @@ export function problemStr(problem: Problem): string;
  * @param spec the spec to test with
  * @param value the value to test
  */
-export function assert(spec: spec.SpecInput, value: any): void;
+export function assert(spec: SpecInput, value: any): void;
 
 /**
  * Symbols used
@@ -146,17 +157,10 @@ export namespace symbol {
     const optional: symbol;
 }
 
+/**
+ * Factory methods to create Spec instances. Also provides included predicate functions that can be used in Specs.
+ */
 export namespace spec {
-    /**
-     * Predicate function definition to describe non-spec predicate functions.
-     */
-    type PredFn = (value: any) => boolean;
-
-    /**
-     * Defins an input to a spec. Can be a Spec instance or a predicate function.
-     */
-    type SpecInput = PredFn | Spec;
-
     /**
      * Data must conform to every provided spec.
      * @param name the name of the spec
@@ -231,116 +235,116 @@ export namespace spec {
     /**
      * Returns true if data is an integer.
      */
-    const int: Predicate;
+    const int: PredFn;
 
     /**
      * Returns true if data is an integer.
      */
-    const integer: Predicate;
+    const integer: PredFn;
 
     /**
      * Returns true if data is a finite number.
      */
-    const finite: Predicate;
+    const finite: PredFn;
 
     /**
      * Returns true if data is a number (can be double or integer).
      */
-    const number: Predicate;
+    const number: PredFn;
 
     /**
      * Returns true if data is an odd number.
      */
-    const odd: Predicate;
+    const odd: PredFn;
 
     /**
      * Returns true if data is an even number.
      */
-    const even: Predicate;
+    const even: PredFn;
 
     /**
      * Returns true if data is a number greater than zero.
      */
-    const positive: Predicate;
+    const positive: PredFn;
 
     /**
      * Returns true if data is a number smaller than zero.
      */
-    const negative: Predicate;
+    const negative: PredFn;
 
     /**
      * Returns true if data is the number zero.
      * Why: To easily construct specs for >= 0.
      */
-    const zero: Predicate;
+    const zero: PredFn;
 
     /**
      * Returns true if data is a string.
      */
-    const str: Predicate;
+    const str: PredFn;
 
     /**
      * Returns true if data is a string.
      */
-    const string: Predicate;
+    const string: PredFn;
 
     /**
      * Returns true if data is a function.
      */
-    const fn: Predicate;
+    const fn: PredFn;
 
     /**
      * Returns true if data is a Symbol.
      */
-    const sym: Predicate;
+    const sym: PredFn;
 
     /**
      * Returns true if data is a Symbol.
      */
-    const symbol: Predicate;
+    const symbol: PredFn;
 
     /**
      * Returns true if data is null or undefined.
      */
-    const nil: Predicate;
+    const nil: PredFn;
 
     /**
      * Returns true if data is a boolean.
      */
-    const bool: Predicate;
+    const bool: PredFn;
 
     /**
      * Returns true if data is a boolean.
      */
-    const boolean: Predicate;
+    const boolean: PredFn;
 
     /**
      * Returns true if data is a Date.
      */
-    const date: Predicate;
+    const date: PredFn;
 
     /**
      * Returns true if data is a plain object.
      */
-    const obj: Predicate;
+    const obj: PredFn;
 
     /**
      * Returns true if data is a plain object.
      */
-    const object: Predicate;
+    const object: PredFn;
 
     /**
      * Returns true if data is an Array.
      */
-    const array: Predicate;
+    const array: PredFn;
 
     /**
      * Returns true if data is a Set.
      */
-    const set: Predicate;
+    const set: PredFn;
 
     /**
      * Returns true if data is an Array or Set.
      */
-    const coll: Predicate;
+    const coll: PredFn;
 }
diff --git a/types/js.spec/js.spec-tests.ts b/types/js.spec/js.spec-tests.ts
index 17e49cfea6..685283d83f 100644
--- a/types/js.spec/js.spec-tests.ts
+++ b/types/js.spec/js.spec-tests.ts
@@ -1,8 +1,9 @@
 import * as S from "js.spec";
 
-const spec: S.Spec = S.spec.bool;
+const spec: S.Spec = S.spec.predicate("test spec", S.spec.bool);
 const c: symbol = spec.conform("water");
-const waterProblems: S.Problem[] = spec.explain("water");
+const waterProblems: S.Problem[] = spec.explain(["data"], ["spec"], "water");
+const toString: string = spec.toString();
 const name: string = spec.name;
 const options: object = spec.options;
 
@@ -15,7 +16,7 @@ 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 {path, via, value, predicate}: {path: string[], via: string[], value: any, predicate: S.PredFn} = problems[0];
 
 const problemStr: string = S.problemStr(problems[0]);
 
@@ -52,48 +53,48 @@ const predicateSpec: S.Spec = S.spec.predicate("predicate test", (value) => true
 
 // Predicates
 
-const intPred: S.Predicate = S.spec.int;
+const intPred: S.PredFn = S.spec.int;
 
-const integerPred: S.Predicate = S.spec.integer;
+const integerPred: S.PredFn = S.spec.integer;
 
-const finitePred: S.Predicate = S.spec.finite;
+const finitePred: S.PredFn = S.spec.finite;
 
-const numberPred: S.Predicate = S.spec.number;
+const numberPred: S.PredFn = S.spec.number;
 
-const oddPred: S.Predicate = S.spec.odd;
+const oddPred: S.PredFn = S.spec.odd;
 
-const evenPred: S.Predicate = S.spec.even;
+const evenPred: S.PredFn = S.spec.even;
 
-const positivePred: S.Predicate = S.spec.positive;
+const positivePred: S.PredFn = S.spec.positive;
 
-const negativePred: S.Predicate = S.spec.negative;
+const negativePred: S.PredFn = S.spec.negative;
 
-const zeroPred: S.Predicate = S.spec.zero;
+const zeroPred: S.PredFn = S.spec.zero;
 
-const strPred: S.Predicate = S.spec.str;
+const strPred: S.PredFn = S.spec.str;
 
-const stringPred: S.Predicate = S.spec.string;
+const stringPred: S.PredFn = S.spec.string;
 
-const fnPred: S.Predicate = S.spec.fn;
+const fnPred: S.PredFn = S.spec.fn;
 
-const symPred: S.Predicate = S.spec.sym;
+const symPred: S.PredFn = S.spec.sym;
 
-const symbolPred: S.Predicate = S.spec.symbol;
+const symbolPred: S.PredFn = S.spec.symbol;
 
-const nilPred: S.Predicate = S.spec.nil;
+const nilPred: S.PredFn = S.spec.nil;
 
-const boolPred: S.Predicate = S.spec.bool;
+const boolPred: S.PredFn = S.spec.bool;
 
-const booleanPred: S.Predicate = S.spec.boolean;
+const booleanPred: S.PredFn = S.spec.boolean;
 
-const datePred: S.Predicate = S.spec.date;
+const datePred: S.PredFn = S.spec.date;
 
-const objPred: S.Predicate = S.spec.obj;
+const objPred: S.PredFn = S.spec.obj;
 
-const objectPred: S.Predicate = S.spec.object;
+const objectPred: S.PredFn = S.spec.object;
 
-const arrayPred: S.Predicate = S.spec.array;
+const arrayPred: S.PredFn = S.spec.array;
 
-const setPred: S.Predicate = S.spec.set;
+const setPred: S.PredFn = S.spec.set;
 
-const collPred: S.Predicate = S.spec.coll;
+const collPred: S.PredFn = S.spec.coll;
diff --git a/types/js.spec/tsconfig.json b/types/js.spec/tsconfig.json
index c7a1d13a57..4c1fa0174e 100644
--- a/types/js.spec/tsconfig.json
+++ b/types/js.spec/tsconfig.json
@@ -2,7 +2,7 @@
     "compilerOptions": {
         "module": "commonjs",
         "lib": [
-            "es6"
+            "es5"
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
diff --git a/types/jschannel/tsconfig.json b/types/jschannel/tsconfig.json
index 83727a281c..58b8ca059e 100644
--- a/types/jschannel/tsconfig.json
+++ b/types/jschannel/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "jschannel-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/jsnox/index.d.ts b/types/jsnox/index.d.ts
index ae652ae9c7..6b626c29f0 100644
--- a/types/jsnox/index.d.ts
+++ b/types/jsnox/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Steve Baker <https://github.com/stkb>
 //                 Dovydas Navickas <https://github.com/DovydasNavickas>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from "react";
 
diff --git a/types/jsnox/jsnox-tests.ts b/types/jsnox/jsnox-tests.ts
index d545581591..f03c33e917 100644
--- a/types/jsnox/jsnox-tests.ts
+++ b/types/jsnox/jsnox-tests.ts
@@ -1,5 +1,5 @@
 import * as React from "react";
-import * as jsnox from "jsnox";
+import jsnox = require("jsnox");
 const $ = jsnox(React);
 
 interface PersonProps {
diff --git a/types/jsonfile/tsconfig.json b/types/jsonfile/tsconfig.json
index 287f9558c5..17ac9b0896 100644
--- a/types/jsonfile/tsconfig.json
+++ b/types/jsonfile/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "jsonfile-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/jsqrcode/index.d.ts b/types/jsqrcode/index.d.ts
index fd3948c7b0..e7768d593f 100644
--- a/types/jsqrcode/index.d.ts
+++ b/types/jsqrcode/index.d.ts
@@ -480,7 +480,7 @@ declare const qrcode: {
 	readonly sizeOfDataLengthInfo: [[10, 9, 8, 8], [12, 11, 16, 10], [14, 13, 16, 12]],
 
 	// tslint:disable-next-line:prefer-method-signature
-	callback: () => void,
+	callback: (result: string) => void,
 
 	orderBestPatterns(patterns: AlignmentPattern[]): void,
 
diff --git a/types/jsreport-core/tsconfig.json b/types/jsreport-core/tsconfig.json
index 1602790a14..f5bbf3b5c9 100644
--- a/types/jsreport-core/tsconfig.json
+++ b/types/jsreport-core/tsconfig.json
@@ -1,23 +1,23 @@
 {
-	"compilerOptions": {
-		"module": "commonjs",
-		"lib": [
-			"esnext"
-		],
-		"strictFunctionTypes": true,
-		"noImplicitAny": true,
-		"noImplicitThis": true,
-		"strictNullChecks": true,
-		"baseUrl": "../",
-		"typeRoots": [
-			"../"
-		],
-		"types": [],
-		"noEmit": true,
-		"forceConsistentCasingInFileNames": true
-	},
-	"files": [
-		"index.d.ts",
-		"jsreport-core-tests.ts"
-	]
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "esnext"
+        ],
+        "strictFunctionTypes": true,
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "jsreport-core-tests.ts"
+    ]
 }
\ No newline at end of file
diff --git a/types/jss/tsconfig.json b/types/jss/tsconfig.json
index f34791192c..89741f2b23 100644
--- a/types/jss/tsconfig.json
+++ b/types/jss/tsconfig.json
@@ -21,4 +21,4 @@
         "index.d.ts",
         "jss-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/jszip/jszip-tests.ts b/types/jszip/jszip-tests.ts
index 81ccda09db..5d332a8070 100644
--- a/types/jszip/jszip-tests.ts
+++ b/types/jszip/jszip-tests.ts
@@ -1,4 +1,4 @@
-import * as JSZip from 'jszip';
+import JSZip = require('jszip');
 
 const SEVERITY = {
 	DEBUG: 0,
diff --git a/types/jws/tsconfig.json b/types/jws/tsconfig.json
index a8a2f625d3..2a4c66dd50 100644
--- a/types/jws/tsconfig.json
+++ b/types/jws/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "jws-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/klaw/klaw-tests.ts b/types/klaw/klaw-tests.ts
index 2487aafd85..69406f73e8 100644
--- a/types/klaw/klaw-tests.ts
+++ b/types/klaw/klaw-tests.ts
@@ -1,4 +1,4 @@
-import * as klaw from "klaw";
+import klaw = require("klaw");
 const path = require('path');
 
 // README.md: Streams 1 (push) example:
diff --git a/types/klaw/v1/klaw-tests.ts b/types/klaw/v1/klaw-tests.ts
index 5e425a714a..7bfd79ee50 100644
--- a/types/klaw/v1/klaw-tests.ts
+++ b/types/klaw/v1/klaw-tests.ts
@@ -1,4 +1,4 @@
-import * as klaw from "klaw";
+import klaw = require("klaw");
 import * as  path from "path";
 
 // README.md: Streams 1 (push) example:
diff --git a/types/kms-json/tsconfig.json b/types/kms-json/tsconfig.json
index f8ac8d1921..51cf1b9814 100644
--- a/types/kms-json/tsconfig.json
+++ b/types/kms-json/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "kms-json-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/knex-postgis/knex-postgis-tests.ts b/types/knex-postgis/knex-postgis-tests.ts
index 43a6c2f58b..99eb1382fc 100644
--- a/types/knex-postgis/knex-postgis-tests.ts
+++ b/types/knex-postgis/knex-postgis-tests.ts
@@ -1,6 +1,6 @@
 import * as GeoJSON from 'geojson';
-import * as Knex from 'knex';
-import * as KPG from 'knex-postgis';
+import Knex = require('knex');
+import KPG = require('knex-postgis');
 
 const knex: Knex = Knex({ dialect: 'pg' });
 const st: KPG.KnexPostgis = KPG(knex);
diff --git a/types/knex/index.d.ts b/types/knex/index.d.ts
index 99b6a10476..f98091cb13 100644
--- a/types/knex/index.d.ts
+++ b/types/knex/index.d.ts
@@ -171,11 +171,13 @@ declare namespace Knex {
     }
 
     interface Select extends ColumnNameQueryBuilder {
+        (aliases: { [alias: string]: string }): QueryBuilder;
     }
 
     interface Table {
         (tableName: string): QueryBuilder;
         (callback: Function): QueryBuilder;
+        (raw: Raw): QueryBuilder;
     }
 
     interface Distinct extends ColumnNameQueryBuilder {
@@ -262,8 +264,8 @@ declare namespace Knex {
         (raw: Raw): QueryBuilder;
         (callback: QueryCallback): QueryBuilder;
         (object: Object): QueryBuilder;
-        (columnName: string, value: Value): QueryBuilder;
-        (columnName: string, operator: string, value: Value): QueryBuilder;
+        (columnName: string, value: Value | null): QueryBuilder;
+        (columnName: string, operator: string, value: Value | null): QueryBuilder;
         (columnName: string, operator: string, query: QueryBuilder): QueryBuilder;
     }
 
@@ -426,7 +428,7 @@ declare namespace Knex {
         date(columnName: string): ColumnBuilder;
         dateTime(columnName: string): ColumnBuilder;
         time(columnName: string): ColumnBuilder;
-        timestamp(columnName: string): ColumnBuilder;
+        timestamp(columnName: string, standard?: boolean): ColumnBuilder;
         timestamps(useTimestampType?: boolean, makeDefaultNow?: boolean): ColumnBuilder;
         binary(columnName: string, length?: number): ColumnBuilder;
         enum(columnName: string, values: Value[]): ColumnBuilder;
@@ -439,8 +441,8 @@ declare namespace Knex {
         primary(columnNames: string[]): TableBuilder;
         index(columnNames: (string | Raw)[], indexName?: string, indexType?: string): TableBuilder;
         unique(columnNames: (string | Raw)[], indexName?: string): TableBuilder;
-        foreign(column: string): ForeignConstraintBuilder;
-        foreign(columns: string[]): MultikeyForeignConstraintBuilder;
+        foreign(column: string, foreignKeyName?: string): ForeignConstraintBuilder;
+        foreign(columns: string[], foreignKeyName?: string): MultikeyForeignConstraintBuilder;
         dropForeign(columnNames: string[], foreignKeyName?: string): TableBuilder;
         dropUnique(columnNames: (string | Raw)[], indexName?: string): TableBuilder;
         dropPrimary(constraintName?: string): TableBuilder;
@@ -465,8 +467,8 @@ declare namespace Knex {
 
     interface ColumnBuilder {
         index(indexName?: string): ColumnBuilder;
-        primary(): ColumnBuilder;
-        unique(): ColumnBuilder;
+        primary(constraintName?: string): ColumnBuilder;
+        unique(indexName?: string): ColumnBuilder;
         references(columnName: string): ReferencingColumnBuilder;
         onDelete(command: string): ColumnBuilder;
         onUpdate(command: string): ColumnBuilder;
diff --git a/types/knex/knex-tests.ts b/types/knex/knex-tests.ts
index 3aaefb6909..c76f0d404f 100644
--- a/types/knex/knex-tests.ts
+++ b/types/knex/knex-tests.ts
@@ -160,6 +160,7 @@ var knex = Knex({
 
 // Knex Query Builder
 knex.select('title', 'author', 'year').from('books');
+knex.select({ name: 'title', writer: 'author' }).from(knex.raw('books'));
 knex.select().table('books');
 
 knex.avg('sum_column1').from(function() {
@@ -185,6 +186,10 @@ knex('users').where(() => {
 
 knex('users').where('votes', '>', 100);
 
+// Let null be used in a two or 3 parameter where filter
+knex('users').where('votes', null);
+knex('users').where('votes', 'is not', null);
+
 var subquery = knex('users').where('votes', '>', 100).andWhere('status', 'active').orWhere('name', 'John').select('id');
 knex('accounts').where('id', 'in', subquery);
 
@@ -1039,6 +1044,10 @@ knex.schema
   .dropTableIfExists('A')
   .createTable('A', table => {
     table.integer('C').unsigned().references('B.id').notNullable();
+    table.integer('D').primary('PK').notNullable();
+    table.string('E').unique('UX').nullable();
+    table.foreign('E', 'FK').references('F.id');
+    table.timestamp('T', false).notNullable();
   });
 
 
diff --git a/types/knex/tsconfig.json b/types/knex/tsconfig.json
index 41e9ae905e..8f0b7771d9 100644
--- a/types/knex/tsconfig.json
+++ b/types/knex/tsconfig.json
@@ -21,4 +21,4 @@
         "index.d.ts",
         "knex-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/knockout.postbox/index.d.ts b/types/knockout-postbox/index.d.ts
similarity index 100%
rename from types/knockout.postbox/index.d.ts
rename to types/knockout-postbox/index.d.ts
diff --git a/types/knockout.postbox/tsconfig.json b/types/knockout-postbox/tsconfig.json
similarity index 100%
rename from types/knockout.postbox/tsconfig.json
rename to types/knockout-postbox/tsconfig.json
diff --git a/types/knockout.postbox/tslint.json b/types/knockout-postbox/tslint.json
similarity index 100%
rename from types/knockout.postbox/tslint.json
rename to types/knockout-postbox/tslint.json
diff --git a/types/knockout/index.d.ts b/types/knockout/index.d.ts
index 570f61d80b..c06e0fcd35 100644
--- a/types/knockout/index.d.ts
+++ b/types/knockout/index.d.ts
@@ -314,6 +314,7 @@ interface KnockoutUtils {
     triggerEvent(element: any, eventType: any): void;
 
     unwrapObservable<T>(value: KnockoutObservable<T> | T): T;
+    unwrapObservable<T>(value: KnockoutObservableArray<T> | T[]): T[];
 
     // NOT PART OF THE MINIFIED API SURFACE (ONLY IN knockout-{version}.debug.js) https://github.com/SteveSanderson/knockout/issues/670
     // forceRefresh(node: any): void;
@@ -444,7 +445,8 @@ interface KnockoutStatic {
     isSubscribable(instance: any): instance is KnockoutSubscribable<any>;
     toJSON(viewModel: any, replacer?: Function, space?: any): string;
     toJS<T>(viewModel: KnockoutObservableArray<T>|KnockoutObservableType<T>[]|KnockoutObservableArray<KnockoutObservableType<T>>|T[]): T[];
-    toJS<T>(viewModel: KnockoutObservable<T>|KnockoutObservableType<T>|KnockoutObservable<KnockoutObservableType<T>>|T): T;
+    toJS<T>(viewModel: KnockoutObservable<T>|KnockoutObservableType<T>|KnockoutObservable<KnockoutObservableType<T>>): T;
+    toJS<T>(viewModel: T): T;
     isObservable<T>(instance: KnockoutObservable<T>|T): instance is KnockoutObservable<T>;
     isWriteableObservable<T>(instance: KnockoutObservable<T>|T): instance is KnockoutObservable<T>;
     isComputed<T>(instance: KnockoutObservable<T>|T): instance is KnockoutComputed<T>;
@@ -454,6 +456,7 @@ interface KnockoutStatic {
     renderTemplate(template: Function, viewModel: any, options?: any, target?: any, renderMode?: any): any;
     renderTemplate(template: string, viewModel: any, options?: any, target?: any, renderMode?: any): any;
     unwrap<T>(value: KnockoutObservable<T> | T): T;
+    unwrap<T>(value: KnockoutObservableArray<T> | T[]): T[];
 
     computedContext: KnockoutComputedContext;
 
diff --git a/types/koa-basic-auth/koa-basic-auth-tests.ts b/types/koa-basic-auth/koa-basic-auth-tests.ts
index 43cc5ab833..a1a8e8c3c2 100644
--- a/types/koa-basic-auth/koa-basic-auth-tests.ts
+++ b/types/koa-basic-auth/koa-basic-auth-tests.ts
@@ -1,4 +1,4 @@
-import * as Koa from "koa";
+import Koa = require("koa");
 import auth = require("koa-basic-auth");
 
 const app = new Koa();
diff --git a/types/koa-bodyparser/koa-bodyparser-tests.ts b/types/koa-bodyparser/koa-bodyparser-tests.ts
index 7e972e12be..e38eb112dd 100644
--- a/types/koa-bodyparser/koa-bodyparser-tests.ts
+++ b/types/koa-bodyparser/koa-bodyparser-tests.ts
@@ -1,5 +1,5 @@
-import * as Koa from "koa";
-import * as bodyParser from "koa-bodyparser";
+import Koa = require("koa");
+import bodyParser = require("koa-bodyparser");
 
 const app = new Koa();
 
diff --git a/types/koa-cache-control/koa-cache-control-tests.ts b/types/koa-cache-control/koa-cache-control-tests.ts
index c99f4fe862..9135551e7c 100644
--- a/types/koa-cache-control/koa-cache-control-tests.ts
+++ b/types/koa-cache-control/koa-cache-control-tests.ts
@@ -1,5 +1,5 @@
-import * as Koa from "koa";
-import * as cacheControl from "koa-cache-control";
+import Koa = require("koa");
+import cacheControl = require("koa-cache-control");
 
 const app = new Koa();
 
diff --git a/types/koa-compress/koa-compress-tests.ts b/types/koa-compress/koa-compress-tests.ts
index 30195cd30c..e24bc53b27 100644
--- a/types/koa-compress/koa-compress-tests.ts
+++ b/types/koa-compress/koa-compress-tests.ts
@@ -1,4 +1,4 @@
-import * as Koa from "koa";
+import Koa = require("koa");
 import compress = require("koa-compress");
 
 const app = new Koa();
diff --git a/types/koa-conditional-get/tsconfig.json b/types/koa-conditional-get/tsconfig.json
index 111408f39b..e9cf7d274d 100644
--- a/types/koa-conditional-get/tsconfig.json
+++ b/types/koa-conditional-get/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "koa-conditional-get-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/koa-csrf/koa-csrf-tests.ts b/types/koa-csrf/koa-csrf-tests.ts
index d0bb211b01..8886e8b0cf 100644
--- a/types/koa-csrf/koa-csrf-tests.ts
+++ b/types/koa-csrf/koa-csrf-tests.ts
@@ -1,5 +1,5 @@
 import koaCsrf = require("koa-csrf");
-import * as Koa from "koa";
+import Koa = require("koa");
 const app = new Koa();
 
 app.use(new koaCsrf({
diff --git a/types/koa-csrf/tsconfig.json b/types/koa-csrf/tsconfig.json
index 56e1cf81a8..e03b172a0e 100644
--- a/types/koa-csrf/tsconfig.json
+++ b/types/koa-csrf/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "koa-csrf-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/koa-etag/koa-etag-tests.ts b/types/koa-etag/koa-etag-tests.ts
index fa2d5515d6..a5cac4b870 100644
--- a/types/koa-etag/koa-etag-tests.ts
+++ b/types/koa-etag/koa-etag-tests.ts
@@ -1,5 +1,5 @@
 import koaEtag = require('koa-etag');
-import * as Koa from 'koa';
+import Koa = require('koa');
 
 new Koa().use(koaEtag());
 
diff --git a/types/koa-etag/tsconfig.json b/types/koa-etag/tsconfig.json
index d6b1feb52c..0b29fceb73 100644
--- a/types/koa-etag/tsconfig.json
+++ b/types/koa-etag/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "koa-etag-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/koa-favicon/koa-favicon-tests.ts b/types/koa-favicon/koa-favicon-tests.ts
index 72dfdb5aaa..755c38ff58 100644
--- a/types/koa-favicon/koa-favicon-tests.ts
+++ b/types/koa-favicon/koa-favicon-tests.ts
@@ -1,4 +1,4 @@
-import * as Koa from "koa";
+import Koa = require("koa");
 import favicon = require("koa-favicon");
 
 const app = new Koa();
diff --git a/types/koa-generic-session/koa-generic-session-tests.ts b/types/koa-generic-session/koa-generic-session-tests.ts
index e48d4dbef6..be10c1e04f 100644
--- a/types/koa-generic-session/koa-generic-session-tests.ts
+++ b/types/koa-generic-session/koa-generic-session-tests.ts
@@ -1,4 +1,4 @@
-import * as Koa from "koa";
+import Koa = require("koa");
 import { MemoryStore, Session } from "koa-generic-session";
 import session = require("koa-generic-session");
 
diff --git a/types/koa-hbs/koa-hbs-tests.ts b/types/koa-hbs/koa-hbs-tests.ts
index 14a113e816..0090f446c1 100644
--- a/types/koa-hbs/koa-hbs-tests.ts
+++ b/types/koa-hbs/koa-hbs-tests.ts
@@ -1,4 +1,4 @@
-import * as Koa from 'koa';
+import Koa = require('koa');
 import hbs = require("koa-hbs");
 import * as Path from 'path';
 
diff --git a/types/koa-helmet/koa-helmet-tests.ts b/types/koa-helmet/koa-helmet-tests.ts
index 1f50ea5c6b..2290ab07fa 100644
--- a/types/koa-helmet/koa-helmet-tests.ts
+++ b/types/koa-helmet/koa-helmet-tests.ts
@@ -1,4 +1,4 @@
-import * as Koa from 'koa';
+import Koa = require('koa');
 import helmet = require('koa-helmet');
 
 const app = new Koa();
diff --git a/types/koa-json-error/koa-json-error-tests.ts b/types/koa-json-error/koa-json-error-tests.ts
index 9b2ab3c8de..be76a08cb3 100644
--- a/types/koa-json-error/koa-json-error-tests.ts
+++ b/types/koa-json-error/koa-json-error-tests.ts
@@ -1,5 +1,5 @@
-import * as Koa from "koa";
-import * as error from "koa-json-error";
+import Koa = require("koa");
+import error = require("koa-json-error");
 
 const app = new Koa();
 
diff --git a/types/koa-json/koa-json-tests.ts b/types/koa-json/koa-json-tests.ts
index deb3aa8e0d..bce89d95eb 100644
--- a/types/koa-json/koa-json-tests.ts
+++ b/types/koa-json/koa-json-tests.ts
@@ -1,5 +1,5 @@
-import * as Koa from "koa";
-import * as json from 'koa-json';
+import Koa = require("koa");
+import json = require('koa-json');
 
 const app = new Koa();
 
diff --git a/types/koa-logger-winston/koa-logger-winston-tests.ts b/types/koa-logger-winston/koa-logger-winston-tests.ts
index 44b9047b86..7bec5877f4 100644
--- a/types/koa-logger-winston/koa-logger-winston-tests.ts
+++ b/types/koa-logger-winston/koa-logger-winston-tests.ts
@@ -1,5 +1,5 @@
-import * as koa from 'koa';
-import * as logger from 'koa-logger-winston';
+import koa = require('koa');
+import logger = require('koa-logger-winston');
 import * as winston from 'winston';
 
 const app = new koa();
diff --git a/types/koa-logger/koa-logger-tests.ts b/types/koa-logger/koa-logger-tests.ts
index 502c33255d..bd4a32213b 100644
--- a/types/koa-logger/koa-logger-tests.ts
+++ b/types/koa-logger/koa-logger-tests.ts
@@ -1,5 +1,5 @@
-import * as koa from 'koa';
-import * as logger from 'koa-logger';
+import koa = require('koa');
+import logger = require('koa-logger');
 
 const app = new koa();
 app.use(logger());
diff --git a/types/koa-morgan/koa-morgan-tests.ts b/types/koa-morgan/koa-morgan-tests.ts
index 0a0e51cd95..8d4936a78a 100644
--- a/types/koa-morgan/koa-morgan-tests.ts
+++ b/types/koa-morgan/koa-morgan-tests.ts
@@ -1,6 +1,6 @@
 import { IncomingMessage, ServerResponse } from 'http';
-import * as Koa from 'koa';
-import * as morgan from 'koa-morgan';
+import Koa = require('koa');
+import morgan = require('koa-morgan');
 
 const app = new Koa();
 
diff --git a/types/koa-mount/index.d.ts b/types/koa-mount/index.d.ts
index d05036d83b..138d4f6f36 100644
--- a/types/koa-mount/index.d.ts
+++ b/types/koa-mount/index.d.ts
@@ -5,7 +5,7 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
-import * as Koa from "koa";
+import Koa = require("koa");
 
 declare function mount(app: Koa.Middleware | Koa): Koa.Middleware;
 
diff --git a/types/koa-mount/koa-mount-tests.ts b/types/koa-mount/koa-mount-tests.ts
index 9a7702935f..139e08a3d8 100644
--- a/types/koa-mount/koa-mount-tests.ts
+++ b/types/koa-mount/koa-mount-tests.ts
@@ -1,5 +1,5 @@
-import * as Koa from "koa";
-import * as mount from "koa-mount";
+import Koa = require("koa");
+import mount = require("koa-mount");
 
 const a = new Koa();
 
diff --git a/types/koa-multer/koa-multer-tests.ts b/types/koa-multer/koa-multer-tests.ts
index 212b4d95b0..617e08c853 100644
--- a/types/koa-multer/koa-multer-tests.ts
+++ b/types/koa-multer/koa-multer-tests.ts
@@ -1,5 +1,5 @@
-import * as Koa from 'koa';
-import * as multer from 'koa-multer';
+import Koa = require('koa');
+import multer = require('koa-multer');
 
 const upload = multer({
     dest: 'uploads/',
diff --git a/types/koa-multer/tsconfig.json b/types/koa-multer/tsconfig.json
index 63f7b13ec3..e076e0d54e 100644
--- a/types/koa-multer/tsconfig.json
+++ b/types/koa-multer/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "koa-multer-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/koa-passport/koa-passport-tests.ts b/types/koa-passport/koa-passport-tests.ts
index 42827a85ba..afc07b956e 100644
--- a/types/koa-passport/koa-passport-tests.ts
+++ b/types/koa-passport/koa-passport-tests.ts
@@ -1,4 +1,4 @@
-import * as Koa from 'koa';
+import Koa = require('koa');
 import * as passport from 'koa-passport';
 
 const app = new Koa();
diff --git a/types/koa-pino-logger/koa-pino-logger-tests.ts b/types/koa-pino-logger/koa-pino-logger-tests.ts
index 68f5dd1331..bec6f887d2 100644
--- a/types/koa-pino-logger/koa-pino-logger-tests.ts
+++ b/types/koa-pino-logger/koa-pino-logger-tests.ts
@@ -1,5 +1,5 @@
-import * as koa from 'koa';
-import * as logger from 'koa-pino-logger';
+import koa = require('koa');
+import logger = require('koa-pino-logger');
 
 const app = new koa();
 app.use(logger());
diff --git a/types/koa-range/koa-range-tests.ts b/types/koa-range/koa-range-tests.ts
index c489bf4a6b..29982f9b04 100644
--- a/types/koa-range/koa-range-tests.ts
+++ b/types/koa-range/koa-range-tests.ts
@@ -1,5 +1,5 @@
-import * as range from "koa-range";
-import * as Koa from "koa";
+import range = require("koa-range");
+import Koa = require("koa");
 
 const app = new Koa();
 app.use(range);
diff --git a/types/koa-redis/koa-redis-tests.ts b/types/koa-redis/koa-redis-tests.ts
index 21c8e010b0..2cf4ca2ddb 100644
--- a/types/koa-redis/koa-redis-tests.ts
+++ b/types/koa-redis/koa-redis-tests.ts
@@ -1,4 +1,4 @@
-import * as Koa from "koa";
+import Koa = require("koa");
 import { MemoryStore, Session } from "koa-generic-session";
 import session = require("koa-generic-session");
 import redisStore = require("koa-redis");
diff --git a/types/koa-route/koa-route-tests.ts b/types/koa-route/koa-route-tests.ts
index 331c7d6b53..3b26266434 100644
--- a/types/koa-route/koa-route-tests.ts
+++ b/types/koa-route/koa-route-tests.ts
@@ -1,4 +1,4 @@
-import * as Koa from 'koa';
+import Koa = require('koa');
 import * as route from 'koa-route';
 
 const app = new Koa();
diff --git a/types/koa-router/koa-router-tests.ts b/types/koa-router/koa-router-tests.ts
index 32f041bbc7..bbd525897c 100644
--- a/types/koa-router/koa-router-tests.ts
+++ b/types/koa-router/koa-router-tests.ts
@@ -1,5 +1,5 @@
-import * as Koa from "koa";
-import * as Router from "koa-router";
+import Koa = require("koa");
+import Router = require("koa-router");
 
 const app = new Koa();
 
diff --git a/types/koa-send/koa-send-tests.ts b/types/koa-send/koa-send-tests.ts
index a3b136ea9a..33c8cdaa18 100644
--- a/types/koa-send/koa-send-tests.ts
+++ b/types/koa-send/koa-send-tests.ts
@@ -1,5 +1,5 @@
-import * as Koa from 'koa';
-import * as send from 'koa-send';
+import Koa = require('koa');
+import send = require('koa-send');
 
 const app = new Koa();
 
diff --git a/types/koa-session-minimal/koa-session-minimal-tests.ts b/types/koa-session-minimal/koa-session-minimal-tests.ts
index b58f441d8e..6ea0ef7cf5 100644
--- a/types/koa-session-minimal/koa-session-minimal-tests.ts
+++ b/types/koa-session-minimal/koa-session-minimal-tests.ts
@@ -1,5 +1,5 @@
-import * as Koa from "koa";
-import * as session from "koa-session-minimal";
+import Koa = require("koa");
+import session = require("koa-session-minimal");
 
 const app = new Koa();
 
diff --git a/types/koa-session/index.d.ts b/types/koa-session/index.d.ts
index d05ce7055e..8650a07d91 100644
--- a/types/koa-session/index.d.ts
+++ b/types/koa-session/index.d.ts
@@ -15,7 +15,7 @@
 
  =============================================== */
 
-import * as Koa from "koa";
+import Koa = require("koa");
 
 declare namespace session {
     /**
diff --git a/types/koa-session/koa-session-tests.ts b/types/koa-session/koa-session-tests.ts
index 02f944ae66..2844767240 100644
--- a/types/koa-session/koa-session-tests.ts
+++ b/types/koa-session/koa-session-tests.ts
@@ -1,5 +1,5 @@
-import * as Koa from 'koa';
-import * as session from 'koa-session';
+import Koa = require('koa');
+import session = require('koa-session');
 import * as ContextSession from "koa-session/lib/context";
 
 import {
diff --git a/types/koa-session/tsconfig.json b/types/koa-session/tsconfig.json
index df47800012..3d8334f36e 100644
--- a/types/koa-session/tsconfig.json
+++ b/types/koa-session/tsconfig.json
@@ -23,4 +23,4 @@
         "lib/util.d.ts",
         "koa-session-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/koa-sslify/tsconfig.json b/types/koa-sslify/tsconfig.json
index 64615e2ab9..775b453de9 100644
--- a/types/koa-sslify/tsconfig.json
+++ b/types/koa-sslify/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "koa-sslify-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/koa-static/koa-static-tests.ts b/types/koa-static/koa-static-tests.ts
index 9b0d756f7d..c81b81483c 100644
--- a/types/koa-static/koa-static-tests.ts
+++ b/types/koa-static/koa-static-tests.ts
@@ -1,4 +1,4 @@
-import * as Koa from "koa";
+import Koa = require("koa");
 import serve = require("koa-static");
 
 const app = new Koa();
diff --git a/types/koa-views/koa-views-tests.ts b/types/koa-views/koa-views-tests.ts
index 65d6be7e1f..3453b156de 100644
--- a/types/koa-views/koa-views-tests.ts
+++ b/types/koa-views/koa-views-tests.ts
@@ -1,5 +1,5 @@
-import * as Koa from "koa";
-import * as views from "koa-views";
+import Koa = require("koa");
+import views = require("koa-views");
 
 const app = new Koa();
 
diff --git a/types/koa-webpack/tsconfig.json b/types/koa-webpack/tsconfig.json
index d3cef374db..621bc791d1 100644
--- a/types/koa-webpack/tsconfig.json
+++ b/types/koa-webpack/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "koa-webpack-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/koa-websocket/index.d.ts b/types/koa-websocket/index.d.ts
index 326f098ae5..e7a6c39a7d 100644
--- a/types/koa-websocket/index.d.ts
+++ b/types/koa-websocket/index.d.ts
@@ -4,7 +4,7 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
-import * as Koa from 'koa';
+import Koa = require('koa');
 import * as ws from 'ws';
 import * as http from 'http';
 import * as https from 'https';
@@ -30,7 +30,5 @@ interface KoaWebsocketApp extends Koa {
     ws: KoaWebsocketServer;
 }
 
-type KoaWebsockets = (app: Koa) => KoaWebsocketApp;
-
-declare const websockets: KoaWebsockets;
+declare function websockets(app: Koa): KoaWebsocketApp;
 export = websockets;
diff --git a/types/koa-websocket/koa-websocket-tests.ts b/types/koa-websocket/koa-websocket-tests.ts
index 66bd4bf4d2..bd99c3d17e 100644
--- a/types/koa-websocket/koa-websocket-tests.ts
+++ b/types/koa-websocket/koa-websocket-tests.ts
@@ -1,5 +1,5 @@
-import * as Koa from 'koa';
-import * as websocket from 'koa-websocket';
+import Koa = require('koa');
+import websocket = require('koa-websocket');
 
 const app = websocket(new Koa());
 
diff --git a/types/koa/index.d.ts b/types/koa/index.d.ts
index 1203864c8c..2a5c49f110 100644
--- a/types/koa/index.d.ts
+++ b/types/koa/index.d.ts
@@ -21,7 +21,7 @@ import * as accepts from "accepts";
 import * as Cookies from "cookies";
 import { EventEmitter } from "events";
 import { IncomingMessage, ServerResponse, Server } from "http";
-import * as httpAssert from "http-assert";
+import httpAssert = require("http-assert");
 import * as Keygrip from "keygrip";
 import * as compose from "koa-compose";
 import { Socket, ListenOptions } from "net";
diff --git a/types/koa/koa-tests.ts b/types/koa/koa-tests.ts
index 6dbc073bea..ea0a4a18b8 100644
--- a/types/koa/koa-tests.ts
+++ b/types/koa/koa-tests.ts
@@ -1,4 +1,4 @@
-import * as Koa from "koa";
+import Koa = require("koa");
 
 const app = new Koa();
 
diff --git a/types/koa2-cors/koa2-cors-tests.ts b/types/koa2-cors/koa2-cors-tests.ts
index 820722d635..228fa4242e 100644
--- a/types/koa2-cors/koa2-cors-tests.ts
+++ b/types/koa2-cors/koa2-cors-tests.ts
@@ -1,5 +1,5 @@
-import * as Koa from 'koa';
-import * as cors from 'koa2-cors';
+import Koa = require('koa');
+import cors = require('koa2-cors');
 
 const app = new Koa();
 app.use(cors({
diff --git a/types/kraken-js/tsconfig.json b/types/kraken-js/tsconfig.json
index 2fce7a799d..6ff537a6dc 100644
--- a/types/kraken-js/tsconfig.json
+++ b/types/kraken-js/tsconfig.json
@@ -9,7 +9,9 @@
         "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
-        "typeRoots": ["../"],
+        "typeRoots": [
+            "../"
+        ],
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
@@ -18,4 +20,4 @@
         "index.d.ts",
         "kraken-js-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/lasso/tsconfig.json b/types/lasso/tsconfig.json
index 210de56a0d..d83095e1d3 100644
--- a/types/lasso/tsconfig.json
+++ b/types/lasso/tsconfig.json
@@ -29,4 +29,4 @@
         "lib/writers/Writer.d.ts",
         "middleware/index.d.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/latlon-geohash/tsconfig.json b/types/latlon-geohash/tsconfig.json
index 10d9c00791..e31b03319d 100644
--- a/types/latlon-geohash/tsconfig.json
+++ b/types/latlon-geohash/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "latlon-geohash-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/ldapjs/index.d.ts b/types/ldapjs/index.d.ts
index 8034add042..b2444ae232 100644
--- a/types/ldapjs/index.d.ts
+++ b/types/ldapjs/index.d.ts
@@ -52,7 +52,7 @@ export interface ClientOptions {
 
 export interface SearchOptions {
 	scope?: string;
-	filter?: string;
+	filter?: string | Filter;
 	attributes?: string[];
 	sizeLimit?: number;
 	timeLimit?: number;
@@ -238,3 +238,46 @@ export interface Client extends EventEmitter {
 }
 
 export function createClient(options?: ClientOptions): Client;
+
+declare class Filter {
+	matches(obj: any): boolean;
+	type: string;
+}
+
+export function parseFilter(filterString: string): Filter;
+
+export class EqualityFilter extends Filter {
+	constructor(options: { attribute: string, value: string })
+}
+
+export class PresenceFilter extends Filter {
+	constructor(options: { attribute: string })
+}
+
+export class SubstringFilter extends Filter {
+	constructor(options: { attribute: string, initial: string, any?: string[], final?: string })
+}
+
+export class GreaterThanEqualsFilter extends Filter {
+	constructor(options: { attribute: string, value: string })
+}
+
+export class LessThanEqualsFilter extends Filter {
+	constructor(options: { attribute: string, value: string })
+}
+
+export class AndFilter extends Filter {
+	constructor(options: { filters: Filter[] })
+}
+
+export class OrFilter extends Filter {
+	constructor(options: { filters: Filter[] })
+}
+
+export class NotFilter extends Filter {
+	constructor(options: { filter: Filter })
+}
+
+export class ApproximateFilter extends Filter {
+	constructor(options: { attribute: string, value: string })
+}
diff --git a/types/ldapjs/ldapjs-tests.ts b/types/ldapjs/ldapjs-tests.ts
index ec106fd29a..51a0edbd77 100644
--- a/types/ldapjs/ldapjs-tests.ts
+++ b/types/ldapjs/ldapjs-tests.ts
@@ -2,7 +2,7 @@
 import ldap = require("ldapjs");
 
 let client = ldap.createClient({
-  url: 'ldap://127.0.0.1:1389'
+	url: 'ldap://127.0.0.1:1389'
 });
 
 client.bind('cn=root', 'secret', (err: Error): void => {
@@ -10,9 +10,9 @@ client.bind('cn=root', 'secret', (err: Error): void => {
 });
 
 let opts: ldap.SearchOptions = {
-  filter: '(&(l=Seattle)(email=*@foo.com))',
-  scope: 'sub',
-  attributes: ['dn', 'sn', 'cn']
+	filter: '(&(l=Seattle)(email=*@foo.com))',
+	scope: 'sub',
+	attributes: ['dn', 'sn', 'cn']
 };
 
 client.search('o=example', opts, (err: Error, res: NodeJS.EventEmitter): void => {
@@ -20,12 +20,89 @@ client.search('o=example', opts, (err: Error, res: NodeJS.EventEmitter): void =>
 });
 
 let change = new ldap.Change({
-    operation: 'add',
-    modification: {
-        pets: ['cat', 'dog']
-    }
+	operation: 'add',
+	modification: {
+		pets: ['cat', 'dog']
+	}
 });
 
-client.modify('cn=foo, o=example', change, function(err) {
-    // nothing
+client.modify('cn=foo, o=example', change, function (err) {
+	// nothing
 });
+
+
+let f = ldap.parseFilter('(objectclass=*)');
+f.matches({});
+
+let equalityFilter = new ldap.EqualityFilter({
+	attribute: 'cn',
+	value: 'foo'
+});
+equalityFilter.matches({ cn: 'foo' });
+
+let presenceFilter = new ldap.PresenceFilter({
+	attribute: 'cn'
+});
+presenceFilter.matches({ cn: 'foo' });
+
+let substringFilter = new ldap.SubstringFilter({
+	attribute: 'cn',
+	initial: 'foo',
+	any: ['bar'],
+	final: 'baz'
+});
+substringFilter.matches({ cn: 'foobigbardogbaz' });
+
+let greaterThanEqualsFilter = new ldap.GreaterThanEqualsFilter({
+	attribute: 'cn',
+	value: 'foo',
+});
+greaterThanEqualsFilter.matches({ cn: 'foobar' });
+
+let lessThanEqualsFilter = new ldap.LessThanEqualsFilter({
+	attribute: 'cn',
+	value: 'foo',
+});
+lessThanEqualsFilter.matches({ cn: 'abc' });
+
+let andFilter = new ldap.AndFilter({
+	filters: [
+		new ldap.EqualityFilter({
+			attribute: 'cn',
+			value: 'foo'
+		}),
+		new ldap.EqualityFilter({
+			attribute: 'sn',
+			value: 'bar'
+		})
+	]
+});
+andFilter.matches({ cn: 'foo', sn: 'bar' });
+
+let orFilter = new ldap.OrFilter({
+	filters: [
+		new ldap.EqualityFilter({
+			attribute: 'cn',
+			value: 'foo'
+		}),
+		new ldap.EqualityFilter({
+			attribute: 'sn',
+			value: 'bar'
+		})
+	]
+});
+orFilter.matches({ cn: 'foo', sn: 'baz' });
+
+let notFilter = new ldap.NotFilter({
+	filter: new ldap.EqualityFilter({
+		attribute: 'cn',
+		value: 'foo'
+	})
+});
+notFilter.matches({ cn: 'bar' });
+
+let approximateFilter = new ldap.ApproximateFilter({
+	attribute: 'cn',
+	value: 'foo'
+});
+approximateFilter.matches({ cn: 'foo' });
diff --git a/types/ldapjs/tsconfig.json b/types/ldapjs/tsconfig.json
index a0df7615fd..1f1d5bafc9 100644
--- a/types/ldapjs/tsconfig.json
+++ b/types/ldapjs/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "ldapjs-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/leaflet-mouse-position/tsconfig.json b/types/leaflet-mouse-position/tsconfig.json
index a853ad3c56..acf01e41a5 100644
--- a/types/leaflet-mouse-position/tsconfig.json
+++ b/types/leaflet-mouse-position/tsconfig.json
@@ -21,4 +21,4 @@
         "index.d.ts",
         "leaflet-mouse-position-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/leaflet-rotatedmarker/tsconfig.json b/types/leaflet-rotatedmarker/tsconfig.json
index 18bf544889..88b4b42c46 100644
--- a/types/leaflet-rotatedmarker/tsconfig.json
+++ b/types/leaflet-rotatedmarker/tsconfig.json
@@ -21,4 +21,4 @@
         "index.d.ts",
         "leaflet-rotatedmarker-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/leaflet.heat/tsconfig.json b/types/leaflet.heat/tsconfig.json
index 482c984b8c..6e041d8ac2 100644
--- a/types/leaflet.heat/tsconfig.json
+++ b/types/leaflet.heat/tsconfig.json
@@ -1,24 +1,24 @@
 {
-  "compilerOptions": {
-    "module": "commonjs",
-    "lib": [
-      "es6",
-      "dom"
-    ],
-    "noImplicitAny": true,
-    "noImplicitThis": true,
-    "strictNullChecks": true,
-    "strictFunctionTypes": true,
-    "baseUrl": "../",
-    "typeRoots": [
-      "../"
-    ],
-    "types": [],
-    "noEmit": true,
-    "forceConsistentCasingInFileNames": true
-  },
-  "files": [
-    "index.d.ts",
-    "leaflet.heat-tests.ts"
-  ]
-}
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "leaflet.heat-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/leaflet.pancontrol/tsconfig.json b/types/leaflet.pancontrol/tsconfig.json
index ec286c0305..d7fb9d543c 100644
--- a/types/leaflet.pancontrol/tsconfig.json
+++ b/types/leaflet.pancontrol/tsconfig.json
@@ -21,4 +21,4 @@
         "index.d.ts",
         "leaflet.pancontrol-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/leaflet.polylinemeasure/tsconfig.json b/types/leaflet.polylinemeasure/tsconfig.json
index b1db5e086d..0ab54d7e16 100644
--- a/types/leaflet.polylinemeasure/tsconfig.json
+++ b/types/leaflet.polylinemeasure/tsconfig.json
@@ -21,4 +21,4 @@
         "index.d.ts",
         "leaflet.polylinemeasure-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/legal-eagle/tsconfig.json b/types/legal-eagle/tsconfig.json
index 380eaaed72..78c749f43f 100644
--- a/types/legal-eagle/tsconfig.json
+++ b/types/legal-eagle/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "legal-eagle-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/less2sass/tsconfig.json b/types/less2sass/tsconfig.json
index e70848dca8..04d99cda84 100644
--- a/types/less2sass/tsconfig.json
+++ b/types/less2sass/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "less2sass-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/leveldown/leveldown-tests.ts b/types/leveldown/leveldown-tests.ts
index 94d852d204..0aa9b3625e 100644
--- a/types/leveldown/leveldown-tests.ts
+++ b/types/leveldown/leveldown-tests.ts
@@ -1,4 +1,4 @@
-import * as leveldown from "leveldown";
+import leveldown = require("leveldown");
 
 const db = leveldown("db1");
 
diff --git a/types/levelup/levelup-tests.ts b/types/levelup/levelup-tests.ts
index 8827512437..2d3867cdd3 100644
--- a/types/levelup/levelup-tests.ts
+++ b/types/levelup/levelup-tests.ts
@@ -1,4 +1,4 @@
-import * as levelup from "levelup";
+import levelup = require("levelup");
 
 interface BufferEncoding {
     encode(val: any): Buffer;
@@ -68,7 +68,7 @@ db.batch()
     .write(function () { console.log('Done!') })
 
 var open:boolean = db.isOpen();
-var closed:boolean = db.isClosed(); 
+var closed:boolean = db.isClosed();
 db.createReadStream()
     .on('data', function (data: any) {
       console.log(data.key, '=', data.value)
diff --git a/types/libpq/libpq-tests.ts b/types/libpq/libpq-tests.ts
index fee968dabc..f1ae6cc1e3 100644
--- a/types/libpq/libpq-tests.ts
+++ b/types/libpq/libpq-tests.ts
@@ -1,9 +1,9 @@
 /// <reference types="mocha" />
 
 import { Buffer } from 'buffer';
-import * as assert from 'assert';
+import assert = require('assert');
 import * as async from 'async';
-import * as PQ from 'libpq';
+import PQ = require('libpq');
 
 declare const _: { times<T>(n: number, f: () => T): T[] };
 
diff --git a/types/lil-uuid/tsconfig.json b/types/lil-uuid/tsconfig.json
index 889bd07cca..d93027e2f2 100644
--- a/types/lil-uuid/tsconfig.json
+++ b/types/lil-uuid/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "lil-uuid-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/line-by-line/line-by-line-tests.ts b/types/line-by-line/line-by-line-tests.ts
index 9181e91a98..c97d02ca58 100644
--- a/types/line-by-line/line-by-line-tests.ts
+++ b/types/line-by-line/line-by-line-tests.ts
@@ -1,4 +1,4 @@
-import * as LineByLineReader from "line-by-line";
+import LineByLineReader = require("line-by-line");
 
 const reader: LineByLineReader  = new LineByLineReader("index.d.ts");
 reader.on("line", (line: any) => {
diff --git a/types/loader-utils/index.d.ts b/types/loader-utils/index.d.ts
index a178ada777..37ce2e461f 100644
--- a/types/loader-utils/index.d.ts
+++ b/types/loader-utils/index.d.ts
@@ -3,9 +3,11 @@
 // Definitions by: Gyusun Yeom <https://github.com/Perlmint>
 //                 Totooria Hyperion <https://github.com/TotooriaHyperion>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
 /// <reference types="node" />
 
-import { loader } from "webpack";
+import { loader } from 'webpack';
 
 export interface InterpolateOption {
     context?: string;
diff --git a/types/local-dynamo/tsconfig.json b/types/local-dynamo/tsconfig.json
index fe3803ac8c..a66d5b4aef 100644
--- a/types/local-dynamo/tsconfig.json
+++ b/types/local-dynamo/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "local-dynamo-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/lodash-es/tsconfig.json b/types/lodash-es/tsconfig.json
index 7f69811c3c..fba6506cc9 100644
--- a/types/lodash-es/tsconfig.json
+++ b/types/lodash-es/tsconfig.json
@@ -341,4 +341,4 @@
         "zipObjectDeep.d.ts",
         "zipWith.d.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/lodash-webpack-plugin/index.d.ts b/types/lodash-webpack-plugin/index.d.ts
index 7b2c3ebe67..e7e2dfd4db 100644
--- a/types/lodash-webpack-plugin/index.d.ts
+++ b/types/lodash-webpack-plugin/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/lodash/lodash-webpack-plugin#readme
 // Definitions by: Benjamin Lim <https://github.com/bumbleblym>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 import { Plugin } from 'webpack';
 
diff --git a/types/lodash-webpack-plugin/lodash-webpack-plugin-tests.ts b/types/lodash-webpack-plugin/lodash-webpack-plugin-tests.ts
index d6483e3d03..6d0163faf6 100644
--- a/types/lodash-webpack-plugin/lodash-webpack-plugin-tests.ts
+++ b/types/lodash-webpack-plugin/lodash-webpack-plugin-tests.ts
@@ -1,4 +1,4 @@
-import * as LodashModuleReplacementPlugin from 'lodash-webpack-plugin';
+import LodashModuleReplacementPlugin = require('lodash-webpack-plugin');
 
 new LodashModuleReplacementPlugin();
 
diff --git a/types/lodash/array/chunk.d.ts b/types/lodash/array/chunk.d.ts
deleted file mode 100644
index 16e4f8beb9..0000000000
--- a/types/lodash/array/chunk.d.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Creates an array of elements split into groups the length of size. If collection can’t be split evenly, the
-         * final chunk will be the remaining elements.
-         *
-         * @param array The array to process.
-         * @param size The length of each chunk.
-         * @return Returns the new array containing chunks.
-         */
-        chunk<T>(
-            array: List<T> | null | undefined,
-            size?: number
-        ): T[][];
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.chunk
-         */
-        chunk<T>(
-            this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            size?: number,
-        ): LoDashImplicitWrapper<T[][]>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.chunk
-         */
-        chunk<T>(
-            this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            size?: number,
-        ): LoDashExplicitWrapper<T[][]>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/array/compact.d.ts b/types/lodash/array/compact.d.ts
deleted file mode 100644
index 7bf05df7e3..0000000000
--- a/types/lodash/array/compact.d.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Creates an array with all falsey values removed. The values false, null, 0, "", undefined, and NaN are
-         * falsey.
-         *
-         * @param array The array to compact.
-         * @return Returns the new array of filtered values.
-         */
-        compact<T>(array: List<T | null | undefined | false | "" | 0> | null | undefined): T[];
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.compact
-         */
-        compact<T>(this: LoDashImplicitWrapper<List<T | null | undefined | false | "" | 0> | null | undefined>): LoDashImplicitWrapper<T[]>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.compact
-         */
-        compact<T>(this: LoDashExplicitWrapper<List<T | null | undefined | false | "" | 0> | null | undefined>): LoDashExplicitWrapper<T[]>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/array/concat.d.ts b/types/lodash/array/concat.d.ts
deleted file mode 100644
index 3b1bac32aa..0000000000
--- a/types/lodash/array/concat.d.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Creates a new array concatenating `array` with any additional arrays
-         * and/or values.
-         *
-         * @category Array
-         * @param array The array to concatenate.
-         * @param [values] The values to concatenate.
-         * @returns Returns the new concatenated array.
-         * @example
-         *
-         * var array = [1];
-         * var other = _.concat(array, 2, [3], [[4]]);
-         *
-         * console.log(other);
-         * // => [1, 2, 3, [4]]
-         *
-         * console.log(array);
-         * // => [1]
-         */
-         concat<T>(array: Many<T>, ...values: Array<Many<T>>): T[];
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.compact
-         */
-        concat<T>(this: LoDashImplicitWrapper<Many<T>>, ...values: Array<Many<T>>): LoDashImplicitWrapper<T[]>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.compact
-         */
-        concat<T>(this: LoDashExplicitWrapper<Many<T>>, ...values: Array<Many<T>>): LoDashExplicitWrapper<T[]>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/array/difference.d.ts b/types/lodash/array/difference.d.ts
deleted file mode 100644
index 5c237eccea..0000000000
--- a/types/lodash/array/difference.d.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Creates an array of unique array values not included in the other provided arrays using SameValueZero for
-         * equality comparisons.
-         *
-         * @param array The array to inspect.
-         * @param values The arrays of values to exclude.
-         * @return Returns the new array of filtered values.
-         */
-        difference<T>(
-            array: List<T> | null | undefined,
-            ...values: Array<List<T>>
-        ): T[];
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.difference
-         */
-        difference<T>(
-            this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            ...values: Array<List<T>>
-        ): LoDashImplicitWrapper<T[]>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.difference
-         */
-        difference<T>(
-            this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            ...values: Array<List<T>>
-        ): LoDashExplicitWrapper<T[]>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/array/differenceBy.d.ts b/types/lodash/array/differenceBy.d.ts
deleted file mode 100644
index da8e928097..0000000000
--- a/types/lodash/array/differenceBy.d.ts
+++ /dev/null
@@ -1,243 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * This method is like _.difference except that it accepts iteratee which is invoked for each element of array
-         * and values to generate the criterion by which uniqueness is computed. The iteratee is invoked with one
-         * argument: (value).
-         *
-         * @param array The array to inspect.
-         * @param values The values to exclude.
-         * @param iteratee The iteratee invoked per element.
-         * @returns Returns the new array of filtered values.
-         */
-        differenceBy<T1, T2>(
-            array: List<T1> | null | undefined,
-            values: List<T2>,
-            iteratee: ValueIteratee<T1 | T2>
-        ): T1[];
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T1, T2, T3>(
-            array: List<T1> | null | undefined,
-            values1: List<T2>,
-            values2: List<T3>,
-            iteratee: ValueIteratee<T1 | T2 | T3>
-        ): T1[];
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T1, T2, T3, T4>(
-            array: List<T1> | null | undefined,
-            values1: List<T2>,
-            values2: List<T3>,
-            values3: List<T4>,
-            iteratee: ValueIteratee<T1 | T2 | T3 | T4>
-        ): T1[];
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T1, T2, T3, T4, T5>(
-            array: List<T1> | null | undefined,
-            values1: List<T2>,
-            values2: List<T3>,
-            values3: List<T4>,
-            values4: List<T5>,
-            iteratee: ValueIteratee<T1 | T2 | T3 | T4 | T5>
-        ): T1[];
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T1, T2, T3, T4, T5, T6>(
-            array: List<T1> | null | undefined,
-            values1: List<T2>,
-            values2: List<T3>,
-            values3: List<T4>,
-            values4: List<T5>,
-            values5: List<T6>,
-            iteratee: ValueIteratee<T1 | T2 | T3 | T4 | T5 | T6>
-        ): T1[];
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T1, T2, T3, T4, T5, T6, T7>(
-            array: List<T1> | null | undefined,
-            values1: List<T2>,
-            values2: List<T3>,
-            values3: List<T4>,
-            values4: List<T5>,
-            values5: List<T6>,
-            ...values: Array<List<T7> | ValueIteratee<T1 | T2 | T3 | T4 | T5 | T6 | T7>>
-        ): T1[];
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T>(
-            array: List<T> | null | undefined,
-            ...values: Array<List<T>>
-        ): T[];
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T1, T2>(
-            this: LoDashImplicitWrapper<List<T1> | null | undefined>,
-            values: List<T2>,
-            iteratee: ValueIteratee<T1 | T2>
-        ): LoDashImplicitWrapper<T1[]>;
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T1, T2, T3>(
-            this: LoDashImplicitWrapper<List<T1> | null | undefined>,
-            values1: List<T2>,
-            values2: List<T3>,
-            iteratee: ValueIteratee<T1 | T2 | T3>
-        ): LoDashImplicitWrapper<T1[]>;
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T1, T2, T3, T4>(
-            this: LoDashImplicitWrapper<List<T1> | null | undefined>,
-            values1: List<T2>,
-            values2: List<T3>,
-            values3: List<T4>,
-            iteratee: ValueIteratee<T1 | T2 | T3 | T4>
-        ): LoDashImplicitWrapper<T1[]>;
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T1, T2, T3, T4, T5>(
-            this: LoDashImplicitWrapper<List<T1> | null | undefined>,
-            values1: List<T2>,
-            values2: List<T3>,
-            values3: List<T4>,
-            values4: List<T5>,
-            iteratee: ValueIteratee<T1 | T2 | T3 | T4 | T5>
-        ): LoDashImplicitWrapper<T1[]>;
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T1, T2, T3, T4, T5, T6>(
-            this: LoDashImplicitWrapper<List<T1> | null | undefined>,
-            values1: List<T2>,
-            values2: List<T3>,
-            values3: List<T4>,
-            values4: List<T5>,
-            values5: List<T6>,
-            iteratee: ValueIteratee<T1 | T2 | T3 | T4 | T5 | T6>
-        ): LoDashImplicitWrapper<T1[]>;
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T1, T2, T3, T4, T5, T6, T7>(
-            this: LoDashImplicitWrapper<List<T1> | null | undefined>,
-            values1: List<T2>,
-            values2: List<T3>,
-            values3: List<T4>,
-            values4: List<T5>,
-            values5: List<T6>,
-            ...values: Array<List<T7> | ValueIteratee<T1 | T2 | T3 | T4 | T5 | T6 | T7>>
-        ): LoDashImplicitWrapper<T1[]>;
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T>(
-            this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            ...values: Array<List<T>>
-        ): LoDashImplicitWrapper<T[]>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T1, T2>(
-            this: LoDashExplicitWrapper<List<T1> | null | undefined>,
-            values: List<T2>,
-            iteratee: ValueIteratee<T1 | T2>
-        ): LoDashExplicitWrapper<T1[]>;
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T1, T2, T3>(
-            this: LoDashExplicitWrapper<List<T1> | null | undefined>,
-            values1: List<T2>,
-            values2: List<T3>,
-            iteratee: ValueIteratee<T1 | T2 | T3>
-        ): LoDashExplicitWrapper<T1[]>;
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T1, T2, T3, T4>(
-            this: LoDashExplicitWrapper<List<T1> | null | undefined>,
-            values1: List<T2>,
-            values2: List<T3>,
-            values3: List<T4>,
-            iteratee: ValueIteratee<T1 | T2 | T3 | T4>
-        ): LoDashExplicitWrapper<T1[]>;
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T1, T2, T3, T4, T5>(
-            this: LoDashExplicitWrapper<List<T1> | null | undefined>,
-            values1: List<T2>,
-            values2: List<T3>,
-            values3: List<T4>,
-            values4: List<T5>,
-            iteratee: ValueIteratee<T1 | T2 | T3 | T4 | T5>
-        ): LoDashExplicitWrapper<T1[]>;
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T1, T2, T3, T4, T5, T6>(
-            this: LoDashExplicitWrapper<List<T1> | null | undefined>,
-            values1: List<T2>,
-            values2: List<T3>,
-            values3: List<T4>,
-            values4: List<T5>,
-            values5: List<T6>,
-            iteratee: ValueIteratee<T1 | T2 | T3 | T4 | T5 | T6>
-        ): LoDashExplicitWrapper<T1[]>;
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T1, T2, T3, T4, T5, T6, T7>(
-            this: LoDashExplicitWrapper<List<T1> | null | undefined>,
-            values1: List<T2>,
-            values2: List<T3>,
-            values3: List<T4>,
-            values4: List<T5>,
-            values5: List<T6>,
-            ...values: Array<List<T7> | ValueIteratee<T1 | T2 | T3 | T4 | T5 | T6 | T7>>
-        ): LoDashExplicitWrapper<T1[]>;
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T>(
-            this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            ...values: Array<List<T>>
-        ): LoDashExplicitWrapper<T[]>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/array/differenceWith.d.ts b/types/lodash/array/differenceWith.d.ts
deleted file mode 100644
index 39eca3314f..0000000000
--- a/types/lodash/array/differenceWith.d.ts
+++ /dev/null
@@ -1,132 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Creates an array of unique `array` values not included in the other
-         * provided arrays using [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
-         * for equality comparisons.
-         *
-         * @category Array
-         * @param [values] The arrays to inspect.
-         * @param [comparator] The comparator invoked per element.
-         * @returns Returns the new array of filtered values.
-         * @example
-         *
-         * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
-
-         * _.differenceWith(objects, [{ 'x': 1, 'y': 2 }], _.isEqual);
-         * // => [{ 'x': 2, 'y': 1 }]
-         */
-        differenceWith<T1, T2>(
-            array: List<T1> | null | undefined,
-            values: List<T2>,
-            comparator: Comparator2<T1, T2>
-        ): T1[];
-
-        /**
-         * @see _.differenceWith
-         */
-        differenceWith<T1, T2, T3>(
-            array: List<T1> | null | undefined,
-            values1: List<T2>,
-            values2: List<T3>,
-            comparator: Comparator2<T1, T2 | T3>
-        ): T1[];
-
-        /**
-         * @see _.differenceWith
-         */
-        differenceWith<T1, T2, T3, T4>(
-            array: List<T1> | null | undefined,
-            values1: List<T2>,
-            values2: List<T3>,
-            ...values: Array<List<T4> | Comparator2<T1, T2 | T3 | T4>>
-        ): T1[];
-
-        /**
-         * @see _.differenceWith
-         */
-        differenceWith<T>(
-            array: List<T> | null | undefined,
-            ...values: Array<List<T>>
-        ): T[];
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.differenceWith
-         */
-        differenceWith<T1, T2>(
-            this: LoDashImplicitWrapper<List<T1> | null | undefined>,
-            values: List<T2>,
-            comparator: Comparator2<T1, T2>
-        ): LoDashImplicitWrapper<T1[]>;
-
-        /**
-         * @see _.differenceWith
-         */
-        differenceWith<T1, T2, T3>(
-            this: LoDashImplicitWrapper<List<T1> | null | undefined>,
-            values1: List<T2>,
-            values2: List<T3>,
-            comparator: Comparator2<T1, T2 | T3>
-        ): LoDashImplicitWrapper<T1[]>;
-
-        /**
-         * @see _.differenceWith
-         */
-        differenceWith<T1, T2, T3, T4>(
-            this: LoDashImplicitWrapper<List<T1> | null | undefined>,
-            values1: List<T2>,
-            values2: List<T3>,
-            ...values: Array<List<T4> | Comparator2<T1, T2 | T3 | T4>>
-        ): LoDashImplicitWrapper<T1[]>;
-
-        /**
-         * @see _.differenceWith
-         */
-        differenceWith<T>(
-            this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            ...values: Array<List<T>>
-        ): LoDashImplicitWrapper<T[]>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.differenceWith
-         */
-        differenceWith<T1, T2>(
-            this: LoDashExplicitWrapper<List<T1> | null | undefined>,
-            values: List<T2>,
-            comparator: Comparator2<T1, T2>
-        ): LoDashExplicitWrapper<T1[]>;
-
-        /**
-         * @see _.differenceWith
-         */
-        differenceWith<T1, T2, T3>(
-            this: LoDashExplicitWrapper<List<T1> | null | undefined>,
-            values1: List<T2>,
-            values2: List<T3>,
-            comparator: Comparator2<T1, T2 | T3>
-        ): LoDashExplicitWrapper<T1[]>;
-
-        /**
-         * @see _.differenceWith
-         */
-        differenceWith<T1, T2, T3, T4>(
-            this: LoDashExplicitWrapper<List<T1> | null | undefined>,
-            values1: List<T2>,
-            values2: List<T3>,
-            ...values: Array<List<T4> | Comparator2<T1, T2 | T3 | T4>>
-        ): LoDashExplicitWrapper<T1[]>;
-
-        /**
-         * @see _.differenceWith
-         */
-        differenceWith<T>(
-            this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            ...values: Array<List<T>>
-        ): LoDashExplicitWrapper<T[]>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/array/drop.d.ts b/types/lodash/array/drop.d.ts
deleted file mode 100644
index 6df72adcb6..0000000000
--- a/types/lodash/array/drop.d.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Creates a slice of array with n elements dropped from the beginning.
-         *
-         * @param array The array to query.
-         * @param n The number of elements to drop.
-         * @return Returns the slice of array.
-         */
-        drop<T>(array: List<T> | null | undefined, n?: number): T[];
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.drop
-         */
-        drop<T>(this: LoDashImplicitWrapper<List<T> | null | undefined>, n?: number): LoDashImplicitWrapper<T[]>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.drop
-         */
-        drop<T>(this: LoDashExplicitWrapper<List<T> | null | undefined>, n?: number): LoDashExplicitWrapper<T[]>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/array/dropRight.d.ts b/types/lodash/array/dropRight.d.ts
deleted file mode 100644
index 4e08a213b9..0000000000
--- a/types/lodash/array/dropRight.d.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Creates a slice of array with n elements dropped from the end.
-         *
-         * @param array The array to query.
-         * @param n The number of elements to drop.
-         * @return Returns the slice of array.
-         */
-        dropRight<T>(
-            array: List<T> | null | undefined,
-            n?: number
-        ): T[];
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.dropRight
-         */
-        dropRight<T>(this: LoDashImplicitWrapper<List<T> | null | undefined>, n?: number): LoDashImplicitWrapper<T[]>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.dropRight
-         */
-        dropRight<T>(this: LoDashExplicitWrapper<List<T> | null | undefined>, n?: number): LoDashExplicitWrapper<T[]>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/array/dropRightWhile.d.ts b/types/lodash/array/dropRightWhile.d.ts
deleted file mode 100644
index efce8161d2..0000000000
--- a/types/lodash/array/dropRightWhile.d.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Creates a slice of array excluding elements dropped from the end. Elements are dropped until predicate
-         * returns falsey. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
-         *
-         * If a property name is provided for predicate the created _.property style callback returns the property
-         * value of the given element.
-         *
-         * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-         * elements that have a matching property value, else false.
-         *
-         * If an object is provided for predicate the created _.matches style callback returns true for elements that
-         * match the properties of the given object, else false.
-         *
-         * @param array The array to query.
-         * @param predicate The function invoked per iteration.
-         * @param thisArg The this binding of predicate.
-         * @return Returns the slice of array.
-         */
-        dropRightWhile<T>(
-            array: List<T> | null | undefined,
-            predicate?: ListIteratee<T>
-        ): T[];
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.dropRightWhile
-         */
-        dropRightWhile<T>(
-            this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            predicate?: ListIteratee<T>
-        ): LoDashImplicitWrapper<T[]>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.dropRightWhile
-         */
-        dropRightWhile<T>(
-            this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            predicate?: ListIteratee<T>
-        ): LoDashExplicitWrapper<T[]>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/array/dropWhile.d.ts b/types/lodash/array/dropWhile.d.ts
deleted file mode 100644
index f6f68fb191..0000000000
--- a/types/lodash/array/dropWhile.d.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Creates a slice of array excluding elements dropped from the beginning. Elements are dropped until predicate
-         * returns falsey. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
-         *
-         * If a property name is provided for predicate the created _.property style callback returns the property
-         * value of the given element.
-         *
-         * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-         * elements that have a matching property value, else false.
-         *
-         * If an object is provided for predicate the created _.matches style callback returns true for elements that
-         * have the properties of the given object, else false.
-         *
-         * @param array The array to query.
-         * @param predicate The function invoked per iteration.
-         * @param thisArg The this binding of predicate.
-         * @return Returns the slice of array.
-         */
-        dropWhile<T>(
-            array: List<T> | null | undefined,
-            predicate?: ListIteratee<T>
-        ): T[];
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.dropWhile
-         */
-        dropWhile<T>(
-            this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            predicate?: ListIteratee<T>
-        ): LoDashImplicitWrapper<T[]>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.dropWhile
-         */
-        dropWhile<T>(
-            this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            predicate?: ListIteratee<T>
-        ): LoDashExplicitWrapper<T[]>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/array/fill.d.ts b/types/lodash/array/fill.d.ts
deleted file mode 100644
index 651a19a830..0000000000
--- a/types/lodash/array/fill.d.ts
+++ /dev/null
@@ -1,124 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Fills elements of array with value from start up to, but not including, end.
-         *
-         * Note: This method mutates array.
-         *
-         * @param array The array to fill.
-         * @param value The value to fill array with.
-         * @param start The start position.
-         * @param end The end position.
-         * @return Returns array.
-         */
-        fill<T>(
-            array: any[] | null | undefined,
-            value: T
-        ): T[];
-
-        /**
-         * @see _.fill
-         */
-        fill<T>(
-            array: List<any> | null | undefined,
-            value: T
-        ): List<T>;
-
-        /**
-         * @see _.fill
-         */
-        fill<T, U>(
-            array: U[] | null | undefined,
-            value: T,
-            start?: number,
-            end?: number
-        ): Array<T | U>;
-
-        /**
-         * @see _.fill
-         */
-        fill<T, U>(
-            array: List<U> | null | undefined,
-            value: T,
-            start?: number,
-            end?: number
-        ): List<T | U>;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.fill
-         */
-        fill<T>(
-            this: LoDashImplicitWrapper<any[] | null | undefined>,
-            value: T
-        ): LoDashImplicitWrapper<T[]>;
-
-        /**
-         * @see _.fill
-         */
-        fill<T>(
-            this: LoDashImplicitWrapper<List<any> | null | undefined>,
-            value: T
-        ): LoDashImplicitWrapper<List<T>>;
-
-        /**
-         * @see _.fill
-         */
-        fill<T, U>(
-            this: LoDashImplicitWrapper<U[] | null | undefined>,
-            value: T,
-            start?: number,
-            end?: number
-        ): LoDashImplicitWrapper<Array<T | U>>;
-
-        /**
-         * @see _.fill
-         */
-        fill<T, U>(
-            this: LoDashImplicitWrapper<List<U> | null | undefined>,
-            value: T,
-            start?: number,
-            end?: number
-        ): LoDashImplicitWrapper<List<T | U>>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.fill
-         */
-        fill<T>(
-            this: LoDashExplicitWrapper<any[] | null | undefined>,
-            value: T
-        ): LoDashExplicitWrapper<T[]>;
-
-        /**
-         * @see _.fill
-         */
-        fill<T>(
-            this: LoDashExplicitWrapper<List<any> | null | undefined>,
-            value: T
-        ): LoDashExplicitWrapper<List<T>>;
-
-        /**
-         * @see _.fill
-         */
-        fill<T, U>(
-            this: LoDashExplicitWrapper<U[] | null | undefined>,
-            value: T,
-            start?: number,
-            end?: number
-        ): LoDashExplicitWrapper<Array<T | U>>;
-
-        /**
-         * @see _.fill
-         */
-        fill<T, U>(
-            this: LoDashExplicitWrapper<List<U> | null | undefined>,
-            value: T,
-            start?: number,
-            end?: number
-        ): LoDashExplicitWrapper<List<T | U>>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/array/findIndex.d.ts b/types/lodash/array/findIndex.d.ts
deleted file mode 100644
index 13f314ee82..0000000000
--- a/types/lodash/array/findIndex.d.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * This method is like _.find except that it returns the index of the first element predicate returns truthy
-         * for instead of the element itself.
-         *
-         * If a property name is provided for predicate the created _.property style callback returns the property
-         * value of the given element.
-         *
-         * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-         * elements that have a matching property value, else false.
-         *
-         * If an object is provided for predicate the created _.matches style callback returns true for elements that
-         * have the properties of the given object, else false.
-         *
-         * @param array The array to search.
-         * @param predicate The function invoked per iteration.
-         * @param fromIndex The index to search from.
-         * @return Returns the index of the found element, else -1.
-         */
-        findIndex<T>(
-            array: List<T> | null | undefined,
-            predicate?: ListIterateeCustom<T, boolean>,
-            fromIndex?: number
-        ): number;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.findIndex
-         */
-        findIndex<T>(
-            this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            predicate?: ListIterateeCustom<T, boolean>,
-            fromIndex?: number
-        ): number;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.findIndex
-         */
-        findIndex<T>(
-            this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            predicate?: ListIterateeCustom<T, boolean>,
-            fromIndex?: number
-        ): LoDashExplicitWrapper<number>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/array/findLastIndex.d.ts b/types/lodash/array/findLastIndex.d.ts
deleted file mode 100644
index db28988a4a..0000000000
--- a/types/lodash/array/findLastIndex.d.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * This method is like _.findIndex except that it iterates over elements of collection from right to left.
-         *
-         * If a property name is provided for predicate the created _.property style callback returns the property
-         * value of the given element.
-         *
-         * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-         * elements that have a matching property value, else false.
-         *
-         * If an object is provided for predicate the created _.matches style callback returns true for elements that
-         * have the properties of the given object, else false.
-         *
-         * @param array The array to search.
-         * @param predicate The function invoked per iteration.
-         * @param fromIndex The index to search from.
-         * @return Returns the index of the found element, else -1.
-         */
-        findLastIndex<T>(
-            array: List<T> | null | undefined,
-            predicate?: ListIterateeCustom<T, boolean>,
-            fromIndex?: number
-        ): number;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.findLastIndex
-         */
-        findLastIndex<T>(
-            this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            predicate?: ListIterateeCustom<T, boolean>,
-            fromIndex?: number
-        ): number;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.findLastIndex
-         */
-        findLastIndex<T>(
-            this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            predicate?: ListIterateeCustom<T, boolean>,
-            fromIndex?: number
-        ): LoDashExplicitWrapper<number>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/array/first.d.ts b/types/lodash/array/first.d.ts
deleted file mode 100644
index ec88a9b5b2..0000000000
--- a/types/lodash/array/first.d.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        first: typeof _.head; // tslint:disable-line:no-unnecessary-qualifier
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.head
-         */
-        first<T>(this: LoDashImplicitWrapper<List<T> | null | undefined>): T | undefined;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.head
-         */
-        first<T>(this: LoDashExplicitWrapper<List<T> | null | undefined>): LoDashExplicitWrapper<T | undefined>;
-    }
-
-    interface RecursiveArray<T> extends Array<T|RecursiveArray<T>> {}
-    interface ListOfRecursiveArraysOrValues<T> extends List<T|RecursiveArray<T>> {}
-}
\ No newline at end of file
diff --git a/types/lodash/array/flatten.d.ts b/types/lodash/array/flatten.d.ts
deleted file mode 100644
index 8453624756..0000000000
--- a/types/lodash/array/flatten.d.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Flattens a nested array. If isDeep is true the array is recursively flattened, otherwise it’s only
-         * flattened a single level.
-         *
-         * @param array The array to flatten.
-         * @param isDeep Specify a deep flatten.
-         * @return Returns the new flattened array.
-         */
-        flatten<T>(array: ListOfRecursiveArraysOrValues<T> | null | undefined, isDeep: boolean): T[];
-
-        /**
-         * @see _.flatten
-         */
-        flatten<T>(array: List<Many<T>> | null | undefined): T[];
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.flatten
-         */
-        flatten<T>(this: LoDashImplicitWrapper<ListOfRecursiveArraysOrValues<T> | null | undefined>, isDeep: boolean): LoDashImplicitWrapper<T[]>;
-
-        /**
-         * @see _.flatten
-         */
-        flatten<T>(this: LoDashImplicitWrapper<List<Many<T>> | null | undefined>): LoDashImplicitWrapper<T[]>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.flatten
-         */
-        flatten<T>(this: LoDashExplicitWrapper<ListOfRecursiveArraysOrValues<T> | null | undefined>, isDeep: boolean): LoDashExplicitWrapper<T[]>;
-
-        /**
-         * @see _.flatten
-         */
-        flatten<T>(this: LoDashExplicitWrapper<List<Many<T>> | null | undefined>): LoDashExplicitWrapper<T[]>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/array/flattenDeep.d.ts b/types/lodash/array/flattenDeep.d.ts
deleted file mode 100644
index 0c604f2571..0000000000
--- a/types/lodash/array/flattenDeep.d.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Recursively flattens a nested array.
-         *
-         * @param array The array to recursively flatten.
-         * @return Returns the new flattened array.
-         */
-        flattenDeep<T>(array: ListOfRecursiveArraysOrValues<T> | null | undefined): T[];
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.flattenDeep
-         */
-        flattenDeep<T>(this: LoDashImplicitWrapper<ListOfRecursiveArraysOrValues<T> | null | undefined>): LoDashImplicitWrapper<T[]>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.flattenDeep
-         */
-        flattenDeep<T>(this: LoDashExplicitWrapper<ListOfRecursiveArraysOrValues<T> | null | undefined>): LoDashExplicitWrapper<T[]>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/array/flattenDepth.d.ts b/types/lodash/array/flattenDepth.d.ts
deleted file mode 100644
index 0efd206f9e..0000000000
--- a/types/lodash/array/flattenDepth.d.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-       /**
-       * Recursively flatten array up to depth times.
-       *
-       * @param array The array to recursively flatten.
-       * @param number The maximum recursion depth.
-       * @return Returns the new flattened array.
-       */
-       flattenDepth<T>(array: ListOfRecursiveArraysOrValues<T> | null | undefined, depth?: number): T[];
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-       /**
-        * @see _.flattenDeep
-        */
-       flattenDepth<T>(this: LoDashImplicitWrapper<ListOfRecursiveArraysOrValues<T> | null | undefined>, depth?: number): LoDashImplicitWrapper<T[]>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-       /**
-        * @see _.flattenDeep
-        */
-       flattenDepth<T>(this: LoDashExplicitWrapper<ListOfRecursiveArraysOrValues<T> | null | undefined>, depth?: number): LoDashExplicitWrapper<T[]>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/array/fromPairs.d.ts b/types/lodash/array/fromPairs.d.ts
deleted file mode 100644
index 92a8e4d168..0000000000
--- a/types/lodash/array/fromPairs.d.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * The inverse of `_.toPairs`; this method returns an object composed
-         * from key-value `pairs`.
-         *
-         * @category Array
-         * @param pairs The key-value pairs.
-         * @returns Returns the new object.
-         * @example
-         *
-         * _.fromPairs([['fred', 30], ['barney', 40]]);
-         * // => { 'fred': 30, 'barney': 40 }
-         */
-        fromPairs<T>(
-            pairs: List<[PropertyName, T]> | null | undefined
-        ): Dictionary<T>;
-
-        /**
-         @see _.fromPairs
-         */
-        fromPairs(
-            pairs: List<any[]> | null | undefined
-        ): Dictionary<any>;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.fromPairs
-         */
-        fromPairs<T>(
-          this: LoDashImplicitWrapper<List<[PropertyName, T]> | null | undefined>
-        ): LoDashImplicitWrapper<Dictionary<T>>;
-
-        /**
-         @see _.fromPairs
-         */
-        fromPairs(
-            this: LoDashImplicitWrapper<List<any[]> | null | undefined>
-        ): LoDashImplicitWrapper<Dictionary<any>>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.fromPairs
-         */
-        fromPairs<T>(
-          this: LoDashExplicitWrapper<List<[PropertyName, T]> | null | undefined>
-        ): LoDashExplicitWrapper<Dictionary<T>>;
-
-        /**
-         @see _.fromPairs
-         */
-        fromPairs(
-            this: LoDashExplicitWrapper<List<any[]> | null | undefined>
-        ): LoDashExplicitWrapper<Dictionary<any>>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/array/head.d.ts b/types/lodash/array/head.d.ts
deleted file mode 100644
index 476e5b2b07..0000000000
--- a/types/lodash/array/head.d.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Gets the first element of array.
-         *
-         * @alias _.first
-         *
-         * @param array The array to query.
-         * @return Returns the first element of array.
-         */
-        head<T>(array: List<T> | null | undefined): T | undefined;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.head
-         */
-        head<T>(this: LoDashImplicitWrapper<List<T> | null | undefined>): T | undefined;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.head
-         */
-        head<T>(this: LoDashExplicitWrapper<List<T> | null | undefined>): LoDashExplicitWrapper<T | undefined>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/array/indexOf.d.ts b/types/lodash/array/indexOf.d.ts
deleted file mode 100644
index f2f01c2e5c..0000000000
--- a/types/lodash/array/indexOf.d.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Gets the index at which the first occurrence of `value` is found in `array`
-         * using [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
-         * for equality comparisons. If `fromIndex` is negative, it's used as the offset
-         * from the end of `array`. If `array` is sorted providing `true` for `fromIndex`
-         * performs a faster binary search.
-         *
-         * @category Array
-         * @param array The array to search.
-         * @param value The value to search for.
-         * @param [fromIndex=0] The index to search from.
-         * @returns Returns the index of the matched value, else `-1`.
-         * @example
-         *
-         * _.indexOf([1, 2, 1, 2], 2);
-         * // => 1
-         *
-         * // using `fromIndex`
-         * _.indexOf([1, 2, 1, 2], 2, 2);
-         * // => 3
-         */
-        indexOf<T>(
-            array: List<T> | null | undefined,
-            value: T,
-            fromIndex?: boolean|number
-        ): number;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.indexOf
-         */
-        indexOf<T>(
-            this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            value: T,
-            fromIndex?: boolean|number
-        ): number;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.indexOf
-         */
-        indexOf<T>(
-            this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            value: T,
-            fromIndex?: boolean|number
-        ): LoDashExplicitWrapper<number>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/array/initial.d.ts b/types/lodash/array/initial.d.ts
deleted file mode 100644
index fca86bcfa0..0000000000
--- a/types/lodash/array/initial.d.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Gets all but the last element of array.
-         *
-         * @param array The array to query.
-         * @return Returns the slice of array.
-         */
-        initial<T>(array: List<T> | null | undefined): T[];
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.initial
-         */
-        initial<T>(this: LoDashImplicitWrapper<List<T> | null | undefined>): LoDashImplicitWrapper<T[]>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.initial
-         */
-        initial<T>(this: LoDashExplicitWrapper<List<T> | null | undefined>): LoDashExplicitWrapper<T[]>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/array/intersection.d.ts b/types/lodash/array/intersection.d.ts
deleted file mode 100644
index 444e0b23f1..0000000000
--- a/types/lodash/array/intersection.d.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Creates an array of unique values that are included in all of the provided arrays using SameValueZero for
-         * equality comparisons.
-         *
-         * @param arrays The arrays to inspect.
-         * @return Returns the new array of shared values.
-         */
-        intersection<T>(...arrays: Array<List<T>>): T[];
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.intersection
-         */
-        intersection<T>(
-            this: LoDashImplicitWrapper<List<T>>,
-            ...arrays: Array<List<T>>
-        ): LoDashImplicitWrapper<T[]>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.intersection
-         */
-        intersection<T>(
-            this: LoDashExplicitWrapper<List<T>>,
-            ...arrays: Array<List<T>>
-        ): LoDashExplicitWrapper<T[]>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/array/intersectionBy.d.ts b/types/lodash/array/intersectionBy.d.ts
deleted file mode 100644
index 4148043afe..0000000000
--- a/types/lodash/array/intersectionBy.d.ts
+++ /dev/null
@@ -1,134 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * This method is like `_.intersection` except that it accepts `iteratee`
-         * which is invoked for each element of each `arrays` to generate the criterion
-         * by which uniqueness is computed. The iteratee is invoked with one argument: (value).
-         *
-         * @category Array
-         * @param [arrays] The arrays to inspect.
-         * @param [iteratee=_.identity] The iteratee invoked per element.
-         * @returns Returns the new array of shared values.
-         * @example
-         *
-         * _.intersectionBy([2.1, 1.2], [4.3, 2.4], Math.floor);
-         * // => [2.1]
-         *
-         * // using the `_.property` iteratee shorthand
-         * _.intersectionBy([{ 'x': 1 }], [{ 'x': 2 }, { 'x': 1 }], 'x');
-         * // => [{ 'x': 1 }]
-         */
-        intersectionBy<T1, T2>(
-            array: List<T1> | null,
-            values: List<T2>,
-            iteratee: ValueIteratee<T1 | T2>
-        ): T1[];
-
-        /**
-         * @see _.intersectionBy
-         */
-        intersectionBy<T1, T2, T3>(
-            array: List<T1> | null,
-            values1: List<T2>,
-            values2: List<T3>,
-            iteratee: ValueIteratee<T1 | T2 | T3>
-        ): T1[];
-
-        /**
-         * @see _.intersectionBy
-         */
-        intersectionBy<T1, T2, T3, T4>(
-            array: List<T1> | null | undefined,
-            values1: List<T2>,
-            values2: List<T3>,
-            ...values: Array<List<T4> | ValueIteratee<T1 | T2 | T3 | T4>>
-        ): T1[];
-
-        /**
-         * @see _.intersectionBy
-         */
-        intersectionBy<T>(
-            array?: List<T> | null,
-            ...values: Array<List<T>>
-        ): T[];
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.intersectionBy
-         */
-        intersectionBy<T1, T2>(
-            this: LoDashImplicitWrapper<List<T1> | null | undefined>,
-            values: List<T2>,
-            iteratee: ValueIteratee<T1 | T2>
-        ): LoDashImplicitWrapper<T1[]>;
-
-        /**
-         * @see _.intersectionBy
-         */
-        intersectionBy<T1, T2, T3>(
-            this: LoDashImplicitWrapper<List<T1> | null | undefined>,
-            values1: List<T2>,
-            values2: List<T3>,
-            iteratee: ValueIteratee<T1 | T2 | T3>
-        ): LoDashImplicitWrapper<T1[]>;
-
-        /**
-         * @see _.intersectionBy
-         */
-        intersectionBy<T1, T2, T3, T4>(
-            this: LoDashImplicitWrapper<List<T1> | null | undefined>,
-            values1: List<T2>,
-            values2: List<T3>,
-            ...values: Array<List<T4> | ValueIteratee<T1 | T2 | T3 | T4>>
-        ): LoDashImplicitWrapper<T1[]>;
-
-        /**
-         * @see _.intersectionBy
-         */
-        intersectionBy<T>(
-            this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            ...values: Array<List<T>>
-        ): LoDashImplicitWrapper<T[]>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.intersectionBy
-         */
-        intersectionBy<T1, T2>(
-            this: LoDashExplicitWrapper<List<T1> | null | undefined>,
-            values: List<T2>,
-            iteratee: ValueIteratee<T1 | T2>
-        ): LoDashExplicitWrapper<T1[]>;
-
-        /**
-         * @see _.intersectionBy
-         */
-        intersectionBy<T1, T2, T3>(
-            this: LoDashExplicitWrapper<List<T1> | null | undefined>,
-            values1: List<T2>,
-            values2: List<T3>,
-            iteratee: ValueIteratee<T1 | T2 | T3>
-        ): LoDashExplicitWrapper<T1[]>;
-
-        /**
-         * @see _.intersectionBy
-         */
-        intersectionBy<T1, T2, T3, T4>(
-            this: LoDashExplicitWrapper<List<T1> | null | undefined>,
-            values1: List<T2>,
-            values2: List<T3>,
-            ...values: Array<List<T4> | ValueIteratee<T1 | T2 | T3 | T4>>
-        ): LoDashExplicitWrapper<T1[]>;
-
-        /**
-         * @see _.intersectionBy
-         */
-        intersectionBy<T>(
-            this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            ...values: Array<List<T>>
-        ): LoDashExplicitWrapper<T[]>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/array/intersectionWith.d.ts b/types/lodash/array/intersectionWith.d.ts
deleted file mode 100644
index 9fa2198c9b..0000000000
--- a/types/lodash/array/intersectionWith.d.ts
+++ /dev/null
@@ -1,133 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Creates an array of unique `array` values not included in the other
-         * provided arrays using [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
-         * for equality comparisons.
-         *
-         * @category Array
-         * @param [values] The arrays to inspect.
-         * @param [comparator] The comparator invoked per element.
-         * @returns Returns the new array of filtered values.
-         * @example
-         *
-         * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
-         * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
-
-         * _.intersectionWith(objects, others, _.isEqual);
-         * // => [{ 'x': 1, 'y': 2 }]
-         */
-        intersectionWith<T1, T2>(
-            array: List<T1> | null | undefined,
-            values: List<T2>,
-            comparator: Comparator2<T1, T2>
-        ): T1[];
-
-        /**
-         * @see _.intersectionWith
-         */
-        intersectionWith<T1, T2, T3>(
-            array: List<T1> | null | undefined,
-            values1: List<T2>,
-            values2: List<T3>,
-            comparator: Comparator2<T1, T2 | T3>
-        ): T1[];
-
-        /**
-         * @see _.intersectionWith
-         */
-        intersectionWith<T1, T2, T3, T4>(
-            array: List<T1> | null | undefined,
-            values1: List<T2>,
-            values2: List<T3>,
-            ...values: Array<List<T4> | Comparator2<T1, T2 | T3 | T4>>
-        ): T1[];
-
-        /**
-         * @see _.intersectionWith
-         */
-        intersectionWith<T>(
-            array?: List<T> | null,
-            ...values: Array<List<T>>
-        ): T[];
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.intersectionWith
-         */
-        intersectionWith<T1, T2>(
-            this: LoDashImplicitWrapper<List<T1> | null | undefined>,
-            values: List<T2>,
-            comparator: Comparator2<T1, T2>
-        ): LoDashImplicitWrapper<T1[]>;
-
-        /**
-         * @see _.intersectionWith
-         */
-        intersectionWith<T1, T2, T3>(
-            this: LoDashImplicitWrapper<List<T1> | null | undefined>,
-            values1: List<T2>,
-            values2: List<T3>,
-            comparator: Comparator2<T1, T2 | T3>
-        ): LoDashImplicitWrapper<T1[]>;
-
-        /**
-         * @see _.intersectionWith
-         */
-        intersectionWith<T1, T2, T3, T4>(
-            this: LoDashImplicitWrapper<List<T1> | null | undefined>,
-            values1: List<T2>,
-            values2: List<T3>,
-            ...values: Array<List<T4> | Comparator2<T1, T2 | T3 | T4>>,
-        ): LoDashImplicitWrapper<T1[]>;
-
-        /**
-         * @see _.intersectionWith
-         */
-        intersectionWith<T>(
-            this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            ...values: Array<List<T>>
-        ): LoDashImplicitWrapper<T[]>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.intersectionWith
-         */
-        intersectionWith<T1, T2>(
-            this: LoDashExplicitWrapper<List<T1> | null | undefined>,
-            values: List<T2>,
-            comparator: Comparator2<T1, T2>
-        ): LoDashExplicitWrapper<T1[]>;
-
-        /**
-         * @see _.intersectionWith
-         */
-        intersectionWith<T1, T2, T3>(
-            this: LoDashExplicitWrapper<List<T1> | null | undefined>,
-            values1: List<T2>,
-            values2: List<T3>,
-            comparator: Comparator2<T1, T2 | T3>
-        ): LoDashExplicitWrapper<T1[]>;
-
-        /**
-         * @see _.intersectionWith
-         */
-        intersectionWith<T1, T2, T3, T4>(
-            this: LoDashExplicitWrapper<List<T1> | null | undefined>,
-            values1: List<T2>,
-            values2: List<T3>,
-            ...values: Array<List<T4> | Comparator2<T1, T2 | T3 | T4>>,
-        ): LoDashExplicitWrapper<T1[]>;
-
-        /**
-         * @see _.intersectionWith
-         */
-        intersectionWith<T>(
-            this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            ...values: Array<List<T>>
-        ): LoDashExplicitWrapper<T[]>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/array/join.d.ts b/types/lodash/array/join.d.ts
deleted file mode 100644
index 2fd74dab4a..0000000000
--- a/types/lodash/array/join.d.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Converts all elements in `array` into a string separated by `separator`.
-         *
-         * @param array The array to convert.
-         * @param separator The element separator.
-         * @returns Returns the joined string.
-         */
-        join(
-            array: List<any> | null | undefined,
-            separator?: string
-        ): string;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.join
-         */
-        join(separator?: string): string;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.join
-         */
-        join(separator?: string): LoDashExplicitWrapper<string>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/array/last.d.ts b/types/lodash/array/last.d.ts
deleted file mode 100644
index 4dcdb30423..0000000000
--- a/types/lodash/array/last.d.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Gets the last element of array.
-         *
-         * @param array The array to query.
-         * @return Returns the last element of array.
-         */
-        last<T>(array: List<T> | null | undefined): T | undefined;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.last
-         */
-        last<T>(this: LoDashImplicitWrapper<List<T> | null | undefined>): T | undefined;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.last
-         */
-        last<T>(this: LoDashExplicitWrapper<List<T> | null | undefined>): LoDashExplicitWrapper<T | undefined>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/array/lastIndexOf.d.ts b/types/lodash/array/lastIndexOf.d.ts
deleted file mode 100644
index 4bcc38c947..0000000000
--- a/types/lodash/array/lastIndexOf.d.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * This method is like _.indexOf except that it iterates over elements of array from right to left.
-         *
-         * @param array The array to search.
-         * @param value The value to search for.
-         * @param fromIndex The index to search from or true to perform a binary search on a sorted array.
-         * @return Returns the index of the matched value, else -1.
-         */
-        lastIndexOf<T>(
-            array: List<T> | null | undefined,
-            value: T,
-            fromIndex?: true|number
-        ): number;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.indexOf
-         */
-        lastIndexOf<T>(
-            this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            value: T,
-            fromIndex?: true|number
-        ): number;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.indexOf
-         */
-        lastIndexOf<T>(
-            this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            value: T,
-            fromIndex?: true|number
-        ): LoDashExplicitWrapper<number>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/array/nth.d.ts b/types/lodash/array/nth.d.ts
deleted file mode 100644
index 50e5b209a3..0000000000
--- a/types/lodash/array/nth.d.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Gets the element at index `n` of `array`. If `n` is negative, the nth element from the end is returned.
-         *
-         * @param array array The array to query.
-         * @param value The index of the element to return.
-         * @return Returns the nth element of `array`.
-         */
-        nth<T>(
-            array: List<T> | null | undefined,
-            n?: number
-        ): T | undefined;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.nth
-         */
-        nth<T>(
-            this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            n?: number
-        ): T | undefined;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.nth
-         */
-        nth<T>(
-            this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            n?: number
-        ): LoDashExplicitWrapper<T | undefined>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/array/pull.d.ts b/types/lodash/array/pull.d.ts
deleted file mode 100644
index 44ebc855c6..0000000000
--- a/types/lodash/array/pull.d.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Removes all provided values from array using SameValueZero for equality comparisons.
-         *
-         * Note: Unlike _.without, this method mutates array.
-         *
-         * @param array The array to modify.
-         * @param values The values to remove.
-         * @return Returns array.
-         */
-        pull<T>(
-            array: T[],
-            ...values: T[]
-        ): T[];
-
-        /**
-         * @see _.pull
-         */
-        pull<T>(
-            array: List<T>,
-            ...values: T[]
-        ): List<T>;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.pull
-         */
-        pull<T>(
-            this: LoDashImplicitWrapper<List<T>>,
-            ...values: T[]
-        ): this;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.pull
-         */
-        pull<T>(
-            this: LoDashExplicitWrapper<List<T>>,
-            ...values: T[]
-        ): this;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/array/pullAll.d.ts b/types/lodash/array/pullAll.d.ts
deleted file mode 100644
index ce926b9bb3..0000000000
--- a/types/lodash/array/pullAll.d.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * This method is like `_.pull` except that it accepts an array of values to remove.
-         *
-         * **Note:** Unlike `_.difference`, this method mutates `array`.
-         *
-         * @category Array
-         * @param array The array to modify.
-         * @param values The values to remove.
-         * @returns Returns `array`.
-         * @example
-         *
-         * var array = [1, 2, 3, 1, 2, 3];
-         *
-         * _.pull(array, [2, 3]);
-         * console.log(array);
-         * // => [1, 1]
-         */
-        pullAll<T>(
-            array: T[],
-            values?: List<T>,
-        ): T[];
-
-        /**
-         * @see _.pullAll
-         */
-        pullAll<T>(
-            array: List<T>,
-            values?: List<T>,
-        ): List<T>;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.pullAll
-         */
-        pullAll<T>(
-            this: LoDashImplicitWrapper<List<T>>,
-            values?: List<T>
-        ): this;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.pullAll
-         */
-        pullAll<T>(
-            this: LoDashExplicitWrapper<List<T>>,
-            values?: List<T>
-        ): this;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/array/pullAllBy.d.ts b/types/lodash/array/pullAllBy.d.ts
deleted file mode 100644
index 3524aeae5e..0000000000
--- a/types/lodash/array/pullAllBy.d.ts
+++ /dev/null
@@ -1,77 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * This method is like `_.pullAll` except that it accepts `iteratee` which is
-         * invoked for each element of `array` and `values` to to generate the criterion
-         * by which uniqueness is computed. The iteratee is invoked with one argument: (value).
-         *
-         * **Note:** Unlike `_.differenceBy`, this method mutates `array`.
-         *
-         * @category Array
-         * @param array The array to modify.
-         * @param values The values to remove.
-         * @param [iteratee=_.identity] The iteratee invoked per element.
-         * @returns Returns `array`.
-         * @example
-         *
-         * var array = [{ 'x': 1 }, { 'x': 2 }, { 'x': 3 }, { 'x': 1 }];
-         *
-         * _.pullAllBy(array, [{ 'x': 1 }, { 'x': 3 }], 'x');
-         * console.log(array);
-         * // => [{ 'x': 2 }]
-         */
-        pullAllBy<T>(
-            array: T[],
-            values?: List<T>,
-            iteratee?: ValueIteratee<T>
-        ): T[];
-
-        /**
-         * @see _.pullAllBy
-         */
-        pullAllBy<T>(
-            array: List<T>,
-            values?: List<T>,
-            iteratee?: ValueIteratee<T>
-        ): List<T>;
-
-        /**
-         * @see _.pullAllBy
-         */
-        pullAllBy<T1, T2>(
-            array: T1[],
-            values: List<T2>,
-            iteratee: ValueIteratee<T1 | T2>
-        ): T1[];
-
-        /**
-         * @see _.pullAllBy
-         */
-        pullAllBy<T1, T2>(
-            array: List<T1>,
-            values: List<T2>,
-            iteratee: ValueIteratee<T1 | T2>
-        ): List<T1>;
-    }
-
-    interface LoDashWrapper<TValue> {
-        /**
-         * @see _.pullAllBy
-         */
-        pullAllBy<T>(
-            this: LoDashWrapper<List<T>>,
-            values?: List<T>,
-            iteratee?: ValueIteratee<T>
-        ): this;
-
-        /**
-         * @see _.pullAllBy
-         */
-        pullAllBy<T1, T2>(
-            this: LoDashWrapper<List<T1>>,
-            values: List<T2>,
-            iteratee: ValueIteratee<T1 | T2>
-        ): this;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/array/pullAllWith.d.ts b/types/lodash/array/pullAllWith.d.ts
deleted file mode 100644
index 345187daad..0000000000
--- a/types/lodash/array/pullAllWith.d.ts
+++ /dev/null
@@ -1,77 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * This method is like `_.pullAll` except that it accepts `comparator` which is
-         * invoked to compare elements of array to values. The comparator is invoked with
-         * two arguments: (arrVal, othVal).
-         *
-         * **Note:** Unlike `_.differenceWith`, this method mutates `array`.
-         *
-         * @category Array
-         * @param array The array to modify.
-         * @param values The values to remove.
-         * @param [iteratee=_.identity] The iteratee invoked per element.
-         * @returns Returns `array`.
-         * @example
-         *
-         * var array = [{ 'x': 1, 'y': 2 }, { 'x': 3, 'y': 4 }, { 'x': 5, 'y': 6 }];
-         *
-         * _.pullAllWith(array, [{ 'x': 3, 'y': 4 }], _.isEqual);
-         * console.log(array);
-         * // => [{ 'x': 1, 'y': 2 }, { 'x': 5, 'y': 6 }]
-         */
-        pullAllWith<T>(
-            array: T[],
-            values?: List<T>,
-            comparator?: Comparator<T>
-        ): T[];
-
-        /**
-         * @see _.pullAllWith
-         */
-        pullAllWith<T>(
-            array: List<T>,
-            values?: List<T>,
-            comparator?: Comparator<T>
-        ): List<T>;
-
-        /**
-         * @see _.pullAllWith
-         */
-        pullAllWith<T1, T2>(
-            array: T1[],
-            values: List<T2>,
-            comparator: Comparator2<T1, T2>
-        ): T1[];
-
-        /**
-         * @see _.pullAllWith
-         */
-        pullAllWith<T1, T2>(
-            array: List<T1>,
-            values: List<T2>,
-            comparator: Comparator2<T1, T2>
-        ): List<T1>;
-    }
-
-    interface LoDashWrapper<TValue> {
-        /**
-         * @see _.pullAllWith
-         */
-        pullAllWith<T>(
-            this: LoDashWrapper<List<T>>,
-            values?: List<T>,
-            comparator?: Comparator<T>
-        ): this;
-
-        /**
-         * @see _.pullAllWith
-         */
-        pullAllWith<T1, T2>(
-            this: LoDashWrapper<List<T1>>,
-            values: List<T2>,
-            comparator: Comparator2<T1, T2>
-        ): this;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/array/pullAt.d.ts b/types/lodash/array/pullAt.d.ts
deleted file mode 100644
index a9d56f23ef..0000000000
--- a/types/lodash/array/pullAt.d.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Removes elements from array corresponding to the given indexes and returns an array of the removed elements.
-         * Indexes may be specified as an array of indexes or as individual arguments.
-         *
-         * Note: Unlike _.at, this method mutates array.
-         *
-         * @param array The array to modify.
-         * @param indexes The indexes of elements to remove, specified as individual indexes or arrays of indexes.
-         * @return Returns the new array of removed elements.
-         */
-        pullAt<T>(
-            array: T[],
-            ...indexes: Array<Many<number>>
-        ): T[];
-
-        /**
-         * @see _.pullAt
-         */
-        pullAt<T>(
-            array: List<T>,
-            ...indexes: Array<Many<number>>
-        ): List<T>;
-    }
-
-    interface LoDashWrapper<TValue> {
-        /**
-         * @see _.pullAt
-         */
-        pullAt(...indexes: Array<Many<number>>): this;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/array/remove.d.ts b/types/lodash/array/remove.d.ts
deleted file mode 100644
index 3ec0636972..0000000000
--- a/types/lodash/array/remove.d.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Removes all elements from array that predicate returns truthy for and returns an array of the removed
-         * elements. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
-         *
-         * If a property name is provided for predicate the created _.property style callback returns the property
-         * value of the given element.
-         *
-         * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-         * elements that have a matching property value, else false.
-         *
-         * If an object is provided for predicate the created _.matches style callback returns true for elements that
-         * have the properties of the given object, else false.
-         *
-         * Note: Unlike _.filter, this method mutates array.
-         *
-         * @param array The array to modify.
-         * @param predicate The function invoked per iteration.
-         * @param thisArg The this binding of predicate.
-         * @return Returns the new array of removed elements.
-         */
-        remove<T>(
-            array: List<T>,
-            predicate?: ListIteratee<T>
-        ): T[];
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.remove
-         */
-        remove<T>(
-            this: LoDashImplicitWrapper<List<T>>,
-            predicate?: ListIteratee<T>
-        ): LoDashImplicitWrapper<T[]>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.remove
-         */
-        remove<T>(
-            this: LoDashExplicitWrapper<List<T>>,
-            predicate?: ListIteratee<T>
-        ): LoDashExplicitWrapper<T[]>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/array/reverse.d.ts b/types/lodash/array/reverse.d.ts
deleted file mode 100644
index 0cf2112e24..0000000000
--- a/types/lodash/array/reverse.d.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Reverses `array` so that the first element becomes the last, the second
-         * element becomes the second to last, and so on.
-         *
-         * **Note:** This method mutates `array` and is based on
-         * [`Array#reverse`](https://mdn.io/Array/reverse).
-         *
-         * @category Array
-         * @returns Returns `array`.
-         * @example
-         *
-         * var array = [1, 2, 3];
-         *
-         * _.reverse(array);
-         * // => [3, 2, 1]
-         *
-         * console.log(array);
-         * // => [3, 2, 1]
-         */
-        reverse<TList extends List<any>>(
-            array: TList,
-        ): TList;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/array/slice.d.ts b/types/lodash/array/slice.d.ts
deleted file mode 100644
index 7744c4b334..0000000000
--- a/types/lodash/array/slice.d.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Creates a slice of array from start up to, but not including, end.
-         *
-         * @param array The array to slice.
-         * @param start The start position.
-         * @param end The end position.
-         * @return Returns the slice of array.
-         */
-        slice<T>(
-            array: List<T> | null | undefined,
-            start?: number,
-            end?: number
-        ): T[];
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.slice
-         */
-        slice<T>(
-            this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            start?: number,
-            end?: number
-        ): LoDashImplicitWrapper<T[]>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.slice
-         */
-        slice<T>(
-            this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            start?: number,
-            end?: number
-        ): LoDashExplicitWrapper<T[]>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/array/sortedIndex.d.ts b/types/lodash/array/sortedIndex.d.ts
deleted file mode 100644
index 5f8df282e6..0000000000
--- a/types/lodash/array/sortedIndex.d.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Uses a binary search to determine the lowest index at which `value` should
-         * be inserted into `array` in order to maintain its sort order.
-         *
-         * @category Array
-         * @param array The sorted array to inspect.
-         * @param value The value to evaluate.
-         * @returns Returns the index at which `value` should be inserted into `array`.
-         * @example
-         *
-         * _.sortedIndex([30, 50], 40);
-         * // => 1
-         *
-         * _.sortedIndex([4, 5], 4);
-         * // => 0
-         */
-        sortedIndex<T>(
-            array: List<T> | null | undefined,
-            value: T
-        ): number;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.sortedIndex
-         */
-        sortedIndex<T>(
-            this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            value: T
-        ): number;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.sortedIndex
-         */
-        sortedIndex<T>(
-            this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            value: T
-        ): LoDashExplicitWrapper<number>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/array/sortedIndexBy.d.ts b/types/lodash/array/sortedIndexBy.d.ts
deleted file mode 100644
index c4184868ca..0000000000
--- a/types/lodash/array/sortedIndexBy.d.ts
+++ /dev/null
@@ -1,97 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Uses a binary search to determine the lowest index at which `value` should
-         * be inserted into `array` in order to maintain its sort order.
-         *
-         * @category Array
-         * @param array The sorted array to inspect.
-         * @param value The value to evaluate.
-         * @returns Returns the index at which `value` should be inserted into `array`.
-         * @example
-         *
-         * _.sortedIndex([30, 50], 40);
-         * // => 1
-         *
-         * _.sortedIndex([4, 5], 4);
-         * // => 0
-         */
-        sortedIndex<T>(
-            array: List<T> | null | undefined,
-            value: T
-        ): number;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.sortedIndex
-         */
-        sortedIndex<T>(
-            this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            value: T
-        ): number;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.sortedIndex
-         */
-        sortedIndex<T>(
-            this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            value: T
-        ): LoDashExplicitWrapper<number>;
-    }
-
-    // _.sortedIndexBy
-    interface LoDashStatic {
-        /**
-         * This method is like `_.sortedIndex` except that it accepts `iteratee`
-         * which is invoked for `value` and each element of `array` to compute their
-         * sort ranking. The iteratee is invoked with one argument: (value).
-         *
-         * @category Array
-         * @param array The sorted array to inspect.
-         * @param value The value to evaluate.
-         * @param [iteratee=_.identity] The iteratee invoked per element.
-         * @returns Returns the index at which `value` should be inserted into `array`.
-         * @example
-         *
-         * var dict = { 'thirty': 30, 'forty': 40, 'fifty': 50 };
-         *
-         * _.sortedIndexBy(['thirty', 'fifty'], 'forty', _.propertyOf(dict));
-         * // => 1
-         *
-         * // using the `_.property` iteratee shorthand
-         * _.sortedIndexBy([{ 'x': 4 }, { 'x': 5 }], { 'x': 4 }, 'x');
-         * // => 0
-         */
-        sortedIndexBy<T>(
-            array: List<T> | null | undefined,
-            value: T,
-            iteratee?: ValueIteratee<T>
-        ): number;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.sortedIndexBy
-         */
-        sortedIndexBy<T>(
-            this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            value: T,
-            iteratee?: ValueIteratee<T>
-        ): number;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.sortedIndexBy
-         */
-        sortedIndexBy<T>(
-            this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            value: T,
-            iteratee?: ValueIteratee<T>
-        ): LoDashExplicitWrapper<number>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/array/sortedIndexOf.d.ts b/types/lodash/array/sortedIndexOf.d.ts
deleted file mode 100644
index b391186178..0000000000
--- a/types/lodash/array/sortedIndexOf.d.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * This method is like `_.indexOf` except that it performs a binary
-         * search on a sorted `array`.
-         *
-         * @category Array
-         * @param array The array to search.
-         * @param value The value to search for.
-         * @returns Returns the index of the matched value, else `-1`.
-         * @example
-         *
-         * _.sortedIndexOf([1, 1, 2, 2], 2);
-         * // => 2
-         */
-        sortedIndexOf<T>(
-            array: List<T> | null | undefined,
-            value: T
-        ): number;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.sortedIndexOf
-         */
-        sortedIndexOf<T>(
-            this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            value: T
-        ): number;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.sortedIndexOf
-         */
-        sortedIndexOf<T>(
-            this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            value: T
-        ): LoDashExplicitWrapper<number>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/array/sortedLastIndex.d.ts b/types/lodash/array/sortedLastIndex.d.ts
deleted file mode 100644
index 33b466ea5f..0000000000
--- a/types/lodash/array/sortedLastIndex.d.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * This method is like `_.sortedIndex` except that it returns the highest
-         * index at which `value` should be inserted into `array` in order to
-         * maintain its sort order.
-         *
-         * @category Array
-         * @param array The sorted array to inspect.
-         * @param value The value to evaluate.
-         * @returns Returns the index at which `value` should be inserted into `array`.
-         * @example
-         *
-         * _.sortedLastIndex([4, 5], 4);
-         * // => 1
-         */
-        sortedLastIndex<T>(
-            array: List<T> | null | undefined,
-            value: T
-        ): number;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.sortedLastIndex
-         */
-        sortedLastIndex<T>(
-            this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            value: T
-        ): number;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.sortedLastIndex
-         */
-        sortedLastIndex<T>(
-            this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            value: T
-        ): LoDashExplicitWrapper<number>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/array/sortedLastIndexBy.d.ts b/types/lodash/array/sortedLastIndexBy.d.ts
deleted file mode 100644
index c0f8344292..0000000000
--- a/types/lodash/array/sortedLastIndexBy.d.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * This method is like `_.sortedLastIndex` except that it accepts `iteratee`
-         * which is invoked for `value` and each element of `array` to compute their
-         * sort ranking. The iteratee is invoked with one argument: (value).
-         *
-         * @category Array
-         * @param array The sorted array to inspect.
-         * @param value The value to evaluate.
-         * @param [iteratee=_.identity] The iteratee invoked per element.
-         * @returns Returns the index at which `value` should be inserted into `array`.
-         * @example
-         *
-         * // using the `_.property` iteratee shorthand
-         * _.sortedLastIndexBy([{ 'x': 4 }, { 'x': 5 }], { 'x': 4 }, 'x');
-         * // => 1
-         */
-        sortedLastIndexBy<T>(
-            array: List<T> | null | undefined,
-            value: T,
-            iteratee: ValueIteratee<T>
-        ): number;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.sortedLastIndexBy
-         */
-        sortedLastIndexBy<T>(
-            this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            value: T,
-            iteratee: ValueIteratee<T>
-        ): number;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.sortedLastIndexBy
-         */
-        sortedLastIndexBy<T>(
-            this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            value: T,
-            iteratee: ValueIteratee<T>
-        ): LoDashExplicitWrapper<number>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/array/sortedLastIndexOf.d.ts b/types/lodash/array/sortedLastIndexOf.d.ts
deleted file mode 100644
index 09f8099d1f..0000000000
--- a/types/lodash/array/sortedLastIndexOf.d.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * This method is like `_.lastIndexOf` except that it performs a binary
-         * search on a sorted `array`.
-         *
-         * @category Array
-         * @param array The array to search.
-         * @param value The value to search for.
-         * @returns Returns the index of the matched value, else `-1`.
-         * @example
-         *
-         * _.sortedLastIndexOf([1, 1, 2, 2], 2);
-         * // => 3
-         */
-        sortedLastIndexOf<T>(
-            array: List<T> | null | undefined,
-            value: T
-        ): number;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.sortedLastIndexOf
-         */
-        sortedLastIndexOf<T>(
-            this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            value: T
-        ): number;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.sortedLastIndexOf
-         */
-        sortedLastIndexOf<T>(
-            this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            value: T
-        ): LoDashExplicitWrapper<number>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/array/sortedUniq.d.ts b/types/lodash/array/sortedUniq.d.ts
deleted file mode 100644
index df0487d626..0000000000
--- a/types/lodash/array/sortedUniq.d.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * This method is like `_.uniq` except that it's designed and optimized
-         * for sorted arrays.
-         *
-         * @category Array
-         * @param array The array to inspect.
-         * @returns Returns the new duplicate free array.
-         * @example
-         *
-         * _.sortedUniq([1, 1, 2]);
-         * // => [1, 2]
-         */
-        sortedUniq<T>(
-            array: List<T> | null | undefined
-        ): T[];
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.sortedUniq
-         */
-        sortedUniq<T>(this: LoDashImplicitWrapper<List<T> | null | undefined>): LoDashImplicitWrapper<T[]>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.sortedUniq
-         */
-        sortedUniq<T>(this: LoDashExplicitWrapper<List<T> | null | undefined>): LoDashExplicitWrapper<T[]>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/array/sortedUniqBy.d.ts b/types/lodash/array/sortedUniqBy.d.ts
deleted file mode 100644
index 054d4e38c9..0000000000
--- a/types/lodash/array/sortedUniqBy.d.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * This method is like `_.uniqBy` except that it's designed and optimized
-         * for sorted arrays.
-         *
-         * @category Array
-         * @param array The array to inspect.
-         * @param [iteratee] The iteratee invoked per element.
-         * @returns Returns the new duplicate free array.
-         * @example
-         *
-         * _.sortedUniqBy([1.1, 1.2, 2.3, 2.4], Math.floor);
-         * // => [1.1, 2.2]
-         */
-        sortedUniqBy(
-            array: string | null | undefined,
-            iteratee: StringIterator<NotVoid>
-        ): string[];
-
-        /**
-         * @see _.sortedUniqBy
-         */
-        sortedUniqBy<T>(
-            array: List<T> | null | undefined,
-            iteratee: ListIteratee<T>
-        ): T[];
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.sortedUniqBy
-         */
-        sortedUniqBy(
-            this: LoDashImplicitWrapper<string | null | undefined>,
-            iteratee: StringIterator<NotVoid>
-        ): LoDashImplicitWrapper<string[]>;
-
-        /**
-         * @see _.sortedUniqBy
-         */
-        sortedUniqBy<T>(
-            this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            iteratee: ListIteratee<T>
-        ): LoDashImplicitWrapper<T[]>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.sortedUniqBy
-         */
-        sortedUniqBy(
-            this: LoDashExplicitWrapper<string | null | undefined>,
-            iteratee: StringIterator<NotVoid>
-        ): LoDashExplicitWrapper<string[]>;
-
-        /**
-         * @see _.sortedUniqBy
-         */
-        sortedUniqBy<T>(
-            this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            iteratee: ListIteratee<T>
-        ): LoDashExplicitWrapper<T[]>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/array/tail.d.ts b/types/lodash/array/tail.d.ts
deleted file mode 100644
index 8716c9a2f8..0000000000
--- a/types/lodash/array/tail.d.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Gets all but the first element of array.
-         *
-         * @param array The array to query.
-         * @return Returns the slice of array.
-         */
-        tail<T>(array: List<T> | null | undefined): T[];
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.tail
-         */
-        tail<T>(this: LoDashImplicitWrapper<List<T> | null | undefined>): LoDashImplicitWrapper<T[]>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.tail
-         */
-        tail<T>(this: LoDashExplicitWrapper<List<T> | null | undefined>): LoDashExplicitWrapper<T[]>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/array/take.d.ts b/types/lodash/array/take.d.ts
deleted file mode 100644
index a97ff6b4ef..0000000000
--- a/types/lodash/array/take.d.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Creates a slice of array with n elements taken from the beginning.
-         *
-         * @param array The array to query.
-         * @param n The number of elements to take.
-         * @return Returns the slice of array.
-         */
-        take<T>(
-            array: List<T> | null | undefined,
-            n?: number
-        ): T[];
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.take
-         */
-        take<T>(
-            this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            n?: number
-        ): LoDashImplicitWrapper<T[]>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.take
-         */
-        take<T>(
-            this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            n?: number
-        ): LoDashExplicitWrapper<T[]>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/array/takeRight.d.ts b/types/lodash/array/takeRight.d.ts
deleted file mode 100644
index c786ab40c0..0000000000
--- a/types/lodash/array/takeRight.d.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Creates a slice of array with n elements taken from the end.
-         *
-         * @param array The array to query.
-         * @param n The number of elements to take.
-         * @return Returns the slice of array.
-         */
-        takeRight<T>(
-            array: List<T> | null | undefined,
-            n?: number
-        ): T[];
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.takeRight
-         */
-        takeRight<T>(
-            this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            n?: number
-        ): LoDashImplicitWrapper<T[]>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.takeRight
-         */
-        takeRight<T>(
-            this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            n?: number
-        ): LoDashExplicitWrapper<T[]>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/array/takeRightWhile.d.ts b/types/lodash/array/takeRightWhile.d.ts
deleted file mode 100644
index 471c0a03f3..0000000000
--- a/types/lodash/array/takeRightWhile.d.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Creates a slice of array with elements taken from the end. Elements are taken until predicate returns
-         * falsey. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
-         *
-         * If a property name is provided for predicate the created _.property style callback returns the property
-         * value of the given element.
-         *
-         * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-         * elements that have a matching property value, else false.
-         *
-         * If an object is provided for predicate the created _.matches style callback returns true for elements that
-         * have the properties of the given object, else false.
-         *
-         * @param array The array to query.
-         * @param predicate The function invoked per iteration.
-         * @param thisArg The this binding of predicate.
-         * @return Returns the slice of array.
-         */
-        takeRightWhile<T>(
-            array: List<T> | null | undefined,
-            predicate?: ListIteratee<T>
-        ): T[];
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.takeRightWhile
-         */
-        takeRightWhile<T>(
-            this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            predicate?: ListIteratee<T>
-        ): LoDashImplicitWrapper<T[]>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.takeRightWhile
-         */
-        takeRightWhile<T>(
-            this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            predicate?: ListIteratee<T>
-        ): LoDashExplicitWrapper<T[]>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/array/takeWhile.d.ts b/types/lodash/array/takeWhile.d.ts
deleted file mode 100644
index 05e6adc2a4..0000000000
--- a/types/lodash/array/takeWhile.d.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Creates a slice of array with elements taken from the beginning. Elements are taken until predicate returns
-         * falsey. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
-         *
-         * If a property name is provided for predicate the created _.property style callback returns the property
-         * value of the given element.
-         *
-         * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-         * elements that have a matching property value, else false.
-         *
-         * If an object is provided for predicate the created _.matches style callback returns true for elements that
-         * have the properties of the given object, else false.
-         *
-         * @param array The array to query.
-         * @param predicate The function invoked per iteration.
-         * @param thisArg The this binding of predicate.
-         * @return Returns the slice of array.
-         */
-        takeWhile<T>(
-            array: List<T> | null | undefined,
-            predicate?: ListIteratee<T>
-        ): T[];
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.takeWhile
-         */
-        takeWhile<T>(
-            this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            predicate?: ListIteratee<T>
-        ): LoDashImplicitWrapper<T[]>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.takeWhile
-         */
-        takeWhile<T>(
-            this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            predicate?: ListIteratee<T>
-        ): LoDashExplicitWrapper<T[]>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/array/union.d.ts b/types/lodash/array/union.d.ts
deleted file mode 100644
index f747a97da0..0000000000
--- a/types/lodash/array/union.d.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Creates an array of unique values, in order, from all of the provided arrays using SameValueZero for
-         * equality comparisons.
-         *
-         * @param arrays The arrays to inspect.
-         * @return Returns the new array of combined values.
-         */
-        union<T>(...arrays: Array<List<T> | null | undefined>): T[];
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.union
-         */
-        union<T>(
-            this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            ...arrays: Array<List<T> | null | undefined>
-        ): LoDashImplicitWrapper<T[]>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.union
-         */
-        union<T>(
-            this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            ...arrays: Array<List<T> | null | undefined>
-        ): LoDashExplicitWrapper<T[]>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/array/unionBy.d.ts b/types/lodash/array/unionBy.d.ts
deleted file mode 100644
index 5e5cd40647..0000000000
--- a/types/lodash/array/unionBy.d.ts
+++ /dev/null
@@ -1,164 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * This method is like `_.union` except that it accepts `iteratee` which is
-         * invoked for each element of each `arrays` to generate the criterion by which
-         * uniqueness is computed. The iteratee is invoked with one argument: (value).
-         *
-         * @param arrays The arrays to inspect.
-         * @param iteratee The iteratee invoked per element.
-         * @return Returns the new array of combined values.
-         */
-        unionBy<T>(
-            arrays: List<T> | null | undefined,
-            iteratee?: ValueIteratee<T>
-        ): T[];
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T>(
-            arrays1: List<T> | null | undefined,
-            arrays2: List<T> | null | undefined,
-            iteratee?: ValueIteratee<T>
-        ): T[];
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T>(
-            arrays1: List<T> | null | undefined,
-            arrays2: List<T> | null | undefined,
-            arrays3: List<T> | null | undefined,
-            iteratee?: ValueIteratee<T>
-        ): T[];
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T>(
-            arrays1: List<T> | null | undefined,
-            arrays2: List<T> | null | undefined,
-            arrays3: List<T> | null | undefined,
-            arrays4: List<T> | null | undefined,
-            iteratee?: ValueIteratee<T>
-        ): T[];
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T>(
-            arrays1: List<T> | null | undefined,
-            arrays2: List<T> | null | undefined,
-            arrays3: List<T> | null | undefined,
-            arrays4: List<T> | null | undefined,
-            arrays5: List<T> | null | undefined,
-            ...iteratee: Array<ValueIteratee<T> | List<T> | null | undefined>
-        ): T[];
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T>(
-            this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            iteratee?: ValueIteratee<T>
-        ): LoDashImplicitWrapper<T[]>;
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T>(
-            this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            arrays2: List<T> | null | undefined,
-            iteratee?: ValueIteratee<T>
-        ): LoDashImplicitWrapper<T[]>;
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T>(
-            this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            arrays2: List<T> | null | undefined,
-            arrays3: List<T> | null | undefined,
-            iteratee?: ValueIteratee<T>
-        ): LoDashImplicitWrapper<T[]>;
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T>(
-            this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            arrays2: List<T> | null | undefined,
-            arrays3: List<T> | null | undefined,
-            arrays4: List<T> | null | undefined,
-            iteratee?: ValueIteratee<T>
-        ): LoDashImplicitWrapper<T[]>;
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T>(
-            this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            arrays2: List<T> | null | undefined,
-            arrays3: List<T> | null | undefined,
-            arrays4: List<T> | null | undefined,
-            arrays5: List<T> | null | undefined,
-            ...iteratee: Array<ValueIteratee<T> | List<T> | null | undefined>
-        ): LoDashImplicitWrapper<T[]>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T>(
-            this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            iteratee?: ValueIteratee<T>
-        ): LoDashExplicitWrapper<T[]>;
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T>(
-            this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            arrays2: List<T> | null | undefined,
-            iteratee?: ValueIteratee<T>
-        ): LoDashExplicitWrapper<T[]>;
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T>(
-            this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            arrays2: List<T> | null | undefined,
-            arrays3: List<T> | null | undefined,
-            iteratee?: ValueIteratee<T>
-        ): LoDashExplicitWrapper<T[]>;
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T>(
-            this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            arrays2: List<T> | null | undefined,
-            arrays3: List<T> | null | undefined,
-            arrays4: List<T> | null | undefined,
-            iteratee?: ValueIteratee<T>
-        ): LoDashExplicitWrapper<T[]>;
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T>(
-            this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            arrays2: List<T> | null | undefined,
-            arrays3: List<T> | null | undefined,
-            arrays4: List<T> | null | undefined,
-            arrays5: List<T> | null | undefined,
-            ...iteratee: Array<ValueIteratee<T> | List<T> | null | undefined>
-        ): LoDashExplicitWrapper<T[]>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/array/unionWith.d.ts b/types/lodash/array/unionWith.d.ts
deleted file mode 100644
index 4778a4a6c7..0000000000
--- a/types/lodash/array/unionWith.d.ts
+++ /dev/null
@@ -1,103 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * This method is like `_.union` except that it accepts `comparator` which
-         * is invoked to compare elements of `arrays`. The comparator is invoked
-         * with two arguments: (arrVal, othVal).
-         *
-         * @category Array
-         * @param [arrays] The arrays to inspect.
-         * @param [comparator] The comparator invoked per element.
-         * @returns Returns the new array of combined values.
-         * @example
-         *
-         * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
-         * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
-         *
-         * _.unionWith(objects, others, _.isEqual);
-         * // => [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }, { 'x': 1, 'y': 1 }]
-         */
-        unionWith<T>(
-            arrays: List<T> | null | undefined,
-            comparator?: Comparator<T>
-        ): T[];
-
-        /**
-         * @see _.unionBy
-         */
-        unionWith<T>(
-            arrays: List<T> | null | undefined,
-            arrays2: List<T> | null | undefined,
-            comparator?: Comparator<T>
-        ): T[];
-
-        /**
-         * @see _.unionWith
-         */
-        unionWith<T>(
-            arrays: List<T> | null | undefined,
-            arrays2: List<T> | null | undefined,
-            arrays3: List<T> | null | undefined,
-            ...comparator: Array<Comparator<T> | List<T> | null | undefined>
-        ): T[];
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.unionWith
-         */
-        unionWith<T>(
-            this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            comparator?: Comparator<T>
-        ): LoDashImplicitWrapper<T[]>;
-
-        /**
-         * @see _.unionWith
-         */
-        unionWith<T>(
-            this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            arrays2: List<T> | null | undefined,
-            comparator?: Comparator<T>
-        ): LoDashImplicitWrapper<T[]>;
-
-        /**
-         * @see _.unionWith
-         */
-        unionWith<T>(
-            this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            arrays2: List<T> | null | undefined,
-            arrays3: List<T> | null | undefined,
-            ...comparator: Array<Comparator<T> | List<T> | null | undefined>
-        ): LoDashImplicitWrapper<T[]>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.unionWith
-         */
-        unionWith<T>(
-            this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            comparator?: Comparator<T>
-        ): LoDashExplicitWrapper<T[]>;
-
-        /**
-         * @see _.unionWith
-         */
-        unionWith<T>(
-            this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            arrays2: List<T> | null | undefined,
-            comparator?: Comparator<T>
-        ): LoDashExplicitWrapper<T[]>;
-
-        /**
-         * @see _.unionWith
-         */
-        unionWith<T>(
-            this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            arrays2: List<T> | null | undefined,
-            arrays3: List<T> | null | undefined,
-            ...comparator: Array<Comparator<T> | List<T> | null | undefined>
-        ): LoDashExplicitWrapper<T[]>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/array/uniq.d.ts b/types/lodash/array/uniq.d.ts
deleted file mode 100644
index 5dacb3b37b..0000000000
--- a/types/lodash/array/uniq.d.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Creates a duplicate-free version of an array, using
-         * [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
-         * for equality comparisons, in which only the first occurrence of each element
-         * is kept.
-         *
-         * @category Array
-         * @param array The array to inspect.
-         * @returns Returns the new duplicate free array.
-         * @example
-         *
-         * _.uniq([2, 1, 2]);
-         * // => [2, 1]
-         */
-        uniq<T>(
-            array: List<T> | null | undefined
-        ): T[];
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.uniq
-         */
-        uniq<T>(this: LoDashImplicitWrapper<List<T> | null | undefined>): LoDashImplicitWrapper<T[]>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.uniq
-         */
-        uniq<T>(this: LoDashExplicitWrapper<List<T> | null | undefined>): LoDashExplicitWrapper<T[]>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/array/uniqBy.d.ts b/types/lodash/array/uniqBy.d.ts
deleted file mode 100644
index 13df8cb7db..0000000000
--- a/types/lodash/array/uniqBy.d.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * This method is like `_.uniq` except that it accepts `iteratee` which is
-         * invoked for each element in `array` to generate the criterion by which
-         * uniqueness is computed. The iteratee is invoked with one argument: (value).
-         *
-         * @category Array
-         * @param array The array to inspect.
-         * @param [iteratee=_.identity] The iteratee invoked per element.
-         * @returns Returns the new duplicate free array.
-         * @example
-         *
-         * _.uniqBy([2.1, 1.2, 2.3], Math.floor);
-         * // => [2.1, 1.2]
-         *
-         * // using the `_.property` iteratee shorthand
-         * _.uniqBy([{ 'x': 1 }, { 'x': 2 }, { 'x': 1 }], 'x');
-         * // => [{ 'x': 1 }, { 'x': 2 }]
-         */
-        uniqBy(
-            array: string | null | undefined,
-            iteratee: StringIterator<NotVoid>
-        ): string[];
-
-        /**
-         * @see _.uniqBy
-         */
-        uniqBy<T>(
-            array: List<T> | null | undefined,
-            iteratee: ListIteratee<T>
-        ): T[];
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.uniqBy
-         */
-        uniqBy(
-            this: LoDashImplicitWrapper<string | null | undefined>,
-            iteratee: StringIterator<NotVoid>
-        ): LoDashImplicitWrapper<string[]>;
-
-        /**
-         * @see _.uniqBy
-         */
-        uniqBy<T>(
-            this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            iteratee: ListIteratee<T>
-        ): LoDashImplicitWrapper<T[]>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.uniqBy
-         */
-        uniqBy(
-            this: LoDashExplicitWrapper<string | null | undefined>,
-            iteratee: StringIterator<NotVoid>
-        ): LoDashExplicitWrapper<string[]>;
-
-        /**
-         * @see _.uniqBy
-         */
-        uniqBy<T>(
-            this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            iteratee: ListIteratee<T>
-        ): LoDashExplicitWrapper<T[]>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/array/uniqWith.d.ts b/types/lodash/array/uniqWith.d.ts
deleted file mode 100644
index 3d4d24334f..0000000000
--- a/types/lodash/array/uniqWith.d.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * This method is like `_.uniq` except that it accepts `comparator` which
-         * is invoked to compare elements of `array`. The comparator is invoked with
-         * two arguments: (arrVal, othVal).
-         *
-         * @category Array
-         * @param array The array to inspect.
-         * @param [comparator] The comparator invoked per element.
-         * @returns Returns the new duplicate free array.
-         * @example
-         *
-         * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 },  { 'x': 1, 'y': 2 }];
-         *
-         * _.uniqWith(objects, _.isEqual);
-         * // => [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }]
-         */
-        uniqWith<T>(
-            array: List<T> | null | undefined,
-            comparator?: Comparator<T>
-        ): T[];
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.uniqWith
-         */
-        uniqWith<T>(
-            this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            comparator?: Comparator<T>
-        ): LoDashImplicitWrapper<T[]>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.uniqWith
-         */
-        uniqWith<T>(
-            this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            comparator?: Comparator<T>
-        ): LoDashExplicitWrapper<T[]>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/array/unzip.d.ts b/types/lodash/array/unzip.d.ts
deleted file mode 100644
index ca96290da5..0000000000
--- a/types/lodash/array/unzip.d.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * This method is like _.zip except that it accepts an array of grouped elements and creates an array
-         * regrouping the elements to their pre-zip configuration.
-         *
-         * @param array The array of grouped elements to process.
-         * @return Returns the new array of regrouped elements.
-         */
-        unzip<T>(array: T[][] | List<List<T>> | null | undefined): T[][];
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.unzip
-         */
-        unzip<T>(this: LoDashImplicitWrapper<T[][] | List<List<T>> | null | undefined>): LoDashImplicitWrapper<T[][]>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.unzip
-         */
-        unzip<T>(this: LoDashExplicitWrapper<T[][] | List<List<T>> | null | undefined>): LoDashExplicitWrapper<T[][]>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/array/unzipWith.d.ts b/types/lodash/array/unzipWith.d.ts
deleted file mode 100644
index 0608c97bd9..0000000000
--- a/types/lodash/array/unzipWith.d.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * This method is like _.unzip except that it accepts an iteratee to specify how regrouped values should be
-         * combined. The iteratee is bound to thisArg and invoked with four arguments: (accumulator, value, index,
-         * group).
-         *
-         * @param array The array of grouped elements to process.
-         * @param iteratee The function to combine regrouped values.
-         * @param thisArg The this binding of iteratee.
-         * @return Returns the new array of regrouped elements.
-         */
-        unzipWith<T, TResult>(
-            array: List<List<T>> | null | undefined,
-            iteratee: (...values: T[]) => TResult
-        ): TResult[];
-
-        /**
-         * @see _.unzipWith
-         */
-        unzipWith<T>(
-            array: List<List<T>> | null | undefined
-        ): T[][];
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.unzipWith
-         */
-        unzipWith<T, TResult>(
-            this: LoDashImplicitWrapper<List<List<T>> | null | undefined>,
-            iteratee: (...values: T[]) => TResult
-        ): LoDashImplicitWrapper<TResult[]>;
-
-        /**
-         * @see _.unzipWith
-         */
-        unzipWith<T>(
-            this: LoDashImplicitWrapper<List<List<T>> | null | undefined>
-        ): LoDashImplicitWrapper<T[][]>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.unzipWith
-         */
-        unzipWith<T, TResult>(
-            this: LoDashExplicitWrapper<List<List<T>> | null | undefined>,
-            iteratee: (...values: T[]) => TResult
-        ): LoDashExplicitWrapper<TResult[]>;
-
-        /**
-         * @see _.unzipWith
-         */
-        unzipWith<T>(
-            this: LoDashExplicitWrapper<List<List<T>> | null | undefined>
-        ): LoDashExplicitWrapper<T[][]>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/array/without.d.ts b/types/lodash/array/without.d.ts
deleted file mode 100644
index ced52397ee..0000000000
--- a/types/lodash/array/without.d.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Creates an array excluding all provided values using SameValueZero for equality comparisons.
-         *
-         * @param array The array to filter.
-         * @param values The values to exclude.
-         * @return Returns the new array of filtered values.
-         */
-        without<T>(
-            array: List<T> | null | undefined,
-            ...values: T[]
-        ): T[];
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.without
-         */
-        without<T>(
-            this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            ...values: T[]
-        ): LoDashImplicitWrapper<T[]>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.without
-         */
-        without<T>(
-            this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            ...values: T[]
-        ): LoDashExplicitWrapper<T[]>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/array/xor.d.ts b/types/lodash/array/xor.d.ts
deleted file mode 100644
index 5369888326..0000000000
--- a/types/lodash/array/xor.d.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Creates an array of unique values that is the symmetric difference of the provided arrays.
-         *
-         * @param arrays The arrays to inspect.
-         * @return Returns the new array of values.
-         */
-        xor<T>(...arrays: Array<List<T> | null | undefined>): T[];
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.xor
-         */
-        xor<T>(
-            this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            ...arrays: Array<List<T> | null | undefined>
-        ): LoDashImplicitWrapper<T[]>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.xor
-         */
-        xor<T>(
-            this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            ...arrays: Array<List<T> | null | undefined>
-        ): LoDashExplicitWrapper<T[]>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/array/xorBy.d.ts b/types/lodash/array/xorBy.d.ts
deleted file mode 100644
index 1be5c1284b..0000000000
--- a/types/lodash/array/xorBy.d.ts
+++ /dev/null
@@ -1,104 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * This method is like `_.xor` except that it accepts `iteratee` which is
-         * invoked for each element of each `arrays` to generate the criterion by which
-         * uniqueness is computed. The iteratee is invoked with one argument: (value).
-         *
-         * @category Array
-         * @param [arrays] The arrays to inspect.
-         * @param [iteratee=_.identity] The iteratee invoked per element.
-         * @returns Returns the new array of values.
-         * @example
-         *
-         * _.xorBy([2.1, 1.2], [4.3, 2.4], Math.floor);
-         * // => [1.2, 4.3]
-         *
-         * // using the `_.property` iteratee shorthand
-         * _.xorBy([{ 'x': 1 }], [{ 'x': 2 }, { 'x': 1 }], 'x');
-         * // => [{ 'x': 2 }]
-         */
-        xorBy<T>(
-            arrays: List<T> | null | undefined,
-            iteratee?: ValueIteratee<T>
-        ): T[];
-
-        /**
-         * @see _.xorBy
-         */
-        xorBy<T>(
-            arrays: List<T> | null | undefined,
-            arrays2: List<T> | null | undefined,
-            iteratee?: ValueIteratee<T>
-        ): T[];
-
-        /**
-         * @see _.xorBy
-         */
-        xorBy<T>(
-            arrays: List<T> | null | undefined,
-            arrays2: List<T> | null | undefined,
-            arrays3: List<T> | null | undefined,
-            ...iteratee: Array<ValueIteratee<T> | List<T> | null | undefined>
-        ): T[];
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.xor
-         */
-        xorBy<T>(
-            this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            iteratee?: ValueIteratee<T>
-        ): LoDashImplicitWrapper<T[]>;
-
-        /**
-         * @see _.xorBy
-         */
-        xorBy<T>(
-            this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            arrays2: List<T> | null | undefined,
-            iteratee?: ValueIteratee<T>
-        ): LoDashImplicitWrapper<T[]>;
-
-        /**
-         * @see _.xorBy
-         */
-        xorBy<T>(
-            this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            arrays2: List<T> | null | undefined,
-            arrays3: List<T> | null | undefined,
-            ...iteratee: Array<ValueIteratee<T> | List<T> | null | undefined>
-        ): LoDashImplicitWrapper<T[]>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.xorBy
-         */
-        xorBy<T>(
-            this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            iteratee?: ValueIteratee<T>
-        ): LoDashExplicitWrapper<T[]>;
-
-        /**
-         * @see _.xorBy
-         */
-        xorBy<T>(
-            this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            arrays2: List<T> | null | undefined,
-            iteratee?: ValueIteratee<T>
-        ): LoDashExplicitWrapper<T[]>;
-
-        /**
-         * @see _.xorBy
-         */
-        xorBy<T>(
-            this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            arrays2: List<T> | null | undefined,
-            arrays3: List<T> | null | undefined,
-            ...iteratee: Array<ValueIteratee<T> | List<T> | null | undefined>
-        ): LoDashExplicitWrapper<T[]>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/array/xorWith.d.ts b/types/lodash/array/xorWith.d.ts
deleted file mode 100644
index 0963a31da7..0000000000
--- a/types/lodash/array/xorWith.d.ts
+++ /dev/null
@@ -1,103 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * This method is like `_.xor` except that it accepts `comparator` which is
-         * invoked to compare elements of `arrays`. The comparator is invoked with
-         * two arguments: (arrVal, othVal).
-         *
-         * @category Array
-         * @param [arrays] The arrays to inspect.
-         * @param [comparator] The comparator invoked per element.
-         * @returns Returns the new array of values.
-         * @example
-         *
-         * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
-         * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
-         *
-         * _.xorWith(objects, others, _.isEqual);
-         * // => [{ 'x': 2, 'y': 1 }, { 'x': 1, 'y': 1 }]
-         */
-        xorWith<T>(
-            arrays: List<T> | null | undefined,
-            comparator?: Comparator<T>
-        ): T[];
-
-        /**
-         * @see _.xorWith
-         */
-        xorWith<T>(
-            arrays: List<T> | null | undefined,
-            arrays2: List<T> | null | undefined,
-            comparator?: Comparator<T>
-        ): T[];
-
-        /**
-         * @see _.xorWith
-         */
-        xorWith<T>(
-            arrays: List<T> | null | undefined,
-            arrays2: List<T> | null | undefined,
-            arrays3: List<T> | null | undefined,
-            ...comparator: Array<Comparator<T> | List<T> | null | undefined>
-        ): T[];
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.xorWith
-         */
-        xorWith<T>(
-            this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            comparator?: Comparator<T>
-        ): LoDashImplicitWrapper<T[]>;
-
-        /**
-         * @see _.xorWith
-         */
-        xorWith<T>(
-            this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            arrays2: List<T> | null | undefined,
-            comparator?: Comparator<T>
-        ): LoDashImplicitWrapper<T[]>;
-
-        /**
-         * @see _.xorWith
-         */
-        xorWith<T>(
-            this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            arrays2: List<T> | null | undefined,
-            arrays3: List<T> | null | undefined,
-            ...comparator: Array<Comparator<T> | List<T> | null | undefined>
-        ): LoDashImplicitWrapper<T[]>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.xorWith
-         */
-        xorWith<T>(
-            this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            comparator?: Comparator<T>
-        ): LoDashExplicitWrapper<T[]>;
-
-        /**
-         * @see _.xorWith
-         */
-        xorWith<T>(
-            this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            arrays2: List<T> | null | undefined,
-            comparator?: Comparator<T>
-        ): LoDashExplicitWrapper<T[]>;
-
-        /**
-         * @see _.xorWith
-         */
-        xorWith<T>(
-            this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            arrays2: List<T> | null | undefined,
-            arrays3: List<T> | null | undefined,
-            ...comparator: Array<Comparator<T> | List<T> | null | undefined>
-        ): LoDashExplicitWrapper<T[]>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/array/zip.d.ts b/types/lodash/array/zip.d.ts
deleted file mode 100644
index bf4e436dbf..0000000000
--- a/types/lodash/array/zip.d.ts
+++ /dev/null
@@ -1,129 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Creates an array of grouped elements, the first of which contains the first elements of the given arrays,
-         * the second of which contains the second elements of the given arrays, and so on.
-         *
-         * @param arrays The arrays to process.
-         * @return Returns the new array of grouped elements.
-         */
-        zip<T1, T2>(arrays1: List<T1>, arrays2: List<T2>): Array<[T1 | undefined, T2 | undefined]>;
-
-        /**
-         * @see _.zip
-         */
-        zip<T1, T2, T3>(arrays1: List<T1>, arrays2: List<T2>, arrays3: List<T3>): Array<[T1 | undefined, T2 | undefined, T3 | undefined]>;
-
-        /**
-         * @see _.zip
-         */
-        zip<T1, T2, T3, T4>(arrays1: List<T1>, arrays2: List<T2>, arrays3: List<T3>, arrays4: List<T4>): Array<[T1 | undefined, T2 | undefined, T3 | undefined, T4 | undefined]>;
-
-        /**
-         * @see _.zip
-         */
-        zip<T1, T2, T3, T4, T5>(arrays1: List<T1>, arrays2: List<T2>, arrays3: List<T3>, arrays4: List<T4>, arrays5: List<T5>): Array<[T1 | undefined, T2 | undefined, T3 | undefined, T4 | undefined, T5 | undefined]>;
-
-        /**
-         * @see _.zip
-         */
-        zip<T>(...arrays: Array<List<T> | null | undefined>): (T | undefined)[][];
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.zip
-         */
-        zip<T1, T2>(
-            this: LoDashImplicitWrapper<List<T1>>,
-            arrays2: List<T2>,
-        ): LoDashImplicitWrapper<Array<[T1 | undefined, T2 | undefined]>>;
-
-        /**
-         * @see _.zip
-         */
-        zip<T1, T2, T3>(
-            this: LoDashImplicitWrapper<List<T1>>,
-            arrays2: List<T2>,
-            arrays3: List<T3>,
-        ): LoDashImplicitWrapper<Array<[T1 | undefined, T2 | undefined, T3 | undefined]>>;
-
-        /**
-         * @see _.zip
-         */
-        zip<T1, T2, T3, T4>(
-            this: LoDashImplicitWrapper<List<T1>>,
-            arrays2: List<T2>,
-            arrays3: List<T3>,
-            arrays4: List<T4>,
-        ): LoDashImplicitWrapper<Array<[T1 | undefined, T2 | undefined, T3 | undefined, T4 | undefined]>>;
-
-        /**
-         * @see _.zip
-         */
-        zip<T1, T2, T3, T4, T5>(
-            this: LoDashImplicitWrapper<List<T1>>,
-            arrays2: List<T2>,
-            arrays3: List<T3>,
-            arrays4: List<T4>,
-            arrays5: List<T5>,
-        ): LoDashImplicitWrapper<Array<[T1 | undefined, T2 | undefined, T3 | undefined, T4 | undefined, T5 | undefined]>>;
-
-        /**
-         * @see _.zip
-         */
-        zip<T>(
-            this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            ...arrays: Array<List<T> | null | undefined>
-        ): LoDashImplicitWrapper<Array<Array<T | undefined>>>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.zip
-         */
-        zip<T1, T2>(
-            this: LoDashExplicitWrapper<List<T1>>,
-            arrays2: List<T2>,
-        ): LoDashExplicitWrapper<Array<[T1 | undefined, T2 | undefined]>>;
-
-        /**
-         * @see _.zip
-         */
-        zip<T1, T2, T3>(
-            this: LoDashExplicitWrapper<List<T1>>,
-            arrays2: List<T2>,
-            arrays3: List<T3>,
-        ): LoDashExplicitWrapper<Array<[T1 | undefined, T2 | undefined, T3 | undefined]>>;
-
-        /**
-         * @see _.zip
-         */
-        zip<T1, T2, T3, T4>(
-            this: LoDashExplicitWrapper<List<T1>>,
-            arrays2: List<T2>,
-            arrays3: List<T3>,
-            arrays4: List<T4>,
-        ): LoDashExplicitWrapper<Array<[T1 | undefined, T2 | undefined, T3 | undefined, T4 | undefined]>>;
-
-        /**
-         * @see _.zip
-         */
-        zip<T1, T2, T3, T4, T5>(
-            this: LoDashExplicitWrapper<List<T1>>,
-            arrays2: List<T2>,
-            arrays3: List<T3>,
-            arrays4: List<T4>,
-            arrays5: List<T5>,
-        ): LoDashExplicitWrapper<Array<[T1 | undefined, T2 | undefined, T3 | undefined, T4 | undefined, T5 | undefined]>>;
-
-        /**
-         * @see _.zip
-         */
-        zip<T>(
-            this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            ...arrays: Array<List<T> | null | undefined>
-        ): LoDashExplicitWrapper<Array<Array<T | undefined>>>;
-    }
-}
diff --git a/types/lodash/array/zipObject.d.ts b/types/lodash/array/zipObject.d.ts
deleted file mode 100644
index cf7c35e96a..0000000000
--- a/types/lodash/array/zipObject.d.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * This method is like _.fromPairs except that it accepts two arrays, one of property
-         * identifiers and one of corresponding values.
-         *
-         * @param props The property names.
-         * @param values The property values.
-         * @return Returns the new object.
-         */
-        zipObject<T>(
-            props: List<PropertyName>,
-            values: List<T>
-        ): Dictionary<T>;
-
-        /**
-         * @see _.zipObject
-         */
-        zipObject(
-            props?: List<PropertyName>
-        ): Dictionary<undefined>;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.zipObject
-         */
-        zipObject<T>(
-            this: LoDashImplicitWrapper<List<PropertyName>>,
-            values: List<T>
-        ): LoDashImplicitWrapper<Dictionary<T>>;
-
-        /**
-         * @see _.zipObject
-         */
-        zipObject(
-            this: LoDashImplicitWrapper<List<PropertyName>>
-        ): LoDashImplicitWrapper<Dictionary<undefined>>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.zipObject
-         */
-        zipObject<T>(
-            this: LoDashExplicitWrapper<List<PropertyName>>,
-            values: List<T>
-        ): LoDashExplicitWrapper<Dictionary<T>>;
-
-        /**
-         * @see _.zipObject
-         */
-        zipObject(
-            this: LoDashExplicitWrapper<List<PropertyName>>
-        ): LoDashExplicitWrapper<Dictionary<undefined>>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/array/zipObjectDeep.d.ts b/types/lodash/array/zipObjectDeep.d.ts
deleted file mode 100644
index a91117e705..0000000000
--- a/types/lodash/array/zipObjectDeep.d.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * This method is like _.zipObject except that it supports property paths.
-         *
-         * @param paths The property names.
-         * @param values The property values.
-         * @return Returns the new object.
-         */
-        zipObjectDeep(
-            paths?: List<PropertyPath>,
-            values?: List<any>
-        ): object;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.zipObjectDeep
-         */
-        zipObjectDeep(
-            this: LoDashImplicitWrapper<List<PropertyPath>>,
-            values?: List<any>
-        ): LoDashImplicitWrapper<object>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.zipObjectDeep
-         */
-        zipObjectDeep(
-            this: LoDashExplicitWrapper<List<PropertyPath>>,
-            values?: List<any>
-        ): LoDashExplicitWrapper<object>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/array/zipWith.d.ts b/types/lodash/array/zipWith.d.ts
deleted file mode 100644
index 31e080b056..0000000000
--- a/types/lodash/array/zipWith.d.ts
+++ /dev/null
@@ -1,187 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * This method is like _.zip except that it accepts an iteratee to specify how grouped values should be
-         * combined. The iteratee is bound to thisArg and invoked with four arguments: (accumulator, value, index,
-         * group).
-         * @param [arrays] The arrays to process.
-         * @param [iteratee] The function to combine grouped values.
-         * @param [thisArg] The `this` binding of `iteratee`.
-         * @return Returns the new array of grouped elements.
-         */
-        zipWith<T, TResult>(
-            arrays: List<T>,
-            iteratee: (value1: T) => TResult
-        ): TResult[];
-
-        /**
-         * @see _.zipWith
-         */
-        zipWith<T1, T2, TResult>(
-            arrays1: List<T1>,
-            arrays2: List<T2>,
-            iteratee: (value1: T1, value2: T2) => TResult
-        ): TResult[];
-
-        /**
-         * @see _.zipWith
-         */
-        zipWith<T1, T2, T3, TResult>(
-            arrays1: List<T1>,
-            arrays2: List<T2>,
-            arrays3: List<T3>,
-            iteratee: (value1: T1, value2: T2, value3: T3) => TResult
-        ): TResult[];
-
-        /**
-         * @see _.zipWith
-         */
-        zipWith<T1, T2, T3, T4, TResult>(
-            arrays1: List<T1>,
-            arrays2: List<T2>,
-            arrays3: List<T3>,
-            arrays4: List<T4>,
-            iteratee: (value1: T1, value2: T2, value3: T3, value4: T4) => TResult
-        ): TResult[];
-
-        /**
-         * @see _.zipWith
-         */
-        zipWith<T1, T2, T3, T4, T5, TResult>(
-            arrays1: List<T1>,
-            arrays2: List<T2>,
-            arrays3: List<T3>,
-            arrays4: List<T4>,
-            arrays5: List<T5>,
-            iteratee: (value1: T1, value2: T2, value3: T3, value4: T4, value5: T5) => TResult
-        ): TResult[];
-
-        /**
-         * @see _.zipWith
-         */
-        zipWith<T, TResult>(
-            ...iteratee: Array<((...group: T[]) => TResult) | List<T> | null | undefined>
-        ): TResult[];
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.zipWith
-         */
-        zipWith<T, TResult>(
-            this: LoDashImplicitWrapper<List<T>>,
-            iteratee: (value1: T) => TResult
-        ): LoDashImplicitWrapper<TResult[]>;
-
-        /**
-         * @see _.zipWith
-         */
-        zipWith<T1, T2, TResult>(
-            this: LoDashImplicitWrapper<List<T1>>,
-            arrays2: List<T2>,
-            iteratee: (value1: T1, value2: T2) => TResult
-        ): LoDashImplicitWrapper<TResult[]>;
-
-        /**
-         * @see _.zipWith
-         */
-        zipWith<T1, T2, T3, TResult>(
-            this: LoDashImplicitWrapper<List<T1>>,
-            arrays2: List<T2>,
-            arrays3: List<T3>,
-            iteratee: (value1: T1, value2: T2, value3: T3) => TResult
-        ): LoDashImplicitWrapper<TResult[]>;
-
-        /**
-         * @see _.zipWith
-         */
-        zipWith<T1, T2, T3, T4, TResult>(
-            this: LoDashImplicitWrapper<List<T1>>,
-            arrays2: List<T2>,
-            arrays3: List<T3>,
-            arrays4: List<T4>,
-            iteratee: (value1: T1, value2: T2, value3: T3, value4: T4) => TResult
-        ): LoDashImplicitWrapper<TResult[]>;
-
-        /**
-         * @see _.zipWith
-         */
-        zipWith<T1, T2, T3, T4, T5, TResult>(
-            this: LoDashImplicitWrapper<List<T1>>,
-            arrays2: List<T2>,
-            arrays3: List<T3>,
-            arrays4: List<T4>,
-            arrays5: List<T5>,
-            iteratee: (value1: T1, value2: T2, value3: T3, value4: T4, value5: T5) => TResult
-        ): LoDashImplicitWrapper<TResult[]>;
-
-        /**
-         * @see _.zipWith
-         */
-        zipWith<T, TResult>(
-            this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            ...iteratee: Array<((...group: T[]) => TResult) | List<T> | null | undefined>
-        ): LoDashImplicitWrapper<TResult[]>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.zipWith
-         */
-        zipWith<T, TResult>(
-            this: LoDashExplicitWrapper<List<T>>,
-            iteratee: (value1: T) => TResult
-        ): LoDashExplicitWrapper<TResult[]>;
-
-        /**
-         * @see _.zipWith
-         */
-        zipWith<T1, T2, TResult>(
-            this: LoDashExplicitWrapper<List<T1>>,
-            arrays2: List<T2>,
-            iteratee: (value1: T1, value2: T2) => TResult
-        ): LoDashExplicitWrapper<TResult[]>;
-
-        /**
-         * @see _.zipWith
-         */
-        zipWith<T1, T2, T3, TResult>(
-            this: LoDashExplicitWrapper<List<T1>>,
-            arrays2: List<T2>,
-            arrays3: List<T3>,
-            iteratee: (value1: T1, value2: T2, value3: T3) => TResult
-        ): LoDashExplicitWrapper<TResult[]>;
-
-        /**
-         * @see _.zipWith
-         */
-        zipWith<T1, T2, T3, T4, TResult>(
-            this: LoDashExplicitWrapper<List<T1>>,
-            arrays2: List<T2>,
-            arrays3: List<T3>,
-            arrays4: List<T4>,
-            iteratee: (value1: T1, value2: T2, value3: T3, value4: T4) => TResult
-        ): LoDashExplicitWrapper<TResult[]>;
-
-        /**
-         * @see _.zipWith
-         */
-        zipWith<T1, T2, T3, T4, T5, TResult>(
-            this: LoDashExplicitWrapper<List<T1>>,
-            arrays2: List<T2>,
-            arrays3: List<T3>,
-            arrays4: List<T4>,
-            arrays5: List<T5>,
-            iteratee: (value1: T1, value2: T2, value3: T3, value4: T4, value5: T5) => TResult
-        ): LoDashExplicitWrapper<TResult[]>;
-
-        /**
-         * @see _.zipWith
-         */
-        zipWith<T, TResult>(
-            this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            ...iteratee: Array<((...group: T[]) => TResult) | List<T> | null | undefined>
-        ): LoDashExplicitWrapper<TResult[]>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/collection/countBy.d.ts b/types/lodash/collection/countBy.d.ts
deleted file mode 100644
index 7c7ca9e03a..0000000000
--- a/types/lodash/collection/countBy.d.ts
+++ /dev/null
@@ -1,121 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Creates an object composed of keys generated from the results of running each element of collection through
-         * iteratee. The corresponding value of each key is the number of times the key was returned by iteratee. The
-         * iteratee is bound to thisArg and invoked with three arguments:
-         * (value, index|key, collection).
-         *
-         * If a property name is provided for iteratee the created _.property style callback returns the property
-         * value of the given element.
-         *
-         * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-         * elements that have a matching property value, else false.
-         *
-         * If an object is provided for iteratee the created _.matches style callback returns true for elements that
-         * have the properties of the given object, else false.
-         *
-         * @param collection The collection to iterate over.
-         * @param iteratee The function invoked per iteration.
-         * @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>
-        ): Dictionary<number>;
-
-        /**
-         * @see _.countBy
-         */
-        countBy<T>(
-            collection: NumericDictionary<T> | null | undefined,
-            iteratee?: NumericDictionaryIteratee<T>
-        ): Dictionary<number>;
-
-        /**
-         * @see _.countBy
-         */
-        countBy<T extends object>(
-            collection: T | null | undefined,
-            iteratee?: ObjectIteratee<T>
-        ): Dictionary<number>;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.countBy
-         */
-        countBy<T>(
-            this: LoDashImplicitWrapper<string | null | undefined>,
-            iteratee?: StringIterator<T>
-        ): LoDashImplicitWrapper<Dictionary<number>>;
-
-        /**
-         * @see _.countBy
-         */
-        countBy<T>(
-            this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            iteratee?: ListIteratee<T>
-        ): LoDashImplicitWrapper<Dictionary<number>>;
-
-        /**
-         * @see _.countBy
-         */
-        countBy<T extends object>(
-            this: LoDashImplicitWrapper<T | null | undefined>,
-            iteratee?: ObjectIteratee<T>
-        ): LoDashImplicitWrapper<Dictionary<number>>;
-
-        /**
-         * @see _.countBy
-         */
-        countBy<T>(
-            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
-            iteratee?: NumericDictionaryIteratee<T>
-        ): LoDashImplicitWrapper<Dictionary<number>>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.countBy
-         */
-        countBy<T>(
-            this: LoDashExplicitWrapper<string | null | undefined>,
-            iteratee?: StringIterator<T>
-        ): LoDashExplicitWrapper<Dictionary<number>>;
-
-        /**
-         * @see _.countBy
-         */
-        countBy<T>(
-            this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            iteratee?: ListIteratee<T>
-        ): LoDashExplicitWrapper<Dictionary<number>>;
-
-        /**
-         * @see _.countBy
-         */
-        countBy<T extends object>(
-            this: LoDashExplicitWrapper<T | null | undefined>,
-            iteratee?: ObjectIteratee<T>
-        ): LoDashExplicitWrapper<Dictionary<number>>;
-
-        /**
-         * @see _.countBy
-         */
-        countBy<T>(
-            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
-            iteratee?: NumericDictionaryIteratee<T>
-        ): LoDashExplicitWrapper<Dictionary<number>>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/collection/each.d.ts b/types/lodash/collection/each.d.ts
deleted file mode 100644
index 9777780edc..0000000000
--- a/types/lodash/collection/each.d.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        each: typeof _.forEach; // tslint:disable-line:no-unnecessary-qualifier
-    }
-
-    interface LoDashWrapper<TValue> {
-        /**
-         * @see _.forEach
-         */
-        each<T>(
-            this: LoDashWrapper<T[] | null | undefined>,
-            iteratee?: ArrayIterator<T, any>
-        ): this;
-
-        /**
-         * @see _.forEach
-         */
-        each(
-            this: LoDashWrapper<string | null | undefined>,
-            iteratee?: StringIterator<any>
-        ): this;
-
-        /**
-         * @see _.forEach
-         */
-        each<T>(
-            this: LoDashWrapper<List<T> | null | undefined>,
-            iteratee?: ListIterator<T, any>
-        ): this;
-
-        /**
-         * @see _.forEach
-         */
-        each<T extends object>(
-            this: LoDashWrapper<T | null | undefined>,
-            iteratee?: ObjectIterator<T, any>
-        ): this;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/collection/eachRight.d.ts b/types/lodash/collection/eachRight.d.ts
deleted file mode 100644
index 15e3007af5..0000000000
--- a/types/lodash/collection/eachRight.d.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        eachRight: typeof _.forEachRight; // tslint:disable-line:no-unnecessary-qualifier
-    }
-
-    interface LoDashWrapper<TValue> {
-        /**
-         * @see _.forEachRight
-         */
-        eachRight<T>(
-            this: LoDashWrapper<T[] | null | undefined>,
-            iteratee?: ArrayIterator<T, any>
-        ): this;
-
-        /**
-         * @see _.forEachRight
-         */
-        eachRight(
-            this: LoDashWrapper<string | null | undefined>,
-            iteratee?: StringIterator<any>
-        ): this;
-
-        /**
-         * @see _.forEachRight
-         */
-        eachRight<T>(
-            this: LoDashWrapper<List<T> | null | undefined>,
-            iteratee?: ListIterator<T, any>
-        ): this;
-
-        /**
-         * @see _.forEachRight
-         */
-        eachRight<T extends object>(
-            this: LoDashWrapper<T | null | undefined>,
-            iteratee?: ObjectIterator<T, any>
-        ): this;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/collection/every.d.ts b/types/lodash/collection/every.d.ts
deleted file mode 100644
index 42062a74ad..0000000000
--- a/types/lodash/collection/every.d.ts
+++ /dev/null
@@ -1,85 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Checks if predicate returns truthy for all elements of collection. Iteration is stopped once predicate
-         * returns falsey. The predicate is invoked with three arguments: (value, index|key, collection).
-         *
-         * @param collection The collection to iterate over.
-         * @param predicate The function invoked per iteration.
-         * @return Returns true if all elements pass the predicate check, else false.
-         */
-        every<T>(
-            collection: List<T> | null | undefined,
-            predicate?: ListIterateeCustom<T, boolean>
-        ): boolean;
-
-        /**
-         * @see _.every
-         */
-        every<T>(
-            collection: NumericDictionary<T> | null | undefined,
-            predicate?: NumericDictionaryIterateeCustom<T, boolean>
-        ): boolean;
-
-        /**
-         * @see _.every
-         */
-        every<T extends object>(
-            collection: T | null | undefined,
-            predicate?: ObjectIterateeCustom<T, boolean>
-        ): boolean;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.every
-         */
-        every<T>(
-            this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            predicate?: ListIterateeCustom<T, boolean>
-        ): boolean;
-
-        /**
-         * @see _.every
-         */
-        every<T extends object>(
-            this: LoDashImplicitWrapper<T | null | undefined>,
-            predicate?: ObjectIterateeCustom<T, boolean>
-        ): boolean;
-
-        /**
-         * @see _.every
-         */
-        every<T>(
-            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
-            predicate?: NumericDictionaryIterateeCustom<T, boolean>
-        ): boolean;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.every
-         */
-        every<T>(
-            this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            predicate?: ListIterateeCustom<T, boolean>
-        ): LoDashExplicitWrapper<boolean>;
-
-        /**
-         * @see _.every
-         */
-        every<T extends object>(
-            this: LoDashExplicitWrapper<T | null | undefined>,
-            predicate?: ObjectIterateeCustom<T, boolean>
-        ): LoDashExplicitWrapper<boolean>;
-
-        /**
-         * @see _.every
-         */
-        every<T>(
-            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
-            predicate?: NumericDictionaryIterateeCustom<T, boolean>
-        ): LoDashExplicitWrapper<boolean>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/collection/filter.d.ts b/types/lodash/collection/filter.d.ts
deleted file mode 100644
index 0f60654127..0000000000
--- a/types/lodash/collection/filter.d.ts
+++ /dev/null
@@ -1,143 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Iterates over elements of collection, returning an array of all elements predicate returns truthy for. The
-         * predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
-         *
-         * If a property name is provided for predicate the created _.property style callback returns the property
-         * value of the given element.
-         *
-         * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-         * elements that have a matching property value, else false.
-         *
-         * If an object is provided for predicate the created _.matches style callback returns true for elements that
-         * have the properties of the given object, else false.
-         *
-         * @param collection The collection to iterate over.
-         * @param predicate The function invoked per iteration.
-         * @param thisArg The this binding of predicate.
-         * @return Returns the new filtered array.
-         */
-        filter(
-            collection: string | null | undefined,
-            predicate?: StringIterator<boolean>
-        ): string[];
-
-        /**
-         * @see _.filter
-         */
-        filter<T, S extends T>(
-            collection: List<T> | null | undefined,
-            predicate: ListIteratorTypeGuard<T, S>
-        ): S[];
-
-        /**
-         * @see _.filter
-         */
-        filter<T>(
-            collection: List<T> | null | undefined,
-            predicate?: ListIterateeCustom<T, boolean>
-        ): T[];
-
-        /**
-         * @see _.filter
-         */
-        filter<T extends object, S extends T[keyof T]>(
-            collection: T | null | undefined,
-            predicate: ObjectIteratorTypeGuard<T, S>
-        ): S[];
-
-        /**
-         * @see _.filter
-         */
-        filter<T extends object>(
-            collection: T | null | undefined,
-            predicate?: ObjectIterateeCustom<T, boolean>
-        ): Array<T[keyof T]>;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.filter
-         */
-        filter(
-            this: LoDashImplicitWrapper<string | null | undefined>,
-            predicate?: StringIterator<boolean>
-        ): LoDashImplicitWrapper<string[]>;
-
-        /**
-         * @see _.filter
-         */
-        filter<T, S extends T>(
-            this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            predicate: ListIteratorTypeGuard<T, S>
-        ): LoDashImplicitWrapper<S[]>;
-
-        /**
-         * @see _.filter
-         */
-        filter<T>(
-            this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            predicate?: ListIterateeCustom<T, boolean>
-        ): LoDashImplicitWrapper<T[]>;
-
-        /**
-         * @see _.filter
-         */
-        filter<T extends object, S extends T[keyof T]>(
-            this: LoDashImplicitWrapper<T | null | undefined>,
-            predicate: ObjectIteratorTypeGuard<T, S>
-        ): LoDashImplicitWrapper<S[]>;
-
-        /**
-         * @see _.filter
-         */
-        filter<T extends object>(
-            this: LoDashImplicitWrapper<T | null | undefined>,
-            predicate?: ObjectIterateeCustom<T, boolean>
-        ): LoDashImplicitWrapper<Array<T[keyof T]>>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.filter
-         */
-        filter(
-            this: LoDashExplicitWrapper<string | null | undefined>,
-            predicate?: StringIterator<boolean>
-        ): LoDashExplicitWrapper<string[]>;
-
-        /**
-         * @see _.filter
-         */
-        filter<T, S extends T>(
-            this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            predicate: ListIteratorTypeGuard<T, S>
-        ): LoDashExplicitWrapper<S[]>;
-
-        /**
-         * @see _.filter
-         */
-        filter<T>(
-            this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            predicate?: ListIterateeCustom<T, boolean>
-        ): LoDashExplicitWrapper<T[]>;
-
-        /**
-         * @see _.filter
-         */
-        filter<T extends object, S extends T[keyof T]>(
-            this: LoDashExplicitWrapper<T | null | undefined>,
-            predicate: ObjectIteratorTypeGuard<T, S>
-        ): LoDashExplicitWrapper<S[]>;
-
-        /**
-         * @see _.filter
-         */
-        filter<T extends object>(
-            this: LoDashExplicitWrapper<T | null | undefined>,
-            predicate?: ObjectIterateeCustom<T, boolean>
-        ): LoDashExplicitWrapper<Array<T[keyof T]>>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/collection/find.d.ts b/types/lodash/collection/find.d.ts
deleted file mode 100644
index 25bfc77efc..0000000000
--- a/types/lodash/collection/find.d.ts
+++ /dev/null
@@ -1,131 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Iterates over elements of collection, returning the first element predicate returns truthy for.
-         * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
-         *
-         * If a property name is provided for predicate the created _.property style callback returns the property
-         * value of the given element.
-         *
-         * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-         * elements that have a matching property value, else false.
-         *
-         * If an object is provided for predicate the created _.matches style callback returns true for elements that
-         * have the properties of the given object, else false.
-         *
-         * @param collection The collection to search.
-         * @param predicate The function invoked per iteration.
-         * @param fromIndex The index to search from.
-         * @return Returns the matched element, else undefined.
-         */
-        find<T, S extends T>(
-            collection: List<T> | null | undefined,
-            predicate: ListIteratorTypeGuard<T, S>,
-            fromIndex?: number
-        ): S|undefined;
-
-        /**
-         * @see _.find
-         */
-        find<T>(
-            collection: List<T> | null | undefined,
-            predicate?: ListIterateeCustom<T, boolean>,
-            fromIndex?: number
-        ): T|undefined;
-
-        /**
-         * @see _.find
-         */
-        find<T extends object, S extends T[keyof T]>(
-            collection: T | null | undefined,
-            predicate: ObjectIteratorTypeGuard<T, S>,
-            fromIndex?: number
-        ): S|undefined;
-
-        /**
-         * @see _.find
-         */
-        find<T extends object>(
-            collection: T | null | undefined,
-            predicate?: ObjectIterateeCustom<T, boolean>,
-            fromIndex?: number
-        ): T[keyof T]|undefined;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.find
-         */
-        find<T, S extends T>(
-            this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            predicate: ListIteratorTypeGuard<T, S>,
-            fromIndex?: number
-        ): S|undefined;
-
-        /**
-         * @see _.find
-         */
-        find<T>(
-            this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            predicate?: ListIterateeCustom<T, boolean>,
-            fromIndex?: number
-        ): T|undefined;
-
-        /**
-         * @see _.find
-         */
-        find<T extends object, S extends T[keyof T]>(
-            this: LoDashImplicitWrapper<T | null | undefined>,
-            predicate: ObjectIteratorTypeGuard<T, S>,
-            fromIndex?: number
-        ): S|undefined;
-
-        /**
-         * @see _.find
-         */
-        find<T extends object>(
-            this: LoDashImplicitWrapper<T | null | undefined>,
-            predicate?: ObjectIterateeCustom<T, boolean>,
-            fromIndex?: number
-        ): T[keyof T]|undefined;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.find
-         */
-        find<T, S extends T>(
-            this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            predicate: ListIteratorTypeGuard<T, S>,
-            fromIndex?: number
-        ): LoDashExplicitWrapper<S|undefined>;
-
-        /**
-         * @see _.find
-         */
-        find<T>(
-            this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            predicate?: ListIterateeCustom<T, boolean>,
-            fromIndex?: number
-        ): LoDashExplicitWrapper<T|undefined>;
-
-        /**
-         * @see _.find
-         */
-        find<T extends object, S extends T[keyof T]>(
-            this: LoDashExplicitWrapper<T | null | undefined>,
-            predicate: ObjectIteratorTypeGuard<T, S>,
-            fromIndex?: number
-        ): LoDashExplicitWrapper<S|undefined>;
-
-        /**
-         * @see _.find
-         */
-        find<T extends object>(
-            this: LoDashExplicitWrapper<T | null | undefined>,
-            predicate?: ObjectIterateeCustom<T, boolean>,
-            fromIndex?: number
-        ): LoDashExplicitWrapper<T[keyof T]|undefined>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/collection/findLast.d.ts b/types/lodash/collection/findLast.d.ts
deleted file mode 100644
index edbcf971e4..0000000000
--- a/types/lodash/collection/findLast.d.ts
+++ /dev/null
@@ -1,121 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-        * This method is like _.find except that it iterates over elements of a collection from
-        * right to left.
-        * @param collection Searches for a value in this list.
-        * @param predicate The function called per iteration.
-        * @param fromIndex The index to search from.
-        * @return The found element, else undefined.
-        **/
-        findLast<T, S extends T>(
-            collection: List<T> | null | undefined,
-            predicate: ListIteratorTypeGuard<T, S>,
-            fromIndex?: number
-        ): S|undefined;
-
-        /**
-         * @see _.findLast
-         */
-        findLast<T>(
-            collection: List<T> | null | undefined,
-            predicate?: ListIterateeCustom<T, boolean>,
-            fromIndex?: number
-        ): T|undefined;
-
-        /**
-         * @see _.findLast
-         */
-        findLast<T extends object, S extends T[keyof T]>(
-            collection: T | null | undefined,
-            predicate: ObjectIteratorTypeGuard<T, S>,
-            fromIndex?: number
-        ): S|undefined;
-
-        /**
-         * @see _.findLast
-         */
-        findLast<T extends object>(
-            collection: T | null | undefined,
-            predicate?: ObjectIterateeCustom<T, boolean>,
-            fromIndex?: number
-        ): T[keyof T]|undefined;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.findLast
-         */
-        findLast<T, S extends T>(
-            this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            predicate: ListIteratorTypeGuard<T, S>,
-            fromIndex?: number
-        ): S | undefined;
-
-        /**
-         * @see _.findLast
-         */
-        findLast<T>(
-            this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            predicate?: ListIterateeCustom<T, boolean>,
-            fromIndex?: number
-        ): T | undefined;
-
-        /**
-         * @see _.findLast
-         */
-        findLast<T extends object, S extends T[keyof T]>(
-            this: LoDashImplicitWrapper<T | null | undefined>,
-            predicate: ObjectIteratorTypeGuard<T, S>,
-            fromIndex?: number
-        ): S|undefined;
-
-        /**
-         * @see _.findLast
-         */
-        findLast<T extends object>(
-            this: LoDashImplicitWrapper<T | null | undefined>,
-            predicate?: ObjectIterateeCustom<T, boolean>,
-            fromIndex?: number
-        ): T[keyof T]|undefined;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.findLast
-         */
-        findLast<T, S extends T>(
-            this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            predicate: ListIteratorTypeGuard<T, S>,
-            fromIndex?: number
-        ): LoDashExplicitWrapper<S | undefined>;
-
-        /**
-         * @see _.findLast
-         */
-        findLast<T>(
-            this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            predicate?: ListIterateeCustom<T, boolean>,
-            fromIndex?: number
-        ): LoDashExplicitWrapper<T | undefined>;
-
-        /**
-         * @see _.findLast
-         */
-        findLast<T extends object, S extends T[keyof T]>(
-            this: LoDashExplicitWrapper<T | null | undefined>,
-            predicate: ObjectIteratorTypeGuard<T, S>,
-            fromIndex?: number
-        ): LoDashExplicitWrapper<S|undefined>;
-
-        /**
-         * @see _.findLast
-         */
-        findLast<T extends object>(
-            this: LoDashExplicitWrapper<T | null | undefined>,
-            predicate?: ObjectIterateeCustom<T, boolean>,
-            fromIndex?: number
-        ): LoDashExplicitWrapper<T[keyof T]|undefined>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/collection/flatMap.d.ts b/types/lodash/collection/flatMap.d.ts
deleted file mode 100644
index 1917e691dc..0000000000
--- a/types/lodash/collection/flatMap.d.ts
+++ /dev/null
@@ -1,164 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Creates an array of flattened values by running each element in collection through iteratee
-         * and concating its result to the other mapped values. The iteratee is invoked with three arguments:
-         * (value, index|key, collection).
-         *
-         * @param collection The collection to iterate over.
-         * @param iteratee The function invoked per iteration.
-         * @return Returns the new flattened array.
-         */
-        flatMap<T>(
-            collection: List<Many<T>> | Dictionary<Many<T>> | NumericDictionary<Many<T>> | null | undefined
-        ): T[];
-
-        /**
-         * @see _.flatMap
-         */
-        flatMap(
-            collection: object | null | undefined
-        ): any[];
-
-        /**
-         * @see _.flatMap
-         */
-        flatMap<T, TResult>(
-            collection: List<T> | null | undefined,
-            iteratee: ListIterator<T, Many<TResult>>
-        ): TResult[];
-
-        /**
-         * @see _.flatMap
-         */
-        flatMap<T, TResult>(
-            collection: NumericDictionary<T> | null | undefined,
-            iteratee: NumericDictionaryIterator<T, Many<TResult>>
-        ): TResult[];
-
-        /**
-         * @see _.flatMap
-         */
-        flatMap<T extends object, TResult>(
-            collection: T | null | undefined,
-            iteratee: ObjectIterator<T, Many<TResult>>
-        ): TResult[];
-
-        /**
-         * @see _.flatMap
-         */
-        flatMap(
-            collection: object | null | undefined,
-            iteratee: string
-        ): any[];
-
-        /**
-         * @see _.flatMap
-         */
-        flatMap(
-            collection: object | null | undefined,
-            iteratee: object
-        ): boolean[];
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.flatMap
-         */
-        flatMap<T>(this: LoDashImplicitWrapper<List<Many<T>> | Dictionary<Many<T>> | NumericDictionary<Many<T>> | null | undefined>): LoDashImplicitWrapper<T[]>;
-
-        /**
-         * @see _.flatMap
-         */
-        flatMap(): LoDashImplicitWrapper<any[]>;
-
-        /**
-         * @see _.flatMap
-         */
-        flatMap<T, TResult>(
-            this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            iteratee: ListIterator<T, Many<TResult>>
-        ): LoDashImplicitWrapper<TResult[]>;
-
-        /**
-         * @see _.flatMap
-         */
-        flatMap<T extends object, TResult>(
-            this: LoDashImplicitWrapper<T | null | undefined>,
-            iteratee: ObjectIterator<T, Many<TResult>>
-        ): LoDashImplicitWrapper<TResult[]>;
-
-        /**
-         * @see _.flatMap
-         */
-        flatMap<T, TResult>(
-            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
-            iteratee: NumericDictionaryIterator<T, Many<TResult>>
-        ): LoDashImplicitWrapper<TResult[]>;
-
-        /**
-         * @see _.flatMap
-         */
-        flatMap(
-            iteratee: string
-        ): LoDashImplicitWrapper<any[]>;
-
-        /**
-         * @see _.flatMap
-         */
-        flatMap(
-            iteratee: object
-        ): LoDashImplicitWrapper<boolean[]>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.flatMap
-         */
-        flatMap<T>(this: LoDashExplicitWrapper<List<Many<T>> | Dictionary<Many<T>> | NumericDictionary<Many<T>> | null | undefined>): LoDashExplicitWrapper<T[]>;
-
-        /**
-         * @see _.flatMap
-         */
-        flatMap(): LoDashExplicitWrapper<any[]>;
-
-        /**
-         * @see _.flatMap
-         */
-        flatMap<T, TResult>(
-            this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            iteratee: ListIterator<T, Many<TResult>>
-        ): LoDashExplicitWrapper<TResult[]>;
-
-        /**
-         * @see _.flatMap
-         */
-        flatMap<T, TResult>(
-            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
-            iteratee: NumericDictionaryIterator<T, Many<TResult>>
-        ): LoDashExplicitWrapper<TResult[]>;
-
-        /**
-         * @see _.flatMap
-         */
-        flatMap<T extends object, TResult>(
-            this: LoDashExplicitWrapper<T | null | undefined>,
-            iteratee: ObjectIterator<T, Many<TResult>>
-        ): LoDashExplicitWrapper<TResult[]>;
-
-        /**
-         * @see _.flatMap
-         */
-        flatMap(
-            iteratee: string
-        ): LoDashExplicitWrapper<any[]>;
-
-        /**
-         * @see _.flatMap
-         */
-        flatMap(
-            iteratee: object
-        ): LoDashExplicitWrapper<boolean[]>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/collection/flatMapDeep.d.ts b/types/lodash/collection/flatMapDeep.d.ts
deleted file mode 100644
index 02a81ed5ab..0000000000
--- a/types/lodash/collection/flatMapDeep.d.ts
+++ /dev/null
@@ -1,164 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * This method is like `_.flatMap` except that it recursively flattens the
-         * mapped results.
-         *
-         * @since 4.7.0
-         * @category Collection
-         * @param collection The collection to iterate over.
-         * @param [iteratee=_.identity] The function invoked per iteration.
-         * @returns Returns the new flattened array.
-         * @example
-         *
-         * function duplicate(n) {
-         *   return [[[n, n]]];
-         * }
-         *
-         * _.flatMapDeep([1, 2], duplicate);
-         * // => [1, 1, 2, 2]
-         */
-        flatMapDeep<T>(
-            collection: List<ListOfRecursiveArraysOrValues<T> | T> | Dictionary<ListOfRecursiveArraysOrValues<T> | T> | NumericDictionary<ListOfRecursiveArraysOrValues<T> | T> | null | undefined
-        ): T[];
-
-        /**
-         * @see _.flatMapDeep
-         */
-        flatMapDeep<T, TResult>(
-            collection: List<T> | null | undefined,
-            iteratee: ListIterator<T, ListOfRecursiveArraysOrValues<TResult> | TResult>
-        ): TResult[];
-
-        /**
-         * @see _.flatMapDeep
-         */
-        flatMapDeep<T, TResult>(
-            collection: NumericDictionary<T> | null | undefined,
-            iteratee: NumericDictionaryIterator<T, ListOfRecursiveArraysOrValues<TResult> | TResult>
-        ): TResult[];
-
-        /**
-         * @see _.flatMapDeep
-         */
-        flatMapDeep<T extends object, TResult>(
-            collection: T | null | undefined,
-            iteratee: ObjectIterator<T, ListOfRecursiveArraysOrValues<TResult> | TResult>
-        ): TResult[];
-
-        /**
-         * @see _.flatMapDeep
-         */
-        flatMapDeep(
-            collection: object | null | undefined,
-            iteratee: string
-        ): any[];
-
-        /**
-         * @see _.flatMapDeep
-         */
-        flatMapDeep(
-            collection: object | null | undefined,
-            iteratee: object
-        ): boolean[];
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.flatMapDeep
-         */
-        flatMapDeep<T>(
-            this: LoDashImplicitWrapper<List<ListOfRecursiveArraysOrValues<T> | T> | Dictionary<ListOfRecursiveArraysOrValues<T> | T> | NumericDictionary<ListOfRecursiveArraysOrValues<T> | T> | null | undefined>
-        ): LoDashImplicitWrapper<T[]>;
-
-        /**
-         * @see _.flatMapDeep
-         */
-        flatMapDeep<T, TResult>(
-            this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            iteratee: ListIterator<T, ListOfRecursiveArraysOrValues<TResult> | TResult>
-        ): LoDashImplicitWrapper<TResult[]>;
-
-        /**
-         * @see _.flatMapDeep
-         */
-        flatMapDeep<T, TResult>(
-            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
-            iteratee: NumericDictionaryIterator<T, ListOfRecursiveArraysOrValues<TResult> | TResult>
-        ): LoDashImplicitWrapper<TResult[]>;
-
-        /**
-         * @see _.flatMapDeep
-         */
-        flatMapDeep<T extends object, TResult>(
-            this: LoDashImplicitWrapper<T | null | undefined>,
-            iteratee: ObjectIterator<T, ListOfRecursiveArraysOrValues<TResult> | TResult>
-        ): LoDashImplicitWrapper<TResult[]>;
-
-        /**
-         * @see _.flatMapDeep
-         */
-        flatMapDeep(
-            this: LoDashImplicitWrapper<object | null | undefined>,
-            iteratee: string
-        ): LoDashImplicitWrapper<any[]>;
-
-        /**
-         * @see _.flatMapDeep
-         */
-        flatMapDeep(
-            this: LoDashImplicitWrapper<object | null | undefined>,
-            iteratee: object
-        ): LoDashImplicitWrapper<boolean[]>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.flatMapDeep
-         */
-        flatMapDeep<T>(
-            this: LoDashExplicitWrapper<List<ListOfRecursiveArraysOrValues<T> | T> | Dictionary<ListOfRecursiveArraysOrValues<T> | T> | NumericDictionary<ListOfRecursiveArraysOrValues<T> | T> | null | undefined>
-        ): LoDashExplicitWrapper<T[]>;
-
-        /**
-         * @see _.flatMapDeep
-         */
-        flatMapDeep<T, TResult>(
-            this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            iteratee: ListIterator<T, ListOfRecursiveArraysOrValues<TResult> | TResult>
-        ): LoDashExplicitWrapper<TResult[]>;
-
-        /**
-         * @see _.flatMapDeep
-         */
-        flatMapDeep<T, TResult>(
-            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
-            iteratee: NumericDictionaryIterator<T, ListOfRecursiveArraysOrValues<TResult> | TResult>
-        ): LoDashExplicitWrapper<TResult[]>;
-
-        /**
-         * @see _.flatMapDeep
-         */
-        flatMapDeep<T extends object, TResult>(
-            this: LoDashExplicitWrapper<T | null | undefined>,
-            iteratee: ObjectIterator<T, ListOfRecursiveArraysOrValues<TResult> | TResult>
-        ): LoDashExplicitWrapper<TResult[]>;
-
-        /**
-         * @see _.flatMapDeep
-         */
-        flatMapDeep(
-            this: LoDashExplicitWrapper<object | null | undefined>,
-            iteratee: string
-        ): LoDashExplicitWrapper<any[]>;
-
-        /**
-         * @see _.flatMapDeep
-         */
-        flatMapDeep(
-            this: LoDashExplicitWrapper<object | null | undefined>,
-            iteratee: object
-        ): LoDashExplicitWrapper<boolean[]>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/collection/flatMapDepth.d.ts b/types/lodash/collection/flatMapDepth.d.ts
deleted file mode 100644
index 6790a8e0f2..0000000000
--- a/types/lodash/collection/flatMapDepth.d.ts
+++ /dev/null
@@ -1,180 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * This method is like `_.flatMap` except that it recursively flattens the
-         * mapped results up to `depth` times.
-         *
-         * @since 4.7.0
-         * @category Collection
-         * @param collection The collection to iterate over.
-         * @param [iteratee=_.identity] The function invoked per iteration.
-         * @param [depth=1] The maximum recursion depth.
-         * @returns Returns the new flattened array.
-         * @example
-         *
-         * function duplicate(n) {
-         *   return [[[n, n]]];
-         * }
-         *
-         * _.flatMapDepth([1, 2], duplicate, 2);
-         * // => [[1, 1], [2, 2]]
-         */
-        flatMapDepth<T>(
-            collection: List<ListOfRecursiveArraysOrValues<T> | T> | Dictionary<ListOfRecursiveArraysOrValues<T> | T> | NumericDictionary<ListOfRecursiveArraysOrValues<T> | T> | null | undefined
-        ): T[];
-
-        /**
-         * @see _.flatMapDepth
-         */
-        flatMapDepth<T, TResult>(
-            collection: List<T> | null | undefined,
-            iteratee: ListIterator<T, ListOfRecursiveArraysOrValues<TResult> | TResult>,
-            depth?: number
-        ): TResult[];
-
-        /**
-         * @see _.flatMapDepth
-         */
-        flatMapDepth<T, TResult>(
-            collection: NumericDictionary<T> | null | undefined,
-            iteratee: NumericDictionaryIterator<T, ListOfRecursiveArraysOrValues<TResult> | TResult>,
-            depth?: number
-        ): TResult[];
-
-        /**
-         * @see _.flatMapDepth
-         */
-        flatMapDepth<T extends object, TResult>(
-            collection: T | null | undefined,
-            iteratee: ObjectIterator<T, ListOfRecursiveArraysOrValues<TResult> | TResult>,
-            depth?: number
-        ): TResult[];
-
-        /**
-         * @see _.flatMapDepth
-         */
-        flatMapDepth(
-            collection: object | null | undefined,
-            iteratee: string,
-            depth?: number
-        ): any[];
-
-        /**
-         * @see _.flatMapDepth
-         */
-        flatMapDepth(
-            collection: object | null | undefined,
-            iteratee: object,
-            depth?: number
-        ): boolean[];
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.flatMapDepth
-         */
-        flatMapDepth<T>(
-            this: LoDashImplicitWrapper<List<ListOfRecursiveArraysOrValues<T> | T> | Dictionary<ListOfRecursiveArraysOrValues<T> | T> | NumericDictionary<ListOfRecursiveArraysOrValues<T> | T> | null | undefined>
-        ): LoDashImplicitWrapper<T[]>;
-
-        /**
-         * @see _.flatMapDepth
-         */
-        flatMapDepth<T, TResult>(
-            this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            iteratee: ListIterator<T, ListOfRecursiveArraysOrValues<TResult> | TResult>,
-            depth?: number
-        ): LoDashImplicitWrapper<TResult[]>;
-
-        /**
-         * @see _.flatMapDepth
-         */
-        flatMapDepth<T, TResult>(
-            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
-            iteratee: NumericDictionaryIterator<T, ListOfRecursiveArraysOrValues<TResult> | TResult>,
-            depth?: number
-        ): LoDashImplicitWrapper<TResult[]>;
-
-        /**
-         * @see _.flatMapDepth
-         */
-        flatMapDepth<T extends object, TResult>(
-            this: LoDashImplicitWrapper<T | null | undefined>,
-            iteratee: ObjectIterator<T, ListOfRecursiveArraysOrValues<TResult> | TResult>,
-            depth?: number
-        ): LoDashImplicitWrapper<TResult[]>;
-
-        /**
-         * @see _.flatMapDepth
-         */
-        flatMapDepth(
-            this: LoDashImplicitWrapper<object | null | undefined>,
-            iteratee: string,
-            depth?: number
-        ): LoDashImplicitWrapper<any[]>;
-
-        /**
-         * @see _.flatMapDepth
-         */
-        flatMapDepth(
-            this: LoDashImplicitWrapper<object | null | undefined>,
-            iteratee: object,
-            depth?: number
-        ): LoDashImplicitWrapper<boolean[]>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.flatMapDepth
-         */
-        flatMapDepth<T>(
-            this: LoDashExplicitWrapper<List<ListOfRecursiveArraysOrValues<T> | T> | Dictionary<ListOfRecursiveArraysOrValues<T> | T> | NumericDictionary<ListOfRecursiveArraysOrValues<T> | T> | null | undefined>
-        ): LoDashExplicitWrapper<T[]>;
-
-        /**
-         * @see _.flatMapDepth
-         */
-        flatMapDepth<T, TResult>(
-            this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            iteratee: ListIterator<T, ListOfRecursiveArraysOrValues<TResult> | TResult>,
-            depth?: number
-        ): LoDashExplicitWrapper<TResult[]>;
-
-        /**
-         * @see _.flatMapDepth
-         */
-        flatMapDepth<T, TResult>(
-            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
-            iteratee: NumericDictionaryIterator<T, ListOfRecursiveArraysOrValues<TResult> | TResult>,
-            depth?: number
-        ): LoDashExplicitWrapper<TResult[]>;
-
-        /**
-         * @see _.flatMapDepth
-         */
-        flatMapDepth<T extends object, TResult>(
-            this: LoDashExplicitWrapper<T | null | undefined>,
-            iteratee: ObjectIterator<T, ListOfRecursiveArraysOrValues<TResult> | TResult>,
-            depth?: number
-        ): LoDashExplicitWrapper<TResult[]>;
-
-        /**
-         * @see _.flatMapDepth
-         */
-        flatMapDepth(
-            this: LoDashExplicitWrapper<object | null | undefined>,
-            iteratee: string,
-            depth?: number
-        ): LoDashExplicitWrapper<any[]>;
-
-        /**
-         * @see _.flatMapDepth
-         */
-        flatMapDepth(
-            this: LoDashExplicitWrapper<object | null | undefined>,
-            iteratee: object,
-            depth?: number
-        ): LoDashExplicitWrapper<boolean[]>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/collection/forEach.d.ts b/types/lodash/collection/forEach.d.ts
deleted file mode 100644
index 74c0b38cde..0000000000
--- a/types/lodash/collection/forEach.d.ts
+++ /dev/null
@@ -1,113 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Iterates over elements of collection invoking iteratee for each element. The iteratee is bound to thisArg
-         * and invoked with three arguments:
-         * (value, index|key, collection). Iteratee functions may exit iteration early by explicitly returning false.
-         *
-         * Note: As with other "Collections" methods, objects with a "length" property are iterated like arrays. To
-         * avoid this behavior _.forIn or _.forOwn may be used for object iteration.
-         *
-         * @alias _.each
-         *
-         * @param collection The collection to iterate over.
-         * @param iteratee The function invoked per iteration.
-         * @param thisArg The this binding of iteratee.
-         */
-        forEach<T>(
-            collection: T[],
-            iteratee?: ArrayIterator<T, any>
-        ): T[];
-
-        /**
-         * @see _.forEach
-         */
-        forEach(
-            collection: string,
-            iteratee?: StringIterator<any>
-        ): string;
-
-        /**
-         * @see _.forEach
-         */
-        forEach<T>(
-            collection: List<T>,
-            iteratee?: ListIterator<T, any>
-        ): List<T>;
-
-        /**
-         * @see _.forEach
-         */
-        forEach<T extends object>(
-            collection: T,
-            iteratee?: ObjectIterator<T, any>
-        ): T;
-
-        /**
-         * @see _.forEach
-         */
-        forEach<T, TArray extends T[] | null | undefined>(
-            collection: TArray & (T[] | null | undefined),
-            iteratee?: ArrayIterator<T, any>
-        ): TArray;
-
-        /**
-         * @see _.forEach
-         */
-        forEach<TString extends string | null | undefined>(
-            collection: TString,
-            iteratee?: StringIterator<any>
-        ): TString;
-
-        /**
-         * @see _.forEach
-         */
-        forEach<T, TList extends List<T> | null | undefined>(
-            collection: TList & (List<T> | null | undefined),
-            iteratee?: ListIterator<T, any>
-        ): TList;
-
-        /**
-         * @see _.forEach
-         */
-        forEach<T extends object>(
-            collection: T | null | undefined,
-            iteratee?: ObjectIterator<T, any>
-        ): T | null | undefined;
-    }
-
-    interface LoDashWrapper<TValue> {
-        /**
-         * @see _.forEach
-         */
-        forEach<T>(
-            this: LoDashWrapper<T[] | null | undefined>,
-            iteratee?: ArrayIterator<T, any>
-        ): this;
-
-        /**
-         * @see _.forEach
-         */
-        forEach(
-            this: LoDashWrapper<string | null | undefined>,
-            iteratee?: StringIterator<any>
-        ): this;
-
-        /**
-         * @see _.forEach
-         */
-        forEach<T>(
-            this: LoDashWrapper<List<T> | null | undefined>,
-            iteratee?: ListIterator<T, any>
-        ): this;
-
-        /**
-         * @see _.forEach
-         */
-        forEach<T extends object>(
-            this: LoDashWrapper<T | null | undefined>,
-            iteratee?: ObjectIterator<T, any>
-        ): this;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/collection/forEachRight.d.ts b/types/lodash/collection/forEachRight.d.ts
deleted file mode 100644
index dd01aa969a..0000000000
--- a/types/lodash/collection/forEachRight.d.ts
+++ /dev/null
@@ -1,108 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * This method is like _.forEach except that it iterates over elements of collection from right to left.
-         *
-         * @alias _.eachRight
-         *
-         * @param collection The collection to iterate over.
-         * @param iteratee The function called per iteration.
-         * @param thisArg The this binding of callback.
-         */
-        forEachRight<T>(
-            collection: T[],
-            iteratee?: ArrayIterator<T, any>
-        ): T[];
-
-        /**
-         * @see _.forEachRight
-         */
-        forEachRight(
-            collection: string,
-            iteratee?: StringIterator<any>
-        ): string;
-
-        /**
-         * @see _.forEachRight
-         */
-        forEachRight<T>(
-            collection: List<T>,
-            iteratee?: ListIterator<T, any>
-        ): List<T>;
-
-        /**
-         * @see _.forEachRight
-         */
-        forEachRight<T extends object>(
-            collection: T,
-            iteratee?: ObjectIterator<T, any>
-        ): T;
-
-        /**
-         * @see _.forEachRight
-         */
-        forEachRight<T, TArray extends T[] | null | undefined>(
-            collection: TArray & (T[] | null | undefined),
-            iteratee?: ArrayIterator<T, any>
-        ): TArray;
-
-        /**
-         * @see _.forEachRight
-         */
-        forEachRight<TString extends string | null | undefined>(
-            collection: TString,
-            iteratee?: StringIterator<any>
-        ): TString;
-
-        /**
-         * @see _.forEachRight
-         */
-        forEachRight<T, TList extends List<T> | null | undefined>(
-            collection: TList & (List<T> | null | undefined),
-            iteratee?: ListIterator<T, any>
-        ): TList;
-
-        /**
-         * @see _.forEachRight
-         */
-        forEachRight<T extends object>(
-            collection: T | null | undefined,
-            iteratee?: ObjectIterator<T, any>
-        ): T | null | undefined;
-    }
-
-    interface LoDashWrapper<TValue> {
-        /**
-         * @see _.forEachRight
-         */
-        forEachRight<T>(
-            this: LoDashWrapper<T[] | null | undefined>,
-            iteratee?: ArrayIterator<T, any>
-        ): this;
-
-        /**
-         * @see _.forEachRight
-         */
-        forEachRight(
-            this: LoDashWrapper<string | null | undefined>,
-            iteratee?: StringIterator<any>
-        ): this;
-
-        /**
-         * @see _.forEachRight
-         */
-        forEachRight<T>(
-            this: LoDashWrapper<List<T> | null | undefined>,
-            iteratee?: ListIterator<T, any>
-        ): this;
-
-        /**
-         * @see _.forEachRight
-         */
-        forEachRight<T extends object>(
-            this: LoDashWrapper<T | null | undefined>,
-            iteratee?: ObjectIterator<T, any>
-        ): this;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/collection/groupBy.d.ts b/types/lodash/collection/groupBy.d.ts
deleted file mode 100644
index 714729181b..0000000000
--- a/types/lodash/collection/groupBy.d.ts
+++ /dev/null
@@ -1,121 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Creates an object composed of keys generated from the results of running each element of collection through
-         * iteratee. The corresponding value of each key is an array of the elements responsible for generating the
-         * key. The iteratee is bound to thisArg and invoked with three arguments:
-         * (value, index|key, collection).
-         *
-         * If a property name is provided for iteratee the created _.property style callback returns the property
-         * value of the given element.
-         *
-         * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-         * elements that have a matching property value, else false.
-         *
-         * If an object is provided for iteratee the created _.matches style callback returns true for elements that
-         * have the properties of the given object, else false.
-         *
-         * @param collection The collection to iterate over.
-         * @param iteratee The function invoked per iteration.
-         * @param thisArg The this binding of iteratee.
-         * @return Returns the composed aggregate object.
-         */
-        groupBy(
-            collection: string | null | undefined,
-            iteratee?: StringIterator<NotVoid>
-        ): Dictionary<string[]>;
-
-        /**
-         * @see _.groupBy
-         */
-        groupBy<T>(
-            collection: List<T> | null | undefined,
-            iteratee?: ListIteratee<T>
-        ): Dictionary<T[]>;
-
-        /**
-         * @see _.groupBy
-         */
-        groupBy<T>(
-            collection: NumericDictionary<T> | null | undefined,
-            iteratee?: NumericDictionaryIteratee<T>
-        ): Dictionary<T[]>;
-
-        /**
-         * @see _.groupBy
-         */
-        groupBy<T extends object>(
-            collection: T | null | undefined,
-            iteratee?: ObjectIteratee<T>
-        ): Dictionary<Array<T[keyof T]>>;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.groupBy
-         */
-        groupBy(
-            this: LoDashImplicitWrapper<string | null | undefined>,
-            iteratee?: StringIterator<NotVoid>
-        ): LoDashImplicitWrapper<Dictionary<string[]>>;
-
-        /**
-         * @see _.groupBy
-         */
-        groupBy<T>(
-            this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            iteratee?: ListIteratee<T>
-        ): LoDashImplicitWrapper<Dictionary<T[]>>;
-
-        /**
-         * @see _.groupBy
-         */
-        groupBy<T extends object>(
-            this: LoDashImplicitWrapper<T | null | undefined>,
-            iteratee?: ObjectIteratee<T>
-        ): LoDashImplicitWrapper<Dictionary<Array<T[keyof T]>>>;
-
-        /**
-         * @see _.groupBy
-         */
-        groupBy<T>(
-            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
-            iteratee?: NumericDictionaryIteratee<T>
-        ): LoDashImplicitWrapper<Dictionary<T[]>>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.groupBy
-         */
-        groupBy(
-            this: LoDashExplicitWrapper<string | null | undefined>,
-            iteratee?: StringIterator<NotVoid>
-        ): LoDashExplicitWrapper<Dictionary<string[]>>;
-
-        /**
-         * @see _.groupBy
-         */
-        groupBy<T>(
-            this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            iteratee?: ListIteratee<T>
-        ): LoDashExplicitWrapper<Dictionary<T[]>>;
-
-        /**
-         * @see _.groupBy
-         */
-        groupBy<T>(
-            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
-            iteratee?: NumericDictionaryIteratee<T>
-        ): LoDashExplicitWrapper<Dictionary<T[]>>;
-
-        /**
-         * @see _.groupBy
-         */
-        groupBy<T extends object>(
-            this: LoDashExplicitWrapper<T | null | undefined>,
-            iteratee?: ObjectIteratee<T>
-        ): LoDashExplicitWrapper<Dictionary<Array<T[keyof T]>>>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/collection/includes.d.ts b/types/lodash/collection/includes.d.ts
deleted file mode 100644
index 87eda4e44a..0000000000
--- a/types/lodash/collection/includes.d.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Checks if target is in collection using SameValueZero for equality comparisons. If fromIndex is negative,
-         * it’s used as the offset from the end of collection.
-         *
-         * @param collection The collection to search.
-         * @param target The value to search for.
-         * @param fromIndex The index to search from.
-         * @return True if the target element is found, else false.
-         */
-        includes<T>(
-            collection: List<T>|Dictionary<T> | null | undefined,
-            target: T,
-            fromIndex?: number
-        ): boolean;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.includes
-         */
-        includes<T>(
-            this: LoDashImplicitWrapper<List<T> | Dictionary<T> | null | undefined>,
-            target: T,
-            fromIndex?: number
-        ): boolean;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.includes
-         */
-        includes<T>(
-            this: LoDashExplicitWrapper<List<T> | Dictionary<T> | null | undefined>,
-            target: T,
-            fromIndex?: number
-        ): LoDashExplicitWrapper<boolean>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/collection/invokeMap.d.ts b/types/lodash/collection/invokeMap.d.ts
deleted file mode 100644
index 99711b4e5f..0000000000
--- a/types/lodash/collection/invokeMap.d.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-        * Invokes the method named by methodName on each element in the collection returning
-        * an array of the results of each invoked method. Additional arguments will be provided
-        * to each invoked method. If methodName is a function it will be invoked for, and this
-        * bound to, each element in the collection.
-        * @param collection The collection to iterate over.
-        * @param methodName The name of the method to invoke.
-        * @param args Arguments to invoke the method with.
-        **/
-        invokeMap(
-            collection: object | null | undefined,
-            methodName: string,
-            ...args: any[]): any[];
-
-        /**
-        * @see _.invokeMap
-        **/
-        invokeMap<TResult>(
-            collection: object | null | undefined,
-            method: (...args: any[]) => TResult,
-            ...args: any[]): TResult[];
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-        * @see _.invokeMap
-        **/
-        invokeMap(
-            methodName: string,
-            ...args: any[]): LoDashImplicitWrapper<any[]>;
-
-        /**
-        * @see _.invokeMap
-        **/
-        invokeMap<TResult>(
-            method: (...args: any[]) => TResult,
-            ...args: any[]): LoDashImplicitWrapper<TResult[]>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-        * @see _.invokeMap
-        **/
-        invokeMap(
-            methodName: string,
-            ...args: any[]): LoDashExplicitWrapper<any[]>;
-
-        /**
-        * @see _.invokeMap
-        **/
-        invokeMap<TResult>(
-            method: (...args: any[]) => TResult,
-            ...args: any[]): LoDashExplicitWrapper<TResult[]>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/collection/keyBy.d.ts b/types/lodash/collection/keyBy.d.ts
deleted file mode 100644
index f9ba2e24b5..0000000000
--- a/types/lodash/collection/keyBy.d.ts
+++ /dev/null
@@ -1,121 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Creates an object composed of keys generated from the results of running each element of collection through
-         * iteratee. The corresponding value of each key is the last element responsible for generating the key. The
-         * iteratee function is bound to thisArg and invoked with three arguments:
-         * (value, index|key, collection).
-         *
-         * If a property name is provided for iteratee the created _.property style callback returns the property
-         * value of the given element.
-         *
-         * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-         * elements that have a matching property value, else false.
-         *
-         * If an object is provided for iteratee the created _.matches style callback returns true for elements that
-         * have the properties of the given object, else false.
-         *
-         * @param collection The collection to iterate over.
-         * @param iteratee The function invoked per iteration.
-         * @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?: ListIterateeCustom<T, PropertyName>
-        ): Dictionary<T>;
-
-        /**
-         * @see _.keyBy
-         */
-        keyBy<T extends object>(
-            collection: T | null | undefined,
-            iteratee?: ObjectIterateeCustom<T, PropertyName>
-        ): Dictionary<T[keyof T]>;
-
-        /**
-         * @see _.keyBy
-         */
-        keyBy<T>(
-            collection: NumericDictionary<T> | null | undefined,
-            iteratee?: NumericDictionaryIterateeCustom<T, PropertyName>
-        ): Dictionary<T>;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @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?: ListIterateeCustom<T, PropertyName>
-        ): LoDashImplicitWrapper<Dictionary<T>>;
-
-        /**
-         * @see _.keyBy
-         */
-        keyBy<T extends object>(
-            this: LoDashImplicitWrapper<T | null | undefined>,
-            iteratee?: ObjectIterateeCustom<T, PropertyName>
-        ): LoDashImplicitWrapper<Dictionary<T[keyof T]>>;
-
-        /**
-         * @see _.keyBy
-         */
-        keyBy<T>(
-            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
-            iteratee?: NumericDictionaryIterateeCustom<T, PropertyName>
-        ): LoDashImplicitWrapper<Dictionary<T>>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @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?: ListIterateeCustom<T, PropertyName>
-        ): LoDashExplicitWrapper<Dictionary<T>>;
-
-        /**
-         * @see _.keyBy
-         */
-        keyBy<T extends object>(
-            this: LoDashExplicitWrapper<T | null | undefined>,
-            iteratee?: ObjectIterateeCustom<T, PropertyName>
-        ): LoDashExplicitWrapper<Dictionary<T[keyof T]>>;
-
-        /**
-         * @see _.keyBy
-         */
-        keyBy<T>(
-            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
-            iteratee?: NumericDictionaryIterateeCustom<T, PropertyName>
-        ): LoDashExplicitWrapper<Dictionary<T>>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/collection/map.d.ts b/types/lodash/collection/map.d.ts
deleted file mode 100644
index 4a90aaf95d..0000000000
--- a/types/lodash/collection/map.d.ts
+++ /dev/null
@@ -1,180 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Creates an array of values by running each element in collection through iteratee. The iteratee is bound to
-         * thisArg and invoked with three arguments: (value, index|key, collection).
-         *
-         * If a property name is provided for iteratee the created _.property style callback returns the property value
-         * of the given element.
-         *
-         * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-         * elements that have a matching property value, else false.
-         *
-         * If an object is provided for iteratee the created _.matches style callback returns true for elements that
-         * have the properties of the given object, else false.
-         *
-         * Many lodash methods are guarded to work as iteratees for methods like _.every, _.filter, _.map, _.mapValues,
-         * _.reject, and _.some.
-         *
-         * The guarded methods are:
-         * ary, callback, chunk, clone, create, curry, curryRight, drop, dropRight, every, fill, flatten, invert, max,
-         * min, parseInt, slice, sortBy, take, takeRight, template, trim, trimLeft, trimRight, trunc, random, range,
-         * sample, some, sum, uniq, and words
-         *
-         * @param collection The collection to iterate over.
-         * @param iteratee The function invoked per iteration.
-         * @param thisArg The this binding of iteratee.
-         * @return Returns the new mapped array.
-         */
-        map<T, TResult>(
-            collection: List<T> | null | undefined,
-            iteratee: ListIterator<T, TResult>
-        ): TResult[];
-
-        /**
-         * @see _.map
-         */
-        map<T>(collection: List<T> | Dictionary<T> | null | undefined): T[];
-
-        /**
-         * @see _.map
-         */
-        map<T, TResult>(
-            collection: Dictionary<T> | null | undefined,
-            iteratee: DictionaryIterator<T, TResult>
-        ): TResult[];
-
-        /** @see _.map */
-        map<T, K extends keyof T>(
-            collection: List<T> | Dictionary<T> | null | undefined,
-            iteratee: K
-        ): Array<T[K]>;
-
-        /** @see _.map */
-        map<T, TResult>(
-            collection: NumericDictionary<T> | null | undefined,
-            iteratee?: NumericDictionaryIterator<T, TResult>
-        ): TResult[];
-
-        /**
-         * @see _.map
-         */
-        map<T, TResult>(
-            collection: List<T>|Dictionary<T>|NumericDictionary<T> | null | undefined,
-            iteratee?: string
-        ): TResult[];
-
-        /**
-         * @see _.map
-         */
-        map<T>(
-            collection: List<T>|Dictionary<T>|NumericDictionary<T> | null | undefined,
-            iteratee?: object
-        ): boolean[];
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.map
-         */
-        map<T, TResult>(
-            this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            iteratee: ListIterator<T, TResult>
-        ): LoDashImplicitWrapper<TResult[]>;
-
-        /**
-         * @see _.map
-         */
-        map<T>(this: LoDashImplicitWrapper<List<T> | Dictionary<T> | null | undefined>): LoDashImplicitWrapper<T[]>;
-
-        /**
-         * @see _.map
-         */
-        map<T, TResult>(
-            this: LoDashImplicitWrapper<Dictionary<T> | null | undefined>,
-            iteratee: DictionaryIterator<T, TResult>
-        ): LoDashImplicitWrapper<TResult[]>;
-
-        /** @see _.map */
-        map<T, K extends keyof T>(
-            this: LoDashImplicitWrapper<List<T> | Dictionary<T> | null | undefined>,
-            iteratee: K
-        ): LoDashImplicitWrapper<Array<T[K]>>;
-
-        /** @see _.map */
-        map<T, TResult>(
-            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
-            iteratee?: NumericDictionaryIterator<T, TResult>
-        ): LoDashImplicitWrapper<TResult[]>;
-
-        /**
-         * @see _.map
-         */
-        map<T, TResult>(
-            this: LoDashImplicitWrapper<List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined>,
-            iteratee?: string
-        ): LoDashImplicitWrapper<TResult[]>;
-
-        /**
-         * @see _.map
-         */
-        map<T>(
-            this: LoDashImplicitWrapper<List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined>,
-            iteratee?: object
-        ): LoDashImplicitWrapper<boolean[]>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.map
-         */
-        map<T, TResult>(
-            this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            iteratee: ListIterator<T, TResult>
-        ): LoDashExplicitWrapper<TResult[]>;
-
-        /**
-         * @see _.map
-         */
-        map<T>(this: LoDashExplicitWrapper<List<T> | Dictionary<T> | null | undefined>): LoDashExplicitWrapper<T[]>;
-
-        /**
-         * @see _.map
-         */
-        map<T, TResult>(
-            this: LoDashExplicitWrapper<Dictionary<T> | null | undefined>,
-            iteratee: DictionaryIterator<T, TResult>
-        ): LoDashExplicitWrapper<TResult[]>;
-
-        /** @see _.map */
-        map<T, K extends keyof T>(
-            this: LoDashExplicitWrapper<List<T> | Dictionary<T> | null | undefined>,
-            iteratee: K
-        ): LoDashExplicitWrapper<Array<T[K]>>;
-
-        /**
-         * @see _.map
-         */
-        map<T, TResult>(
-            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
-            iteratee?: NumericDictionaryIterator<T, TResult>
-        ): LoDashExplicitWrapper<TResult[]>;
-
-        /**
-         * @see _.map
-         */
-        map<T, TResult>(
-            this: LoDashExplicitWrapper<List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined>,
-            iteratee?: string
-        ): LoDashExplicitWrapper<TResult[]>;
-
-        /**
-         * @see _.map
-         */
-        map<T>(
-            this: LoDashExplicitWrapper<List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined>,
-            iteratee?: object
-        ): LoDashExplicitWrapper<boolean[]>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/collection/orderBy.d.ts b/types/lodash/collection/orderBy.d.ts
deleted file mode 100644
index a8950959de..0000000000
--- a/types/lodash/collection/orderBy.d.ts
+++ /dev/null
@@ -1,192 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * This method is like `_.sortBy` except that it allows specifying the sort
-         * orders of the iteratees to sort by. If `orders` is unspecified, all values
-         * are sorted in ascending order. Otherwise, specify an order of "desc" for
-         * descending or "asc" for ascending sort order of corresponding values.
-         *
-         * @category Collection
-         * @param collection The collection to iterate over.
-         * @param [iteratees=[_.identity]] The iteratees to sort by.
-         * @param [orders] The sort orders of `iteratees`.
-         * @param- {Object} [guard] Enables use as an iteratee for functions like `_.reduce`.
-         * @returns Returns the new sorted array.
-         * @example
-         *
-         * var users = [
-         *   { 'user': 'fred',   'age': 48 },
-         *   { 'user': 'barney', 'age': 34 },
-         *   { 'user': 'fred',   'age': 42 },
-         *   { 'user': 'barney', 'age': 36 }
-         * ];
-         *
-         * // sort by `user` in ascending order and by `age` in descending order
-         * _.orderBy(users, ['user', 'age'], ['asc', 'desc']);
-         * // => objects for [['barney', 36], ['barney', 34], ['fred', 48], ['fred', 42]]
-         */
-        orderBy<T>(
-            collection: List<T> | null | undefined,
-            iteratees?: Many<ListIterator<T, NotVoid>>,
-            orders?: Many<boolean|string>
-        ): T[];
-
-        /**
-         * @see _.orderBy
-         */
-        orderBy<T>(
-            collection: List<T> | null | undefined,
-            iteratees?: Many<ListIteratee<T>>,
-            orders?: Many<boolean|string>
-        ): T[];
-
-        /**
-         * @see _.orderBy
-         */
-        orderBy<T extends object>(
-            collection: T | null | undefined,
-            iteratees?: Many<ObjectIterator<T, NotVoid>>,
-            orders?: Many<boolean|string>
-        ): Array<T[keyof T]>;
-
-        /**
-         * @see _.orderBy
-         */
-        orderBy<T extends object>(
-            collection: T | null | undefined,
-            iteratees?: Many<ObjectIteratee<T>>,
-            orders?: Many<boolean|string>
-        ): Array<T[keyof T]>;
-
-        /**
-         * @see _.orderBy
-         */
-        orderBy<T>(
-            collection: NumericDictionary<T> | null | undefined,
-            iteratees?: Many<NumericDictionaryIterator<T, NotVoid>>,
-            orders?: Many<boolean|string>
-        ): T[];
-
-        /**
-         * @see _.orderBy
-         */
-        orderBy<T>(
-            collection: NumericDictionary<T> | null | undefined,
-            iteratees?: Many<NumericDictionaryIteratee<T>>,
-            orders?: Many<boolean|string>
-        ): T[];
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.orderBy
-         */
-        orderBy<T>(
-            this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            iteratees?: Many<ListIterator<T, NotVoid>>,
-            orders?: Many<boolean|string>
-        ): LoDashImplicitWrapper<T[]>;
-
-        /**
-         * @see _.orderBy
-         */
-        orderBy<T>(
-            this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            iteratees?: Many<ListIteratee<T>>,
-            orders?: Many<boolean|string>
-        ): LoDashImplicitWrapper<T[]>;
-
-        /**
-         * @see _.orderBy
-         */
-        orderBy<T extends object>(
-            this: LoDashImplicitWrapper<T | null | undefined>,
-            iteratees?: Many<ObjectIterator<T, NotVoid>>,
-            orders?: Many<boolean|string>
-        ): LoDashImplicitWrapper<Array<T[keyof T]>>;
-
-        /**
-         * @see _.orderBy
-         */
-        orderBy<T extends object>(
-            this: LoDashImplicitWrapper<T | null | undefined>,
-            iteratees?: Many<ObjectIteratee<T>>,
-            orders?: Many<boolean|string>
-        ): LoDashImplicitWrapper<Array<T[keyof T]>>;
-
-        /**
-         * @see _.orderBy
-         */
-        orderBy<T>(
-            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
-            iteratees?: Many<NumericDictionaryIterator<T, NotVoid>>,
-            orders?: Many<boolean|string>
-        ): LoDashImplicitWrapper<T[]>;
-
-        /**
-         * @see _.orderBy
-         */
-        orderBy<T>(
-            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
-            iteratees?: Many<NumericDictionaryIteratee<T>>,
-            orders?: Many<boolean|string>
-        ): LoDashImplicitWrapper<T[]>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.orderBy
-         */
-        orderBy<T>(
-            this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            iteratees?: Many<ListIterator<T, NotVoid>>,
-            orders?: Many<boolean|string>
-        ): LoDashExplicitWrapper<T[]>;
-
-        /**
-         * @see _.orderBy
-         */
-        orderBy<T>(
-            this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            iteratees?: Many<ListIteratee<T>>,
-            orders?: Many<boolean|string>
-        ): LoDashExplicitWrapper<T[]>;
-
-        /**
-         * @see _.orderBy
-         */
-        orderBy<T extends object>(
-            this: LoDashExplicitWrapper<T | null | undefined>,
-            iteratees?: Many<ObjectIterator<T, NotVoid>>,
-            orders?: Many<boolean|string>
-        ): LoDashExplicitWrapper<Array<T[keyof T]>>;
-
-        /**
-         * @see _.orderBy
-         */
-        orderBy<T extends object>(
-            this: LoDashExplicitWrapper<T | null | undefined>,
-            iteratees?: Many<ObjectIteratee<T>>,
-            orders?: Many<boolean|string>
-        ): LoDashExplicitWrapper<Array<T[keyof T]>>;
-
-        /**
-         * @see _.orderBy
-         */
-        orderBy<T>(
-            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
-            iteratees?: Many<NumericDictionaryIterator<T, NotVoid>>,
-            orders?: Many<boolean|string>
-        ): LoDashExplicitWrapper<T[]>;
-
-        /**
-         * @see _.orderBy
-         */
-        orderBy<T>(
-            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
-            iteratees?: Many<NumericDictionaryIteratee<T>>,
-            orders?: Many<boolean|string>
-        ): LoDashExplicitWrapper<T[]>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/collection/partition.d.ts b/types/lodash/collection/partition.d.ts
deleted file mode 100644
index f372f0708d..0000000000
--- a/types/lodash/collection/partition.d.ts
+++ /dev/null
@@ -1,72 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-        * Creates an array of elements split into two groups, the first of which contains elements predicate returns truthy for,
-        * while the second of which contains elements predicate returns falsey for.
-        * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
-        *
-        * If a property name is provided for predicate the created _.property style callback
-        * returns the property value of the given element.
-        *
-        * If a value is also provided for thisArg the created _.matchesProperty style callback
-        * returns true for elements that have a matching property value, else false.
-        *
-        * If an object is provided for predicate the created _.matches style callback returns
-        * true for elements that have the properties of the given object, else false.
-        *
-        * @param collection The collection to iterate over.
-        * @param callback The function called per iteration.
-        * @param thisArg The this binding of predicate.
-        * @return Returns the array of grouped elements.
-        **/
-        partition<T>(
-            collection: List<T> | null | undefined,
-            callback: ValueIteratee<T>
-        ): [T[], T[]];
-
-        /**
-         * @see _.partition
-         */
-        partition<T extends object>(
-            collection: T | null | undefined,
-            callback: ValueIteratee<T[keyof T]>
-        ): [Array<T[keyof T]>, Array<T[keyof T]>];
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.partition
-         */
-        partition<T>(
-            this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            callback: ValueIteratee<T>
-        ): LoDashImplicitWrapper<[T[], T[]]>;
-
-        /**
-         * @see _.partition
-         */
-        partition<T>(
-            this: LoDashImplicitWrapper<T | null | undefined>,
-            callback: ValueIteratee<T[keyof T]>
-        ): LoDashImplicitWrapper<[Array<T[keyof T]>, Array<T[keyof T]>]>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.partition
-         */
-        partition<T>(
-            this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            callback: ValueIteratee<T>
-        ): LoDashExplicitWrapper<[T[], T[]]>;
-
-        /**
-         * @see _.partition
-         */
-        partition<T>(
-            this: LoDashExplicitWrapper<T | null | undefined>,
-            callback: ValueIteratee<T[keyof T]>
-        ): LoDashExplicitWrapper<[Array<T[keyof T]>, Array<T[keyof T]>]>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/collection/reduce.d.ts b/types/lodash/collection/reduce.d.ts
deleted file mode 100644
index 2346225d60..0000000000
--- a/types/lodash/collection/reduce.d.ts
+++ /dev/null
@@ -1,220 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-        * Reduces a collection to a value which is the accumulated result of running each
-        * element in the collection through the callback, where each successive callback execution
-        * consumes the return value of the previous execution. If accumulator is not provided the
-        * first element of the collection will be used as the initial accumulator value. The callback
-        * is bound to thisArg and invoked with four arguments; (accumulator, value, index|key, collection).
-        * @param collection The collection to iterate over.
-        * @param callback The function called per iteration.
-        * @param accumulator Initial value of the accumulator.
-        * @return Returns the accumulated value.
-        **/
-        reduce<T, TResult>(
-            collection: T[] | null | undefined,
-            callback: MemoListIterator<T, TResult, T[]>,
-            accumulator: TResult
-        ): TResult;
-
-        /**
-        * @see _.reduce
-        **/
-        reduce<T, TResult>(
-            collection: List<T> | null | undefined,
-            callback: MemoListIterator<T, TResult, List<T>>,
-            accumulator: TResult
-        ): TResult;
-
-        /**
-        * @see _.reduce
-        **/
-        reduce<T extends object, TResult>(
-            collection: T | null | undefined,
-            callback: MemoObjectIterator<T[keyof T], TResult, T>,
-            accumulator: TResult
-        ): TResult;
-
-        /**
-        * @see _.reduce
-        **/
-        reduce<T, TResult>(
-            collection: NumericDictionary<T> | null | undefined,
-            callback: MemoListIterator<T, TResult, NumericDictionary<T>>,
-            accumulator: TResult
-        ): TResult;
-
-        /**
-        * @see _.reduce
-        **/
-        reduce<T, TResult>(
-            collection: T[] | null | undefined,
-            callback: MemoListIterator<T, TResult, T[]>
-        ): TResult | undefined;
-
-        /**
-         * @see _.reduce
-         **/
-        reduce<T, TResult>(
-            collection: List<T> | null | undefined,
-            callback: MemoListIterator<T, TResult, List<T>>
-        ): TResult | undefined;
-
-        /**
-        * @see _.reduce
-        **/
-        reduce<T extends object, TResult>(
-            collection: T | null | undefined,
-            callback: MemoObjectIterator<T[keyof T], TResult, T>
-        ): TResult | undefined;
-
-        /**
-         * @see _.reduce
-         **/
-        reduce<T, TResult>(
-            collection: NumericDictionary<T> | null | undefined,
-            callback: MemoListIterator<T, TResult, NumericDictionary<T>>
-        ): TResult | undefined;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-         /**
-        * @see _.reduce
-        **/
-        reduce<T, TResult>(
-            this: LoDashImplicitWrapper<T[] | null | undefined>,
-            callback: MemoListIterator<T, TResult, T[]>,
-            accumulator: TResult
-        ): TResult;
-
-        /**
-         * @see _.reduce
-         **/
-        reduce<T, TResult>(
-            this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            callback: MemoListIterator<T, TResult, List<T>>,
-            accumulator: TResult
-        ): TResult;
-
-        /**
-        * @see _.reduce
-        **/
-        reduce<T extends object, TResult>(
-            this: LoDashImplicitWrapper<T | null | undefined>,
-            callback: MemoObjectIterator<T[keyof T], TResult, T>,
-            accumulator: TResult
-        ): TResult;
-
-        /**
-         * @see _.reduce
-         **/
-        reduce<T, TResult>(
-            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
-            callback: MemoListIterator<T, TResult, NumericDictionary<T>>,
-            accumulator: TResult
-        ): TResult;
-
-        /**
-        * @see _.reduce
-        **/
-        reduce<T, TResult>(
-            this: LoDashImplicitWrapper<T[] | null | undefined>,
-            callback: MemoListIterator<T, TResult, T[]>
-        ): TResult | undefined;
-
-        /**
-        * @see _.reduce
-        **/
-        reduce<T, TResult>(
-            this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            callback: MemoListIterator<T, TResult, List<T>>
-        ): TResult | undefined;
-
-        /**
-        * @see _.reduce
-        **/
-        reduce<T extends object, TResult>(
-            this: LoDashImplicitWrapper<T | null | undefined>,
-            callback: MemoObjectIterator<T[keyof T], TResult, T>
-        ): TResult | undefined;
-
-        /**
-        * @see _.reduce
-        **/
-        reduce<T, TResult>(
-            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
-            callback: MemoListIterator<T, TResult, NumericDictionary<T>>
-        ): TResult | undefined;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-        * @see _.reduce
-        **/
-        reduce<T, TResult>(
-            this: LoDashExplicitWrapper<T[] | null | undefined>,
-            callback: MemoListIterator<T, TResult, T[]>,
-            accumulator: TResult
-        ): LoDashExplicitWrapper<TResult>;
-
-        /**
-        * @see _.reduce
-        **/
-        reduce<T, TResult>(
-            this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            callback: MemoListIterator<T, TResult, List<T>>,
-            accumulator: TResult
-        ): LoDashExplicitWrapper<TResult>;
-
-        /**
-        * @see _.reduce
-        **/
-        reduce<T extends object, TResult>(
-            this: LoDashExplicitWrapper<T | null | undefined>,
-            callback: MemoObjectIterator<T[keyof T], TResult, T>,
-            accumulator: TResult
-        ): LoDashExplicitWrapper<TResult>;
-
-        /**
-        * @see _.reduce
-        **/
-        reduce<T, TResult>(
-            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
-            callback: MemoListIterator<T, TResult, NumericDictionary<T>>,
-            accumulator: TResult
-        ): LoDashExplicitWrapper<TResult>;
-
-        /**
-        * @see _.reduce
-        **/
-        reduce<T, TResult>(
-            this: LoDashExplicitWrapper<T[] | null | undefined>,
-            callback: MemoListIterator<T, TResult, T[]>
-        ): LoDashExplicitWrapper<TResult | undefined>;
-
-        /**
-        * @see _.reduce
-        **/
-        reduce<T, TResult>(
-            this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            callback: MemoListIterator<T, TResult, List<T>>
-        ): LoDashExplicitWrapper<TResult | undefined>;
-
-        /**
-        * @see _.reduce
-        **/
-        reduce<T extends object, TResult>(
-            this: LoDashExplicitWrapper<T | null | undefined>,
-            callback: MemoObjectIterator<T[keyof T], TResult, T>
-        ): LoDashExplicitWrapper<TResult | undefined>;
-
-        /**
-         * @see _.reduce
-         **/
-        reduce<T, TResult>(
-            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
-            callback: MemoListIterator<T, TResult, NumericDictionary<T>>
-        ): LoDashExplicitWrapper<TResult | undefined>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/collection/reduceRight.d.ts b/types/lodash/collection/reduceRight.d.ts
deleted file mode 100644
index a183708d45..0000000000
--- a/types/lodash/collection/reduceRight.d.ts
+++ /dev/null
@@ -1,217 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-        * This method is like _.reduce except that it iterates over elements of a collection from
-        * right to left.
-        * @param collection The collection to iterate over.
-        * @param callback The function called per iteration.
-        * @param accumulator Initial value of the accumulator.
-        * @return The accumulated value.
-        **/
-        reduceRight<T, TResult>(
-            collection: T[] | null | undefined,
-            callback: MemoListIterator<T, TResult, T[]>,
-            accumulator: TResult
-        ): TResult;
-
-        /**
-        * @see _.reduceRight
-        **/
-        reduceRight<T, TResult>(
-            collection: List<T> | null | undefined,
-            callback: MemoListIterator<T, TResult, List<T>>,
-            accumulator: TResult
-        ): TResult;
-
-        /**
-        * @see _.reduceRight
-        **/
-        reduceRight<T extends object, TResult>(
-            collection: T | null | undefined,
-            callback: MemoObjectIterator<T[keyof T], TResult, T>,
-            accumulator: TResult
-        ): TResult;
-
-        /**
-        * @see _.reduceRight
-        **/
-        reduceRight<T, TResult>(
-            collection: NumericDictionary<T> | null | undefined,
-            callback: MemoListIterator<T, TResult, NumericDictionary<T>>,
-            accumulator: TResult
-        ): TResult;
-
-        /**
-        * @see _.reduceRight
-        **/
-        reduceRight<T, TResult>(
-            collection: T[] | null | undefined,
-            callback: MemoListIterator<T, TResult, T[]>
-        ): TResult | undefined;
-
-        /**
-        * @see _.reduceRight
-        **/
-        reduceRight<T, TResult>(
-            collection: List<T> | null | undefined,
-            callback: MemoListIterator<T, TResult, List<T>>
-        ): TResult | undefined;
-
-        /**
-        * @see _.reduceRight
-        **/
-        reduceRight<T extends object, TResult>(
-            collection: T | null | undefined,
-            callback: MemoObjectIterator<T[keyof T], TResult, T>
-        ): TResult | undefined;
-
-        /**
-        * @see _.reduceRight
-        **/
-        reduceRight<T, TResult>(
-            collection: NumericDictionary<T> | null | undefined,
-            callback: MemoListIterator<T, TResult, NumericDictionary<T>>
-        ): TResult | undefined;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-         /**
-        * @see _.reduceRight
-        **/
-        reduceRight<T, TResult>(
-            this: LoDashImplicitWrapper<T[] | null | undefined>,
-            callback: MemoListIterator<T, TResult, T[]>,
-            accumulator: TResult
-        ): TResult;
-
-        /**
-        * @see _.reduceRight
-        **/
-        reduceRight<T, TResult>(
-            this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            callback: MemoListIterator<T, TResult, List<T>>,
-            accumulator: TResult
-        ): TResult;
-
-        /**
-        * @see _.reduceRight
-        **/
-        reduceRight<T extends object, TResult>(
-            this: LoDashImplicitWrapper<T | null | undefined>,
-            callback: MemoObjectIterator<T[keyof T], TResult, T>,
-            accumulator: TResult
-        ): TResult;
-
-        /**
-        * @see _.reduceRight
-        **/
-        reduceRight<T, TResult>(
-            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
-            callback: MemoListIterator<T, TResult, NumericDictionary<T>>,
-            accumulator: TResult
-        ): TResult;
-
-        /**
-        * @see _.reduceRight
-        **/
-        reduceRight<T, TResult>(
-            this: LoDashImplicitWrapper<T[] | null | undefined>,
-            callback: MemoListIterator<T, TResult, T[]>
-        ): TResult | undefined;
-
-        /**
-        * @see _.reduceRight
-        **/
-        reduceRight<T, TResult>(
-            this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            callback: MemoListIterator<T, TResult, List<T>>
-        ): TResult | undefined;
-
-        /**
-        * @see _.reduceRight
-        **/
-        reduceRight<T extends object, TResult>(
-            this: LoDashImplicitWrapper<T | null | undefined>,
-            callback: MemoObjectIterator<T[keyof T], TResult, T>
-        ): TResult | undefined;
-
-        /**
-        * @see _.reduceRight
-        **/
-        reduceRight<T, TResult>(
-            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
-            callback: MemoListIterator<T, TResult, NumericDictionary<T>>
-        ): TResult | undefined;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-        * @see _.reduceRight
-        **/
-        reduceRight<T, TResult>(
-            this: LoDashExplicitWrapper<T[] | null | undefined>,
-            callback: MemoListIterator<T, TResult, T[]>,
-            accumulator: TResult
-        ): LoDashExplicitWrapper<TResult>;
-
-        /**
-        * @see _.reduceRight
-        **/
-        reduceRight<T, TResult>(
-            this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            callback: MemoListIterator<T, TResult, List<T>>,
-            accumulator: TResult
-        ): LoDashExplicitWrapper<TResult>;
-
-        /**
-        * @see _.reduceRight
-        **/
-        reduceRight<T extends object, TResult>(
-            this: LoDashExplicitWrapper<T | null | undefined>,
-            callback: MemoObjectIterator<T[keyof T], TResult, T>,
-            accumulator: TResult
-        ): LoDashExplicitWrapper<TResult>;
-
-        /**
-        * @see _.reduceRight
-        **/
-        reduceRight<T, TResult>(
-            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
-            callback: MemoListIterator<T, TResult, NumericDictionary<T>>,
-            accumulator: TResult
-        ): LoDashExplicitWrapper<TResult>;
-
-        /**
-        * @see _.reduceRight
-        **/
-        reduceRight<T, TResult>(
-            this: LoDashExplicitWrapper<T[] | null | undefined>,
-            callback: MemoListIterator<T, TResult, T[]>
-        ): LoDashExplicitWrapper<TResult | undefined>;
-
-        /**
-        * @see _.reduceRight
-        **/
-        reduceRight<T, TResult>(
-            this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            callback: MemoListIterator<T, TResult, List<T>>
-        ): LoDashExplicitWrapper<TResult | undefined>;
-
-        /**
-        * @see _.reduceRight
-        **/
-        reduceRight<T extends object, TResult>(
-            this: LoDashExplicitWrapper<T | null | undefined>,
-            callback: MemoObjectIterator<T[keyof T], TResult, T>
-        ): LoDashExplicitWrapper<TResult | undefined>;
-
-        /**
-         * @see _.reduceRight
-         **/
-        reduceRight<T, TResult>(
-            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
-            callback: MemoListIterator<T, TResult, NumericDictionary<T>>
-        ): LoDashExplicitWrapper<TResult | undefined>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/collection/reject.d.ts b/types/lodash/collection/reject.d.ts
deleted file mode 100644
index d832f1ba14..0000000000
--- a/types/lodash/collection/reject.d.ts
+++ /dev/null
@@ -1,86 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * The opposite of _.filter; this method returns the elements of collection that predicate does not return
-         * truthy for.
-         *
-         * @param collection The collection to iterate over.
-         * @param predicate The function invoked per iteration.
-         * @param thisArg The this binding of predicate.
-         * @return Returns the new filtered array.
-         */
-        reject(
-            collection: string | null | undefined,
-            predicate?: StringIterator<boolean>
-        ): string[];
-
-        /**
-         * @see _.reject
-         */
-        reject<T>(
-            collection: List<T> | null | undefined,
-            predicate?: ListIterateeCustom<T, boolean>
-        ): T[];
-
-        /**
-         * @see _.reject
-         */
-        reject<T extends object>(
-            collection: T | null | undefined,
-            predicate?: ObjectIterateeCustom<T, boolean>
-        ): Array<T[keyof T]>;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.reject
-         */
-        reject(
-            this: LoDashImplicitWrapper<string | null | undefined>,
-            predicate?: StringIterator<boolean>
-        ): LoDashImplicitWrapper<string[]>;
-
-        /**
-         * @see _.reject
-         */
-        reject<T>(
-            this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            predicate?: ListIterateeCustom<T, boolean>
-        ): LoDashImplicitWrapper<T[]>;
-
-        /**
-         * @see _.reject
-         */
-        reject<T extends object>(
-            this: LoDashImplicitWrapper<T | null | undefined>,
-            predicate?: ObjectIterateeCustom<T, boolean>
-        ): LoDashImplicitWrapper<Array<T[keyof T]>>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.reject
-         */
-        reject(
-            this: LoDashExplicitWrapper<string | null | undefined>,
-            predicate?: StringIterator<boolean>
-        ): LoDashExplicitWrapper<string[]>;
-
-        /**
-         * @see _.reject
-         */
-        reject<T>(
-            this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            predicate?: ListIterateeCustom<T, boolean>
-        ): LoDashExplicitWrapper<T[]>;
-
-        /**
-         * @see _.reject
-         */
-        reject<T extends object>(
-            this: LoDashExplicitWrapper<T | null | undefined>,
-            predicate?: ObjectIterateeCustom<T, boolean>
-        ): LoDashExplicitWrapper<Array<T[keyof T]>>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/collection/sample.d.ts b/types/lodash/collection/sample.d.ts
deleted file mode 100644
index ccaa4e118b..0000000000
--- a/types/lodash/collection/sample.d.ts
+++ /dev/null
@@ -1,74 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Gets a random element from collection.
-         *
-         * @param collection The collection to sample.
-         * @return Returns the random element.
-         */
-        sample<T>(
-            collection: List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined
-        ): T | undefined;
-
-        /**
-         * @see _.sample
-         */
-        sample<T extends object>(
-            collection: T
-        ): T[keyof T];
-
-        /**
-         * @see _.sample
-         */
-        sample<T extends object>(
-            collection: T | null | undefined
-        ): T[keyof T] | undefined;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.sample
-         */
-        sample<T>(
-            this: LoDashImplicitWrapper<List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined>
-        ): T | undefined;
-
-        /**
-         * @see _.sample
-         */
-        sample<T extends object>(
-            this: LoDashImplicitWrapper<T>,
-        ): T[keyof T];
-
-        /**
-         * @see _.sample
-         */
-        sample<T extends object>(
-            this: LoDashImplicitWrapper<T | null | undefined>
-        ): T[keyof T] | undefined;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.sample
-         */
-        sample<T>(
-            this: LoDashExplicitWrapper<List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined>
-        ): LoDashExplicitWrapper<T | undefined>;
-
-        /**
-         * @see _.sample
-         */
-        sample<T extends object>(
-            this: LoDashExplicitWrapper<T>,
-        ): LoDashExplicitWrapper<T[keyof T]>;
-
-        /**
-         * @see _.sample
-         */
-        sample<T extends object>(
-            this: LoDashExplicitWrapper<T | null | undefined>
-        ): LoDashExplicitWrapper<T[keyof T] | undefined>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/collection/sampleSize.d.ts b/types/lodash/collection/sampleSize.d.ts
deleted file mode 100644
index bf620987d5..0000000000
--- a/types/lodash/collection/sampleSize.d.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Gets n random elements at unique keys from collection up to the size of collection.
-         *
-         * @param collection The collection to sample.
-         * @param n The number of elements to sample.
-         * @return Returns the random elements.
-         */
-        sampleSize<T>(
-            collection: List<T>|Dictionary<T>|NumericDictionary<T> | null | undefined,
-            n?: number
-        ): T[];
-
-        /**
-         * @see _.sampleSize
-         */
-        sampleSize<T extends object>(
-            collection: T | null | undefined,
-            n?: number
-        ): Array<T[keyof T]>;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.sampleSize
-         */
-        sampleSize<T>(
-            this: LoDashImplicitWrapper<List<T>|Dictionary<T>|NumericDictionary<T> | null | undefined>,
-            n?: number
-        ): LoDashImplicitWrapper<T[]>;
-
-        /**
-         * @see _.sampleSize
-         */
-        sampleSize<T extends object>(
-            this: LoDashImplicitWrapper<T | null | undefined>,
-            n?: number
-        ): LoDashImplicitWrapper<Array<T[keyof T]>>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.sampleSize
-         */
-        sampleSize<T>(
-            this: LoDashExplicitWrapper<List<T>|Dictionary<T>|NumericDictionary<T> | null | undefined>,
-            n?: number
-        ): LoDashExplicitWrapper<T[]>;
-
-        /**
-         * @see _.sampleSize
-         */
-        sampleSize<T extends object>(
-            this: LoDashExplicitWrapper<T | null | undefined>,
-            n?: number
-        ): LoDashExplicitWrapper<Array<T[keyof T]>>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/collection/shuffle.d.ts b/types/lodash/collection/shuffle.d.ts
deleted file mode 100644
index 8209ece654..0000000000
--- a/types/lodash/collection/shuffle.d.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Creates an array of shuffled values, using a version of the Fisher-Yates shuffle.
-         *
-         * @param collection The collection to shuffle.
-         * @return Returns the new shuffled array.
-         */
-        shuffle<T>(collection: List<T> | null | undefined): T[];
-
-        /**
-         * @see _.shuffle
-         */
-        shuffle<T extends object>(collection: T | null | undefined): Array<T[keyof T]>;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.shuffle
-         */
-        shuffle<T>(this: LoDashImplicitWrapper<List<T> | null | undefined>): LoDashImplicitWrapper<T[]>;
-
-        /**
-         * @see _.shuffle
-         */
-        shuffle<T extends object>(this: LoDashImplicitWrapper<T | null | undefined>): LoDashImplicitWrapper<Array<T[keyof T]>>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.shuffle
-         */
-        shuffle<T>(this: LoDashExplicitWrapper<List<T> | null | undefined>): LoDashExplicitWrapper<T[]>;
-
-        /**
-         * @see _.shuffle
-         */
-        shuffle<T extends object>(this: LoDashExplicitWrapper<T | null | undefined>): LoDashExplicitWrapper<Array<T[keyof T]>>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/collection/size.d.ts b/types/lodash/collection/size.d.ts
deleted file mode 100644
index f1c393a7b7..0000000000
--- a/types/lodash/collection/size.d.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Gets the size of collection by returning its length for array-like values or the number of own enumerable
-         * properties for objects.
-         *
-         * @param collection The collection to inspect.
-         * @return Returns the size of collection.
-         */
-        size(collection: object | string | null | undefined): number;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.size
-         */
-        size(): number;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.size
-         */
-        size(): LoDashExplicitWrapper<number>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/collection/some.d.ts b/types/lodash/collection/some.d.ts
deleted file mode 100644
index fff03751d1..0000000000
--- a/types/lodash/collection/some.d.ts
+++ /dev/null
@@ -1,85 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Checks if predicate returns truthy for any element of collection. Iteration is stopped once predicate
-         * returns truthy. The predicate is invoked with three arguments: (value, index|key, collection).
-         *
-         * @param collection The collection to iterate over.
-         * @param predicate The function invoked per iteration.
-         * @return Returns true if any element passes the predicate check, else false.
-         */
-        some<T>(
-            collection: List<T> | null | undefined,
-            predicate?: ListIterateeCustom<T, boolean>
-        ): boolean;
-
-        /**
-         * @see _.some
-         */
-        some<T extends object>(
-            collection: T | null | undefined,
-            predicate?: ObjectIterateeCustom<T, boolean>
-        ): boolean;
-
-        /**
-         * @see _.some
-         */
-        some<T>(
-            collection: NumericDictionary<T> | null | undefined,
-            predicate?: NumericDictionaryIterateeCustom<T, boolean>
-        ): boolean;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.some
-         */
-        some<T>(
-            this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            predicate?: ListIterateeCustom<T, boolean>
-        ): boolean;
-
-        /**
-         * @see _.some
-         */
-        some<T extends object>(
-            this: LoDashImplicitWrapper<T | null | undefined>,
-            predicate?: ObjectIterateeCustom<T, boolean>
-        ): boolean;
-
-        /**
-         * @see _.some
-         */
-        some<T>(
-            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
-            predicate?: NumericDictionaryIterateeCustom<T, boolean>
-        ): boolean;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.some
-         */
-        some<T>(
-            this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            predicate?: ListIterateeCustom<T, boolean>
-        ): LoDashExplicitWrapper<boolean>;
-
-        /**
-         * @see _.some
-         */
-        some<T extends object>(
-            this: LoDashExplicitWrapper<T | null | undefined>,
-            predicate?: ObjectIterateeCustom<T, boolean>
-        ): LoDashExplicitWrapper<boolean>;
-
-        /**
-         * @see _.some
-         */
-        some<T>(
-            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
-            predicate?: NumericDictionaryIterateeCustom<T, boolean>
-        ): LoDashExplicitWrapper<boolean>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/collection/sortBy.d.ts b/types/lodash/collection/sortBy.d.ts
deleted file mode 100644
index d20877f512..0000000000
--- a/types/lodash/collection/sortBy.d.ts
+++ /dev/null
@@ -1,84 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Creates an array of elements, sorted in ascending order by the results of
-         * running each element in a collection through each iteratee. This method
-         * performs a stable sort, that is, it preserves the original sort order of
-         * equal elements. The iteratees are invoked with one argument: (value).
-         *
-         * @category Collection
-         * @param collection The collection to iterate over.
-         * @param [iteratees=[_.identity]]
-         *  The iteratees to sort by, specified individually or in arrays.
-         * @returns Returns the new sorted array.
-         * @example
-         *
-         * var users = [
-         *   { 'user': 'fred',   'age': 48 },
-         *   { 'user': 'barney', 'age': 36 },
-         *   { 'user': 'fred',   'age': 42 },
-         *   { 'user': 'barney', 'age': 34 }
-         * ];
-         *
-         * _.sortBy(users, function(o) { return o.user; });
-         * // => objects for [['barney', 36], ['barney', 34], ['fred', 48], ['fred', 42]]
-         *
-         * _.sortBy(users, ['user', 'age']);
-         * // => objects for [['barney', 34], ['barney', 36], ['fred', 42], ['fred', 48]]
-         *
-         * _.sortBy(users, 'user', function(o) {
-         *   return Math.floor(o.age / 10);
-         * });
-         * // => objects for [['barney', 36], ['barney', 34], ['fred', 48], ['fred', 42]]
-         */
-        sortBy<T>(
-            collection: List<T> | null | undefined,
-            ...iteratees: Array<Many<ListIteratee<T>>>
-        ): T[];
-
-        /**
-         * @see _.sortBy
-         */
-        sortBy<T extends object>(
-            collection: T | null | undefined,
-            ...iteratees: Array<Many<ObjectIteratee<T>>>
-        ): Array<T[keyof T]>;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.sortBy
-         */
-        sortBy<T>(
-            this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            ...iteratees: Array<Many<ListIteratee<T>>>
-        ): LoDashImplicitWrapper<T[]>;
-
-        /**
-         * @see _.sortBy
-         */
-        sortBy<T extends object>(
-            this: LoDashImplicitWrapper<T | null | undefined>,
-            ...iteratees: Array<Many<ObjectIteratee<T>>>
-        ): LoDashImplicitWrapper<Array<T[keyof T]>>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.sortBy
-         */
-        sortBy<T>(
-            this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            ...iteratees: Array<Many<ListIteratee<T>>>
-        ): LoDashExplicitWrapper<T[]>;
-
-        /**
-         * @see _.sortBy
-         */
-        sortBy<T extends object>(
-            this: LoDashExplicitWrapper<T | null | undefined>,
-            ...iteratees: Array<Many<ObjectIteratee<T>>>
-        ): LoDashExplicitWrapper<Array<T[keyof T]>>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/common/array.d.ts b/types/lodash/common/array.d.ts
new file mode 100644
index 0000000000..f70fbbf135
--- /dev/null
+++ b/types/lodash/common/array.d.ts
@@ -0,0 +1,3845 @@
+import _ = require("../index");
+declare module "../index" {
+    // chunk
+
+    interface LoDashStatic {
+        /**
+         * Creates an array of elements split into groups the length of size. If collection can’t be split evenly, the
+         * final chunk will be the remaining elements.
+         *
+         * @param array The array to process.
+         * @param size The length of each chunk.
+         * @return Returns the new array containing chunks.
+         */
+        chunk<T>(
+            array: List<T> | null | undefined,
+            size?: number
+        ): T[][];
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.chunk
+         */
+        chunk<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            size?: number,
+        ): LoDashImplicitWrapper<T[][]>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.chunk
+         */
+        chunk<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            size?: number,
+        ): LoDashExplicitWrapper<T[][]>;
+    }
+
+    // compact
+
+    interface LoDashStatic {
+        /**
+         * Creates an array with all falsey values removed. The values false, null, 0, "", undefined, and NaN are
+         * falsey.
+         *
+         * @param array The array to compact.
+         * @return Returns the new array of filtered values.
+         */
+        compact<T>(array: List<T | null | undefined | false | "" | 0> | null | undefined): T[];
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.compact
+         */
+        compact<T>(this: LoDashImplicitWrapper<List<T | null | undefined | false | "" | 0> | null | undefined>): LoDashImplicitWrapper<T[]>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.compact
+         */
+        compact<T>(this: LoDashExplicitWrapper<List<T | null | undefined | false | "" | 0> | null | undefined>): LoDashExplicitWrapper<T[]>;
+    }
+
+    // concat
+
+    interface LoDashStatic {
+        /**
+         * Creates a new array concatenating `array` with any additional arrays
+         * and/or values.
+         *
+         * @category Array
+         * @param array The array to concatenate.
+         * @param [values] The values to concatenate.
+         * @returns Returns the new concatenated array.
+         * @example
+         *
+         * var array = [1];
+         * var other = _.concat(array, 2, [3], [[4]]);
+         *
+         * console.log(other);
+         * // => [1, 2, 3, [4]]
+         *
+         * console.log(array);
+         * // => [1]
+         */
+         concat<T>(array: Many<T>, ...values: Array<Many<T>>): T[];
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.compact
+         */
+        concat<T>(this: LoDashImplicitWrapper<Many<T>>, ...values: Array<Many<T>>): LoDashImplicitWrapper<T[]>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.compact
+         */
+        concat<T>(this: LoDashExplicitWrapper<Many<T>>, ...values: Array<Many<T>>): LoDashExplicitWrapper<T[]>;
+    }
+
+    // difference
+
+    interface LoDashStatic {
+        /**
+         * Creates an array of unique array values not included in the other provided arrays using SameValueZero for
+         * equality comparisons.
+         *
+         * @param array The array to inspect.
+         * @param values The arrays of values to exclude.
+         * @return Returns the new array of filtered values.
+         */
+        difference<T>(
+            array: List<T> | null | undefined,
+            ...values: Array<List<T>>
+        ): T[];
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.difference
+         */
+        difference<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            ...values: Array<List<T>>
+        ): LoDashImplicitWrapper<T[]>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.difference
+         */
+        difference<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            ...values: Array<List<T>>
+        ): LoDashExplicitWrapper<T[]>;
+    }
+
+    // differenceBy
+
+    interface LoDashStatic {
+        /**
+         * This method is like _.difference except that it accepts iteratee which is invoked for each element of array
+         * and values to generate the criterion by which uniqueness is computed. The iteratee is invoked with one
+         * argument: (value).
+         *
+         * @param array The array to inspect.
+         * @param values The values to exclude.
+         * @param iteratee The iteratee invoked per element.
+         * @returns Returns the new array of filtered values.
+         */
+        differenceBy<T1, T2>(
+            array: List<T1> | null | undefined,
+            values: List<T2>,
+            iteratee: ValueIteratee<T1 | T2>
+        ): T1[];
+
+        /**
+         * @see _.differenceBy
+         */
+        differenceBy<T1, T2, T3>(
+            array: List<T1> | null | undefined,
+            values1: List<T2>,
+            values2: List<T3>,
+            iteratee: ValueIteratee<T1 | T2 | T3>
+        ): T1[];
+
+        /**
+         * @see _.differenceBy
+         */
+        differenceBy<T1, T2, T3, T4>(
+            array: List<T1> | null | undefined,
+            values1: List<T2>,
+            values2: List<T3>,
+            values3: List<T4>,
+            iteratee: ValueIteratee<T1 | T2 | T3 | T4>
+        ): T1[];
+
+        /**
+         * @see _.differenceBy
+         */
+        differenceBy<T1, T2, T3, T4, T5>(
+            array: List<T1> | null | undefined,
+            values1: List<T2>,
+            values2: List<T3>,
+            values3: List<T4>,
+            values4: List<T5>,
+            iteratee: ValueIteratee<T1 | T2 | T3 | T4 | T5>
+        ): T1[];
+
+        /**
+         * @see _.differenceBy
+         */
+        differenceBy<T1, T2, T3, T4, T5, T6>(
+            array: List<T1> | null | undefined,
+            values1: List<T2>,
+            values2: List<T3>,
+            values3: List<T4>,
+            values4: List<T5>,
+            values5: List<T6>,
+            iteratee: ValueIteratee<T1 | T2 | T3 | T4 | T5 | T6>
+        ): T1[];
+
+        /**
+         * @see _.differenceBy
+         */
+        differenceBy<T1, T2, T3, T4, T5, T6, T7>(
+            array: List<T1> | null | undefined,
+            values1: List<T2>,
+            values2: List<T3>,
+            values3: List<T4>,
+            values4: List<T5>,
+            values5: List<T6>,
+            ...values: Array<List<T7> | ValueIteratee<T1 | T2 | T3 | T4 | T5 | T6 | T7>>
+        ): T1[];
+
+        /**
+         * @see _.differenceBy
+         */
+        differenceBy<T>(
+            array: List<T> | null | undefined,
+            ...values: Array<List<T>>
+        ): T[];
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.differenceBy
+         */
+        differenceBy<T1, T2>(
+            this: LoDashImplicitWrapper<List<T1> | null | undefined>,
+            values: List<T2>,
+            iteratee: ValueIteratee<T1 | T2>
+        ): LoDashImplicitWrapper<T1[]>;
+
+        /**
+         * @see _.differenceBy
+         */
+        differenceBy<T1, T2, T3>(
+            this: LoDashImplicitWrapper<List<T1> | null | undefined>,
+            values1: List<T2>,
+            values2: List<T3>,
+            iteratee: ValueIteratee<T1 | T2 | T3>
+        ): LoDashImplicitWrapper<T1[]>;
+
+        /**
+         * @see _.differenceBy
+         */
+        differenceBy<T1, T2, T3, T4>(
+            this: LoDashImplicitWrapper<List<T1> | null | undefined>,
+            values1: List<T2>,
+            values2: List<T3>,
+            values3: List<T4>,
+            iteratee: ValueIteratee<T1 | T2 | T3 | T4>
+        ): LoDashImplicitWrapper<T1[]>;
+
+        /**
+         * @see _.differenceBy
+         */
+        differenceBy<T1, T2, T3, T4, T5>(
+            this: LoDashImplicitWrapper<List<T1> | null | undefined>,
+            values1: List<T2>,
+            values2: List<T3>,
+            values3: List<T4>,
+            values4: List<T5>,
+            iteratee: ValueIteratee<T1 | T2 | T3 | T4 | T5>
+        ): LoDashImplicitWrapper<T1[]>;
+
+        /**
+         * @see _.differenceBy
+         */
+        differenceBy<T1, T2, T3, T4, T5, T6>(
+            this: LoDashImplicitWrapper<List<T1> | null | undefined>,
+            values1: List<T2>,
+            values2: List<T3>,
+            values3: List<T4>,
+            values4: List<T5>,
+            values5: List<T6>,
+            iteratee: ValueIteratee<T1 | T2 | T3 | T4 | T5 | T6>
+        ): LoDashImplicitWrapper<T1[]>;
+
+        /**
+         * @see _.differenceBy
+         */
+        differenceBy<T1, T2, T3, T4, T5, T6, T7>(
+            this: LoDashImplicitWrapper<List<T1> | null | undefined>,
+            values1: List<T2>,
+            values2: List<T3>,
+            values3: List<T4>,
+            values4: List<T5>,
+            values5: List<T6>,
+            ...values: Array<List<T7> | ValueIteratee<T1 | T2 | T3 | T4 | T5 | T6 | T7>>
+        ): LoDashImplicitWrapper<T1[]>;
+
+        /**
+         * @see _.differenceBy
+         */
+        differenceBy<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            ...values: Array<List<T>>
+        ): LoDashImplicitWrapper<T[]>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.differenceBy
+         */
+        differenceBy<T1, T2>(
+            this: LoDashExplicitWrapper<List<T1> | null | undefined>,
+            values: List<T2>,
+            iteratee: ValueIteratee<T1 | T2>
+        ): LoDashExplicitWrapper<T1[]>;
+
+        /**
+         * @see _.differenceBy
+         */
+        differenceBy<T1, T2, T3>(
+            this: LoDashExplicitWrapper<List<T1> | null | undefined>,
+            values1: List<T2>,
+            values2: List<T3>,
+            iteratee: ValueIteratee<T1 | T2 | T3>
+        ): LoDashExplicitWrapper<T1[]>;
+
+        /**
+         * @see _.differenceBy
+         */
+        differenceBy<T1, T2, T3, T4>(
+            this: LoDashExplicitWrapper<List<T1> | null | undefined>,
+            values1: List<T2>,
+            values2: List<T3>,
+            values3: List<T4>,
+            iteratee: ValueIteratee<T1 | T2 | T3 | T4>
+        ): LoDashExplicitWrapper<T1[]>;
+
+        /**
+         * @see _.differenceBy
+         */
+        differenceBy<T1, T2, T3, T4, T5>(
+            this: LoDashExplicitWrapper<List<T1> | null | undefined>,
+            values1: List<T2>,
+            values2: List<T3>,
+            values3: List<T4>,
+            values4: List<T5>,
+            iteratee: ValueIteratee<T1 | T2 | T3 | T4 | T5>
+        ): LoDashExplicitWrapper<T1[]>;
+
+        /**
+         * @see _.differenceBy
+         */
+        differenceBy<T1, T2, T3, T4, T5, T6>(
+            this: LoDashExplicitWrapper<List<T1> | null | undefined>,
+            values1: List<T2>,
+            values2: List<T3>,
+            values3: List<T4>,
+            values4: List<T5>,
+            values5: List<T6>,
+            iteratee: ValueIteratee<T1 | T2 | T3 | T4 | T5 | T6>
+        ): LoDashExplicitWrapper<T1[]>;
+
+        /**
+         * @see _.differenceBy
+         */
+        differenceBy<T1, T2, T3, T4, T5, T6, T7>(
+            this: LoDashExplicitWrapper<List<T1> | null | undefined>,
+            values1: List<T2>,
+            values2: List<T3>,
+            values3: List<T4>,
+            values4: List<T5>,
+            values5: List<T6>,
+            ...values: Array<List<T7> | ValueIteratee<T1 | T2 | T3 | T4 | T5 | T6 | T7>>
+        ): LoDashExplicitWrapper<T1[]>;
+
+        /**
+         * @see _.differenceBy
+         */
+        differenceBy<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            ...values: Array<List<T>>
+        ): LoDashExplicitWrapper<T[]>;
+    }
+
+    // differenceWith
+
+    interface LoDashStatic {
+        /**
+         * Creates an array of unique `array` values not included in the other
+         * provided arrays using [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
+         * for equality comparisons.
+         *
+         * @category Array
+         * @param [values] The arrays to inspect.
+         * @param [comparator] The comparator invoked per element.
+         * @returns Returns the new array of filtered values.
+         * @example
+         *
+         * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
+
+         * _.differenceWith(objects, [{ 'x': 1, 'y': 2 }], _.isEqual);
+         * // => [{ 'x': 2, 'y': 1 }]
+         */
+        differenceWith<T1, T2>(
+            array: List<T1> | null | undefined,
+            values: List<T2>,
+            comparator: Comparator2<T1, T2>
+        ): T1[];
+
+        /**
+         * @see _.differenceWith
+         */
+        differenceWith<T1, T2, T3>(
+            array: List<T1> | null | undefined,
+            values1: List<T2>,
+            values2: List<T3>,
+            comparator: Comparator2<T1, T2 | T3>
+        ): T1[];
+
+        /**
+         * @see _.differenceWith
+         */
+        differenceWith<T1, T2, T3, T4>(
+            array: List<T1> | null | undefined,
+            values1: List<T2>,
+            values2: List<T3>,
+            ...values: Array<List<T4> | Comparator2<T1, T2 | T3 | T4>>
+        ): T1[];
+
+        /**
+         * @see _.differenceWith
+         */
+        differenceWith<T>(
+            array: List<T> | null | undefined,
+            ...values: Array<List<T>>
+        ): T[];
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.differenceWith
+         */
+        differenceWith<T1, T2>(
+            this: LoDashImplicitWrapper<List<T1> | null | undefined>,
+            values: List<T2>,
+            comparator: Comparator2<T1, T2>
+        ): LoDashImplicitWrapper<T1[]>;
+
+        /**
+         * @see _.differenceWith
+         */
+        differenceWith<T1, T2, T3>(
+            this: LoDashImplicitWrapper<List<T1> | null | undefined>,
+            values1: List<T2>,
+            values2: List<T3>,
+            comparator: Comparator2<T1, T2 | T3>
+        ): LoDashImplicitWrapper<T1[]>;
+
+        /**
+         * @see _.differenceWith
+         */
+        differenceWith<T1, T2, T3, T4>(
+            this: LoDashImplicitWrapper<List<T1> | null | undefined>,
+            values1: List<T2>,
+            values2: List<T3>,
+            ...values: Array<List<T4> | Comparator2<T1, T2 | T3 | T4>>
+        ): LoDashImplicitWrapper<T1[]>;
+
+        /**
+         * @see _.differenceWith
+         */
+        differenceWith<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            ...values: Array<List<T>>
+        ): LoDashImplicitWrapper<T[]>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.differenceWith
+         */
+        differenceWith<T1, T2>(
+            this: LoDashExplicitWrapper<List<T1> | null | undefined>,
+            values: List<T2>,
+            comparator: Comparator2<T1, T2>
+        ): LoDashExplicitWrapper<T1[]>;
+
+        /**
+         * @see _.differenceWith
+         */
+        differenceWith<T1, T2, T3>(
+            this: LoDashExplicitWrapper<List<T1> | null | undefined>,
+            values1: List<T2>,
+            values2: List<T3>,
+            comparator: Comparator2<T1, T2 | T3>
+        ): LoDashExplicitWrapper<T1[]>;
+
+        /**
+         * @see _.differenceWith
+         */
+        differenceWith<T1, T2, T3, T4>(
+            this: LoDashExplicitWrapper<List<T1> | null | undefined>,
+            values1: List<T2>,
+            values2: List<T3>,
+            ...values: Array<List<T4> | Comparator2<T1, T2 | T3 | T4>>
+        ): LoDashExplicitWrapper<T1[]>;
+
+        /**
+         * @see _.differenceWith
+         */
+        differenceWith<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            ...values: Array<List<T>>
+        ): LoDashExplicitWrapper<T[]>;
+    }
+
+    // drop
+
+    interface LoDashStatic {
+        /**
+         * Creates a slice of array with n elements dropped from the beginning.
+         *
+         * @param array The array to query.
+         * @param n The number of elements to drop.
+         * @return Returns the slice of array.
+         */
+        drop<T>(array: List<T> | null | undefined, n?: number): T[];
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.drop
+         */
+        drop<T>(this: LoDashImplicitWrapper<List<T> | null | undefined>, n?: number): LoDashImplicitWrapper<T[]>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.drop
+         */
+        drop<T>(this: LoDashExplicitWrapper<List<T> | null | undefined>, n?: number): LoDashExplicitWrapper<T[]>;
+    }
+
+    // dropRight
+
+    interface LoDashStatic {
+        /**
+         * Creates a slice of array with n elements dropped from the end.
+         *
+         * @param array The array to query.
+         * @param n The number of elements to drop.
+         * @return Returns the slice of array.
+         */
+        dropRight<T>(
+            array: List<T> | null | undefined,
+            n?: number
+        ): T[];
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.dropRight
+         */
+        dropRight<T>(this: LoDashImplicitWrapper<List<T> | null | undefined>, n?: number): LoDashImplicitWrapper<T[]>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.dropRight
+         */
+        dropRight<T>(this: LoDashExplicitWrapper<List<T> | null | undefined>, n?: number): LoDashExplicitWrapper<T[]>;
+    }
+
+    // dropRightWhile
+
+    interface LoDashStatic {
+        /**
+         * Creates a slice of array excluding elements dropped from the end. Elements are dropped until predicate
+         * returns falsey. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
+         *
+         * If a property name is provided for predicate the created _.property style callback returns the property
+         * value of the given element.
+         *
+         * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+         * elements that have a matching property value, else false.
+         *
+         * If an object is provided for predicate the created _.matches style callback returns true for elements that
+         * match the properties of the given object, else false.
+         *
+         * @param array The array to query.
+         * @param predicate The function invoked per iteration.
+         * @param thisArg The this binding of predicate.
+         * @return Returns the slice of array.
+         */
+        dropRightWhile<T>(
+            array: List<T> | null | undefined,
+            predicate?: ListIteratee<T>
+        ): T[];
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.dropRightWhile
+         */
+        dropRightWhile<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            predicate?: ListIteratee<T>
+        ): LoDashImplicitWrapper<T[]>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.dropRightWhile
+         */
+        dropRightWhile<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            predicate?: ListIteratee<T>
+        ): LoDashExplicitWrapper<T[]>;
+    }
+
+    // dropWhile
+
+    interface LoDashStatic {
+        /**
+         * Creates a slice of array excluding elements dropped from the beginning. Elements are dropped until predicate
+         * returns falsey. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
+         *
+         * If a property name is provided for predicate the created _.property style callback returns the property
+         * value of the given element.
+         *
+         * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+         * elements that have a matching property value, else false.
+         *
+         * If an object is provided for predicate the created _.matches style callback returns true for elements that
+         * have the properties of the given object, else false.
+         *
+         * @param array The array to query.
+         * @param predicate The function invoked per iteration.
+         * @param thisArg The this binding of predicate.
+         * @return Returns the slice of array.
+         */
+        dropWhile<T>(
+            array: List<T> | null | undefined,
+            predicate?: ListIteratee<T>
+        ): T[];
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.dropWhile
+         */
+        dropWhile<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            predicate?: ListIteratee<T>
+        ): LoDashImplicitWrapper<T[]>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.dropWhile
+         */
+        dropWhile<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            predicate?: ListIteratee<T>
+        ): LoDashExplicitWrapper<T[]>;
+    }
+
+    // fill
+
+    interface LoDashStatic {
+        /**
+         * Fills elements of array with value from start up to, but not including, end.
+         *
+         * Note: This method mutates array.
+         *
+         * @param array The array to fill.
+         * @param value The value to fill array with.
+         * @param start The start position.
+         * @param end The end position.
+         * @return Returns array.
+         */
+        fill<T>(
+            array: any[] | null | undefined,
+            value: T
+        ): T[];
+
+        /**
+         * @see _.fill
+         */
+        fill<T>(
+            array: List<any> | null | undefined,
+            value: T
+        ): List<T>;
+
+        /**
+         * @see _.fill
+         */
+        fill<T, U>(
+            array: U[] | null | undefined,
+            value: T,
+            start?: number,
+            end?: number
+        ): Array<T | U>;
+
+        /**
+         * @see _.fill
+         */
+        fill<T, U>(
+            array: List<U> | null | undefined,
+            value: T,
+            start?: number,
+            end?: number
+        ): List<T | U>;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.fill
+         */
+        fill<T>(
+            this: LoDashImplicitWrapper<any[] | null | undefined>,
+            value: T
+        ): LoDashImplicitWrapper<T[]>;
+
+        /**
+         * @see _.fill
+         */
+        fill<T>(
+            this: LoDashImplicitWrapper<List<any> | null | undefined>,
+            value: T
+        ): LoDashImplicitWrapper<List<T>>;
+
+        /**
+         * @see _.fill
+         */
+        fill<T, U>(
+            this: LoDashImplicitWrapper<U[] | null | undefined>,
+            value: T,
+            start?: number,
+            end?: number
+        ): LoDashImplicitWrapper<Array<T | U>>;
+
+        /**
+         * @see _.fill
+         */
+        fill<T, U>(
+            this: LoDashImplicitWrapper<List<U> | null | undefined>,
+            value: T,
+            start?: number,
+            end?: number
+        ): LoDashImplicitWrapper<List<T | U>>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.fill
+         */
+        fill<T>(
+            this: LoDashExplicitWrapper<any[] | null | undefined>,
+            value: T
+        ): LoDashExplicitWrapper<T[]>;
+
+        /**
+         * @see _.fill
+         */
+        fill<T>(
+            this: LoDashExplicitWrapper<List<any> | null | undefined>,
+            value: T
+        ): LoDashExplicitWrapper<List<T>>;
+
+        /**
+         * @see _.fill
+         */
+        fill<T, U>(
+            this: LoDashExplicitWrapper<U[] | null | undefined>,
+            value: T,
+            start?: number,
+            end?: number
+        ): LoDashExplicitWrapper<Array<T | U>>;
+
+        /**
+         * @see _.fill
+         */
+        fill<T, U>(
+            this: LoDashExplicitWrapper<List<U> | null | undefined>,
+            value: T,
+            start?: number,
+            end?: number
+        ): LoDashExplicitWrapper<List<T | U>>;
+    }
+
+    // findIndex
+
+    interface LoDashStatic {
+        /**
+         * This method is like _.find except that it returns the index of the first element predicate returns truthy
+         * for instead of the element itself.
+         *
+         * If a property name is provided for predicate the created _.property style callback returns the property
+         * value of the given element.
+         *
+         * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+         * elements that have a matching property value, else false.
+         *
+         * If an object is provided for predicate the created _.matches style callback returns true for elements that
+         * have the properties of the given object, else false.
+         *
+         * @param array The array to search.
+         * @param predicate The function invoked per iteration.
+         * @param fromIndex The index to search from.
+         * @return Returns the index of the found element, else -1.
+         */
+        findIndex<T>(
+            array: List<T> | null | undefined,
+            predicate?: ListIterateeCustom<T, boolean>,
+            fromIndex?: number
+        ): number;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.findIndex
+         */
+        findIndex<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            predicate?: ListIterateeCustom<T, boolean>,
+            fromIndex?: number
+        ): number;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.findIndex
+         */
+        findIndex<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            predicate?: ListIterateeCustom<T, boolean>,
+            fromIndex?: number
+        ): LoDashExplicitWrapper<number>;
+    }
+
+    // findLastIndex
+
+    interface LoDashStatic {
+        /**
+         * This method is like _.findIndex except that it iterates over elements of collection from right to left.
+         *
+         * If a property name is provided for predicate the created _.property style callback returns the property
+         * value of the given element.
+         *
+         * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+         * elements that have a matching property value, else false.
+         *
+         * If an object is provided for predicate the created _.matches style callback returns true for elements that
+         * have the properties of the given object, else false.
+         *
+         * @param array The array to search.
+         * @param predicate The function invoked per iteration.
+         * @param fromIndex The index to search from.
+         * @return Returns the index of the found element, else -1.
+         */
+        findLastIndex<T>(
+            array: List<T> | null | undefined,
+            predicate?: ListIterateeCustom<T, boolean>,
+            fromIndex?: number
+        ): number;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.findLastIndex
+         */
+        findLastIndex<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            predicate?: ListIterateeCustom<T, boolean>,
+            fromIndex?: number
+        ): number;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.findLastIndex
+         */
+        findLastIndex<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            predicate?: ListIterateeCustom<T, boolean>,
+            fromIndex?: number
+        ): LoDashExplicitWrapper<number>;
+    }
+
+    // first
+
+    interface LoDashStatic {
+        first: typeof _.head; // tslint:disable-line:no-unnecessary-qualifier
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.head
+         */
+        first<T>(this: LoDashImplicitWrapper<List<T> | null | undefined>): T | undefined;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.head
+         */
+        first<T>(this: LoDashExplicitWrapper<List<T> | null | undefined>): LoDashExplicitWrapper<T | undefined>;
+    }
+
+    interface RecursiveArray<T> extends Array<T|RecursiveArray<T>> {}
+    interface ListOfRecursiveArraysOrValues<T> extends List<T|RecursiveArray<T>> {}
+
+    // flatten
+
+    interface LoDashStatic {
+        /**
+         * Flattens a nested array. If isDeep is true the array is recursively flattened, otherwise it’s only
+         * flattened a single level.
+         *
+         * @param array The array to flatten.
+         * @param isDeep Specify a deep flatten.
+         * @return Returns the new flattened array.
+         */
+        flatten<T>(array: ListOfRecursiveArraysOrValues<T> | null | undefined, isDeep: boolean): T[];
+
+        /**
+         * @see _.flatten
+         */
+        flatten<T>(array: List<Many<T>> | null | undefined): T[];
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.flatten
+         */
+        flatten<T>(this: LoDashImplicitWrapper<ListOfRecursiveArraysOrValues<T> | null | undefined>, isDeep: boolean): LoDashImplicitWrapper<T[]>;
+
+        /**
+         * @see _.flatten
+         */
+        flatten<T>(this: LoDashImplicitWrapper<List<Many<T>> | null | undefined>): LoDashImplicitWrapper<T[]>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.flatten
+         */
+        flatten<T>(this: LoDashExplicitWrapper<ListOfRecursiveArraysOrValues<T> | null | undefined>, isDeep: boolean): LoDashExplicitWrapper<T[]>;
+
+        /**
+         * @see _.flatten
+         */
+        flatten<T>(this: LoDashExplicitWrapper<List<Many<T>> | null | undefined>): LoDashExplicitWrapper<T[]>;
+    }
+
+    // flattenDeep
+
+    interface LoDashStatic {
+        /**
+         * Recursively flattens a nested array.
+         *
+         * @param array The array to recursively flatten.
+         * @return Returns the new flattened array.
+         */
+        flattenDeep<T>(array: ListOfRecursiveArraysOrValues<T> | null | undefined): T[];
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.flattenDeep
+         */
+        flattenDeep<T>(this: LoDashImplicitWrapper<ListOfRecursiveArraysOrValues<T> | null | undefined>): LoDashImplicitWrapper<T[]>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.flattenDeep
+         */
+        flattenDeep<T>(this: LoDashExplicitWrapper<ListOfRecursiveArraysOrValues<T> | null | undefined>): LoDashExplicitWrapper<T[]>;
+    }
+
+    // flattenDepth
+
+    interface LoDashStatic {
+       /**
+       * Recursively flatten array up to depth times.
+       *
+       * @param array The array to recursively flatten.
+       * @param number The maximum recursion depth.
+       * @return Returns the new flattened array.
+       */
+       flattenDepth<T>(array: ListOfRecursiveArraysOrValues<T> | null | undefined, depth?: number): T[];
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+       /**
+        * @see _.flattenDeep
+        */
+       flattenDepth<T>(this: LoDashImplicitWrapper<ListOfRecursiveArraysOrValues<T> | null | undefined>, depth?: number): LoDashImplicitWrapper<T[]>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+       /**
+        * @see _.flattenDeep
+        */
+       flattenDepth<T>(this: LoDashExplicitWrapper<ListOfRecursiveArraysOrValues<T> | null | undefined>, depth?: number): LoDashExplicitWrapper<T[]>;
+    }
+
+    // fromPairs
+
+    interface LoDashStatic {
+        /**
+         * The inverse of `_.toPairs`; this method returns an object composed
+         * from key-value `pairs`.
+         *
+         * @category Array
+         * @param pairs The key-value pairs.
+         * @returns Returns the new object.
+         * @example
+         *
+         * _.fromPairs([['fred', 30], ['barney', 40]]);
+         * // => { 'fred': 30, 'barney': 40 }
+         */
+        fromPairs<T>(
+            pairs: List<[PropertyName, T]> | null | undefined
+        ): Dictionary<T>;
+
+        /**
+         @see _.fromPairs
+         */
+        fromPairs(
+            pairs: List<any[]> | null | undefined
+        ): Dictionary<any>;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.fromPairs
+         */
+        fromPairs<T>(
+          this: LoDashImplicitWrapper<List<[PropertyName, T]> | null | undefined>
+        ): LoDashImplicitWrapper<Dictionary<T>>;
+
+        /**
+         @see _.fromPairs
+         */
+        fromPairs(
+            this: LoDashImplicitWrapper<List<any[]> | null | undefined>
+        ): LoDashImplicitWrapper<Dictionary<any>>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.fromPairs
+         */
+        fromPairs<T>(
+          this: LoDashExplicitWrapper<List<[PropertyName, T]> | null | undefined>
+        ): LoDashExplicitWrapper<Dictionary<T>>;
+
+        /**
+         @see _.fromPairs
+         */
+        fromPairs(
+            this: LoDashExplicitWrapper<List<any[]> | null | undefined>
+        ): LoDashExplicitWrapper<Dictionary<any>>;
+    }
+
+    // head
+
+    interface LoDashStatic {
+        /**
+         * Gets the first element of array.
+         *
+         * @alias _.first
+         *
+         * @param array The array to query.
+         * @return Returns the first element of array.
+         */
+        head<T>(array: List<T> | null | undefined): T | undefined;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.head
+         */
+        head<T>(this: LoDashImplicitWrapper<List<T> | null | undefined>): T | undefined;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.head
+         */
+        head<T>(this: LoDashExplicitWrapper<List<T> | null | undefined>): LoDashExplicitWrapper<T | undefined>;
+    }
+
+    // indexOf
+
+    interface LoDashStatic {
+        /**
+         * Gets the index at which the first occurrence of `value` is found in `array`
+         * using [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
+         * for equality comparisons. If `fromIndex` is negative, it's used as the offset
+         * from the end of `array`. If `array` is sorted providing `true` for `fromIndex`
+         * performs a faster binary search.
+         *
+         * @category Array
+         * @param array The array to search.
+         * @param value The value to search for.
+         * @param [fromIndex=0] The index to search from.
+         * @returns Returns the index of the matched value, else `-1`.
+         * @example
+         *
+         * _.indexOf([1, 2, 1, 2], 2);
+         * // => 1
+         *
+         * // using `fromIndex`
+         * _.indexOf([1, 2, 1, 2], 2, 2);
+         * // => 3
+         */
+        indexOf<T>(
+            array: List<T> | null | undefined,
+            value: T,
+            fromIndex?: boolean|number
+        ): number;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.indexOf
+         */
+        indexOf<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            value: T,
+            fromIndex?: boolean|number
+        ): number;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.indexOf
+         */
+        indexOf<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            value: T,
+            fromIndex?: boolean|number
+        ): LoDashExplicitWrapper<number>;
+    }
+
+    // initial
+
+    interface LoDashStatic {
+        /**
+         * Gets all but the last element of array.
+         *
+         * @param array The array to query.
+         * @return Returns the slice of array.
+         */
+        initial<T>(array: List<T> | null | undefined): T[];
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.initial
+         */
+        initial<T>(this: LoDashImplicitWrapper<List<T> | null | undefined>): LoDashImplicitWrapper<T[]>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.initial
+         */
+        initial<T>(this: LoDashExplicitWrapper<List<T> | null | undefined>): LoDashExplicitWrapper<T[]>;
+    }
+
+    // intersection
+
+    interface LoDashStatic {
+        /**
+         * Creates an array of unique values that are included in all of the provided arrays using SameValueZero for
+         * equality comparisons.
+         *
+         * @param arrays The arrays to inspect.
+         * @return Returns the new array of shared values.
+         */
+        intersection<T>(...arrays: Array<List<T>>): T[];
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.intersection
+         */
+        intersection<T>(
+            this: LoDashImplicitWrapper<List<T>>,
+            ...arrays: Array<List<T>>
+        ): LoDashImplicitWrapper<T[]>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.intersection
+         */
+        intersection<T>(
+            this: LoDashExplicitWrapper<List<T>>,
+            ...arrays: Array<List<T>>
+        ): LoDashExplicitWrapper<T[]>;
+    }
+
+    // intersectionBy
+
+    interface LoDashStatic {
+        /**
+         * This method is like `_.intersection` except that it accepts `iteratee`
+         * which is invoked for each element of each `arrays` to generate the criterion
+         * by which uniqueness is computed. The iteratee is invoked with one argument: (value).
+         *
+         * @category Array
+         * @param [arrays] The arrays to inspect.
+         * @param [iteratee=_.identity] The iteratee invoked per element.
+         * @returns Returns the new array of shared values.
+         * @example
+         *
+         * _.intersectionBy([2.1, 1.2], [4.3, 2.4], Math.floor);
+         * // => [2.1]
+         *
+         * // using the `_.property` iteratee shorthand
+         * _.intersectionBy([{ 'x': 1 }], [{ 'x': 2 }, { 'x': 1 }], 'x');
+         * // => [{ 'x': 1 }]
+         */
+        intersectionBy<T1, T2>(
+            array: List<T1> | null,
+            values: List<T2>,
+            iteratee: ValueIteratee<T1 | T2>
+        ): T1[];
+
+        /**
+         * @see _.intersectionBy
+         */
+        intersectionBy<T1, T2, T3>(
+            array: List<T1> | null,
+            values1: List<T2>,
+            values2: List<T3>,
+            iteratee: ValueIteratee<T1 | T2 | T3>
+        ): T1[];
+
+        /**
+         * @see _.intersectionBy
+         */
+        intersectionBy<T1, T2, T3, T4>(
+            array: List<T1> | null | undefined,
+            values1: List<T2>,
+            values2: List<T3>,
+            ...values: Array<List<T4> | ValueIteratee<T1 | T2 | T3 | T4>>
+        ): T1[];
+
+        /**
+         * @see _.intersectionBy
+         */
+        intersectionBy<T>(
+            array?: List<T> | null,
+            ...values: Array<List<T>>
+        ): T[];
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.intersectionBy
+         */
+        intersectionBy<T1, T2>(
+            this: LoDashImplicitWrapper<List<T1> | null | undefined>,
+            values: List<T2>,
+            iteratee: ValueIteratee<T1 | T2>
+        ): LoDashImplicitWrapper<T1[]>;
+
+        /**
+         * @see _.intersectionBy
+         */
+        intersectionBy<T1, T2, T3>(
+            this: LoDashImplicitWrapper<List<T1> | null | undefined>,
+            values1: List<T2>,
+            values2: List<T3>,
+            iteratee: ValueIteratee<T1 | T2 | T3>
+        ): LoDashImplicitWrapper<T1[]>;
+
+        /**
+         * @see _.intersectionBy
+         */
+        intersectionBy<T1, T2, T3, T4>(
+            this: LoDashImplicitWrapper<List<T1> | null | undefined>,
+            values1: List<T2>,
+            values2: List<T3>,
+            ...values: Array<List<T4> | ValueIteratee<T1 | T2 | T3 | T4>>
+        ): LoDashImplicitWrapper<T1[]>;
+
+        /**
+         * @see _.intersectionBy
+         */
+        intersectionBy<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            ...values: Array<List<T>>
+        ): LoDashImplicitWrapper<T[]>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.intersectionBy
+         */
+        intersectionBy<T1, T2>(
+            this: LoDashExplicitWrapper<List<T1> | null | undefined>,
+            values: List<T2>,
+            iteratee: ValueIteratee<T1 | T2>
+        ): LoDashExplicitWrapper<T1[]>;
+
+        /**
+         * @see _.intersectionBy
+         */
+        intersectionBy<T1, T2, T3>(
+            this: LoDashExplicitWrapper<List<T1> | null | undefined>,
+            values1: List<T2>,
+            values2: List<T3>,
+            iteratee: ValueIteratee<T1 | T2 | T3>
+        ): LoDashExplicitWrapper<T1[]>;
+
+        /**
+         * @see _.intersectionBy
+         */
+        intersectionBy<T1, T2, T3, T4>(
+            this: LoDashExplicitWrapper<List<T1> | null | undefined>,
+            values1: List<T2>,
+            values2: List<T3>,
+            ...values: Array<List<T4> | ValueIteratee<T1 | T2 | T3 | T4>>
+        ): LoDashExplicitWrapper<T1[]>;
+
+        /**
+         * @see _.intersectionBy
+         */
+        intersectionBy<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            ...values: Array<List<T>>
+        ): LoDashExplicitWrapper<T[]>;
+    }
+
+    // intersectionWith
+
+    interface LoDashStatic {
+        /**
+         * Creates an array of unique `array` values not included in the other
+         * provided arrays using [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
+         * for equality comparisons.
+         *
+         * @category Array
+         * @param [values] The arrays to inspect.
+         * @param [comparator] The comparator invoked per element.
+         * @returns Returns the new array of filtered values.
+         * @example
+         *
+         * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
+         * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
+
+         * _.intersectionWith(objects, others, _.isEqual);
+         * // => [{ 'x': 1, 'y': 2 }]
+         */
+        intersectionWith<T1, T2>(
+            array: List<T1> | null | undefined,
+            values: List<T2>,
+            comparator: Comparator2<T1, T2>
+        ): T1[];
+
+        /**
+         * @see _.intersectionWith
+         */
+        intersectionWith<T1, T2, T3>(
+            array: List<T1> | null | undefined,
+            values1: List<T2>,
+            values2: List<T3>,
+            comparator: Comparator2<T1, T2 | T3>
+        ): T1[];
+
+        /**
+         * @see _.intersectionWith
+         */
+        intersectionWith<T1, T2, T3, T4>(
+            array: List<T1> | null | undefined,
+            values1: List<T2>,
+            values2: List<T3>,
+            ...values: Array<List<T4> | Comparator2<T1, T2 | T3 | T4>>
+        ): T1[];
+
+        /**
+         * @see _.intersectionWith
+         */
+        intersectionWith<T>(
+            array?: List<T> | null,
+            ...values: Array<List<T>>
+        ): T[];
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.intersectionWith
+         */
+        intersectionWith<T1, T2>(
+            this: LoDashImplicitWrapper<List<T1> | null | undefined>,
+            values: List<T2>,
+            comparator: Comparator2<T1, T2>
+        ): LoDashImplicitWrapper<T1[]>;
+
+        /**
+         * @see _.intersectionWith
+         */
+        intersectionWith<T1, T2, T3>(
+            this: LoDashImplicitWrapper<List<T1> | null | undefined>,
+            values1: List<T2>,
+            values2: List<T3>,
+            comparator: Comparator2<T1, T2 | T3>
+        ): LoDashImplicitWrapper<T1[]>;
+
+        /**
+         * @see _.intersectionWith
+         */
+        intersectionWith<T1, T2, T3, T4>(
+            this: LoDashImplicitWrapper<List<T1> | null | undefined>,
+            values1: List<T2>,
+            values2: List<T3>,
+            ...values: Array<List<T4> | Comparator2<T1, T2 | T3 | T4>>,
+        ): LoDashImplicitWrapper<T1[]>;
+
+        /**
+         * @see _.intersectionWith
+         */
+        intersectionWith<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            ...values: Array<List<T>>
+        ): LoDashImplicitWrapper<T[]>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.intersectionWith
+         */
+        intersectionWith<T1, T2>(
+            this: LoDashExplicitWrapper<List<T1> | null | undefined>,
+            values: List<T2>,
+            comparator: Comparator2<T1, T2>
+        ): LoDashExplicitWrapper<T1[]>;
+
+        /**
+         * @see _.intersectionWith
+         */
+        intersectionWith<T1, T2, T3>(
+            this: LoDashExplicitWrapper<List<T1> | null | undefined>,
+            values1: List<T2>,
+            values2: List<T3>,
+            comparator: Comparator2<T1, T2 | T3>
+        ): LoDashExplicitWrapper<T1[]>;
+
+        /**
+         * @see _.intersectionWith
+         */
+        intersectionWith<T1, T2, T3, T4>(
+            this: LoDashExplicitWrapper<List<T1> | null | undefined>,
+            values1: List<T2>,
+            values2: List<T3>,
+            ...values: Array<List<T4> | Comparator2<T1, T2 | T3 | T4>>,
+        ): LoDashExplicitWrapper<T1[]>;
+
+        /**
+         * @see _.intersectionWith
+         */
+        intersectionWith<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            ...values: Array<List<T>>
+        ): LoDashExplicitWrapper<T[]>;
+    }
+
+    // join
+
+    interface LoDashStatic {
+        /**
+         * Converts all elements in `array` into a string separated by `separator`.
+         *
+         * @param array The array to convert.
+         * @param separator The element separator.
+         * @returns Returns the joined string.
+         */
+        join(
+            array: List<any> | null | undefined,
+            separator?: string
+        ): string;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.join
+         */
+        join(separator?: string): string;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.join
+         */
+        join(separator?: string): LoDashExplicitWrapper<string>;
+    }
+
+    // last
+
+    interface LoDashStatic {
+        /**
+         * Gets the last element of array.
+         *
+         * @param array The array to query.
+         * @return Returns the last element of array.
+         */
+        last<T>(array: List<T> | null | undefined): T | undefined;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.last
+         */
+        last<T>(this: LoDashImplicitWrapper<List<T> | null | undefined>): T | undefined;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.last
+         */
+        last<T>(this: LoDashExplicitWrapper<List<T> | null | undefined>): LoDashExplicitWrapper<T | undefined>;
+    }
+
+    // lastIndexOf
+
+    interface LoDashStatic {
+        /**
+         * This method is like _.indexOf except that it iterates over elements of array from right to left.
+         *
+         * @param array The array to search.
+         * @param value The value to search for.
+         * @param fromIndex The index to search from or true to perform a binary search on a sorted array.
+         * @return Returns the index of the matched value, else -1.
+         */
+        lastIndexOf<T>(
+            array: List<T> | null | undefined,
+            value: T,
+            fromIndex?: true|number
+        ): number;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.indexOf
+         */
+        lastIndexOf<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            value: T,
+            fromIndex?: true|number
+        ): number;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.indexOf
+         */
+        lastIndexOf<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            value: T,
+            fromIndex?: true|number
+        ): LoDashExplicitWrapper<number>;
+    }
+
+    // nth
+
+    interface LoDashStatic {
+        /**
+         * Gets the element at index `n` of `array`. If `n` is negative, the nth element from the end is returned.
+         *
+         * @param array array The array to query.
+         * @param value The index of the element to return.
+         * @return Returns the nth element of `array`.
+         */
+        nth<T>(
+            array: List<T> | null | undefined,
+            n?: number
+        ): T | undefined;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.nth
+         */
+        nth<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            n?: number
+        ): T | undefined;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.nth
+         */
+        nth<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            n?: number
+        ): LoDashExplicitWrapper<T | undefined>;
+    }
+
+    // pull
+
+    interface LoDashStatic {
+        /**
+         * Removes all provided values from array using SameValueZero for equality comparisons.
+         *
+         * Note: Unlike _.without, this method mutates array.
+         *
+         * @param array The array to modify.
+         * @param values The values to remove.
+         * @return Returns array.
+         */
+        pull<T>(
+            array: T[],
+            ...values: T[]
+        ): T[];
+
+        /**
+         * @see _.pull
+         */
+        pull<T>(
+            array: List<T>,
+            ...values: T[]
+        ): List<T>;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.pull
+         */
+        pull<T>(
+            this: LoDashImplicitWrapper<List<T>>,
+            ...values: T[]
+        ): this;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.pull
+         */
+        pull<T>(
+            this: LoDashExplicitWrapper<List<T>>,
+            ...values: T[]
+        ): this;
+    }
+
+    // pullAll
+
+    interface LoDashStatic {
+        /**
+         * This method is like `_.pull` except that it accepts an array of values to remove.
+         *
+         * **Note:** Unlike `_.difference`, this method mutates `array`.
+         *
+         * @category Array
+         * @param array The array to modify.
+         * @param values The values to remove.
+         * @returns Returns `array`.
+         * @example
+         *
+         * var array = [1, 2, 3, 1, 2, 3];
+         *
+         * _.pull(array, [2, 3]);
+         * console.log(array);
+         * // => [1, 1]
+         */
+        pullAll<T>(
+            array: T[],
+            values?: List<T>,
+        ): T[];
+
+        /**
+         * @see _.pullAll
+         */
+        pullAll<T>(
+            array: List<T>,
+            values?: List<T>,
+        ): List<T>;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.pullAll
+         */
+        pullAll<T>(
+            this: LoDashImplicitWrapper<List<T>>,
+            values?: List<T>
+        ): this;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.pullAll
+         */
+        pullAll<T>(
+            this: LoDashExplicitWrapper<List<T>>,
+            values?: List<T>
+        ): this;
+    }
+
+    // pullAllBy
+
+    interface LoDashStatic {
+        /**
+         * This method is like `_.pullAll` except that it accepts `iteratee` which is
+         * invoked for each element of `array` and `values` to to generate the criterion
+         * by which uniqueness is computed. The iteratee is invoked with one argument: (value).
+         *
+         * **Note:** Unlike `_.differenceBy`, this method mutates `array`.
+         *
+         * @category Array
+         * @param array The array to modify.
+         * @param values The values to remove.
+         * @param [iteratee=_.identity] The iteratee invoked per element.
+         * @returns Returns `array`.
+         * @example
+         *
+         * var array = [{ 'x': 1 }, { 'x': 2 }, { 'x': 3 }, { 'x': 1 }];
+         *
+         * _.pullAllBy(array, [{ 'x': 1 }, { 'x': 3 }], 'x');
+         * console.log(array);
+         * // => [{ 'x': 2 }]
+         */
+        pullAllBy<T>(
+            array: T[],
+            values?: List<T>,
+            iteratee?: ValueIteratee<T>
+        ): T[];
+
+        /**
+         * @see _.pullAllBy
+         */
+        pullAllBy<T>(
+            array: List<T>,
+            values?: List<T>,
+            iteratee?: ValueIteratee<T>
+        ): List<T>;
+
+        /**
+         * @see _.pullAllBy
+         */
+        pullAllBy<T1, T2>(
+            array: T1[],
+            values: List<T2>,
+            iteratee: ValueIteratee<T1 | T2>
+        ): T1[];
+
+        /**
+         * @see _.pullAllBy
+         */
+        pullAllBy<T1, T2>(
+            array: List<T1>,
+            values: List<T2>,
+            iteratee: ValueIteratee<T1 | T2>
+        ): List<T1>;
+    }
+
+    interface LoDashWrapper<TValue> {
+        /**
+         * @see _.pullAllBy
+         */
+        pullAllBy<T>(
+            this: LoDashWrapper<List<T>>,
+            values?: List<T>,
+            iteratee?: ValueIteratee<T>
+        ): this;
+
+        /**
+         * @see _.pullAllBy
+         */
+        pullAllBy<T1, T2>(
+            this: LoDashWrapper<List<T1>>,
+            values: List<T2>,
+            iteratee: ValueIteratee<T1 | T2>
+        ): this;
+    }
+
+    // pullAllWith
+
+    interface LoDashStatic {
+        /**
+         * This method is like `_.pullAll` except that it accepts `comparator` which is
+         * invoked to compare elements of array to values. The comparator is invoked with
+         * two arguments: (arrVal, othVal).
+         *
+         * **Note:** Unlike `_.differenceWith`, this method mutates `array`.
+         *
+         * @category Array
+         * @param array The array to modify.
+         * @param values The values to remove.
+         * @param [iteratee=_.identity] The iteratee invoked per element.
+         * @returns Returns `array`.
+         * @example
+         *
+         * var array = [{ 'x': 1, 'y': 2 }, { 'x': 3, 'y': 4 }, { 'x': 5, 'y': 6 }];
+         *
+         * _.pullAllWith(array, [{ 'x': 3, 'y': 4 }], _.isEqual);
+         * console.log(array);
+         * // => [{ 'x': 1, 'y': 2 }, { 'x': 5, 'y': 6 }]
+         */
+        pullAllWith<T>(
+            array: T[],
+            values?: List<T>,
+            comparator?: Comparator<T>
+        ): T[];
+
+        /**
+         * @see _.pullAllWith
+         */
+        pullAllWith<T>(
+            array: List<T>,
+            values?: List<T>,
+            comparator?: Comparator<T>
+        ): List<T>;
+
+        /**
+         * @see _.pullAllWith
+         */
+        pullAllWith<T1, T2>(
+            array: T1[],
+            values: List<T2>,
+            comparator: Comparator2<T1, T2>
+        ): T1[];
+
+        /**
+         * @see _.pullAllWith
+         */
+        pullAllWith<T1, T2>(
+            array: List<T1>,
+            values: List<T2>,
+            comparator: Comparator2<T1, T2>
+        ): List<T1>;
+    }
+
+    interface LoDashWrapper<TValue> {
+        /**
+         * @see _.pullAllWith
+         */
+        pullAllWith<T>(
+            this: LoDashWrapper<List<T>>,
+            values?: List<T>,
+            comparator?: Comparator<T>
+        ): this;
+
+        /**
+         * @see _.pullAllWith
+         */
+        pullAllWith<T1, T2>(
+            this: LoDashWrapper<List<T1>>,
+            values: List<T2>,
+            comparator: Comparator2<T1, T2>
+        ): this;
+    }
+
+    // pullAt
+
+    interface LoDashStatic {
+        /**
+         * Removes elements from array corresponding to the given indexes and returns an array of the removed elements.
+         * Indexes may be specified as an array of indexes or as individual arguments.
+         *
+         * Note: Unlike _.at, this method mutates array.
+         *
+         * @param array The array to modify.
+         * @param indexes The indexes of elements to remove, specified as individual indexes or arrays of indexes.
+         * @return Returns the new array of removed elements.
+         */
+        pullAt<T>(
+            array: T[],
+            ...indexes: Array<Many<number>>
+        ): T[];
+
+        /**
+         * @see _.pullAt
+         */
+        pullAt<T>(
+            array: List<T>,
+            ...indexes: Array<Many<number>>
+        ): List<T>;
+    }
+
+    interface LoDashWrapper<TValue> {
+        /**
+         * @see _.pullAt
+         */
+        pullAt(...indexes: Array<Many<number>>): this;
+    }
+
+    // remove
+
+    interface LoDashStatic {
+        /**
+         * Removes all elements from array that predicate returns truthy for and returns an array of the removed
+         * elements. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
+         *
+         * If a property name is provided for predicate the created _.property style callback returns the property
+         * value of the given element.
+         *
+         * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+         * elements that have a matching property value, else false.
+         *
+         * If an object is provided for predicate the created _.matches style callback returns true for elements that
+         * have the properties of the given object, else false.
+         *
+         * Note: Unlike _.filter, this method mutates array.
+         *
+         * @param array The array to modify.
+         * @param predicate The function invoked per iteration.
+         * @param thisArg The this binding of predicate.
+         * @return Returns the new array of removed elements.
+         */
+        remove<T>(
+            array: List<T>,
+            predicate?: ListIteratee<T>
+        ): T[];
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.remove
+         */
+        remove<T>(
+            this: LoDashImplicitWrapper<List<T>>,
+            predicate?: ListIteratee<T>
+        ): LoDashImplicitWrapper<T[]>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.remove
+         */
+        remove<T>(
+            this: LoDashExplicitWrapper<List<T>>,
+            predicate?: ListIteratee<T>
+        ): LoDashExplicitWrapper<T[]>;
+    }
+
+    // reverse
+
+    interface LoDashStatic {
+        /**
+         * Reverses `array` so that the first element becomes the last, the second
+         * element becomes the second to last, and so on.
+         *
+         * **Note:** This method mutates `array` and is based on
+         * [`Array#reverse`](https://mdn.io/Array/reverse).
+         *
+         * @category Array
+         * @returns Returns `array`.
+         * @example
+         *
+         * var array = [1, 2, 3];
+         *
+         * _.reverse(array);
+         * // => [3, 2, 1]
+         *
+         * console.log(array);
+         * // => [3, 2, 1]
+         */
+        reverse<TList extends List<any>>(
+            array: TList,
+        ): TList;
+    }
+
+    // slice
+
+    interface LoDashStatic {
+        /**
+         * Creates a slice of array from start up to, but not including, end.
+         *
+         * @param array The array to slice.
+         * @param start The start position.
+         * @param end The end position.
+         * @return Returns the slice of array.
+         */
+        slice<T>(
+            array: List<T> | null | undefined,
+            start?: number,
+            end?: number
+        ): T[];
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.slice
+         */
+        slice<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            start?: number,
+            end?: number
+        ): LoDashImplicitWrapper<T[]>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.slice
+         */
+        slice<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            start?: number,
+            end?: number
+        ): LoDashExplicitWrapper<T[]>;
+    }
+
+    // sortedIndex
+
+    interface LoDashStatic {
+        /**
+         * Uses a binary search to determine the lowest index at which `value` should
+         * be inserted into `array` in order to maintain its sort order.
+         *
+         * @category Array
+         * @param array The sorted array to inspect.
+         * @param value The value to evaluate.
+         * @returns Returns the index at which `value` should be inserted into `array`.
+         * @example
+         *
+         * _.sortedIndex([30, 50], 40);
+         * // => 1
+         *
+         * _.sortedIndex([4, 5], 4);
+         * // => 0
+         */
+        sortedIndex<T>(
+            array: List<T> | null | undefined,
+            value: T
+        ): number;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.sortedIndex
+         */
+        sortedIndex<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            value: T
+        ): number;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.sortedIndex
+         */
+        sortedIndex<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            value: T
+        ): LoDashExplicitWrapper<number>;
+    }
+
+    // sortedIndexBy
+
+    interface LoDashStatic {
+        /**
+         * Uses a binary search to determine the lowest index at which `value` should
+         * be inserted into `array` in order to maintain its sort order.
+         *
+         * @category Array
+         * @param array The sorted array to inspect.
+         * @param value The value to evaluate.
+         * @returns Returns the index at which `value` should be inserted into `array`.
+         * @example
+         *
+         * _.sortedIndex([30, 50], 40);
+         * // => 1
+         *
+         * _.sortedIndex([4, 5], 4);
+         * // => 0
+         */
+        sortedIndex<T>(
+            array: List<T> | null | undefined,
+            value: T
+        ): number;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.sortedIndex
+         */
+        sortedIndex<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            value: T
+        ): number;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.sortedIndex
+         */
+        sortedIndex<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            value: T
+        ): LoDashExplicitWrapper<number>;
+    }
+
+    // _.sortedIndexBy
+    interface LoDashStatic {
+        /**
+         * This method is like `_.sortedIndex` except that it accepts `iteratee`
+         * which is invoked for `value` and each element of `array` to compute their
+         * sort ranking. The iteratee is invoked with one argument: (value).
+         *
+         * @category Array
+         * @param array The sorted array to inspect.
+         * @param value The value to evaluate.
+         * @param [iteratee=_.identity] The iteratee invoked per element.
+         * @returns Returns the index at which `value` should be inserted into `array`.
+         * @example
+         *
+         * var dict = { 'thirty': 30, 'forty': 40, 'fifty': 50 };
+         *
+         * _.sortedIndexBy(['thirty', 'fifty'], 'forty', _.propertyOf(dict));
+         * // => 1
+         *
+         * // using the `_.property` iteratee shorthand
+         * _.sortedIndexBy([{ 'x': 4 }, { 'x': 5 }], { 'x': 4 }, 'x');
+         * // => 0
+         */
+        sortedIndexBy<T>(
+            array: List<T> | null | undefined,
+            value: T,
+            iteratee?: ValueIteratee<T>
+        ): number;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.sortedIndexBy
+         */
+        sortedIndexBy<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            value: T,
+            iteratee?: ValueIteratee<T>
+        ): number;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.sortedIndexBy
+         */
+        sortedIndexBy<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            value: T,
+            iteratee?: ValueIteratee<T>
+        ): LoDashExplicitWrapper<number>;
+    }
+
+    // sortedIndexOf
+
+    interface LoDashStatic {
+        /**
+         * This method is like `_.indexOf` except that it performs a binary
+         * search on a sorted `array`.
+         *
+         * @category Array
+         * @param array The array to search.
+         * @param value The value to search for.
+         * @returns Returns the index of the matched value, else `-1`.
+         * @example
+         *
+         * _.sortedIndexOf([1, 1, 2, 2], 2);
+         * // => 2
+         */
+        sortedIndexOf<T>(
+            array: List<T> | null | undefined,
+            value: T
+        ): number;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.sortedIndexOf
+         */
+        sortedIndexOf<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            value: T
+        ): number;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.sortedIndexOf
+         */
+        sortedIndexOf<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            value: T
+        ): LoDashExplicitWrapper<number>;
+    }
+
+    // sortedLastIndex
+
+    interface LoDashStatic {
+        /**
+         * This method is like `_.sortedIndex` except that it returns the highest
+         * index at which `value` should be inserted into `array` in order to
+         * maintain its sort order.
+         *
+         * @category Array
+         * @param array The sorted array to inspect.
+         * @param value The value to evaluate.
+         * @returns Returns the index at which `value` should be inserted into `array`.
+         * @example
+         *
+         * _.sortedLastIndex([4, 5], 4);
+         * // => 1
+         */
+        sortedLastIndex<T>(
+            array: List<T> | null | undefined,
+            value: T
+        ): number;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.sortedLastIndex
+         */
+        sortedLastIndex<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            value: T
+        ): number;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.sortedLastIndex
+         */
+        sortedLastIndex<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            value: T
+        ): LoDashExplicitWrapper<number>;
+    }
+
+    // sortedLastIndexBy
+
+    interface LoDashStatic {
+        /**
+         * This method is like `_.sortedLastIndex` except that it accepts `iteratee`
+         * which is invoked for `value` and each element of `array` to compute their
+         * sort ranking. The iteratee is invoked with one argument: (value).
+         *
+         * @category Array
+         * @param array The sorted array to inspect.
+         * @param value The value to evaluate.
+         * @param [iteratee=_.identity] The iteratee invoked per element.
+         * @returns Returns the index at which `value` should be inserted into `array`.
+         * @example
+         *
+         * // using the `_.property` iteratee shorthand
+         * _.sortedLastIndexBy([{ 'x': 4 }, { 'x': 5 }], { 'x': 4 }, 'x');
+         * // => 1
+         */
+        sortedLastIndexBy<T>(
+            array: List<T> | null | undefined,
+            value: T,
+            iteratee: ValueIteratee<T>
+        ): number;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.sortedLastIndexBy
+         */
+        sortedLastIndexBy<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            value: T,
+            iteratee: ValueIteratee<T>
+        ): number;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.sortedLastIndexBy
+         */
+        sortedLastIndexBy<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            value: T,
+            iteratee: ValueIteratee<T>
+        ): LoDashExplicitWrapper<number>;
+    }
+
+    // sortedLastIndexOf
+
+    interface LoDashStatic {
+        /**
+         * This method is like `_.lastIndexOf` except that it performs a binary
+         * search on a sorted `array`.
+         *
+         * @category Array
+         * @param array The array to search.
+         * @param value The value to search for.
+         * @returns Returns the index of the matched value, else `-1`.
+         * @example
+         *
+         * _.sortedLastIndexOf([1, 1, 2, 2], 2);
+         * // => 3
+         */
+        sortedLastIndexOf<T>(
+            array: List<T> | null | undefined,
+            value: T
+        ): number;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.sortedLastIndexOf
+         */
+        sortedLastIndexOf<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            value: T
+        ): number;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.sortedLastIndexOf
+         */
+        sortedLastIndexOf<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            value: T
+        ): LoDashExplicitWrapper<number>;
+    }
+
+    // sortedUniq
+
+    interface LoDashStatic {
+        /**
+         * This method is like `_.uniq` except that it's designed and optimized
+         * for sorted arrays.
+         *
+         * @category Array
+         * @param array The array to inspect.
+         * @returns Returns the new duplicate free array.
+         * @example
+         *
+         * _.sortedUniq([1, 1, 2]);
+         * // => [1, 2]
+         */
+        sortedUniq<T>(
+            array: List<T> | null | undefined
+        ): T[];
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.sortedUniq
+         */
+        sortedUniq<T>(this: LoDashImplicitWrapper<List<T> | null | undefined>): LoDashImplicitWrapper<T[]>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.sortedUniq
+         */
+        sortedUniq<T>(this: LoDashExplicitWrapper<List<T> | null | undefined>): LoDashExplicitWrapper<T[]>;
+    }
+
+    // sortedUniqBy
+
+    interface LoDashStatic {
+        /**
+         * This method is like `_.uniqBy` except that it's designed and optimized
+         * for sorted arrays.
+         *
+         * @category Array
+         * @param array The array to inspect.
+         * @param [iteratee] The iteratee invoked per element.
+         * @returns Returns the new duplicate free array.
+         * @example
+         *
+         * _.sortedUniqBy([1.1, 1.2, 2.3, 2.4], Math.floor);
+         * // => [1.1, 2.2]
+         */
+        sortedUniqBy(
+            array: string | null | undefined,
+            iteratee: StringIterator<NotVoid>
+        ): string[];
+
+        /**
+         * @see _.sortedUniqBy
+         */
+        sortedUniqBy<T>(
+            array: List<T> | null | undefined,
+            iteratee: ListIteratee<T>
+        ): T[];
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.sortedUniqBy
+         */
+        sortedUniqBy(
+            this: LoDashImplicitWrapper<string | null | undefined>,
+            iteratee: StringIterator<NotVoid>
+        ): LoDashImplicitWrapper<string[]>;
+
+        /**
+         * @see _.sortedUniqBy
+         */
+        sortedUniqBy<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            iteratee: ListIteratee<T>
+        ): LoDashImplicitWrapper<T[]>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.sortedUniqBy
+         */
+        sortedUniqBy(
+            this: LoDashExplicitWrapper<string | null | undefined>,
+            iteratee: StringIterator<NotVoid>
+        ): LoDashExplicitWrapper<string[]>;
+
+        /**
+         * @see _.sortedUniqBy
+         */
+        sortedUniqBy<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            iteratee: ListIteratee<T>
+        ): LoDashExplicitWrapper<T[]>;
+    }
+
+    // tail
+
+    interface LoDashStatic {
+        /**
+         * Gets all but the first element of array.
+         *
+         * @param array The array to query.
+         * @return Returns the slice of array.
+         */
+        tail<T>(array: List<T> | null | undefined): T[];
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.tail
+         */
+        tail<T>(this: LoDashImplicitWrapper<List<T> | null | undefined>): LoDashImplicitWrapper<T[]>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.tail
+         */
+        tail<T>(this: LoDashExplicitWrapper<List<T> | null | undefined>): LoDashExplicitWrapper<T[]>;
+    }
+
+    // take
+
+    interface LoDashStatic {
+        /**
+         * Creates a slice of array with n elements taken from the beginning.
+         *
+         * @param array The array to query.
+         * @param n The number of elements to take.
+         * @return Returns the slice of array.
+         */
+        take<T>(
+            array: List<T> | null | undefined,
+            n?: number
+        ): T[];
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.take
+         */
+        take<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            n?: number
+        ): LoDashImplicitWrapper<T[]>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.take
+         */
+        take<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            n?: number
+        ): LoDashExplicitWrapper<T[]>;
+    }
+
+    // takeRight
+
+    interface LoDashStatic {
+        /**
+         * Creates a slice of array with n elements taken from the end.
+         *
+         * @param array The array to query.
+         * @param n The number of elements to take.
+         * @return Returns the slice of array.
+         */
+        takeRight<T>(
+            array: List<T> | null | undefined,
+            n?: number
+        ): T[];
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.takeRight
+         */
+        takeRight<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            n?: number
+        ): LoDashImplicitWrapper<T[]>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.takeRight
+         */
+        takeRight<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            n?: number
+        ): LoDashExplicitWrapper<T[]>;
+    }
+
+    // takeRightWhile
+
+    interface LoDashStatic {
+        /**
+         * Creates a slice of array with elements taken from the end. Elements are taken until predicate returns
+         * falsey. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
+         *
+         * If a property name is provided for predicate the created _.property style callback returns the property
+         * value of the given element.
+         *
+         * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+         * elements that have a matching property value, else false.
+         *
+         * If an object is provided for predicate the created _.matches style callback returns true for elements that
+         * have the properties of the given object, else false.
+         *
+         * @param array The array to query.
+         * @param predicate The function invoked per iteration.
+         * @param thisArg The this binding of predicate.
+         * @return Returns the slice of array.
+         */
+        takeRightWhile<T>(
+            array: List<T> | null | undefined,
+            predicate?: ListIteratee<T>
+        ): T[];
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.takeRightWhile
+         */
+        takeRightWhile<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            predicate?: ListIteratee<T>
+        ): LoDashImplicitWrapper<T[]>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.takeRightWhile
+         */
+        takeRightWhile<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            predicate?: ListIteratee<T>
+        ): LoDashExplicitWrapper<T[]>;
+    }
+
+    // takeWhile
+
+    interface LoDashStatic {
+        /**
+         * Creates a slice of array with elements taken from the beginning. Elements are taken until predicate returns
+         * falsey. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
+         *
+         * If a property name is provided for predicate the created _.property style callback returns the property
+         * value of the given element.
+         *
+         * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+         * elements that have a matching property value, else false.
+         *
+         * If an object is provided for predicate the created _.matches style callback returns true for elements that
+         * have the properties of the given object, else false.
+         *
+         * @param array The array to query.
+         * @param predicate The function invoked per iteration.
+         * @param thisArg The this binding of predicate.
+         * @return Returns the slice of array.
+         */
+        takeWhile<T>(
+            array: List<T> | null | undefined,
+            predicate?: ListIteratee<T>
+        ): T[];
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.takeWhile
+         */
+        takeWhile<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            predicate?: ListIteratee<T>
+        ): LoDashImplicitWrapper<T[]>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.takeWhile
+         */
+        takeWhile<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            predicate?: ListIteratee<T>
+        ): LoDashExplicitWrapper<T[]>;
+    }
+
+    // union
+
+    interface LoDashStatic {
+        /**
+         * Creates an array of unique values, in order, from all of the provided arrays using SameValueZero for
+         * equality comparisons.
+         *
+         * @param arrays The arrays to inspect.
+         * @return Returns the new array of combined values.
+         */
+        union<T>(...arrays: Array<List<T> | null | undefined>): T[];
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.union
+         */
+        union<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            ...arrays: Array<List<T> | null | undefined>
+        ): LoDashImplicitWrapper<T[]>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.union
+         */
+        union<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            ...arrays: Array<List<T> | null | undefined>
+        ): LoDashExplicitWrapper<T[]>;
+    }
+
+    // unionBy
+
+    interface LoDashStatic {
+        /**
+         * This method is like `_.union` except that it accepts `iteratee` which is
+         * invoked for each element of each `arrays` to generate the criterion by which
+         * uniqueness is computed. The iteratee is invoked with one argument: (value).
+         *
+         * @param arrays The arrays to inspect.
+         * @param iteratee The iteratee invoked per element.
+         * @return Returns the new array of combined values.
+         */
+        unionBy<T>(
+            arrays: List<T> | null | undefined,
+            iteratee?: ValueIteratee<T>
+        ): T[];
+
+        /**
+         * @see _.unionBy
+         */
+        unionBy<T>(
+            arrays1: List<T> | null | undefined,
+            arrays2: List<T> | null | undefined,
+            iteratee?: ValueIteratee<T>
+        ): T[];
+
+        /**
+         * @see _.unionBy
+         */
+        unionBy<T>(
+            arrays1: List<T> | null | undefined,
+            arrays2: List<T> | null | undefined,
+            arrays3: List<T> | null | undefined,
+            iteratee?: ValueIteratee<T>
+        ): T[];
+
+        /**
+         * @see _.unionBy
+         */
+        unionBy<T>(
+            arrays1: List<T> | null | undefined,
+            arrays2: List<T> | null | undefined,
+            arrays3: List<T> | null | undefined,
+            arrays4: List<T> | null | undefined,
+            iteratee?: ValueIteratee<T>
+        ): T[];
+
+        /**
+         * @see _.unionBy
+         */
+        unionBy<T>(
+            arrays1: List<T> | null | undefined,
+            arrays2: List<T> | null | undefined,
+            arrays3: List<T> | null | undefined,
+            arrays4: List<T> | null | undefined,
+            arrays5: List<T> | null | undefined,
+            ...iteratee: Array<ValueIteratee<T> | List<T> | null | undefined>
+        ): T[];
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.unionBy
+         */
+        unionBy<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            iteratee?: ValueIteratee<T>
+        ): LoDashImplicitWrapper<T[]>;
+
+        /**
+         * @see _.unionBy
+         */
+        unionBy<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            arrays2: List<T> | null | undefined,
+            iteratee?: ValueIteratee<T>
+        ): LoDashImplicitWrapper<T[]>;
+
+        /**
+         * @see _.unionBy
+         */
+        unionBy<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            arrays2: List<T> | null | undefined,
+            arrays3: List<T> | null | undefined,
+            iteratee?: ValueIteratee<T>
+        ): LoDashImplicitWrapper<T[]>;
+
+        /**
+         * @see _.unionBy
+         */
+        unionBy<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            arrays2: List<T> | null | undefined,
+            arrays3: List<T> | null | undefined,
+            arrays4: List<T> | null | undefined,
+            iteratee?: ValueIteratee<T>
+        ): LoDashImplicitWrapper<T[]>;
+
+        /**
+         * @see _.unionBy
+         */
+        unionBy<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            arrays2: List<T> | null | undefined,
+            arrays3: List<T> | null | undefined,
+            arrays4: List<T> | null | undefined,
+            arrays5: List<T> | null | undefined,
+            ...iteratee: Array<ValueIteratee<T> | List<T> | null | undefined>
+        ): LoDashImplicitWrapper<T[]>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.unionBy
+         */
+        unionBy<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            iteratee?: ValueIteratee<T>
+        ): LoDashExplicitWrapper<T[]>;
+
+        /**
+         * @see _.unionBy
+         */
+        unionBy<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            arrays2: List<T> | null | undefined,
+            iteratee?: ValueIteratee<T>
+        ): LoDashExplicitWrapper<T[]>;
+
+        /**
+         * @see _.unionBy
+         */
+        unionBy<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            arrays2: List<T> | null | undefined,
+            arrays3: List<T> | null | undefined,
+            iteratee?: ValueIteratee<T>
+        ): LoDashExplicitWrapper<T[]>;
+
+        /**
+         * @see _.unionBy
+         */
+        unionBy<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            arrays2: List<T> | null | undefined,
+            arrays3: List<T> | null | undefined,
+            arrays4: List<T> | null | undefined,
+            iteratee?: ValueIteratee<T>
+        ): LoDashExplicitWrapper<T[]>;
+
+        /**
+         * @see _.unionBy
+         */
+        unionBy<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            arrays2: List<T> | null | undefined,
+            arrays3: List<T> | null | undefined,
+            arrays4: List<T> | null | undefined,
+            arrays5: List<T> | null | undefined,
+            ...iteratee: Array<ValueIteratee<T> | List<T> | null | undefined>
+        ): LoDashExplicitWrapper<T[]>;
+    }
+
+    // unionWith
+
+    interface LoDashStatic {
+        /**
+         * This method is like `_.union` except that it accepts `comparator` which
+         * is invoked to compare elements of `arrays`. The comparator is invoked
+         * with two arguments: (arrVal, othVal).
+         *
+         * @category Array
+         * @param [arrays] The arrays to inspect.
+         * @param [comparator] The comparator invoked per element.
+         * @returns Returns the new array of combined values.
+         * @example
+         *
+         * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
+         * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
+         *
+         * _.unionWith(objects, others, _.isEqual);
+         * // => [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }, { 'x': 1, 'y': 1 }]
+         */
+        unionWith<T>(
+            arrays: List<T> | null | undefined,
+            comparator?: Comparator<T>
+        ): T[];
+
+        /**
+         * @see _.unionBy
+         */
+        unionWith<T>(
+            arrays: List<T> | null | undefined,
+            arrays2: List<T> | null | undefined,
+            comparator?: Comparator<T>
+        ): T[];
+
+        /**
+         * @see _.unionWith
+         */
+        unionWith<T>(
+            arrays: List<T> | null | undefined,
+            arrays2: List<T> | null | undefined,
+            arrays3: List<T> | null | undefined,
+            ...comparator: Array<Comparator<T> | List<T> | null | undefined>
+        ): T[];
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.unionWith
+         */
+        unionWith<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            comparator?: Comparator<T>
+        ): LoDashImplicitWrapper<T[]>;
+
+        /**
+         * @see _.unionWith
+         */
+        unionWith<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            arrays2: List<T> | null | undefined,
+            comparator?: Comparator<T>
+        ): LoDashImplicitWrapper<T[]>;
+
+        /**
+         * @see _.unionWith
+         */
+        unionWith<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            arrays2: List<T> | null | undefined,
+            arrays3: List<T> | null | undefined,
+            ...comparator: Array<Comparator<T> | List<T> | null | undefined>
+        ): LoDashImplicitWrapper<T[]>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.unionWith
+         */
+        unionWith<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            comparator?: Comparator<T>
+        ): LoDashExplicitWrapper<T[]>;
+
+        /**
+         * @see _.unionWith
+         */
+        unionWith<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            arrays2: List<T> | null | undefined,
+            comparator?: Comparator<T>
+        ): LoDashExplicitWrapper<T[]>;
+
+        /**
+         * @see _.unionWith
+         */
+        unionWith<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            arrays2: List<T> | null | undefined,
+            arrays3: List<T> | null | undefined,
+            ...comparator: Array<Comparator<T> | List<T> | null | undefined>
+        ): LoDashExplicitWrapper<T[]>;
+    }
+
+    // uniq
+
+    interface LoDashStatic {
+        /**
+         * Creates a duplicate-free version of an array, using
+         * [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
+         * for equality comparisons, in which only the first occurrence of each element
+         * is kept.
+         *
+         * @category Array
+         * @param array The array to inspect.
+         * @returns Returns the new duplicate free array.
+         * @example
+         *
+         * _.uniq([2, 1, 2]);
+         * // => [2, 1]
+         */
+        uniq<T>(
+            array: List<T> | null | undefined
+        ): T[];
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.uniq
+         */
+        uniq<T>(this: LoDashImplicitWrapper<List<T> | null | undefined>): LoDashImplicitWrapper<T[]>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.uniq
+         */
+        uniq<T>(this: LoDashExplicitWrapper<List<T> | null | undefined>): LoDashExplicitWrapper<T[]>;
+    }
+
+    // uniqBy
+
+    interface LoDashStatic {
+        /**
+         * This method is like `_.uniq` except that it accepts `iteratee` which is
+         * invoked for each element in `array` to generate the criterion by which
+         * uniqueness is computed. The iteratee is invoked with one argument: (value).
+         *
+         * @category Array
+         * @param array The array to inspect.
+         * @param [iteratee=_.identity] The iteratee invoked per element.
+         * @returns Returns the new duplicate free array.
+         * @example
+         *
+         * _.uniqBy([2.1, 1.2, 2.3], Math.floor);
+         * // => [2.1, 1.2]
+         *
+         * // using the `_.property` iteratee shorthand
+         * _.uniqBy([{ 'x': 1 }, { 'x': 2 }, { 'x': 1 }], 'x');
+         * // => [{ 'x': 1 }, { 'x': 2 }]
+         */
+        uniqBy(
+            array: string | null | undefined,
+            iteratee: StringIterator<NotVoid>
+        ): string[];
+
+        /**
+         * @see _.uniqBy
+         */
+        uniqBy<T>(
+            array: List<T> | null | undefined,
+            iteratee: ListIteratee<T>
+        ): T[];
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.uniqBy
+         */
+        uniqBy(
+            this: LoDashImplicitWrapper<string | null | undefined>,
+            iteratee: StringIterator<NotVoid>
+        ): LoDashImplicitWrapper<string[]>;
+
+        /**
+         * @see _.uniqBy
+         */
+        uniqBy<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            iteratee: ListIteratee<T>
+        ): LoDashImplicitWrapper<T[]>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.uniqBy
+         */
+        uniqBy(
+            this: LoDashExplicitWrapper<string | null | undefined>,
+            iteratee: StringIterator<NotVoid>
+        ): LoDashExplicitWrapper<string[]>;
+
+        /**
+         * @see _.uniqBy
+         */
+        uniqBy<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            iteratee: ListIteratee<T>
+        ): LoDashExplicitWrapper<T[]>;
+    }
+
+    // uniqWith
+
+    interface LoDashStatic {
+        /**
+         * This method is like `_.uniq` except that it accepts `comparator` which
+         * is invoked to compare elements of `array`. The comparator is invoked with
+         * two arguments: (arrVal, othVal).
+         *
+         * @category Array
+         * @param array The array to inspect.
+         * @param [comparator] The comparator invoked per element.
+         * @returns Returns the new duplicate free array.
+         * @example
+         *
+         * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 },  { 'x': 1, 'y': 2 }];
+         *
+         * _.uniqWith(objects, _.isEqual);
+         * // => [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }]
+         */
+        uniqWith<T>(
+            array: List<T> | null | undefined,
+            comparator?: Comparator<T>
+        ): T[];
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.uniqWith
+         */
+        uniqWith<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            comparator?: Comparator<T>
+        ): LoDashImplicitWrapper<T[]>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.uniqWith
+         */
+        uniqWith<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            comparator?: Comparator<T>
+        ): LoDashExplicitWrapper<T[]>;
+    }
+
+    // unzip
+
+    interface LoDashStatic {
+        /**
+         * This method is like _.zip except that it accepts an array of grouped elements and creates an array
+         * regrouping the elements to their pre-zip configuration.
+         *
+         * @param array The array of grouped elements to process.
+         * @return Returns the new array of regrouped elements.
+         */
+        unzip<T>(array: T[][] | List<List<T>> | null | undefined): T[][];
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.unzip
+         */
+        unzip<T>(this: LoDashImplicitWrapper<T[][] | List<List<T>> | null | undefined>): LoDashImplicitWrapper<T[][]>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.unzip
+         */
+        unzip<T>(this: LoDashExplicitWrapper<T[][] | List<List<T>> | null | undefined>): LoDashExplicitWrapper<T[][]>;
+    }
+
+    // unzipWith
+
+    interface LoDashStatic {
+        /**
+         * This method is like _.unzip except that it accepts an iteratee to specify how regrouped values should be
+         * combined. The iteratee is bound to thisArg and invoked with four arguments: (accumulator, value, index,
+         * group).
+         *
+         * @param array The array of grouped elements to process.
+         * @param iteratee The function to combine regrouped values.
+         * @param thisArg The this binding of iteratee.
+         * @return Returns the new array of regrouped elements.
+         */
+        unzipWith<T, TResult>(
+            array: List<List<T>> | null | undefined,
+            iteratee: (...values: T[]) => TResult
+        ): TResult[];
+
+        /**
+         * @see _.unzipWith
+         */
+        unzipWith<T>(
+            array: List<List<T>> | null | undefined
+        ): T[][];
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.unzipWith
+         */
+        unzipWith<T, TResult>(
+            this: LoDashImplicitWrapper<List<List<T>> | null | undefined>,
+            iteratee: (...values: T[]) => TResult
+        ): LoDashImplicitWrapper<TResult[]>;
+
+        /**
+         * @see _.unzipWith
+         */
+        unzipWith<T>(
+            this: LoDashImplicitWrapper<List<List<T>> | null | undefined>
+        ): LoDashImplicitWrapper<T[][]>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.unzipWith
+         */
+        unzipWith<T, TResult>(
+            this: LoDashExplicitWrapper<List<List<T>> | null | undefined>,
+            iteratee: (...values: T[]) => TResult
+        ): LoDashExplicitWrapper<TResult[]>;
+
+        /**
+         * @see _.unzipWith
+         */
+        unzipWith<T>(
+            this: LoDashExplicitWrapper<List<List<T>> | null | undefined>
+        ): LoDashExplicitWrapper<T[][]>;
+    }
+
+    // without
+
+    interface LoDashStatic {
+        /**
+         * Creates an array excluding all provided values using SameValueZero for equality comparisons.
+         *
+         * @param array The array to filter.
+         * @param values The values to exclude.
+         * @return Returns the new array of filtered values.
+         */
+        without<T>(
+            array: List<T> | null | undefined,
+            ...values: T[]
+        ): T[];
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.without
+         */
+        without<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            ...values: T[]
+        ): LoDashImplicitWrapper<T[]>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.without
+         */
+        without<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            ...values: T[]
+        ): LoDashExplicitWrapper<T[]>;
+    }
+
+    // xor
+
+    interface LoDashStatic {
+        /**
+         * Creates an array of unique values that is the symmetric difference of the provided arrays.
+         *
+         * @param arrays The arrays to inspect.
+         * @return Returns the new array of values.
+         */
+        xor<T>(...arrays: Array<List<T> | null | undefined>): T[];
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.xor
+         */
+        xor<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            ...arrays: Array<List<T> | null | undefined>
+        ): LoDashImplicitWrapper<T[]>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.xor
+         */
+        xor<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            ...arrays: Array<List<T> | null | undefined>
+        ): LoDashExplicitWrapper<T[]>;
+    }
+
+    // xorBy
+
+    interface LoDashStatic {
+        /**
+         * This method is like `_.xor` except that it accepts `iteratee` which is
+         * invoked for each element of each `arrays` to generate the criterion by which
+         * uniqueness is computed. The iteratee is invoked with one argument: (value).
+         *
+         * @category Array
+         * @param [arrays] The arrays to inspect.
+         * @param [iteratee=_.identity] The iteratee invoked per element.
+         * @returns Returns the new array of values.
+         * @example
+         *
+         * _.xorBy([2.1, 1.2], [4.3, 2.4], Math.floor);
+         * // => [1.2, 4.3]
+         *
+         * // using the `_.property` iteratee shorthand
+         * _.xorBy([{ 'x': 1 }], [{ 'x': 2 }, { 'x': 1 }], 'x');
+         * // => [{ 'x': 2 }]
+         */
+        xorBy<T>(
+            arrays: List<T> | null | undefined,
+            iteratee?: ValueIteratee<T>
+        ): T[];
+
+        /**
+         * @see _.xorBy
+         */
+        xorBy<T>(
+            arrays: List<T> | null | undefined,
+            arrays2: List<T> | null | undefined,
+            iteratee?: ValueIteratee<T>
+        ): T[];
+
+        /**
+         * @see _.xorBy
+         */
+        xorBy<T>(
+            arrays: List<T> | null | undefined,
+            arrays2: List<T> | null | undefined,
+            arrays3: List<T> | null | undefined,
+            ...iteratee: Array<ValueIteratee<T> | List<T> | null | undefined>
+        ): T[];
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.xor
+         */
+        xorBy<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            iteratee?: ValueIteratee<T>
+        ): LoDashImplicitWrapper<T[]>;
+
+        /**
+         * @see _.xorBy
+         */
+        xorBy<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            arrays2: List<T> | null | undefined,
+            iteratee?: ValueIteratee<T>
+        ): LoDashImplicitWrapper<T[]>;
+
+        /**
+         * @see _.xorBy
+         */
+        xorBy<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            arrays2: List<T> | null | undefined,
+            arrays3: List<T> | null | undefined,
+            ...iteratee: Array<ValueIteratee<T> | List<T> | null | undefined>
+        ): LoDashImplicitWrapper<T[]>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.xorBy
+         */
+        xorBy<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            iteratee?: ValueIteratee<T>
+        ): LoDashExplicitWrapper<T[]>;
+
+        /**
+         * @see _.xorBy
+         */
+        xorBy<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            arrays2: List<T> | null | undefined,
+            iteratee?: ValueIteratee<T>
+        ): LoDashExplicitWrapper<T[]>;
+
+        /**
+         * @see _.xorBy
+         */
+        xorBy<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            arrays2: List<T> | null | undefined,
+            arrays3: List<T> | null | undefined,
+            ...iteratee: Array<ValueIteratee<T> | List<T> | null | undefined>
+        ): LoDashExplicitWrapper<T[]>;
+    }
+
+    // xorWith
+
+    interface LoDashStatic {
+        /**
+         * This method is like `_.xor` except that it accepts `comparator` which is
+         * invoked to compare elements of `arrays`. The comparator is invoked with
+         * two arguments: (arrVal, othVal).
+         *
+         * @category Array
+         * @param [arrays] The arrays to inspect.
+         * @param [comparator] The comparator invoked per element.
+         * @returns Returns the new array of values.
+         * @example
+         *
+         * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
+         * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
+         *
+         * _.xorWith(objects, others, _.isEqual);
+         * // => [{ 'x': 2, 'y': 1 }, { 'x': 1, 'y': 1 }]
+         */
+        xorWith<T>(
+            arrays: List<T> | null | undefined,
+            comparator?: Comparator<T>
+        ): T[];
+
+        /**
+         * @see _.xorWith
+         */
+        xorWith<T>(
+            arrays: List<T> | null | undefined,
+            arrays2: List<T> | null | undefined,
+            comparator?: Comparator<T>
+        ): T[];
+
+        /**
+         * @see _.xorWith
+         */
+        xorWith<T>(
+            arrays: List<T> | null | undefined,
+            arrays2: List<T> | null | undefined,
+            arrays3: List<T> | null | undefined,
+            ...comparator: Array<Comparator<T> | List<T> | null | undefined>
+        ): T[];
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.xorWith
+         */
+        xorWith<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            comparator?: Comparator<T>
+        ): LoDashImplicitWrapper<T[]>;
+
+        /**
+         * @see _.xorWith
+         */
+        xorWith<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            arrays2: List<T> | null | undefined,
+            comparator?: Comparator<T>
+        ): LoDashImplicitWrapper<T[]>;
+
+        /**
+         * @see _.xorWith
+         */
+        xorWith<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            arrays2: List<T> | null | undefined,
+            arrays3: List<T> | null | undefined,
+            ...comparator: Array<Comparator<T> | List<T> | null | undefined>
+        ): LoDashImplicitWrapper<T[]>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.xorWith
+         */
+        xorWith<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            comparator?: Comparator<T>
+        ): LoDashExplicitWrapper<T[]>;
+
+        /**
+         * @see _.xorWith
+         */
+        xorWith<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            arrays2: List<T> | null | undefined,
+            comparator?: Comparator<T>
+        ): LoDashExplicitWrapper<T[]>;
+
+        /**
+         * @see _.xorWith
+         */
+        xorWith<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            arrays2: List<T> | null | undefined,
+            arrays3: List<T> | null | undefined,
+            ...comparator: Array<Comparator<T> | List<T> | null | undefined>
+        ): LoDashExplicitWrapper<T[]>;
+    }
+
+    // zip
+
+    interface LoDashStatic {
+        /**
+         * Creates an array of grouped elements, the first of which contains the first elements of the given arrays,
+         * the second of which contains the second elements of the given arrays, and so on.
+         *
+         * @param arrays The arrays to process.
+         * @return Returns the new array of grouped elements.
+         */
+        zip<T1, T2>(arrays1: List<T1>, arrays2: List<T2>): Array<[T1 | undefined, T2 | undefined]>;
+
+        /**
+         * @see _.zip
+         */
+        zip<T1, T2, T3>(arrays1: List<T1>, arrays2: List<T2>, arrays3: List<T3>): Array<[T1 | undefined, T2 | undefined, T3 | undefined]>;
+
+        /**
+         * @see _.zip
+         */
+        zip<T1, T2, T3, T4>(arrays1: List<T1>, arrays2: List<T2>, arrays3: List<T3>, arrays4: List<T4>): Array<[T1 | undefined, T2 | undefined, T3 | undefined, T4 | undefined]>;
+
+        /**
+         * @see _.zip
+         */
+        zip<T1, T2, T3, T4, T5>(arrays1: List<T1>, arrays2: List<T2>, arrays3: List<T3>, arrays4: List<T4>, arrays5: List<T5>): Array<[T1 | undefined, T2 | undefined, T3 | undefined, T4 | undefined, T5 | undefined]>;
+
+        /**
+         * @see _.zip
+         */
+        zip<T>(...arrays: Array<List<T> | null | undefined>): (T | undefined)[][];
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.zip
+         */
+        zip<T1, T2>(
+            this: LoDashImplicitWrapper<List<T1>>,
+            arrays2: List<T2>,
+        ): LoDashImplicitWrapper<Array<[T1 | undefined, T2 | undefined]>>;
+
+        /**
+         * @see _.zip
+         */
+        zip<T1, T2, T3>(
+            this: LoDashImplicitWrapper<List<T1>>,
+            arrays2: List<T2>,
+            arrays3: List<T3>,
+        ): LoDashImplicitWrapper<Array<[T1 | undefined, T2 | undefined, T3 | undefined]>>;
+
+        /**
+         * @see _.zip
+         */
+        zip<T1, T2, T3, T4>(
+            this: LoDashImplicitWrapper<List<T1>>,
+            arrays2: List<T2>,
+            arrays3: List<T3>,
+            arrays4: List<T4>,
+        ): LoDashImplicitWrapper<Array<[T1 | undefined, T2 | undefined, T3 | undefined, T4 | undefined]>>;
+
+        /**
+         * @see _.zip
+         */
+        zip<T1, T2, T3, T4, T5>(
+            this: LoDashImplicitWrapper<List<T1>>,
+            arrays2: List<T2>,
+            arrays3: List<T3>,
+            arrays4: List<T4>,
+            arrays5: List<T5>,
+        ): LoDashImplicitWrapper<Array<[T1 | undefined, T2 | undefined, T3 | undefined, T4 | undefined, T5 | undefined]>>;
+
+        /**
+         * @see _.zip
+         */
+        zip<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            ...arrays: Array<List<T> | null | undefined>
+        ): LoDashImplicitWrapper<Array<Array<T | undefined>>>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.zip
+         */
+        zip<T1, T2>(
+            this: LoDashExplicitWrapper<List<T1>>,
+            arrays2: List<T2>,
+        ): LoDashExplicitWrapper<Array<[T1 | undefined, T2 | undefined]>>;
+
+        /**
+         * @see _.zip
+         */
+        zip<T1, T2, T3>(
+            this: LoDashExplicitWrapper<List<T1>>,
+            arrays2: List<T2>,
+            arrays3: List<T3>,
+        ): LoDashExplicitWrapper<Array<[T1 | undefined, T2 | undefined, T3 | undefined]>>;
+
+        /**
+         * @see _.zip
+         */
+        zip<T1, T2, T3, T4>(
+            this: LoDashExplicitWrapper<List<T1>>,
+            arrays2: List<T2>,
+            arrays3: List<T3>,
+            arrays4: List<T4>,
+        ): LoDashExplicitWrapper<Array<[T1 | undefined, T2 | undefined, T3 | undefined, T4 | undefined]>>;
+
+        /**
+         * @see _.zip
+         */
+        zip<T1, T2, T3, T4, T5>(
+            this: LoDashExplicitWrapper<List<T1>>,
+            arrays2: List<T2>,
+            arrays3: List<T3>,
+            arrays4: List<T4>,
+            arrays5: List<T5>,
+        ): LoDashExplicitWrapper<Array<[T1 | undefined, T2 | undefined, T3 | undefined, T4 | undefined, T5 | undefined]>>;
+
+        /**
+         * @see _.zip
+         */
+        zip<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            ...arrays: Array<List<T> | null | undefined>
+        ): LoDashExplicitWrapper<Array<Array<T | undefined>>>;
+    }
+
+    // zipObject
+
+    interface LoDashStatic {
+        /**
+         * This method is like _.fromPairs except that it accepts two arrays, one of property
+         * identifiers and one of corresponding values.
+         *
+         * @param props The property names.
+         * @param values The property values.
+         * @return Returns the new object.
+         */
+        zipObject<T>(
+            props: List<PropertyName>,
+            values: List<T>
+        ): Dictionary<T>;
+
+        /**
+         * @see _.zipObject
+         */
+        zipObject(
+            props?: List<PropertyName>
+        ): Dictionary<undefined>;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.zipObject
+         */
+        zipObject<T>(
+            this: LoDashImplicitWrapper<List<PropertyName>>,
+            values: List<T>
+        ): LoDashImplicitWrapper<Dictionary<T>>;
+
+        /**
+         * @see _.zipObject
+         */
+        zipObject(
+            this: LoDashImplicitWrapper<List<PropertyName>>
+        ): LoDashImplicitWrapper<Dictionary<undefined>>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.zipObject
+         */
+        zipObject<T>(
+            this: LoDashExplicitWrapper<List<PropertyName>>,
+            values: List<T>
+        ): LoDashExplicitWrapper<Dictionary<T>>;
+
+        /**
+         * @see _.zipObject
+         */
+        zipObject(
+            this: LoDashExplicitWrapper<List<PropertyName>>
+        ): LoDashExplicitWrapper<Dictionary<undefined>>;
+    }
+
+    // zipObjectDeep
+
+    interface LoDashStatic {
+        /**
+         * This method is like _.zipObject except that it supports property paths.
+         *
+         * @param paths The property names.
+         * @param values The property values.
+         * @return Returns the new object.
+         */
+        zipObjectDeep(
+            paths?: List<PropertyPath>,
+            values?: List<any>
+        ): object;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.zipObjectDeep
+         */
+        zipObjectDeep(
+            this: LoDashImplicitWrapper<List<PropertyPath>>,
+            values?: List<any>
+        ): LoDashImplicitWrapper<object>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.zipObjectDeep
+         */
+        zipObjectDeep(
+            this: LoDashExplicitWrapper<List<PropertyPath>>,
+            values?: List<any>
+        ): LoDashExplicitWrapper<object>;
+    }
+
+    // zipWith
+
+    interface LoDashStatic {
+        /**
+         * This method is like _.zip except that it accepts an iteratee to specify how grouped values should be
+         * combined. The iteratee is bound to thisArg and invoked with four arguments: (accumulator, value, index,
+         * group).
+         * @param [arrays] The arrays to process.
+         * @param [iteratee] The function to combine grouped values.
+         * @param [thisArg] The `this` binding of `iteratee`.
+         * @return Returns the new array of grouped elements.
+         */
+        zipWith<T, TResult>(
+            arrays: List<T>,
+            iteratee: (value1: T) => TResult
+        ): TResult[];
+
+        /**
+         * @see _.zipWith
+         */
+        zipWith<T1, T2, TResult>(
+            arrays1: List<T1>,
+            arrays2: List<T2>,
+            iteratee: (value1: T1, value2: T2) => TResult
+        ): TResult[];
+
+        /**
+         * @see _.zipWith
+         */
+        zipWith<T1, T2, T3, TResult>(
+            arrays1: List<T1>,
+            arrays2: List<T2>,
+            arrays3: List<T3>,
+            iteratee: (value1: T1, value2: T2, value3: T3) => TResult
+        ): TResult[];
+
+        /**
+         * @see _.zipWith
+         */
+        zipWith<T1, T2, T3, T4, TResult>(
+            arrays1: List<T1>,
+            arrays2: List<T2>,
+            arrays3: List<T3>,
+            arrays4: List<T4>,
+            iteratee: (value1: T1, value2: T2, value3: T3, value4: T4) => TResult
+        ): TResult[];
+
+        /**
+         * @see _.zipWith
+         */
+        zipWith<T1, T2, T3, T4, T5, TResult>(
+            arrays1: List<T1>,
+            arrays2: List<T2>,
+            arrays3: List<T3>,
+            arrays4: List<T4>,
+            arrays5: List<T5>,
+            iteratee: (value1: T1, value2: T2, value3: T3, value4: T4, value5: T5) => TResult
+        ): TResult[];
+
+        /**
+         * @see _.zipWith
+         */
+        zipWith<T, TResult>(
+            ...iteratee: Array<((...group: T[]) => TResult) | List<T> | null | undefined>
+        ): TResult[];
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.zipWith
+         */
+        zipWith<T, TResult>(
+            this: LoDashImplicitWrapper<List<T>>,
+            iteratee: (value1: T) => TResult
+        ): LoDashImplicitWrapper<TResult[]>;
+
+        /**
+         * @see _.zipWith
+         */
+        zipWith<T1, T2, TResult>(
+            this: LoDashImplicitWrapper<List<T1>>,
+            arrays2: List<T2>,
+            iteratee: (value1: T1, value2: T2) => TResult
+        ): LoDashImplicitWrapper<TResult[]>;
+
+        /**
+         * @see _.zipWith
+         */
+        zipWith<T1, T2, T3, TResult>(
+            this: LoDashImplicitWrapper<List<T1>>,
+            arrays2: List<T2>,
+            arrays3: List<T3>,
+            iteratee: (value1: T1, value2: T2, value3: T3) => TResult
+        ): LoDashImplicitWrapper<TResult[]>;
+
+        /**
+         * @see _.zipWith
+         */
+        zipWith<T1, T2, T3, T4, TResult>(
+            this: LoDashImplicitWrapper<List<T1>>,
+            arrays2: List<T2>,
+            arrays3: List<T3>,
+            arrays4: List<T4>,
+            iteratee: (value1: T1, value2: T2, value3: T3, value4: T4) => TResult
+        ): LoDashImplicitWrapper<TResult[]>;
+
+        /**
+         * @see _.zipWith
+         */
+        zipWith<T1, T2, T3, T4, T5, TResult>(
+            this: LoDashImplicitWrapper<List<T1>>,
+            arrays2: List<T2>,
+            arrays3: List<T3>,
+            arrays4: List<T4>,
+            arrays5: List<T5>,
+            iteratee: (value1: T1, value2: T2, value3: T3, value4: T4, value5: T5) => TResult
+        ): LoDashImplicitWrapper<TResult[]>;
+
+        /**
+         * @see _.zipWith
+         */
+        zipWith<T, TResult>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            ...iteratee: Array<((...group: T[]) => TResult) | List<T> | null | undefined>
+        ): LoDashImplicitWrapper<TResult[]>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.zipWith
+         */
+        zipWith<T, TResult>(
+            this: LoDashExplicitWrapper<List<T>>,
+            iteratee: (value1: T) => TResult
+        ): LoDashExplicitWrapper<TResult[]>;
+
+        /**
+         * @see _.zipWith
+         */
+        zipWith<T1, T2, TResult>(
+            this: LoDashExplicitWrapper<List<T1>>,
+            arrays2: List<T2>,
+            iteratee: (value1: T1, value2: T2) => TResult
+        ): LoDashExplicitWrapper<TResult[]>;
+
+        /**
+         * @see _.zipWith
+         */
+        zipWith<T1, T2, T3, TResult>(
+            this: LoDashExplicitWrapper<List<T1>>,
+            arrays2: List<T2>,
+            arrays3: List<T3>,
+            iteratee: (value1: T1, value2: T2, value3: T3) => TResult
+        ): LoDashExplicitWrapper<TResult[]>;
+
+        /**
+         * @see _.zipWith
+         */
+        zipWith<T1, T2, T3, T4, TResult>(
+            this: LoDashExplicitWrapper<List<T1>>,
+            arrays2: List<T2>,
+            arrays3: List<T3>,
+            arrays4: List<T4>,
+            iteratee: (value1: T1, value2: T2, value3: T3, value4: T4) => TResult
+        ): LoDashExplicitWrapper<TResult[]>;
+
+        /**
+         * @see _.zipWith
+         */
+        zipWith<T1, T2, T3, T4, T5, TResult>(
+            this: LoDashExplicitWrapper<List<T1>>,
+            arrays2: List<T2>,
+            arrays3: List<T3>,
+            arrays4: List<T4>,
+            arrays5: List<T5>,
+            iteratee: (value1: T1, value2: T2, value3: T3, value4: T4, value5: T5) => TResult
+        ): LoDashExplicitWrapper<TResult[]>;
+
+        /**
+         * @see _.zipWith
+         */
+        zipWith<T, TResult>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            ...iteratee: Array<((...group: T[]) => TResult) | List<T> | null | undefined>
+        ): LoDashExplicitWrapper<TResult[]>;
+    }
+}
\ No newline at end of file
diff --git a/types/lodash/common/collection.d.ts b/types/lodash/common/collection.d.ts
new file mode 100644
index 0000000000..31e5b1c212
--- /dev/null
+++ b/types/lodash/common/collection.d.ts
@@ -0,0 +1,3091 @@
+import _ = require("../index");
+declare module "../index" {
+    // countBy
+
+    interface LoDashStatic {
+        /**
+         * Creates an object composed of keys generated from the results of running each element of collection through
+         * iteratee. The corresponding value of each key is the number of times the key was returned by iteratee. The
+         * iteratee is bound to thisArg and invoked with three arguments:
+         * (value, index|key, collection).
+         *
+         * If a property name is provided for iteratee the created _.property style callback returns the property
+         * value of the given element.
+         *
+         * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+         * elements that have a matching property value, else false.
+         *
+         * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+         * have the properties of the given object, else false.
+         *
+         * @param collection The collection to iterate over.
+         * @param iteratee The function invoked per iteration.
+         * @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>
+        ): Dictionary<number>;
+
+        /**
+         * @see _.countBy
+         */
+        countBy<T>(
+            collection: NumericDictionary<T> | null | undefined,
+            iteratee?: NumericDictionaryIteratee<T>
+        ): Dictionary<number>;
+
+        /**
+         * @see _.countBy
+         */
+        countBy<T extends object>(
+            collection: T | null | undefined,
+            iteratee?: ObjectIteratee<T>
+        ): Dictionary<number>;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.countBy
+         */
+        countBy<T>(
+            this: LoDashImplicitWrapper<string | null | undefined>,
+            iteratee?: StringIterator<T>
+        ): LoDashImplicitWrapper<Dictionary<number>>;
+
+        /**
+         * @see _.countBy
+         */
+        countBy<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            iteratee?: ListIteratee<T>
+        ): LoDashImplicitWrapper<Dictionary<number>>;
+
+        /**
+         * @see _.countBy
+         */
+        countBy<T extends object>(
+            this: LoDashImplicitWrapper<T | null | undefined>,
+            iteratee?: ObjectIteratee<T>
+        ): LoDashImplicitWrapper<Dictionary<number>>;
+
+        /**
+         * @see _.countBy
+         */
+        countBy<T>(
+            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
+            iteratee?: NumericDictionaryIteratee<T>
+        ): LoDashImplicitWrapper<Dictionary<number>>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.countBy
+         */
+        countBy<T>(
+            this: LoDashExplicitWrapper<string | null | undefined>,
+            iteratee?: StringIterator<T>
+        ): LoDashExplicitWrapper<Dictionary<number>>;
+
+        /**
+         * @see _.countBy
+         */
+        countBy<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            iteratee?: ListIteratee<T>
+        ): LoDashExplicitWrapper<Dictionary<number>>;
+
+        /**
+         * @see _.countBy
+         */
+        countBy<T extends object>(
+            this: LoDashExplicitWrapper<T | null | undefined>,
+            iteratee?: ObjectIteratee<T>
+        ): LoDashExplicitWrapper<Dictionary<number>>;
+
+        /**
+         * @see _.countBy
+         */
+        countBy<T>(
+            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
+            iteratee?: NumericDictionaryIteratee<T>
+        ): LoDashExplicitWrapper<Dictionary<number>>;
+    }
+
+    // each
+
+    interface LoDashStatic {
+        each: typeof _.forEach; // tslint:disable-line:no-unnecessary-qualifier
+    }
+
+    interface LoDashWrapper<TValue> {
+        /**
+         * @see _.forEach
+         */
+        each<T>(
+            this: LoDashWrapper<T[] | null | undefined>,
+            iteratee?: ArrayIterator<T, any>
+        ): this;
+
+        /**
+         * @see _.forEach
+         */
+        each(
+            this: LoDashWrapper<string | null | undefined>,
+            iteratee?: StringIterator<any>
+        ): this;
+
+        /**
+         * @see _.forEach
+         */
+        each<T>(
+            this: LoDashWrapper<List<T> | null | undefined>,
+            iteratee?: ListIterator<T, any>
+        ): this;
+
+        /**
+         * @see _.forEach
+         */
+        each<T extends object>(
+            this: LoDashWrapper<T | null | undefined>,
+            iteratee?: ObjectIterator<T, any>
+        ): this;
+    }
+
+    // eachRight
+
+    interface LoDashStatic {
+        eachRight: typeof _.forEachRight; // tslint:disable-line:no-unnecessary-qualifier
+    }
+
+    interface LoDashWrapper<TValue> {
+        /**
+         * @see _.forEachRight
+         */
+        eachRight<T>(
+            this: LoDashWrapper<T[] | null | undefined>,
+            iteratee?: ArrayIterator<T, any>
+        ): this;
+
+        /**
+         * @see _.forEachRight
+         */
+        eachRight(
+            this: LoDashWrapper<string | null | undefined>,
+            iteratee?: StringIterator<any>
+        ): this;
+
+        /**
+         * @see _.forEachRight
+         */
+        eachRight<T>(
+            this: LoDashWrapper<List<T> | null | undefined>,
+            iteratee?: ListIterator<T, any>
+        ): this;
+
+        /**
+         * @see _.forEachRight
+         */
+        eachRight<T extends object>(
+            this: LoDashWrapper<T | null | undefined>,
+            iteratee?: ObjectIterator<T, any>
+        ): this;
+    }
+
+    // every
+
+    interface LoDashStatic {
+        /**
+         * Checks if predicate returns truthy for all elements of collection. Iteration is stopped once predicate
+         * returns falsey. The predicate is invoked with three arguments: (value, index|key, collection).
+         *
+         * @param collection The collection to iterate over.
+         * @param predicate The function invoked per iteration.
+         * @return Returns true if all elements pass the predicate check, else false.
+         */
+        every<T>(
+            collection: List<T> | null | undefined,
+            predicate?: ListIterateeCustom<T, boolean>
+        ): boolean;
+
+        /**
+         * @see _.every
+         */
+        every<T>(
+            collection: NumericDictionary<T> | null | undefined,
+            predicate?: NumericDictionaryIterateeCustom<T, boolean>
+        ): boolean;
+
+        /**
+         * @see _.every
+         */
+        every<T extends object>(
+            collection: T | null | undefined,
+            predicate?: ObjectIterateeCustom<T, boolean>
+        ): boolean;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.every
+         */
+        every<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            predicate?: ListIterateeCustom<T, boolean>
+        ): boolean;
+
+        /**
+         * @see _.every
+         */
+        every<T extends object>(
+            this: LoDashImplicitWrapper<T | null | undefined>,
+            predicate?: ObjectIterateeCustom<T, boolean>
+        ): boolean;
+
+        /**
+         * @see _.every
+         */
+        every<T>(
+            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
+            predicate?: NumericDictionaryIterateeCustom<T, boolean>
+        ): boolean;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.every
+         */
+        every<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            predicate?: ListIterateeCustom<T, boolean>
+        ): LoDashExplicitWrapper<boolean>;
+
+        /**
+         * @see _.every
+         */
+        every<T extends object>(
+            this: LoDashExplicitWrapper<T | null | undefined>,
+            predicate?: ObjectIterateeCustom<T, boolean>
+        ): LoDashExplicitWrapper<boolean>;
+
+        /**
+         * @see _.every
+         */
+        every<T>(
+            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
+            predicate?: NumericDictionaryIterateeCustom<T, boolean>
+        ): LoDashExplicitWrapper<boolean>;
+    }
+
+    // filter
+
+    interface LoDashStatic {
+        /**
+         * Iterates over elements of collection, returning an array of all elements predicate returns truthy for. The
+         * predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
+         *
+         * If a property name is provided for predicate the created _.property style callback returns the property
+         * value of the given element.
+         *
+         * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+         * elements that have a matching property value, else false.
+         *
+         * If an object is provided for predicate the created _.matches style callback returns true for elements that
+         * have the properties of the given object, else false.
+         *
+         * @param collection The collection to iterate over.
+         * @param predicate The function invoked per iteration.
+         * @param thisArg The this binding of predicate.
+         * @return Returns the new filtered array.
+         */
+        filter(
+            collection: string | null | undefined,
+            predicate?: StringIterator<boolean>
+        ): string[];
+
+        /**
+         * @see _.filter
+         */
+        filter<T, S extends T>(
+            collection: List<T> | null | undefined,
+            predicate: ListIteratorTypeGuard<T, S>
+        ): S[];
+
+        /**
+         * @see _.filter
+         */
+        filter<T>(
+            collection: List<T> | null | undefined,
+            predicate?: ListIterateeCustom<T, boolean>
+        ): T[];
+
+        /**
+         * @see _.filter
+         */
+        filter<T extends object, S extends T[keyof T]>(
+            collection: T | null | undefined,
+            predicate: ObjectIteratorTypeGuard<T, S>
+        ): S[];
+
+        /**
+         * @see _.filter
+         */
+        filter<T extends object>(
+            collection: T | null | undefined,
+            predicate?: ObjectIterateeCustom<T, boolean>
+        ): Array<T[keyof T]>;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.filter
+         */
+        filter(
+            this: LoDashImplicitWrapper<string | null | undefined>,
+            predicate?: StringIterator<boolean>
+        ): LoDashImplicitWrapper<string[]>;
+
+        /**
+         * @see _.filter
+         */
+        filter<T, S extends T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            predicate: ListIteratorTypeGuard<T, S>
+        ): LoDashImplicitWrapper<S[]>;
+
+        /**
+         * @see _.filter
+         */
+        filter<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            predicate?: ListIterateeCustom<T, boolean>
+        ): LoDashImplicitWrapper<T[]>;
+
+        /**
+         * @see _.filter
+         */
+        filter<T extends object, S extends T[keyof T]>(
+            this: LoDashImplicitWrapper<T | null | undefined>,
+            predicate: ObjectIteratorTypeGuard<T, S>
+        ): LoDashImplicitWrapper<S[]>;
+
+        /**
+         * @see _.filter
+         */
+        filter<T extends object>(
+            this: LoDashImplicitWrapper<T | null | undefined>,
+            predicate?: ObjectIterateeCustom<T, boolean>
+        ): LoDashImplicitWrapper<Array<T[keyof T]>>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.filter
+         */
+        filter(
+            this: LoDashExplicitWrapper<string | null | undefined>,
+            predicate?: StringIterator<boolean>
+        ): LoDashExplicitWrapper<string[]>;
+
+        /**
+         * @see _.filter
+         */
+        filter<T, S extends T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            predicate: ListIteratorTypeGuard<T, S>
+        ): LoDashExplicitWrapper<S[]>;
+
+        /**
+         * @see _.filter
+         */
+        filter<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            predicate?: ListIterateeCustom<T, boolean>
+        ): LoDashExplicitWrapper<T[]>;
+
+        /**
+         * @see _.filter
+         */
+        filter<T extends object, S extends T[keyof T]>(
+            this: LoDashExplicitWrapper<T | null | undefined>,
+            predicate: ObjectIteratorTypeGuard<T, S>
+        ): LoDashExplicitWrapper<S[]>;
+
+        /**
+         * @see _.filter
+         */
+        filter<T extends object>(
+            this: LoDashExplicitWrapper<T | null | undefined>,
+            predicate?: ObjectIterateeCustom<T, boolean>
+        ): LoDashExplicitWrapper<Array<T[keyof T]>>;
+    }
+
+    // find
+
+    interface LoDashStatic {
+        /**
+         * Iterates over elements of collection, returning the first element predicate returns truthy for.
+         * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
+         *
+         * If a property name is provided for predicate the created _.property style callback returns the property
+         * value of the given element.
+         *
+         * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+         * elements that have a matching property value, else false.
+         *
+         * If an object is provided for predicate the created _.matches style callback returns true for elements that
+         * have the properties of the given object, else false.
+         *
+         * @param collection The collection to search.
+         * @param predicate The function invoked per iteration.
+         * @param fromIndex The index to search from.
+         * @return Returns the matched element, else undefined.
+         */
+        find<T, S extends T>(
+            collection: List<T> | null | undefined,
+            predicate: ListIteratorTypeGuard<T, S>,
+            fromIndex?: number
+        ): S|undefined;
+
+        /**
+         * @see _.find
+         */
+        find<T>(
+            collection: List<T> | null | undefined,
+            predicate?: ListIterateeCustom<T, boolean>,
+            fromIndex?: number
+        ): T|undefined;
+
+        /**
+         * @see _.find
+         */
+        find<T extends object, S extends T[keyof T]>(
+            collection: T | null | undefined,
+            predicate: ObjectIteratorTypeGuard<T, S>,
+            fromIndex?: number
+        ): S|undefined;
+
+        /**
+         * @see _.find
+         */
+        find<T extends object>(
+            collection: T | null | undefined,
+            predicate?: ObjectIterateeCustom<T, boolean>,
+            fromIndex?: number
+        ): T[keyof T]|undefined;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.find
+         */
+        find<T, S extends T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            predicate: ListIteratorTypeGuard<T, S>,
+            fromIndex?: number
+        ): S|undefined;
+
+        /**
+         * @see _.find
+         */
+        find<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            predicate?: ListIterateeCustom<T, boolean>,
+            fromIndex?: number
+        ): T|undefined;
+
+        /**
+         * @see _.find
+         */
+        find<T extends object, S extends T[keyof T]>(
+            this: LoDashImplicitWrapper<T | null | undefined>,
+            predicate: ObjectIteratorTypeGuard<T, S>,
+            fromIndex?: number
+        ): S|undefined;
+
+        /**
+         * @see _.find
+         */
+        find<T extends object>(
+            this: LoDashImplicitWrapper<T | null | undefined>,
+            predicate?: ObjectIterateeCustom<T, boolean>,
+            fromIndex?: number
+        ): T[keyof T]|undefined;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.find
+         */
+        find<T, S extends T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            predicate: ListIteratorTypeGuard<T, S>,
+            fromIndex?: number
+        ): LoDashExplicitWrapper<S|undefined>;
+
+        /**
+         * @see _.find
+         */
+        find<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            predicate?: ListIterateeCustom<T, boolean>,
+            fromIndex?: number
+        ): LoDashExplicitWrapper<T|undefined>;
+
+        /**
+         * @see _.find
+         */
+        find<T extends object, S extends T[keyof T]>(
+            this: LoDashExplicitWrapper<T | null | undefined>,
+            predicate: ObjectIteratorTypeGuard<T, S>,
+            fromIndex?: number
+        ): LoDashExplicitWrapper<S|undefined>;
+
+        /**
+         * @see _.find
+         */
+        find<T extends object>(
+            this: LoDashExplicitWrapper<T | null | undefined>,
+            predicate?: ObjectIterateeCustom<T, boolean>,
+            fromIndex?: number
+        ): LoDashExplicitWrapper<T[keyof T]|undefined>;
+    }
+
+    // findLast
+
+    interface LoDashStatic {
+        /**
+        * This method is like _.find except that it iterates over elements of a collection from
+        * right to left.
+        * @param collection Searches for a value in this list.
+        * @param predicate The function called per iteration.
+        * @param fromIndex The index to search from.
+        * @return The found element, else undefined.
+        **/
+        findLast<T, S extends T>(
+            collection: List<T> | null | undefined,
+            predicate: ListIteratorTypeGuard<T, S>,
+            fromIndex?: number
+        ): S|undefined;
+
+        /**
+         * @see _.findLast
+         */
+        findLast<T>(
+            collection: List<T> | null | undefined,
+            predicate?: ListIterateeCustom<T, boolean>,
+            fromIndex?: number
+        ): T|undefined;
+
+        /**
+         * @see _.findLast
+         */
+        findLast<T extends object, S extends T[keyof T]>(
+            collection: T | null | undefined,
+            predicate: ObjectIteratorTypeGuard<T, S>,
+            fromIndex?: number
+        ): S|undefined;
+
+        /**
+         * @see _.findLast
+         */
+        findLast<T extends object>(
+            collection: T | null | undefined,
+            predicate?: ObjectIterateeCustom<T, boolean>,
+            fromIndex?: number
+        ): T[keyof T]|undefined;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.findLast
+         */
+        findLast<T, S extends T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            predicate: ListIteratorTypeGuard<T, S>,
+            fromIndex?: number
+        ): S | undefined;
+
+        /**
+         * @see _.findLast
+         */
+        findLast<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            predicate?: ListIterateeCustom<T, boolean>,
+            fromIndex?: number
+        ): T | undefined;
+
+        /**
+         * @see _.findLast
+         */
+        findLast<T extends object, S extends T[keyof T]>(
+            this: LoDashImplicitWrapper<T | null | undefined>,
+            predicate: ObjectIteratorTypeGuard<T, S>,
+            fromIndex?: number
+        ): S|undefined;
+
+        /**
+         * @see _.findLast
+         */
+        findLast<T extends object>(
+            this: LoDashImplicitWrapper<T | null | undefined>,
+            predicate?: ObjectIterateeCustom<T, boolean>,
+            fromIndex?: number
+        ): T[keyof T]|undefined;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.findLast
+         */
+        findLast<T, S extends T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            predicate: ListIteratorTypeGuard<T, S>,
+            fromIndex?: number
+        ): LoDashExplicitWrapper<S | undefined>;
+
+        /**
+         * @see _.findLast
+         */
+        findLast<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            predicate?: ListIterateeCustom<T, boolean>,
+            fromIndex?: number
+        ): LoDashExplicitWrapper<T | undefined>;
+
+        /**
+         * @see _.findLast
+         */
+        findLast<T extends object, S extends T[keyof T]>(
+            this: LoDashExplicitWrapper<T | null | undefined>,
+            predicate: ObjectIteratorTypeGuard<T, S>,
+            fromIndex?: number
+        ): LoDashExplicitWrapper<S|undefined>;
+
+        /**
+         * @see _.findLast
+         */
+        findLast<T extends object>(
+            this: LoDashExplicitWrapper<T | null | undefined>,
+            predicate?: ObjectIterateeCustom<T, boolean>,
+            fromIndex?: number
+        ): LoDashExplicitWrapper<T[keyof T]|undefined>;
+    }
+
+    // flatMap
+
+    interface LoDashStatic {
+        /**
+         * Creates an array of flattened values by running each element in collection through iteratee
+         * and concating its result to the other mapped values. The iteratee is invoked with three arguments:
+         * (value, index|key, collection).
+         *
+         * @param collection The collection to iterate over.
+         * @param iteratee The function invoked per iteration.
+         * @return Returns the new flattened array.
+         */
+        flatMap<T>(
+            collection: List<Many<T>> | Dictionary<Many<T>> | NumericDictionary<Many<T>> | null | undefined
+        ): T[];
+
+        /**
+         * @see _.flatMap
+         */
+        flatMap(
+            collection: object | null | undefined
+        ): any[];
+
+        /**
+         * @see _.flatMap
+         */
+        flatMap<T, TResult>(
+            collection: List<T> | null | undefined,
+            iteratee: ListIterator<T, Many<TResult>>
+        ): TResult[];
+
+        /**
+         * @see _.flatMap
+         */
+        flatMap<T, TResult>(
+            collection: NumericDictionary<T> | null | undefined,
+            iteratee: NumericDictionaryIterator<T, Many<TResult>>
+        ): TResult[];
+
+        /**
+         * @see _.flatMap
+         */
+        flatMap<T extends object, TResult>(
+            collection: T | null | undefined,
+            iteratee: ObjectIterator<T, Many<TResult>>
+        ): TResult[];
+
+        /**
+         * @see _.flatMap
+         */
+        flatMap(
+            collection: object | null | undefined,
+            iteratee: string
+        ): any[];
+
+        /**
+         * @see _.flatMap
+         */
+        flatMap(
+            collection: object | null | undefined,
+            iteratee: object
+        ): boolean[];
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.flatMap
+         */
+        flatMap<T>(this: LoDashImplicitWrapper<List<Many<T>> | Dictionary<Many<T>> | NumericDictionary<Many<T>> | null | undefined>): LoDashImplicitWrapper<T[]>;
+
+        /**
+         * @see _.flatMap
+         */
+        flatMap(): LoDashImplicitWrapper<any[]>;
+
+        /**
+         * @see _.flatMap
+         */
+        flatMap<T, TResult>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            iteratee: ListIterator<T, Many<TResult>>
+        ): LoDashImplicitWrapper<TResult[]>;
+
+        /**
+         * @see _.flatMap
+         */
+        flatMap<T extends object, TResult>(
+            this: LoDashImplicitWrapper<T | null | undefined>,
+            iteratee: ObjectIterator<T, Many<TResult>>
+        ): LoDashImplicitWrapper<TResult[]>;
+
+        /**
+         * @see _.flatMap
+         */
+        flatMap<T, TResult>(
+            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
+            iteratee: NumericDictionaryIterator<T, Many<TResult>>
+        ): LoDashImplicitWrapper<TResult[]>;
+
+        /**
+         * @see _.flatMap
+         */
+        flatMap(
+            iteratee: string
+        ): LoDashImplicitWrapper<any[]>;
+
+        /**
+         * @see _.flatMap
+         */
+        flatMap(
+            iteratee: object
+        ): LoDashImplicitWrapper<boolean[]>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.flatMap
+         */
+        flatMap<T>(this: LoDashExplicitWrapper<List<Many<T>> | Dictionary<Many<T>> | NumericDictionary<Many<T>> | null | undefined>): LoDashExplicitWrapper<T[]>;
+
+        /**
+         * @see _.flatMap
+         */
+        flatMap(): LoDashExplicitWrapper<any[]>;
+
+        /**
+         * @see _.flatMap
+         */
+        flatMap<T, TResult>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            iteratee: ListIterator<T, Many<TResult>>
+        ): LoDashExplicitWrapper<TResult[]>;
+
+        /**
+         * @see _.flatMap
+         */
+        flatMap<T, TResult>(
+            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
+            iteratee: NumericDictionaryIterator<T, Many<TResult>>
+        ): LoDashExplicitWrapper<TResult[]>;
+
+        /**
+         * @see _.flatMap
+         */
+        flatMap<T extends object, TResult>(
+            this: LoDashExplicitWrapper<T | null | undefined>,
+            iteratee: ObjectIterator<T, Many<TResult>>
+        ): LoDashExplicitWrapper<TResult[]>;
+
+        /**
+         * @see _.flatMap
+         */
+        flatMap(
+            iteratee: string
+        ): LoDashExplicitWrapper<any[]>;
+
+        /**
+         * @see _.flatMap
+         */
+        flatMap(
+            iteratee: object
+        ): LoDashExplicitWrapper<boolean[]>;
+    }
+
+    // flatMapDeep
+
+    interface LoDashStatic {
+        /**
+         * This method is like `_.flatMap` except that it recursively flattens the
+         * mapped results.
+         *
+         * @since 4.7.0
+         * @category Collection
+         * @param collection The collection to iterate over.
+         * @param [iteratee=_.identity] The function invoked per iteration.
+         * @returns Returns the new flattened array.
+         * @example
+         *
+         * function duplicate(n) {
+         *   return [[[n, n]]];
+         * }
+         *
+         * _.flatMapDeep([1, 2], duplicate);
+         * // => [1, 1, 2, 2]
+         */
+        flatMapDeep<T>(
+            collection: List<ListOfRecursiveArraysOrValues<T> | T> | Dictionary<ListOfRecursiveArraysOrValues<T> | T> | NumericDictionary<ListOfRecursiveArraysOrValues<T> | T> | null | undefined
+        ): T[];
+
+        /**
+         * @see _.flatMapDeep
+         */
+        flatMapDeep<T, TResult>(
+            collection: List<T> | null | undefined,
+            iteratee: ListIterator<T, ListOfRecursiveArraysOrValues<TResult> | TResult>
+        ): TResult[];
+
+        /**
+         * @see _.flatMapDeep
+         */
+        flatMapDeep<T, TResult>(
+            collection: NumericDictionary<T> | null | undefined,
+            iteratee: NumericDictionaryIterator<T, ListOfRecursiveArraysOrValues<TResult> | TResult>
+        ): TResult[];
+
+        /**
+         * @see _.flatMapDeep
+         */
+        flatMapDeep<T extends object, TResult>(
+            collection: T | null | undefined,
+            iteratee: ObjectIterator<T, ListOfRecursiveArraysOrValues<TResult> | TResult>
+        ): TResult[];
+
+        /**
+         * @see _.flatMapDeep
+         */
+        flatMapDeep(
+            collection: object | null | undefined,
+            iteratee: string
+        ): any[];
+
+        /**
+         * @see _.flatMapDeep
+         */
+        flatMapDeep(
+            collection: object | null | undefined,
+            iteratee: object
+        ): boolean[];
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.flatMapDeep
+         */
+        flatMapDeep<T>(
+            this: LoDashImplicitWrapper<List<ListOfRecursiveArraysOrValues<T> | T> | Dictionary<ListOfRecursiveArraysOrValues<T> | T> | NumericDictionary<ListOfRecursiveArraysOrValues<T> | T> | null | undefined>
+        ): LoDashImplicitWrapper<T[]>;
+
+        /**
+         * @see _.flatMapDeep
+         */
+        flatMapDeep<T, TResult>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            iteratee: ListIterator<T, ListOfRecursiveArraysOrValues<TResult> | TResult>
+        ): LoDashImplicitWrapper<TResult[]>;
+
+        /**
+         * @see _.flatMapDeep
+         */
+        flatMapDeep<T, TResult>(
+            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
+            iteratee: NumericDictionaryIterator<T, ListOfRecursiveArraysOrValues<TResult> | TResult>
+        ): LoDashImplicitWrapper<TResult[]>;
+
+        /**
+         * @see _.flatMapDeep
+         */
+        flatMapDeep<T extends object, TResult>(
+            this: LoDashImplicitWrapper<T | null | undefined>,
+            iteratee: ObjectIterator<T, ListOfRecursiveArraysOrValues<TResult> | TResult>
+        ): LoDashImplicitWrapper<TResult[]>;
+
+        /**
+         * @see _.flatMapDeep
+         */
+        flatMapDeep(
+            this: LoDashImplicitWrapper<object | null | undefined>,
+            iteratee: string
+        ): LoDashImplicitWrapper<any[]>;
+
+        /**
+         * @see _.flatMapDeep
+         */
+        flatMapDeep(
+            this: LoDashImplicitWrapper<object | null | undefined>,
+            iteratee: object
+        ): LoDashImplicitWrapper<boolean[]>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.flatMapDeep
+         */
+        flatMapDeep<T>(
+            this: LoDashExplicitWrapper<List<ListOfRecursiveArraysOrValues<T> | T> | Dictionary<ListOfRecursiveArraysOrValues<T> | T> | NumericDictionary<ListOfRecursiveArraysOrValues<T> | T> | null | undefined>
+        ): LoDashExplicitWrapper<T[]>;
+
+        /**
+         * @see _.flatMapDeep
+         */
+        flatMapDeep<T, TResult>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            iteratee: ListIterator<T, ListOfRecursiveArraysOrValues<TResult> | TResult>
+        ): LoDashExplicitWrapper<TResult[]>;
+
+        /**
+         * @see _.flatMapDeep
+         */
+        flatMapDeep<T, TResult>(
+            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
+            iteratee: NumericDictionaryIterator<T, ListOfRecursiveArraysOrValues<TResult> | TResult>
+        ): LoDashExplicitWrapper<TResult[]>;
+
+        /**
+         * @see _.flatMapDeep
+         */
+        flatMapDeep<T extends object, TResult>(
+            this: LoDashExplicitWrapper<T | null | undefined>,
+            iteratee: ObjectIterator<T, ListOfRecursiveArraysOrValues<TResult> | TResult>
+        ): LoDashExplicitWrapper<TResult[]>;
+
+        /**
+         * @see _.flatMapDeep
+         */
+        flatMapDeep(
+            this: LoDashExplicitWrapper<object | null | undefined>,
+            iteratee: string
+        ): LoDashExplicitWrapper<any[]>;
+
+        /**
+         * @see _.flatMapDeep
+         */
+        flatMapDeep(
+            this: LoDashExplicitWrapper<object | null | undefined>,
+            iteratee: object
+        ): LoDashExplicitWrapper<boolean[]>;
+    }
+
+    // flatMapDepth
+
+    interface LoDashStatic {
+        /**
+         * This method is like `_.flatMap` except that it recursively flattens the
+         * mapped results up to `depth` times.
+         *
+         * @since 4.7.0
+         * @category Collection
+         * @param collection The collection to iterate over.
+         * @param [iteratee=_.identity] The function invoked per iteration.
+         * @param [depth=1] The maximum recursion depth.
+         * @returns Returns the new flattened array.
+         * @example
+         *
+         * function duplicate(n) {
+         *   return [[[n, n]]];
+         * }
+         *
+         * _.flatMapDepth([1, 2], duplicate, 2);
+         * // => [[1, 1], [2, 2]]
+         */
+        flatMapDepth<T>(
+            collection: List<ListOfRecursiveArraysOrValues<T> | T> | Dictionary<ListOfRecursiveArraysOrValues<T> | T> | NumericDictionary<ListOfRecursiveArraysOrValues<T> | T> | null | undefined
+        ): T[];
+
+        /**
+         * @see _.flatMapDepth
+         */
+        flatMapDepth<T, TResult>(
+            collection: List<T> | null | undefined,
+            iteratee: ListIterator<T, ListOfRecursiveArraysOrValues<TResult> | TResult>,
+            depth?: number
+        ): TResult[];
+
+        /**
+         * @see _.flatMapDepth
+         */
+        flatMapDepth<T, TResult>(
+            collection: NumericDictionary<T> | null | undefined,
+            iteratee: NumericDictionaryIterator<T, ListOfRecursiveArraysOrValues<TResult> | TResult>,
+            depth?: number
+        ): TResult[];
+
+        /**
+         * @see _.flatMapDepth
+         */
+        flatMapDepth<T extends object, TResult>(
+            collection: T | null | undefined,
+            iteratee: ObjectIterator<T, ListOfRecursiveArraysOrValues<TResult> | TResult>,
+            depth?: number
+        ): TResult[];
+
+        /**
+         * @see _.flatMapDepth
+         */
+        flatMapDepth(
+            collection: object | null | undefined,
+            iteratee: string,
+            depth?: number
+        ): any[];
+
+        /**
+         * @see _.flatMapDepth
+         */
+        flatMapDepth(
+            collection: object | null | undefined,
+            iteratee: object,
+            depth?: number
+        ): boolean[];
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.flatMapDepth
+         */
+        flatMapDepth<T>(
+            this: LoDashImplicitWrapper<List<ListOfRecursiveArraysOrValues<T> | T> | Dictionary<ListOfRecursiveArraysOrValues<T> | T> | NumericDictionary<ListOfRecursiveArraysOrValues<T> | T> | null | undefined>
+        ): LoDashImplicitWrapper<T[]>;
+
+        /**
+         * @see _.flatMapDepth
+         */
+        flatMapDepth<T, TResult>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            iteratee: ListIterator<T, ListOfRecursiveArraysOrValues<TResult> | TResult>,
+            depth?: number
+        ): LoDashImplicitWrapper<TResult[]>;
+
+        /**
+         * @see _.flatMapDepth
+         */
+        flatMapDepth<T, TResult>(
+            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
+            iteratee: NumericDictionaryIterator<T, ListOfRecursiveArraysOrValues<TResult> | TResult>,
+            depth?: number
+        ): LoDashImplicitWrapper<TResult[]>;
+
+        /**
+         * @see _.flatMapDepth
+         */
+        flatMapDepth<T extends object, TResult>(
+            this: LoDashImplicitWrapper<T | null | undefined>,
+            iteratee: ObjectIterator<T, ListOfRecursiveArraysOrValues<TResult> | TResult>,
+            depth?: number
+        ): LoDashImplicitWrapper<TResult[]>;
+
+        /**
+         * @see _.flatMapDepth
+         */
+        flatMapDepth(
+            this: LoDashImplicitWrapper<object | null | undefined>,
+            iteratee: string,
+            depth?: number
+        ): LoDashImplicitWrapper<any[]>;
+
+        /**
+         * @see _.flatMapDepth
+         */
+        flatMapDepth(
+            this: LoDashImplicitWrapper<object | null | undefined>,
+            iteratee: object,
+            depth?: number
+        ): LoDashImplicitWrapper<boolean[]>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.flatMapDepth
+         */
+        flatMapDepth<T>(
+            this: LoDashExplicitWrapper<List<ListOfRecursiveArraysOrValues<T> | T> | Dictionary<ListOfRecursiveArraysOrValues<T> | T> | NumericDictionary<ListOfRecursiveArraysOrValues<T> | T> | null | undefined>
+        ): LoDashExplicitWrapper<T[]>;
+
+        /**
+         * @see _.flatMapDepth
+         */
+        flatMapDepth<T, TResult>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            iteratee: ListIterator<T, ListOfRecursiveArraysOrValues<TResult> | TResult>,
+            depth?: number
+        ): LoDashExplicitWrapper<TResult[]>;
+
+        /**
+         * @see _.flatMapDepth
+         */
+        flatMapDepth<T, TResult>(
+            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
+            iteratee: NumericDictionaryIterator<T, ListOfRecursiveArraysOrValues<TResult> | TResult>,
+            depth?: number
+        ): LoDashExplicitWrapper<TResult[]>;
+
+        /**
+         * @see _.flatMapDepth
+         */
+        flatMapDepth<T extends object, TResult>(
+            this: LoDashExplicitWrapper<T | null | undefined>,
+            iteratee: ObjectIterator<T, ListOfRecursiveArraysOrValues<TResult> | TResult>,
+            depth?: number
+        ): LoDashExplicitWrapper<TResult[]>;
+
+        /**
+         * @see _.flatMapDepth
+         */
+        flatMapDepth(
+            this: LoDashExplicitWrapper<object | null | undefined>,
+            iteratee: string,
+            depth?: number
+        ): LoDashExplicitWrapper<any[]>;
+
+        /**
+         * @see _.flatMapDepth
+         */
+        flatMapDepth(
+            this: LoDashExplicitWrapper<object | null | undefined>,
+            iteratee: object,
+            depth?: number
+        ): LoDashExplicitWrapper<boolean[]>;
+    }
+
+    // forEach
+
+    interface LoDashStatic {
+        /**
+         * Iterates over elements of collection invoking iteratee for each element. The iteratee is bound to thisArg
+         * and invoked with three arguments:
+         * (value, index|key, collection). Iteratee functions may exit iteration early by explicitly returning false.
+         *
+         * Note: As with other "Collections" methods, objects with a "length" property are iterated like arrays. To
+         * avoid this behavior _.forIn or _.forOwn may be used for object iteration.
+         *
+         * @alias _.each
+         *
+         * @param collection The collection to iterate over.
+         * @param iteratee The function invoked per iteration.
+         * @param thisArg The this binding of iteratee.
+         */
+        forEach<T>(
+            collection: T[],
+            iteratee?: ArrayIterator<T, any>
+        ): T[];
+
+        /**
+         * @see _.forEach
+         */
+        forEach(
+            collection: string,
+            iteratee?: StringIterator<any>
+        ): string;
+
+        /**
+         * @see _.forEach
+         */
+        forEach<T>(
+            collection: List<T>,
+            iteratee?: ListIterator<T, any>
+        ): List<T>;
+
+        /**
+         * @see _.forEach
+         */
+        forEach<T extends object>(
+            collection: T,
+            iteratee?: ObjectIterator<T, any>
+        ): T;
+
+        /**
+         * @see _.forEach
+         */
+        forEach<T, TArray extends T[] | null | undefined>(
+            collection: TArray & (T[] | null | undefined),
+            iteratee?: ArrayIterator<T, any>
+        ): TArray;
+
+        /**
+         * @see _.forEach
+         */
+        forEach<TString extends string | null | undefined>(
+            collection: TString,
+            iteratee?: StringIterator<any>
+        ): TString;
+
+        /**
+         * @see _.forEach
+         */
+        forEach<T, TList extends List<T> | null | undefined>(
+            collection: TList & (List<T> | null | undefined),
+            iteratee?: ListIterator<T, any>
+        ): TList;
+
+        /**
+         * @see _.forEach
+         */
+        forEach<T extends object>(
+            collection: T | null | undefined,
+            iteratee?: ObjectIterator<T, any>
+        ): T | null | undefined;
+    }
+
+    interface LoDashWrapper<TValue> {
+        /**
+         * @see _.forEach
+         */
+        forEach<T>(
+            this: LoDashWrapper<T[] | null | undefined>,
+            iteratee?: ArrayIterator<T, any>
+        ): this;
+
+        /**
+         * @see _.forEach
+         */
+        forEach(
+            this: LoDashWrapper<string | null | undefined>,
+            iteratee?: StringIterator<any>
+        ): this;
+
+        /**
+         * @see _.forEach
+         */
+        forEach<T>(
+            this: LoDashWrapper<List<T> | null | undefined>,
+            iteratee?: ListIterator<T, any>
+        ): this;
+
+        /**
+         * @see _.forEach
+         */
+        forEach<T extends object>(
+            this: LoDashWrapper<T | null | undefined>,
+            iteratee?: ObjectIterator<T, any>
+        ): this;
+    }
+
+    // forEachRight
+
+    interface LoDashStatic {
+        /**
+         * This method is like _.forEach except that it iterates over elements of collection from right to left.
+         *
+         * @alias _.eachRight
+         *
+         * @param collection The collection to iterate over.
+         * @param iteratee The function called per iteration.
+         * @param thisArg The this binding of callback.
+         */
+        forEachRight<T>(
+            collection: T[],
+            iteratee?: ArrayIterator<T, any>
+        ): T[];
+
+        /**
+         * @see _.forEachRight
+         */
+        forEachRight(
+            collection: string,
+            iteratee?: StringIterator<any>
+        ): string;
+
+        /**
+         * @see _.forEachRight
+         */
+        forEachRight<T>(
+            collection: List<T>,
+            iteratee?: ListIterator<T, any>
+        ): List<T>;
+
+        /**
+         * @see _.forEachRight
+         */
+        forEachRight<T extends object>(
+            collection: T,
+            iteratee?: ObjectIterator<T, any>
+        ): T;
+
+        /**
+         * @see _.forEachRight
+         */
+        forEachRight<T, TArray extends T[] | null | undefined>(
+            collection: TArray & (T[] | null | undefined),
+            iteratee?: ArrayIterator<T, any>
+        ): TArray;
+
+        /**
+         * @see _.forEachRight
+         */
+        forEachRight<TString extends string | null | undefined>(
+            collection: TString,
+            iteratee?: StringIterator<any>
+        ): TString;
+
+        /**
+         * @see _.forEachRight
+         */
+        forEachRight<T, TList extends List<T> | null | undefined>(
+            collection: TList & (List<T> | null | undefined),
+            iteratee?: ListIterator<T, any>
+        ): TList;
+
+        /**
+         * @see _.forEachRight
+         */
+        forEachRight<T extends object>(
+            collection: T | null | undefined,
+            iteratee?: ObjectIterator<T, any>
+        ): T | null | undefined;
+    }
+
+    interface LoDashWrapper<TValue> {
+        /**
+         * @see _.forEachRight
+         */
+        forEachRight<T>(
+            this: LoDashWrapper<T[] | null | undefined>,
+            iteratee?: ArrayIterator<T, any>
+        ): this;
+
+        /**
+         * @see _.forEachRight
+         */
+        forEachRight(
+            this: LoDashWrapper<string | null | undefined>,
+            iteratee?: StringIterator<any>
+        ): this;
+
+        /**
+         * @see _.forEachRight
+         */
+        forEachRight<T>(
+            this: LoDashWrapper<List<T> | null | undefined>,
+            iteratee?: ListIterator<T, any>
+        ): this;
+
+        /**
+         * @see _.forEachRight
+         */
+        forEachRight<T extends object>(
+            this: LoDashWrapper<T | null | undefined>,
+            iteratee?: ObjectIterator<T, any>
+        ): this;
+    }
+
+    // groupBy
+
+    interface LoDashStatic {
+        /**
+         * Creates an object composed of keys generated from the results of running each element of collection through
+         * iteratee. The corresponding value of each key is an array of the elements responsible for generating the
+         * key. The iteratee is bound to thisArg and invoked with three arguments:
+         * (value, index|key, collection).
+         *
+         * If a property name is provided for iteratee the created _.property style callback returns the property
+         * value of the given element.
+         *
+         * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+         * elements that have a matching property value, else false.
+         *
+         * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+         * have the properties of the given object, else false.
+         *
+         * @param collection The collection to iterate over.
+         * @param iteratee The function invoked per iteration.
+         * @param thisArg The this binding of iteratee.
+         * @return Returns the composed aggregate object.
+         */
+        groupBy(
+            collection: string | null | undefined,
+            iteratee?: StringIterator<NotVoid>
+        ): Dictionary<string[]>;
+
+        /**
+         * @see _.groupBy
+         */
+        groupBy<T>(
+            collection: List<T> | null | undefined,
+            iteratee?: ListIteratee<T>
+        ): Dictionary<T[]>;
+
+        /**
+         * @see _.groupBy
+         */
+        groupBy<T>(
+            collection: NumericDictionary<T> | null | undefined,
+            iteratee?: NumericDictionaryIteratee<T>
+        ): Dictionary<T[]>;
+
+        /**
+         * @see _.groupBy
+         */
+        groupBy<T extends object>(
+            collection: T | null | undefined,
+            iteratee?: ObjectIteratee<T>
+        ): Dictionary<Array<T[keyof T]>>;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.groupBy
+         */
+        groupBy(
+            this: LoDashImplicitWrapper<string | null | undefined>,
+            iteratee?: StringIterator<NotVoid>
+        ): LoDashImplicitWrapper<Dictionary<string[]>>;
+
+        /**
+         * @see _.groupBy
+         */
+        groupBy<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            iteratee?: ListIteratee<T>
+        ): LoDashImplicitWrapper<Dictionary<T[]>>;
+
+        /**
+         * @see _.groupBy
+         */
+        groupBy<T extends object>(
+            this: LoDashImplicitWrapper<T | null | undefined>,
+            iteratee?: ObjectIteratee<T>
+        ): LoDashImplicitWrapper<Dictionary<Array<T[keyof T]>>>;
+
+        /**
+         * @see _.groupBy
+         */
+        groupBy<T>(
+            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
+            iteratee?: NumericDictionaryIteratee<T>
+        ): LoDashImplicitWrapper<Dictionary<T[]>>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.groupBy
+         */
+        groupBy(
+            this: LoDashExplicitWrapper<string | null | undefined>,
+            iteratee?: StringIterator<NotVoid>
+        ): LoDashExplicitWrapper<Dictionary<string[]>>;
+
+        /**
+         * @see _.groupBy
+         */
+        groupBy<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            iteratee?: ListIteratee<T>
+        ): LoDashExplicitWrapper<Dictionary<T[]>>;
+
+        /**
+         * @see _.groupBy
+         */
+        groupBy<T>(
+            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
+            iteratee?: NumericDictionaryIteratee<T>
+        ): LoDashExplicitWrapper<Dictionary<T[]>>;
+
+        /**
+         * @see _.groupBy
+         */
+        groupBy<T extends object>(
+            this: LoDashExplicitWrapper<T | null | undefined>,
+            iteratee?: ObjectIteratee<T>
+        ): LoDashExplicitWrapper<Dictionary<Array<T[keyof T]>>>;
+    }
+
+    // includes
+
+    interface LoDashStatic {
+        /**
+         * Checks if target is in collection using SameValueZero for equality comparisons. If fromIndex is negative,
+         * it’s used as the offset from the end of collection.
+         *
+         * @param collection The collection to search.
+         * @param target The value to search for.
+         * @param fromIndex The index to search from.
+         * @return True if the target element is found, else false.
+         */
+        includes<T>(
+            collection: List<T>|Dictionary<T> | null | undefined,
+            target: T,
+            fromIndex?: number
+        ): boolean;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.includes
+         */
+        includes<T>(
+            this: LoDashImplicitWrapper<List<T> | Dictionary<T> | null | undefined>,
+            target: T,
+            fromIndex?: number
+        ): boolean;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.includes
+         */
+        includes<T>(
+            this: LoDashExplicitWrapper<List<T> | Dictionary<T> | null | undefined>,
+            target: T,
+            fromIndex?: number
+        ): LoDashExplicitWrapper<boolean>;
+    }
+
+    // invokeMap
+
+    interface LoDashStatic {
+        /**
+        * Invokes the method named by methodName on each element in the collection returning
+        * an array of the results of each invoked method. Additional arguments will be provided
+        * to each invoked method. If methodName is a function it will be invoked for, and this
+        * bound to, each element in the collection.
+        * @param collection The collection to iterate over.
+        * @param methodName The name of the method to invoke.
+        * @param args Arguments to invoke the method with.
+        **/
+        invokeMap(
+            collection: object | null | undefined,
+            methodName: string,
+            ...args: any[]): any[];
+
+        /**
+        * @see _.invokeMap
+        **/
+        invokeMap<TResult>(
+            collection: object | null | undefined,
+            method: (...args: any[]) => TResult,
+            ...args: any[]): TResult[];
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+        * @see _.invokeMap
+        **/
+        invokeMap(
+            methodName: string,
+            ...args: any[]): LoDashImplicitWrapper<any[]>;
+
+        /**
+        * @see _.invokeMap
+        **/
+        invokeMap<TResult>(
+            method: (...args: any[]) => TResult,
+            ...args: any[]): LoDashImplicitWrapper<TResult[]>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+        * @see _.invokeMap
+        **/
+        invokeMap(
+            methodName: string,
+            ...args: any[]): LoDashExplicitWrapper<any[]>;
+
+        /**
+        * @see _.invokeMap
+        **/
+        invokeMap<TResult>(
+            method: (...args: any[]) => TResult,
+            ...args: any[]): LoDashExplicitWrapper<TResult[]>;
+    }
+
+    // keyBy
+
+    interface LoDashStatic {
+        /**
+         * Creates an object composed of keys generated from the results of running each element of collection through
+         * iteratee. The corresponding value of each key is the last element responsible for generating the key. The
+         * iteratee function is bound to thisArg and invoked with three arguments:
+         * (value, index|key, collection).
+         *
+         * If a property name is provided for iteratee the created _.property style callback returns the property
+         * value of the given element.
+         *
+         * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+         * elements that have a matching property value, else false.
+         *
+         * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+         * have the properties of the given object, else false.
+         *
+         * @param collection The collection to iterate over.
+         * @param iteratee The function invoked per iteration.
+         * @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?: ListIterateeCustom<T, PropertyName>
+        ): Dictionary<T>;
+
+        /**
+         * @see _.keyBy
+         */
+        keyBy<T extends object>(
+            collection: T | null | undefined,
+            iteratee?: ObjectIterateeCustom<T, PropertyName>
+        ): Dictionary<T[keyof T]>;
+
+        /**
+         * @see _.keyBy
+         */
+        keyBy<T>(
+            collection: NumericDictionary<T> | null | undefined,
+            iteratee?: NumericDictionaryIterateeCustom<T, PropertyName>
+        ): Dictionary<T>;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @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?: ListIterateeCustom<T, PropertyName>
+        ): LoDashImplicitWrapper<Dictionary<T>>;
+
+        /**
+         * @see _.keyBy
+         */
+        keyBy<T extends object>(
+            this: LoDashImplicitWrapper<T | null | undefined>,
+            iteratee?: ObjectIterateeCustom<T, PropertyName>
+        ): LoDashImplicitWrapper<Dictionary<T[keyof T]>>;
+
+        /**
+         * @see _.keyBy
+         */
+        keyBy<T>(
+            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
+            iteratee?: NumericDictionaryIterateeCustom<T, PropertyName>
+        ): LoDashImplicitWrapper<Dictionary<T>>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @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?: ListIterateeCustom<T, PropertyName>
+        ): LoDashExplicitWrapper<Dictionary<T>>;
+
+        /**
+         * @see _.keyBy
+         */
+        keyBy<T extends object>(
+            this: LoDashExplicitWrapper<T | null | undefined>,
+            iteratee?: ObjectIterateeCustom<T, PropertyName>
+        ): LoDashExplicitWrapper<Dictionary<T[keyof T]>>;
+
+        /**
+         * @see _.keyBy
+         */
+        keyBy<T>(
+            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
+            iteratee?: NumericDictionaryIterateeCustom<T, PropertyName>
+        ): LoDashExplicitWrapper<Dictionary<T>>;
+    }
+
+    // map
+
+    interface LoDashStatic {
+        /**
+         * Creates an array of values by running each element in collection through iteratee. The iteratee is bound to
+         * thisArg and invoked with three arguments: (value, index|key, collection).
+         *
+         * If a property name is provided for iteratee the created _.property style callback returns the property value
+         * of the given element.
+         *
+         * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+         * elements that have a matching property value, else false.
+         *
+         * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+         * have the properties of the given object, else false.
+         *
+         * Many lodash methods are guarded to work as iteratees for methods like _.every, _.filter, _.map, _.mapValues,
+         * _.reject, and _.some.
+         *
+         * The guarded methods are:
+         * ary, callback, chunk, clone, create, curry, curryRight, drop, dropRight, every, fill, flatten, invert, max,
+         * min, parseInt, slice, sortBy, take, takeRight, template, trim, trimLeft, trimRight, trunc, random, range,
+         * sample, some, sum, uniq, and words
+         *
+         * @param collection The collection to iterate over.
+         * @param iteratee The function invoked per iteration.
+         * @param thisArg The this binding of iteratee.
+         * @return Returns the new mapped array.
+         */
+        map<T, TResult>(
+            collection: List<T> | null | undefined,
+            iteratee: ListIterator<T, TResult>
+        ): TResult[];
+
+        /**
+         * @see _.map
+         */
+        map<T>(collection: List<T> | Dictionary<T> | null | undefined): T[];
+
+        /**
+         * @see _.map
+         */
+        map<T, TResult>(
+            collection: Dictionary<T> | null | undefined,
+            iteratee: DictionaryIterator<T, TResult>
+        ): TResult[];
+
+        /** @see _.map */
+        map<T, K extends keyof T>(
+            collection: List<T> | Dictionary<T> | null | undefined,
+            iteratee: K
+        ): Array<T[K]>;
+
+        /** @see _.map */
+        map<T, TResult>(
+            collection: NumericDictionary<T> | null | undefined,
+            iteratee?: NumericDictionaryIterator<T, TResult>
+        ): TResult[];
+
+        /**
+         * @see _.map
+         */
+        map<T, TResult>(
+            collection: List<T>|Dictionary<T>|NumericDictionary<T> | null | undefined,
+            iteratee?: string
+        ): TResult[];
+
+        /**
+         * @see _.map
+         */
+        map<T>(
+            collection: List<T>|Dictionary<T>|NumericDictionary<T> | null | undefined,
+            iteratee?: object
+        ): boolean[];
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.map
+         */
+        map<T, TResult>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            iteratee: ListIterator<T, TResult>
+        ): LoDashImplicitWrapper<TResult[]>;
+
+        /**
+         * @see _.map
+         */
+        map<T>(this: LoDashImplicitWrapper<List<T> | Dictionary<T> | null | undefined>): LoDashImplicitWrapper<T[]>;
+
+        /**
+         * @see _.map
+         */
+        map<T, TResult>(
+            this: LoDashImplicitWrapper<Dictionary<T> | null | undefined>,
+            iteratee: DictionaryIterator<T, TResult>
+        ): LoDashImplicitWrapper<TResult[]>;
+
+        /** @see _.map */
+        map<T, K extends keyof T>(
+            this: LoDashImplicitWrapper<List<T> | Dictionary<T> | null | undefined>,
+            iteratee: K
+        ): LoDashImplicitWrapper<Array<T[K]>>;
+
+        /** @see _.map */
+        map<T, TResult>(
+            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
+            iteratee?: NumericDictionaryIterator<T, TResult>
+        ): LoDashImplicitWrapper<TResult[]>;
+
+        /**
+         * @see _.map
+         */
+        map<T, TResult>(
+            this: LoDashImplicitWrapper<List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined>,
+            iteratee?: string
+        ): LoDashImplicitWrapper<TResult[]>;
+
+        /**
+         * @see _.map
+         */
+        map<T>(
+            this: LoDashImplicitWrapper<List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined>,
+            iteratee?: object
+        ): LoDashImplicitWrapper<boolean[]>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.map
+         */
+        map<T, TResult>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            iteratee: ListIterator<T, TResult>
+        ): LoDashExplicitWrapper<TResult[]>;
+
+        /**
+         * @see _.map
+         */
+        map<T>(this: LoDashExplicitWrapper<List<T> | Dictionary<T> | null | undefined>): LoDashExplicitWrapper<T[]>;
+
+        /**
+         * @see _.map
+         */
+        map<T, TResult>(
+            this: LoDashExplicitWrapper<Dictionary<T> | null | undefined>,
+            iteratee: DictionaryIterator<T, TResult>
+        ): LoDashExplicitWrapper<TResult[]>;
+
+        /** @see _.map */
+        map<T, K extends keyof T>(
+            this: LoDashExplicitWrapper<List<T> | Dictionary<T> | null | undefined>,
+            iteratee: K
+        ): LoDashExplicitWrapper<Array<T[K]>>;
+
+        /**
+         * @see _.map
+         */
+        map<T, TResult>(
+            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
+            iteratee?: NumericDictionaryIterator<T, TResult>
+        ): LoDashExplicitWrapper<TResult[]>;
+
+        /**
+         * @see _.map
+         */
+        map<T, TResult>(
+            this: LoDashExplicitWrapper<List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined>,
+            iteratee?: string
+        ): LoDashExplicitWrapper<TResult[]>;
+
+        /**
+         * @see _.map
+         */
+        map<T>(
+            this: LoDashExplicitWrapper<List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined>,
+            iteratee?: object
+        ): LoDashExplicitWrapper<boolean[]>;
+    }
+
+    // orderBy
+
+    interface LoDashStatic {
+        /**
+         * This method is like `_.sortBy` except that it allows specifying the sort
+         * orders of the iteratees to sort by. If `orders` is unspecified, all values
+         * are sorted in ascending order. Otherwise, specify an order of "desc" for
+         * descending or "asc" for ascending sort order of corresponding values.
+         *
+         * @category Collection
+         * @param collection The collection to iterate over.
+         * @param [iteratees=[_.identity]] The iteratees to sort by.
+         * @param [orders] The sort orders of `iteratees`.
+         * @param- {Object} [guard] Enables use as an iteratee for functions like `_.reduce`.
+         * @returns Returns the new sorted array.
+         * @example
+         *
+         * var users = [
+         *   { 'user': 'fred',   'age': 48 },
+         *   { 'user': 'barney', 'age': 34 },
+         *   { 'user': 'fred',   'age': 42 },
+         *   { 'user': 'barney', 'age': 36 }
+         * ];
+         *
+         * // sort by `user` in ascending order and by `age` in descending order
+         * _.orderBy(users, ['user', 'age'], ['asc', 'desc']);
+         * // => objects for [['barney', 36], ['barney', 34], ['fred', 48], ['fred', 42]]
+         */
+        orderBy<T>(
+            collection: List<T> | null | undefined,
+            iteratees?: Many<ListIterator<T, NotVoid>>,
+            orders?: Many<boolean|string>
+        ): T[];
+
+        /**
+         * @see _.orderBy
+         */
+        orderBy<T>(
+            collection: List<T> | null | undefined,
+            iteratees?: Many<ListIteratee<T>>,
+            orders?: Many<boolean|string>
+        ): T[];
+
+        /**
+         * @see _.orderBy
+         */
+        orderBy<T extends object>(
+            collection: T | null | undefined,
+            iteratees?: Many<ObjectIterator<T, NotVoid>>,
+            orders?: Many<boolean|string>
+        ): Array<T[keyof T]>;
+
+        /**
+         * @see _.orderBy
+         */
+        orderBy<T extends object>(
+            collection: T | null | undefined,
+            iteratees?: Many<ObjectIteratee<T>>,
+            orders?: Many<boolean|string>
+        ): Array<T[keyof T]>;
+
+        /**
+         * @see _.orderBy
+         */
+        orderBy<T>(
+            collection: NumericDictionary<T> | null | undefined,
+            iteratees?: Many<NumericDictionaryIterator<T, NotVoid>>,
+            orders?: Many<boolean|string>
+        ): T[];
+
+        /**
+         * @see _.orderBy
+         */
+        orderBy<T>(
+            collection: NumericDictionary<T> | null | undefined,
+            iteratees?: Many<NumericDictionaryIteratee<T>>,
+            orders?: Many<boolean|string>
+        ): T[];
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.orderBy
+         */
+        orderBy<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            iteratees?: Many<ListIterator<T, NotVoid>>,
+            orders?: Many<boolean|string>
+        ): LoDashImplicitWrapper<T[]>;
+
+        /**
+         * @see _.orderBy
+         */
+        orderBy<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            iteratees?: Many<ListIteratee<T>>,
+            orders?: Many<boolean|string>
+        ): LoDashImplicitWrapper<T[]>;
+
+        /**
+         * @see _.orderBy
+         */
+        orderBy<T extends object>(
+            this: LoDashImplicitWrapper<T | null | undefined>,
+            iteratees?: Many<ObjectIterator<T, NotVoid>>,
+            orders?: Many<boolean|string>
+        ): LoDashImplicitWrapper<Array<T[keyof T]>>;
+
+        /**
+         * @see _.orderBy
+         */
+        orderBy<T extends object>(
+            this: LoDashImplicitWrapper<T | null | undefined>,
+            iteratees?: Many<ObjectIteratee<T>>,
+            orders?: Many<boolean|string>
+        ): LoDashImplicitWrapper<Array<T[keyof T]>>;
+
+        /**
+         * @see _.orderBy
+         */
+        orderBy<T>(
+            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
+            iteratees?: Many<NumericDictionaryIterator<T, NotVoid>>,
+            orders?: Many<boolean|string>
+        ): LoDashImplicitWrapper<T[]>;
+
+        /**
+         * @see _.orderBy
+         */
+        orderBy<T>(
+            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
+            iteratees?: Many<NumericDictionaryIteratee<T>>,
+            orders?: Many<boolean|string>
+        ): LoDashImplicitWrapper<T[]>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.orderBy
+         */
+        orderBy<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            iteratees?: Many<ListIterator<T, NotVoid>>,
+            orders?: Many<boolean|string>
+        ): LoDashExplicitWrapper<T[]>;
+
+        /**
+         * @see _.orderBy
+         */
+        orderBy<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            iteratees?: Many<ListIteratee<T>>,
+            orders?: Many<boolean|string>
+        ): LoDashExplicitWrapper<T[]>;
+
+        /**
+         * @see _.orderBy
+         */
+        orderBy<T extends object>(
+            this: LoDashExplicitWrapper<T | null | undefined>,
+            iteratees?: Many<ObjectIterator<T, NotVoid>>,
+            orders?: Many<boolean|string>
+        ): LoDashExplicitWrapper<Array<T[keyof T]>>;
+
+        /**
+         * @see _.orderBy
+         */
+        orderBy<T extends object>(
+            this: LoDashExplicitWrapper<T | null | undefined>,
+            iteratees?: Many<ObjectIteratee<T>>,
+            orders?: Many<boolean|string>
+        ): LoDashExplicitWrapper<Array<T[keyof T]>>;
+
+        /**
+         * @see _.orderBy
+         */
+        orderBy<T>(
+            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
+            iteratees?: Many<NumericDictionaryIterator<T, NotVoid>>,
+            orders?: Many<boolean|string>
+        ): LoDashExplicitWrapper<T[]>;
+
+        /**
+         * @see _.orderBy
+         */
+        orderBy<T>(
+            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
+            iteratees?: Many<NumericDictionaryIteratee<T>>,
+            orders?: Many<boolean|string>
+        ): LoDashExplicitWrapper<T[]>;
+    }
+
+    // partition
+
+    interface LoDashStatic {
+        /**
+        * Creates an array of elements split into two groups, the first of which contains elements predicate returns truthy for,
+        * while the second of which contains elements predicate returns falsey for.
+        * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
+        *
+        * If a property name is provided for predicate the created _.property style callback
+        * returns the property value of the given element.
+        *
+        * If a value is also provided for thisArg the created _.matchesProperty style callback
+        * returns true for elements that have a matching property value, else false.
+        *
+        * If an object is provided for predicate the created _.matches style callback returns
+        * true for elements that have the properties of the given object, else false.
+        *
+        * @param collection The collection to iterate over.
+        * @param callback The function called per iteration.
+        * @param thisArg The this binding of predicate.
+        * @return Returns the array of grouped elements.
+        **/
+        partition<T>(
+            collection: List<T> | null | undefined,
+            callback: ValueIteratee<T>
+        ): [T[], T[]];
+
+        /**
+         * @see _.partition
+         */
+        partition<T extends object>(
+            collection: T | null | undefined,
+            callback: ValueIteratee<T[keyof T]>
+        ): [Array<T[keyof T]>, Array<T[keyof T]>];
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.partition
+         */
+        partition<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            callback: ValueIteratee<T>
+        ): LoDashImplicitWrapper<[T[], T[]]>;
+
+        /**
+         * @see _.partition
+         */
+        partition<T>(
+            this: LoDashImplicitWrapper<T | null | undefined>,
+            callback: ValueIteratee<T[keyof T]>
+        ): LoDashImplicitWrapper<[Array<T[keyof T]>, Array<T[keyof T]>]>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.partition
+         */
+        partition<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            callback: ValueIteratee<T>
+        ): LoDashExplicitWrapper<[T[], T[]]>;
+
+        /**
+         * @see _.partition
+         */
+        partition<T>(
+            this: LoDashExplicitWrapper<T | null | undefined>,
+            callback: ValueIteratee<T[keyof T]>
+        ): LoDashExplicitWrapper<[Array<T[keyof T]>, Array<T[keyof T]>]>;
+    }
+
+    // reduce
+
+    interface LoDashStatic {
+        /**
+        * Reduces a collection to a value which is the accumulated result of running each
+        * element in the collection through the callback, where each successive callback execution
+        * consumes the return value of the previous execution. If accumulator is not provided the
+        * first element of the collection will be used as the initial accumulator value. The callback
+        * is bound to thisArg and invoked with four arguments; (accumulator, value, index|key, collection).
+        * @param collection The collection to iterate over.
+        * @param callback The function called per iteration.
+        * @param accumulator Initial value of the accumulator.
+        * @return Returns the accumulated value.
+        **/
+        reduce<T, TResult>(
+            collection: T[] | null | undefined,
+            callback: MemoListIterator<T, TResult, T[]>,
+            accumulator: TResult
+        ): TResult;
+
+        /**
+        * @see _.reduce
+        **/
+        reduce<T, TResult>(
+            collection: List<T> | null | undefined,
+            callback: MemoListIterator<T, TResult, List<T>>,
+            accumulator: TResult
+        ): TResult;
+
+        /**
+        * @see _.reduce
+        **/
+        reduce<T extends object, TResult>(
+            collection: T | null | undefined,
+            callback: MemoObjectIterator<T[keyof T], TResult, T>,
+            accumulator: TResult
+        ): TResult;
+
+        /**
+        * @see _.reduce
+        **/
+        reduce<T, TResult>(
+            collection: NumericDictionary<T> | null | undefined,
+            callback: MemoListIterator<T, TResult, NumericDictionary<T>>,
+            accumulator: TResult
+        ): TResult;
+
+        /**
+        * @see _.reduce
+        **/
+        reduce<T, TResult>(
+            collection: T[] | null | undefined,
+            callback: MemoListIterator<T, TResult, T[]>
+        ): TResult | undefined;
+
+        /**
+         * @see _.reduce
+         **/
+        reduce<T, TResult>(
+            collection: List<T> | null | undefined,
+            callback: MemoListIterator<T, TResult, List<T>>
+        ): TResult | undefined;
+
+        /**
+        * @see _.reduce
+        **/
+        reduce<T extends object, TResult>(
+            collection: T | null | undefined,
+            callback: MemoObjectIterator<T[keyof T], TResult, T>
+        ): TResult | undefined;
+
+        /**
+         * @see _.reduce
+         **/
+        reduce<T, TResult>(
+            collection: NumericDictionary<T> | null | undefined,
+            callback: MemoListIterator<T, TResult, NumericDictionary<T>>
+        ): TResult | undefined;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+         /**
+        * @see _.reduce
+        **/
+        reduce<T, TResult>(
+            this: LoDashImplicitWrapper<T[] | null | undefined>,
+            callback: MemoListIterator<T, TResult, T[]>,
+            accumulator: TResult
+        ): TResult;
+
+        /**
+         * @see _.reduce
+         **/
+        reduce<T, TResult>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            callback: MemoListIterator<T, TResult, List<T>>,
+            accumulator: TResult
+        ): TResult;
+
+        /**
+        * @see _.reduce
+        **/
+        reduce<T extends object, TResult>(
+            this: LoDashImplicitWrapper<T | null | undefined>,
+            callback: MemoObjectIterator<T[keyof T], TResult, T>,
+            accumulator: TResult
+        ): TResult;
+
+        /**
+         * @see _.reduce
+         **/
+        reduce<T, TResult>(
+            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
+            callback: MemoListIterator<T, TResult, NumericDictionary<T>>,
+            accumulator: TResult
+        ): TResult;
+
+        /**
+        * @see _.reduce
+        **/
+        reduce<T, TResult>(
+            this: LoDashImplicitWrapper<T[] | null | undefined>,
+            callback: MemoListIterator<T, TResult, T[]>
+        ): TResult | undefined;
+
+        /**
+        * @see _.reduce
+        **/
+        reduce<T, TResult>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            callback: MemoListIterator<T, TResult, List<T>>
+        ): TResult | undefined;
+
+        /**
+        * @see _.reduce
+        **/
+        reduce<T extends object, TResult>(
+            this: LoDashImplicitWrapper<T | null | undefined>,
+            callback: MemoObjectIterator<T[keyof T], TResult, T>
+        ): TResult | undefined;
+
+        /**
+        * @see _.reduce
+        **/
+        reduce<T, TResult>(
+            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
+            callback: MemoListIterator<T, TResult, NumericDictionary<T>>
+        ): TResult | undefined;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+        * @see _.reduce
+        **/
+        reduce<T, TResult>(
+            this: LoDashExplicitWrapper<T[] | null | undefined>,
+            callback: MemoListIterator<T, TResult, T[]>,
+            accumulator: TResult
+        ): LoDashExplicitWrapper<TResult>;
+
+        /**
+        * @see _.reduce
+        **/
+        reduce<T, TResult>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            callback: MemoListIterator<T, TResult, List<T>>,
+            accumulator: TResult
+        ): LoDashExplicitWrapper<TResult>;
+
+        /**
+        * @see _.reduce
+        **/
+        reduce<T extends object, TResult>(
+            this: LoDashExplicitWrapper<T | null | undefined>,
+            callback: MemoObjectIterator<T[keyof T], TResult, T>,
+            accumulator: TResult
+        ): LoDashExplicitWrapper<TResult>;
+
+        /**
+        * @see _.reduce
+        **/
+        reduce<T, TResult>(
+            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
+            callback: MemoListIterator<T, TResult, NumericDictionary<T>>,
+            accumulator: TResult
+        ): LoDashExplicitWrapper<TResult>;
+
+        /**
+        * @see _.reduce
+        **/
+        reduce<T, TResult>(
+            this: LoDashExplicitWrapper<T[] | null | undefined>,
+            callback: MemoListIterator<T, TResult, T[]>
+        ): LoDashExplicitWrapper<TResult | undefined>;
+
+        /**
+        * @see _.reduce
+        **/
+        reduce<T, TResult>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            callback: MemoListIterator<T, TResult, List<T>>
+        ): LoDashExplicitWrapper<TResult | undefined>;
+
+        /**
+        * @see _.reduce
+        **/
+        reduce<T extends object, TResult>(
+            this: LoDashExplicitWrapper<T | null | undefined>,
+            callback: MemoObjectIterator<T[keyof T], TResult, T>
+        ): LoDashExplicitWrapper<TResult | undefined>;
+
+        /**
+         * @see _.reduce
+         **/
+        reduce<T, TResult>(
+            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
+            callback: MemoListIterator<T, TResult, NumericDictionary<T>>
+        ): LoDashExplicitWrapper<TResult | undefined>;
+    }
+
+    // reduceRight
+
+    interface LoDashStatic {
+        /**
+        * This method is like _.reduce except that it iterates over elements of a collection from
+        * right to left.
+        * @param collection The collection to iterate over.
+        * @param callback The function called per iteration.
+        * @param accumulator Initial value of the accumulator.
+        * @return The accumulated value.
+        **/
+        reduceRight<T, TResult>(
+            collection: T[] | null | undefined,
+            callback: MemoListIterator<T, TResult, T[]>,
+            accumulator: TResult
+        ): TResult;
+
+        /**
+        * @see _.reduceRight
+        **/
+        reduceRight<T, TResult>(
+            collection: List<T> | null | undefined,
+            callback: MemoListIterator<T, TResult, List<T>>,
+            accumulator: TResult
+        ): TResult;
+
+        /**
+        * @see _.reduceRight
+        **/
+        reduceRight<T extends object, TResult>(
+            collection: T | null | undefined,
+            callback: MemoObjectIterator<T[keyof T], TResult, T>,
+            accumulator: TResult
+        ): TResult;
+
+        /**
+        * @see _.reduceRight
+        **/
+        reduceRight<T, TResult>(
+            collection: NumericDictionary<T> | null | undefined,
+            callback: MemoListIterator<T, TResult, NumericDictionary<T>>,
+            accumulator: TResult
+        ): TResult;
+
+        /**
+        * @see _.reduceRight
+        **/
+        reduceRight<T, TResult>(
+            collection: T[] | null | undefined,
+            callback: MemoListIterator<T, TResult, T[]>
+        ): TResult | undefined;
+
+        /**
+        * @see _.reduceRight
+        **/
+        reduceRight<T, TResult>(
+            collection: List<T> | null | undefined,
+            callback: MemoListIterator<T, TResult, List<T>>
+        ): TResult | undefined;
+
+        /**
+        * @see _.reduceRight
+        **/
+        reduceRight<T extends object, TResult>(
+            collection: T | null | undefined,
+            callback: MemoObjectIterator<T[keyof T], TResult, T>
+        ): TResult | undefined;
+
+        /**
+        * @see _.reduceRight
+        **/
+        reduceRight<T, TResult>(
+            collection: NumericDictionary<T> | null | undefined,
+            callback: MemoListIterator<T, TResult, NumericDictionary<T>>
+        ): TResult | undefined;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+         /**
+        * @see _.reduceRight
+        **/
+        reduceRight<T, TResult>(
+            this: LoDashImplicitWrapper<T[] | null | undefined>,
+            callback: MemoListIterator<T, TResult, T[]>,
+            accumulator: TResult
+        ): TResult;
+
+        /**
+        * @see _.reduceRight
+        **/
+        reduceRight<T, TResult>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            callback: MemoListIterator<T, TResult, List<T>>,
+            accumulator: TResult
+        ): TResult;
+
+        /**
+        * @see _.reduceRight
+        **/
+        reduceRight<T extends object, TResult>(
+            this: LoDashImplicitWrapper<T | null | undefined>,
+            callback: MemoObjectIterator<T[keyof T], TResult, T>,
+            accumulator: TResult
+        ): TResult;
+
+        /**
+        * @see _.reduceRight
+        **/
+        reduceRight<T, TResult>(
+            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
+            callback: MemoListIterator<T, TResult, NumericDictionary<T>>,
+            accumulator: TResult
+        ): TResult;
+
+        /**
+        * @see _.reduceRight
+        **/
+        reduceRight<T, TResult>(
+            this: LoDashImplicitWrapper<T[] | null | undefined>,
+            callback: MemoListIterator<T, TResult, T[]>
+        ): TResult | undefined;
+
+        /**
+        * @see _.reduceRight
+        **/
+        reduceRight<T, TResult>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            callback: MemoListIterator<T, TResult, List<T>>
+        ): TResult | undefined;
+
+        /**
+        * @see _.reduceRight
+        **/
+        reduceRight<T extends object, TResult>(
+            this: LoDashImplicitWrapper<T | null | undefined>,
+            callback: MemoObjectIterator<T[keyof T], TResult, T>
+        ): TResult | undefined;
+
+        /**
+        * @see _.reduceRight
+        **/
+        reduceRight<T, TResult>(
+            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
+            callback: MemoListIterator<T, TResult, NumericDictionary<T>>
+        ): TResult | undefined;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+        * @see _.reduceRight
+        **/
+        reduceRight<T, TResult>(
+            this: LoDashExplicitWrapper<T[] | null | undefined>,
+            callback: MemoListIterator<T, TResult, T[]>,
+            accumulator: TResult
+        ): LoDashExplicitWrapper<TResult>;
+
+        /**
+        * @see _.reduceRight
+        **/
+        reduceRight<T, TResult>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            callback: MemoListIterator<T, TResult, List<T>>,
+            accumulator: TResult
+        ): LoDashExplicitWrapper<TResult>;
+
+        /**
+        * @see _.reduceRight
+        **/
+        reduceRight<T extends object, TResult>(
+            this: LoDashExplicitWrapper<T | null | undefined>,
+            callback: MemoObjectIterator<T[keyof T], TResult, T>,
+            accumulator: TResult
+        ): LoDashExplicitWrapper<TResult>;
+
+        /**
+        * @see _.reduceRight
+        **/
+        reduceRight<T, TResult>(
+            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
+            callback: MemoListIterator<T, TResult, NumericDictionary<T>>,
+            accumulator: TResult
+        ): LoDashExplicitWrapper<TResult>;
+
+        /**
+        * @see _.reduceRight
+        **/
+        reduceRight<T, TResult>(
+            this: LoDashExplicitWrapper<T[] | null | undefined>,
+            callback: MemoListIterator<T, TResult, T[]>
+        ): LoDashExplicitWrapper<TResult | undefined>;
+
+        /**
+        * @see _.reduceRight
+        **/
+        reduceRight<T, TResult>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            callback: MemoListIterator<T, TResult, List<T>>
+        ): LoDashExplicitWrapper<TResult | undefined>;
+
+        /**
+        * @see _.reduceRight
+        **/
+        reduceRight<T extends object, TResult>(
+            this: LoDashExplicitWrapper<T | null | undefined>,
+            callback: MemoObjectIterator<T[keyof T], TResult, T>
+        ): LoDashExplicitWrapper<TResult | undefined>;
+
+        /**
+         * @see _.reduceRight
+         **/
+        reduceRight<T, TResult>(
+            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
+            callback: MemoListIterator<T, TResult, NumericDictionary<T>>
+        ): LoDashExplicitWrapper<TResult | undefined>;
+    }
+
+    // reject
+
+    interface LoDashStatic {
+        /**
+         * The opposite of _.filter; this method returns the elements of collection that predicate does not return
+         * truthy for.
+         *
+         * @param collection The collection to iterate over.
+         * @param predicate The function invoked per iteration.
+         * @param thisArg The this binding of predicate.
+         * @return Returns the new filtered array.
+         */
+        reject(
+            collection: string | null | undefined,
+            predicate?: StringIterator<boolean>
+        ): string[];
+
+        /**
+         * @see _.reject
+         */
+        reject<T>(
+            collection: List<T> | null | undefined,
+            predicate?: ListIterateeCustom<T, boolean>
+        ): T[];
+
+        /**
+         * @see _.reject
+         */
+        reject<T extends object>(
+            collection: T | null | undefined,
+            predicate?: ObjectIterateeCustom<T, boolean>
+        ): Array<T[keyof T]>;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.reject
+         */
+        reject(
+            this: LoDashImplicitWrapper<string | null | undefined>,
+            predicate?: StringIterator<boolean>
+        ): LoDashImplicitWrapper<string[]>;
+
+        /**
+         * @see _.reject
+         */
+        reject<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            predicate?: ListIterateeCustom<T, boolean>
+        ): LoDashImplicitWrapper<T[]>;
+
+        /**
+         * @see _.reject
+         */
+        reject<T extends object>(
+            this: LoDashImplicitWrapper<T | null | undefined>,
+            predicate?: ObjectIterateeCustom<T, boolean>
+        ): LoDashImplicitWrapper<Array<T[keyof T]>>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.reject
+         */
+        reject(
+            this: LoDashExplicitWrapper<string | null | undefined>,
+            predicate?: StringIterator<boolean>
+        ): LoDashExplicitWrapper<string[]>;
+
+        /**
+         * @see _.reject
+         */
+        reject<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            predicate?: ListIterateeCustom<T, boolean>
+        ): LoDashExplicitWrapper<T[]>;
+
+        /**
+         * @see _.reject
+         */
+        reject<T extends object>(
+            this: LoDashExplicitWrapper<T | null | undefined>,
+            predicate?: ObjectIterateeCustom<T, boolean>
+        ): LoDashExplicitWrapper<Array<T[keyof T]>>;
+    }
+
+    // sample
+
+    interface LoDashStatic {
+        /**
+         * Gets a random element from collection.
+         *
+         * @param collection The collection to sample.
+         * @return Returns the random element.
+         */
+        sample<T>(
+            collection: List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined
+        ): T | undefined;
+
+        /**
+         * @see _.sample
+         */
+        sample<T extends object>(
+            collection: T
+        ): T[keyof T];
+
+        /**
+         * @see _.sample
+         */
+        sample<T extends object>(
+            collection: T | null | undefined
+        ): T[keyof T] | undefined;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.sample
+         */
+        sample<T>(
+            this: LoDashImplicitWrapper<List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined>
+        ): T | undefined;
+
+        /**
+         * @see _.sample
+         */
+        sample<T extends object>(
+            this: LoDashImplicitWrapper<T>,
+        ): T[keyof T];
+
+        /**
+         * @see _.sample
+         */
+        sample<T extends object>(
+            this: LoDashImplicitWrapper<T | null | undefined>
+        ): T[keyof T] | undefined;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.sample
+         */
+        sample<T>(
+            this: LoDashExplicitWrapper<List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined>
+        ): LoDashExplicitWrapper<T | undefined>;
+
+        /**
+         * @see _.sample
+         */
+        sample<T extends object>(
+            this: LoDashExplicitWrapper<T>,
+        ): LoDashExplicitWrapper<T[keyof T]>;
+
+        /**
+         * @see _.sample
+         */
+        sample<T extends object>(
+            this: LoDashExplicitWrapper<T | null | undefined>
+        ): LoDashExplicitWrapper<T[keyof T] | undefined>;
+    }
+
+    // sampleSize
+
+    interface LoDashStatic {
+        /**
+         * Gets n random elements at unique keys from collection up to the size of collection.
+         *
+         * @param collection The collection to sample.
+         * @param n The number of elements to sample.
+         * @return Returns the random elements.
+         */
+        sampleSize<T>(
+            collection: List<T>|Dictionary<T>|NumericDictionary<T> | null | undefined,
+            n?: number
+        ): T[];
+
+        /**
+         * @see _.sampleSize
+         */
+        sampleSize<T extends object>(
+            collection: T | null | undefined,
+            n?: number
+        ): Array<T[keyof T]>;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.sampleSize
+         */
+        sampleSize<T>(
+            this: LoDashImplicitWrapper<List<T>|Dictionary<T>|NumericDictionary<T> | null | undefined>,
+            n?: number
+        ): LoDashImplicitWrapper<T[]>;
+
+        /**
+         * @see _.sampleSize
+         */
+        sampleSize<T extends object>(
+            this: LoDashImplicitWrapper<T | null | undefined>,
+            n?: number
+        ): LoDashImplicitWrapper<Array<T[keyof T]>>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.sampleSize
+         */
+        sampleSize<T>(
+            this: LoDashExplicitWrapper<List<T>|Dictionary<T>|NumericDictionary<T> | null | undefined>,
+            n?: number
+        ): LoDashExplicitWrapper<T[]>;
+
+        /**
+         * @see _.sampleSize
+         */
+        sampleSize<T extends object>(
+            this: LoDashExplicitWrapper<T | null | undefined>,
+            n?: number
+        ): LoDashExplicitWrapper<Array<T[keyof T]>>;
+    }
+
+    // shuffle
+
+    interface LoDashStatic {
+        /**
+         * Creates an array of shuffled values, using a version of the Fisher-Yates shuffle.
+         *
+         * @param collection The collection to shuffle.
+         * @return Returns the new shuffled array.
+         */
+        shuffle<T>(collection: List<T> | null | undefined): T[];
+
+        /**
+         * @see _.shuffle
+         */
+        shuffle<T extends object>(collection: T | null | undefined): Array<T[keyof T]>;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.shuffle
+         */
+        shuffle<T>(this: LoDashImplicitWrapper<List<T> | null | undefined>): LoDashImplicitWrapper<T[]>;
+
+        /**
+         * @see _.shuffle
+         */
+        shuffle<T extends object>(this: LoDashImplicitWrapper<T | null | undefined>): LoDashImplicitWrapper<Array<T[keyof T]>>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.shuffle
+         */
+        shuffle<T>(this: LoDashExplicitWrapper<List<T> | null | undefined>): LoDashExplicitWrapper<T[]>;
+
+        /**
+         * @see _.shuffle
+         */
+        shuffle<T extends object>(this: LoDashExplicitWrapper<T | null | undefined>): LoDashExplicitWrapper<Array<T[keyof T]>>;
+    }
+
+    // size
+
+    interface LoDashStatic {
+        /**
+         * Gets the size of collection by returning its length for array-like values or the number of own enumerable
+         * properties for objects.
+         *
+         * @param collection The collection to inspect.
+         * @return Returns the size of collection.
+         */
+        size(collection: object | string | null | undefined): number;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.size
+         */
+        size(): number;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.size
+         */
+        size(): LoDashExplicitWrapper<number>;
+    }
+
+    // some
+
+    interface LoDashStatic {
+        /**
+         * Checks if predicate returns truthy for any element of collection. Iteration is stopped once predicate
+         * returns truthy. The predicate is invoked with three arguments: (value, index|key, collection).
+         *
+         * @param collection The collection to iterate over.
+         * @param predicate The function invoked per iteration.
+         * @return Returns true if any element passes the predicate check, else false.
+         */
+        some<T>(
+            collection: List<T> | null | undefined,
+            predicate?: ListIterateeCustom<T, boolean>
+        ): boolean;
+
+        /**
+         * @see _.some
+         */
+        some<T extends object>(
+            collection: T | null | undefined,
+            predicate?: ObjectIterateeCustom<T, boolean>
+        ): boolean;
+
+        /**
+         * @see _.some
+         */
+        some<T>(
+            collection: NumericDictionary<T> | null | undefined,
+            predicate?: NumericDictionaryIterateeCustom<T, boolean>
+        ): boolean;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.some
+         */
+        some<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            predicate?: ListIterateeCustom<T, boolean>
+        ): boolean;
+
+        /**
+         * @see _.some
+         */
+        some<T extends object>(
+            this: LoDashImplicitWrapper<T | null | undefined>,
+            predicate?: ObjectIterateeCustom<T, boolean>
+        ): boolean;
+
+        /**
+         * @see _.some
+         */
+        some<T>(
+            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
+            predicate?: NumericDictionaryIterateeCustom<T, boolean>
+        ): boolean;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.some
+         */
+        some<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            predicate?: ListIterateeCustom<T, boolean>
+        ): LoDashExplicitWrapper<boolean>;
+
+        /**
+         * @see _.some
+         */
+        some<T extends object>(
+            this: LoDashExplicitWrapper<T | null | undefined>,
+            predicate?: ObjectIterateeCustom<T, boolean>
+        ): LoDashExplicitWrapper<boolean>;
+
+        /**
+         * @see _.some
+         */
+        some<T>(
+            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
+            predicate?: NumericDictionaryIterateeCustom<T, boolean>
+        ): LoDashExplicitWrapper<boolean>;
+    }
+
+    // sortBy
+
+    interface LoDashStatic {
+        /**
+         * Creates an array of elements, sorted in ascending order by the results of
+         * running each element in a collection through each iteratee. This method
+         * performs a stable sort, that is, it preserves the original sort order of
+         * equal elements. The iteratees are invoked with one argument: (value).
+         *
+         * @category Collection
+         * @param collection The collection to iterate over.
+         * @param [iteratees=[_.identity]]
+         *  The iteratees to sort by, specified individually or in arrays.
+         * @returns Returns the new sorted array.
+         * @example
+         *
+         * var users = [
+         *   { 'user': 'fred',   'age': 48 },
+         *   { 'user': 'barney', 'age': 36 },
+         *   { 'user': 'fred',   'age': 42 },
+         *   { 'user': 'barney', 'age': 34 }
+         * ];
+         *
+         * _.sortBy(users, function(o) { return o.user; });
+         * // => objects for [['barney', 36], ['barney', 34], ['fred', 48], ['fred', 42]]
+         *
+         * _.sortBy(users, ['user', 'age']);
+         * // => objects for [['barney', 34], ['barney', 36], ['fred', 42], ['fred', 48]]
+         *
+         * _.sortBy(users, 'user', function(o) {
+         *   return Math.floor(o.age / 10);
+         * });
+         * // => objects for [['barney', 36], ['barney', 34], ['fred', 48], ['fred', 42]]
+         */
+        sortBy<T>(
+            collection: List<T> | null | undefined,
+            ...iteratees: Array<Many<ListIteratee<T>>>
+        ): T[];
+
+        /**
+         * @see _.sortBy
+         */
+        sortBy<T extends object>(
+            collection: T | null | undefined,
+            ...iteratees: Array<Many<ObjectIteratee<T>>>
+        ): Array<T[keyof T]>;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.sortBy
+         */
+        sortBy<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            ...iteratees: Array<Many<ListIteratee<T>>>
+        ): LoDashImplicitWrapper<T[]>;
+
+        /**
+         * @see _.sortBy
+         */
+        sortBy<T extends object>(
+            this: LoDashImplicitWrapper<T | null | undefined>,
+            ...iteratees: Array<Many<ObjectIteratee<T>>>
+        ): LoDashImplicitWrapper<Array<T[keyof T]>>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.sortBy
+         */
+        sortBy<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            ...iteratees: Array<Many<ListIteratee<T>>>
+        ): LoDashExplicitWrapper<T[]>;
+
+        /**
+         * @see _.sortBy
+         */
+        sortBy<T extends object>(
+            this: LoDashExplicitWrapper<T | null | undefined>,
+            ...iteratees: Array<Many<ObjectIteratee<T>>>
+        ): LoDashExplicitWrapper<Array<T[keyof T]>>;
+    }
+}
\ No newline at end of file
diff --git a/types/lodash/common/common.d.ts b/types/lodash/common/common.d.ts
index 4956ca2ae0..5af72d2440 100644
--- a/types/lodash/common/common.d.ts
+++ b/types/lodash/common/common.d.ts
@@ -2,7 +2,7 @@ import _ = require("../index");
 type GlobalPartial<T> = Partial<T>;
 declare module "../index" {
     type PartialObject<T> = GlobalPartial<T>;
-    type Many<T> = T | T[];
+    type Many<T> = T | ReadonlyArray<T>;
     interface LoDashStatic {
         /**
         * Creates a lodash object which wraps value to enable implicit method chain sequences.
@@ -252,4 +252,4 @@ declare module "../index" {
     type LoDashExplicitNillableObjectWrapper<T> = LoDashExplicitWrapper<T | null | undefined>;
     type LoDashExplicitNumberArrayWrapper = LoDashExplicitWrapper<number[]>;
     type LoDashExplicitStringWrapper = LoDashExplicitWrapper<string>;
-}
\ No newline at end of file
+}
diff --git a/types/lodash/date/now.d.ts b/types/lodash/common/date.d.ts
similarity index 97%
rename from types/lodash/date/now.d.ts
rename to types/lodash/common/date.d.ts
index 480326dd3d..e460de4e1a 100644
--- a/types/lodash/date/now.d.ts
+++ b/types/lodash/common/date.d.ts
@@ -1,5 +1,7 @@
 import _ = require("../index");
 declare module "../index" {
+    // now
+
     interface LoDashStatic {
         /**
          * Gets the number of milliseconds that have elapsed since the Unix epoch (1 January 1970 00:00:00 UTC).
diff --git a/types/lodash/common/function.d.ts b/types/lodash/common/function.d.ts
new file mode 100644
index 0000000000..b51fa6c625
--- /dev/null
+++ b/types/lodash/common/function.d.ts
@@ -0,0 +1,1367 @@
+import _ = require("../index");
+declare module "../index" {
+    // after
+
+    interface LoDashStatic {
+        /**
+         * The opposite of _.before; this method creates a function that invokes func once it’s called n or more times.
+         *
+         * @param n The number of calls before func is invoked.
+         * @param func The function to restrict.
+         * @return Returns the new restricted function.
+         */
+        after<TFunc extends (...args: any[]) => any>(
+            n: number,
+            func: TFunc
+        ): TFunc;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+        * @see _.after
+        **/
+        after<TFunc extends (...args: any[]) => any>(func: TFunc): LoDashImplicitWrapper<TFunc>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.after
+         **/
+        after<TFunc extends (...args: any[]) => any>(func: TFunc): LoDashExplicitWrapper<TFunc>;
+    }
+
+    // ary
+
+    interface LoDashStatic {
+        /**
+         * Creates a function that accepts up to n arguments ignoring any additional arguments.
+         *
+         * @param func The function to cap arguments for.
+         * @param n The arity cap.
+         * @returns Returns the new function.
+         */
+        ary(
+            func: (...args: any[]) => any,
+            n?: number
+        ): (...args: any[]) => any;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.ary
+         */
+        ary(n?: number): LoDashImplicitWrapper<(...args: any[]) => any>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.ary
+         */
+        ary(n?: number): LoDashExplicitWrapper<(...args: any[]) => any>;
+    }
+
+    // before
+
+    interface LoDashStatic {
+        /**
+         * Creates a function that invokes func, with the this binding and arguments of the created function, while
+         * it’s called less than n times. Subsequent calls to the created function return the result of the last func
+         * invocation.
+         *
+         * @param n The number of calls at which func is no longer invoked.
+         * @param func The function to restrict.
+         * @return Returns the new restricted function.
+         */
+        before<TFunc extends (...args: any[]) => any>(
+            n: number,
+            func: TFunc
+        ): TFunc;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.before
+         **/
+        before<TFunc extends (...args: any[]) => any>(func: TFunc): LoDashImplicitWrapper<TFunc>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.before
+         **/
+        before<TFunc extends (...args: any[]) => any>(func: TFunc): LoDashExplicitWrapper<TFunc>;
+    }
+
+    // bind
+
+    interface FunctionBind {
+        placeholder: any;
+
+        (
+            func: (...args: any[]) => any,
+            thisArg: any,
+            ...partials: any[]
+        ): (...args: any[]) => any;
+    }
+
+    interface LoDashStatic {
+        /**
+         * Creates a function that invokes func with the this binding of thisArg and prepends any additional _.bind
+         * arguments to those provided to the bound function.
+         *
+         * The _.bind.placeholder value, which defaults to _ in monolithic builds, may be used as a placeholder for
+         * partially applied arguments.
+         *
+         * Note: Unlike native Function#bind this method does not set the "length" property of bound functions.
+         *
+         * @param func The function to bind.
+         * @param thisArg The this binding of func.
+         * @param partials The arguments to be partially applied.
+         * @return Returns the new bound function.
+         */
+        bind: FunctionBind;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.bind
+         */
+        bind(
+            thisArg: any,
+            ...partials: any[]
+        ): LoDashImplicitWrapper<(...args: any[]) => any>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.bind
+         */
+        bind(
+            thisArg: any,
+            ...partials: any[]
+        ): LoDashExplicitWrapper<(...args: any[]) => any>;
+    }
+
+    // bindKey
+
+    interface FunctionBindKey {
+        placeholder: any;
+
+        (
+            object: object,
+            key: string,
+            ...partials: any[]
+        ): (...args: any[]) => any;
+    }
+
+    interface LoDashStatic {
+        /**
+         * Creates a function that invokes the method at object[key] and prepends any additional _.bindKey arguments
+         * to those provided to the bound function.
+         *
+         * This method differs from _.bind by allowing bound functions to reference methods that may be redefined
+         * or don’t yet exist. See Peter Michaux’s article for more details.
+         *
+         * The _.bindKey.placeholder value, which defaults to _ in monolithic builds, may be used as a placeholder
+         * for partially applied arguments.
+         *
+         * @param object The object the method belongs to.
+         * @param key The key of the method.
+         * @param partials The arguments to be partially applied.
+         * @return Returns the new bound function.
+         */
+        bindKey: FunctionBindKey;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.bindKey
+         */
+        bindKey(
+            key: string,
+            ...partials: any[]
+        ): LoDashImplicitWrapper<(...args: any[]) => any>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.bindKey
+         */
+        bindKey(
+            key: string,
+            ...partials: any[]
+        ): LoDashExplicitWrapper<(...args: any[]) => any>;
+    }
+
+    // curry
+
+    interface LoDashStatic {
+        /**
+         * Creates a function that accepts one or more arguments of func that when called either invokes func returning
+         * its result, if all func arguments have been provided, or returns a function that accepts one or more of the
+         * remaining func arguments, and so on. The arity of func may be specified if func.length is not sufficient.
+         * @param func The function to curry.
+         * @param arity The arity of func.
+         * @return Returns the new curried function.
+         */
+        curry<T1, R>(func: (t1: T1) => R, arity?: number):
+            CurriedFunction1<T1, R>;
+        /**
+         * Creates a function that accepts one or more arguments of func that when called either invokes func returning
+         * its result, if all func arguments have been provided, or returns a function that accepts one or more of the
+         * remaining func arguments, and so on. The arity of func may be specified if func.length is not sufficient.
+         * @param func The function to curry.
+         * @param arity The arity of func.
+         * @return Returns the new curried function.
+         */
+        curry<T1, T2, R>(func: (t1: T1, t2: T2) => R, arity?: number):
+            CurriedFunction2<T1, T2, R>;
+        /**
+         * Creates a function that accepts one or more arguments of func that when called either invokes func returning
+         * its result, if all func arguments have been provided, or returns a function that accepts one or more of the
+         * remaining func arguments, and so on. The arity of func may be specified if func.length is not sufficient.
+         * @param func The function to curry.
+         * @param arity The arity of func.
+         * @return Returns the new curried function.
+         */
+        curry<T1, T2, T3, R>(func: (t1: T1, t2: T2, t3: T3) => R, arity?: number):
+            CurriedFunction3<T1, T2, T3, R>;
+        /**
+         * Creates a function that accepts one or more arguments of func that when called either invokes func returning
+         * its result, if all func arguments have been provided, or returns a function that accepts one or more of the
+         * remaining func arguments, and so on. The arity of func may be specified if func.length is not sufficient.
+         * @param func The function to curry.
+         * @param arity The arity of func.
+         * @return Returns the new curried function.
+         */
+        curry<T1, T2, T3, T4, R>(func: (t1: T1, t2: T2, t3: T3, t4: T4) => R, arity?: number):
+            CurriedFunction4<T1, T2, T3, T4, R>;
+        /**
+         * Creates a function that accepts one or more arguments of func that when called either invokes func returning
+         * its result, if all func arguments have been provided, or returns a function that accepts one or more of the
+         * remaining func arguments, and so on. The arity of func may be specified if func.length is not sufficient.
+         * @param func The function to curry.
+         * @param arity The arity of func.
+         * @return Returns the new curried function.
+         */
+        curry<T1, T2, T3, T4, T5, R>(func: (t1: T1, t2: T2, t3: T3, t4: T4, t5: T5) => R, arity?: number):
+            CurriedFunction5<T1, T2, T3, T4, T5, R>;
+        /**
+         * Creates a function that accepts one or more arguments of func that when called either invokes func returning
+         * its result, if all func arguments have been provided, or returns a function that accepts one or more of the
+         * remaining func arguments, and so on. The arity of func may be specified if func.length is not sufficient.
+         * @param func The function to curry.
+         * @param arity The arity of func.
+         * @return Returns the new curried function.
+         */
+        curry(func: (...args: any[]) => any, arity?: number): (...args: any[]) => any;
+    }
+
+    interface CurriedFunction1<T1, R> {
+        (): CurriedFunction1<T1, R>;
+        (t1: T1): R;
+    }
+
+    interface CurriedFunction2<T1, T2, R> {
+        (): CurriedFunction2<T1, T2, R>;
+        (t1: T1): CurriedFunction1<T2, R>;
+        (t1: T1, t2: T2): R;
+    }
+
+    interface CurriedFunction3<T1, T2, T3, R> {
+        (): CurriedFunction3<T1, T2, T3, R>;
+        (t1: T1): CurriedFunction2<T2, T3, R>;
+        (t1: T1, t2: T2): CurriedFunction1<T3, R>;
+        (t1: T1, t2: T2, t3: T3): R;
+    }
+
+    interface CurriedFunction4<T1, T2, T3, T4, R> {
+        (): CurriedFunction4<T1, T2, T3, T4, R>;
+        (t1: T1): CurriedFunction3<T2, T3, T4, R>;
+        (t1: T1, t2: T2): CurriedFunction2<T3, T4, R>;
+        (t1: T1, t2: T2, t3: T3): CurriedFunction1<T4, R>;
+        (t1: T1, t2: T2, t3: T3, t4: T4): R;
+    }
+
+    interface CurriedFunction5<T1, T2, T3, T4, T5, R> {
+        (): CurriedFunction5<T1, T2, T3, T4, T5, R>;
+        (t1: T1): CurriedFunction4<T2, T3, T4, T5, R>;
+        (t1: T1, t2: T2): CurriedFunction3<T3, T4, T5, R>;
+        (t1: T1, t2: T2, t3: T3): CurriedFunction2<T4, T5, R>;
+        (t1: T1, t2: T2, t3: T3, t4: T4): CurriedFunction1<T5, R>;
+        (t1: T1, t2: T2, t3: T3, t4: T4, t5: T5): R;
+    }
+    interface RightCurriedFunction1<T1, R> {
+        (): RightCurriedFunction1<T1, R>;
+        (t1: T1): R;
+    }
+    interface RightCurriedFunction2<T1, T2, R> {
+        (): RightCurriedFunction2<T1, T2, R>;
+        (t2: T2): RightCurriedFunction1<T1, R>;
+        (t1: T1, t2: T2): R;
+    }
+    interface RightCurriedFunction3<T1, T2, T3, R> {
+        (): RightCurriedFunction3<T1, T2, T3, R>;
+        (t3: T3): RightCurriedFunction2<T1, T2, R>;
+        (t2: T2, t3: T3): RightCurriedFunction1<T1, R>;
+        (t1: T1, t2: T2, t3: T3): R;
+    }
+    interface RightCurriedFunction4<T1, T2, T3, T4, R> {
+        (): RightCurriedFunction4<T1, T2, T3, T4, R>;
+        (t4: T4): RightCurriedFunction3<T1, T2, T3, R>;
+        (t3: T3, t4: T4): RightCurriedFunction2<T1, T2, R>;
+        (t2: T2, t3: T3, t4: T4): RightCurriedFunction1<T1, R>;
+        (t1: T1, t2: T2, t3: T3, t4: T4): R;
+    }
+    interface RightCurriedFunction5<T1, T2, T3, T4, T5, R> {
+        (): RightCurriedFunction5<T1, T2, T3, T4, T5, R>;
+        (t5: T5): RightCurriedFunction4<T1, T2, T3, T4, R>;
+        (t4: T4, t5: T5): RightCurriedFunction3<T1, T2, T3, R>;
+        (t3: T3, t4: T4, t5: T5): RightCurriedFunction2<T1, T2, R>;
+        (t2: T2, t3: T3, t4: T4, t5: T5): RightCurriedFunction1<T1, R>;
+        (t1: T1, t2: T2, t3: T3, t4: T4, t5: T5): R;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+        * @see _.curry
+        **/
+        curry<T1, R>(this: LoDashImplicitWrapper<(t1: T1) => R>, arity?: number):
+            LoDashImplicitWrapper<CurriedFunction1<T1, R>>;
+
+        /**
+        * @see _.curry
+        **/
+        curry<T1, T2, R>(this: LoDashImplicitWrapper<(t1: T1, t2: T2) => R>, arity?: number):
+            LoDashImplicitWrapper<CurriedFunction2<T1, T2, R>>;
+
+        /**
+        * @see _.curry
+        **/
+        curry<T1, T2, T3, R>(this: LoDashImplicitWrapper<(t1: T1, t2: T2, t3: T3) => R>, arity?: number):
+            LoDashImplicitWrapper<CurriedFunction3<T1, T2, T3, R>>;
+
+        /**
+        * @see _.curry
+        **/
+        curry<T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<(t1: T1, t2: T2, t3: T3, t4: T4) => R>, arity?: number):
+            LoDashImplicitWrapper<CurriedFunction4<T1, T2, T3, T4, R>>;
+
+        /**
+        * @see _.curry
+        **/
+        curry<T1, T2, T3, T4, T5, R>(this: LoDashImplicitWrapper<(t1: T1, t2: T2, t3: T3, t4: T4, t5: T5) => R>, arity?: number):
+            LoDashImplicitWrapper<CurriedFunction5<T1, T2, T3, T4, T5, R>>;
+
+        /**
+        * @see _.curry
+        **/
+        curry(arity?: number): LoDashImplicitWrapper<(...args: any[]) => any>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+        * @see _.curry
+        **/
+        curry<T1, R>(this: LoDashExplicitWrapper<(t1: T1) => R>):
+            LoDashExplicitWrapper<CurriedFunction1<T1, R>>;
+
+        /**
+        * @see _.curry
+        **/
+        curry<T1, T2, R>(this: LoDashExplicitWrapper<(t1: T1, t2: T2) => R>):
+            LoDashExplicitWrapper<CurriedFunction2<T1, T2, R>>;
+
+        /**
+        * @see _.curry
+        **/
+        curry<T1, T2, T3, R>(this: LoDashExplicitWrapper<(t1: T1, t2: T2, t3: T3) => R>):
+            LoDashExplicitWrapper<CurriedFunction3<T1, T2, T3, R>>;
+
+        /**
+        * @see _.curry
+        **/
+        curry<T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<(t1: T1, t2: T2, t3: T3, t4: T4) => R>):
+            LoDashExplicitWrapper<CurriedFunction4<T1, T2, T3, T4, R>>;
+
+        /**
+        * @see _.curry
+        **/
+        curry<T1, T2, T3, T4, T5, R>(this: LoDashExplicitWrapper<(t1: T1, t2: T2, t3: T3, t4: T4, t5: T5) => R>):
+            LoDashExplicitWrapper<CurriedFunction5<T1, T2, T3, T4, T5, R>>;
+
+        /**
+        * @see _.curry
+        **/
+        curry(arity?: number): LoDashExplicitWrapper<(...args: any[]) => any>;
+    }
+
+    // curryRight
+
+    interface LoDashStatic {
+        /**
+         * This method is like _.curry except that arguments are applied to func in the manner of _.partialRight
+         * instead of _.partial.
+         * @param func The function to curry.
+         * @param arity The arity of func.
+         * @return Returns the new curried function.
+         */
+        curryRight<T1, R>(func: (t1: T1) => R, arity?: number):
+            RightCurriedFunction1<T1, R>;
+        /**
+         * This method is like _.curry except that arguments are applied to func in the manner of _.partialRight
+         * instead of _.partial.
+         * @param func The function to curry.
+         * @param arity The arity of func.
+         * @return Returns the new curried function.
+         */
+        curryRight<T1, T2, R>(func: (t1: T1, t2: T2) => R, arity?: number):
+            RightCurriedFunction2<T1, T2, R>;
+        /**
+         * This method is like _.curry except that arguments are applied to func in the manner of _.partialRight
+         * instead of _.partial.
+         * @param func The function to curry.
+         * @param arity The arity of func.
+         * @return Returns the new curried function.
+         */
+        curryRight<T1, T2, T3, R>(func: (t1: T1, t2: T2, t3: T3) => R, arity?: number):
+            RightCurriedFunction3<T1, T2, T3, R>;
+        /**
+         * This method is like _.curry except that arguments are applied to func in the manner of _.partialRight
+         * instead of _.partial.
+         * @param func The function to curry.
+         * @param arity The arity of func.
+         * @return Returns the new curried function.
+         */
+        curryRight<T1, T2, T3, T4, R>(func: (t1: T1, t2: T2, t3: T3, t4: T4) => R, arity?: number):
+            RightCurriedFunction4<T1, T2, T3, T4, R>;
+        /**
+         * This method is like _.curry except that arguments are applied to func in the manner of _.partialRight
+         * instead of _.partial.
+         * @param func The function to curry.
+         * @param arity The arity of func.
+         * @return Returns the new curried function.
+         */
+        curryRight<T1, T2, T3, T4, T5, R>(func: (t1: T1, t2: T2, t3: T3, t4: T4, t5: T5) => R, arity?: number):
+            RightCurriedFunction5<T1, T2, T3, T4, T5, R>;
+        /**
+         * This method is like _.curry except that arguments are applied to func in the manner of _.partialRight
+         * instead of _.partial.
+         * @param func The function to curry.
+         * @param arity The arity of func.
+         * @return Returns the new curried function.
+         */
+        curryRight(func: (...args: any[]) => any, arity?: number): (...args: any[]) => any;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.curryRight
+         **/
+        curryRight<T1, R>(this: LoDashImplicitWrapper<(t1: T1) => R>, arity?: number):
+            LoDashImplicitWrapper<RightCurriedFunction1<T1, R>>;
+
+        /**
+         * @see _.curryRight
+         **/
+        curryRight<T1, T2, R>(this: LoDashImplicitWrapper<(t1: T1, t2: T2) => R>, arity?: number):
+            LoDashImplicitWrapper<RightCurriedFunction2<T1, T2, R>>;
+
+        /**
+         * @see _.curryRight
+         **/
+        curryRight<T1, T2, T3, R>(this: LoDashImplicitWrapper<(t1: T1, t2: T2, t3: T3) => R>, arity?: number):
+            LoDashImplicitWrapper<RightCurriedFunction3<T1, T2, T3, R>>;
+
+        /**
+         * @see _.curryRight
+         **/
+        curryRight<T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<(t1: T1, t2: T2, t3: T3, t4: T4) => R>, arity?: number):
+            LoDashImplicitWrapper<RightCurriedFunction4<T1, T2, T3, T4, R>>;
+
+        /**
+         * @see _.curryRight
+         **/
+        curryRight<T1, T2, T3, T4, T5, R>(this: LoDashImplicitWrapper<(t1: T1, t2: T2, t3: T3, t4: T4, t5: T5) => R>, arity?: number):
+            LoDashImplicitWrapper<RightCurriedFunction5<T1, T2, T3, T4, T5, R>>;
+
+        /**
+         * @see _.curryRight
+         **/
+        curryRight(arity?: number): LoDashImplicitWrapper<(...args: any[]) => any>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.curryRight
+         **/
+        curryRight<T1, R>(this: LoDashExplicitWrapper<(t1: T1) => R>, arity?: number):
+            LoDashExplicitWrapper<RightCurriedFunction1<T1, R>>;
+
+        /**
+         * @see _.curryRight
+         **/
+        curryRight<T1, T2, R>(this: LoDashExplicitWrapper<(t1: T1, t2: T2) => R>, arity?: number):
+            LoDashExplicitWrapper<RightCurriedFunction2<T1, T2, R>>;
+
+        /**
+         * @see _.curryRight
+         **/
+        curryRight<T1, T2, T3, R>(this: LoDashExplicitWrapper<(t1: T1, t2: T2, t3: T3) => R>, arity?: number):
+            LoDashExplicitWrapper<RightCurriedFunction3<T1, T2, T3, R>>;
+
+        /**
+         * @see _.curryRight
+         **/
+        curryRight<T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<(t1: T1, t2: T2, t3: T3, t4: T4) => R>, arity?: number):
+            LoDashExplicitWrapper<RightCurriedFunction4<T1, T2, T3, T4, R>>;
+
+        /**
+         * @see _.curryRight
+         **/
+        curryRight<T1, T2, T3, T4, T5, R>(this: LoDashExplicitWrapper<(t1: T1, t2: T2, t3: T3, t4: T4, t5: T5) => R>, arity?: number):
+            LoDashExplicitWrapper<RightCurriedFunction5<T1, T2, T3, T4, T5, R>>;
+
+        /**
+         * @see _.curryRight
+         **/
+        curryRight(arity?: number): LoDashExplicitWrapper<(...args: any[]) => any>;
+    }
+
+    // debounce
+
+    interface DebounceSettings {
+        /**
+         * Specify invoking on the leading edge of the timeout.
+         */
+        leading?: boolean;
+
+        /**
+         * The maximum time func is allowed to be delayed before it’s invoked.
+         */
+        maxWait?: number;
+
+        /**
+         * Specify invoking on the trailing edge of the timeout.
+         */
+        trailing?: boolean;
+    }
+
+    interface LoDashStatic {
+        /**
+         * Creates a debounced function that delays invoking func until after wait milliseconds have elapsed since
+         * the last time the debounced function was invoked. The debounced function comes with a cancel method to
+         * cancel delayed invocations and a flush method to immediately invoke them. Provide an options object to
+         * indicate that func should be invoked on the leading and/or trailing edge of the wait timeout. Subsequent
+         * calls to the debounced function return the result of the last func invocation.
+         *
+         * Note: If leading and trailing options are true, func is invoked on the trailing edge of the timeout only
+         * if the the debounced function is invoked more than once during the wait timeout.
+         *
+         * See David Corbacho’s article for details over the differences between _.debounce and _.throttle.
+         *
+         * @param func The function to debounce.
+         * @param wait The number of milliseconds to delay.
+         * @param options The options object.
+         * @param options.leading Specify invoking on the leading edge of the timeout.
+         * @param options.maxWait The maximum time func is allowed to be delayed before it’s invoked.
+         * @param options.trailing Specify invoking on the trailing edge of the timeout.
+         * @return Returns the new debounced function.
+         */
+        debounce<T extends (...args: any[]) => any>(
+            func: T,
+            wait?: number,
+            options?: DebounceSettings
+        ): T & Cancelable;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.debounce
+         */
+        debounce(
+            wait?: number,
+            options?: DebounceSettings
+        ): LoDashImplicitWrapper<TValue & Cancelable>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.debounce
+         */
+        debounce(
+            wait?: number,
+            options?: DebounceSettings
+        ): LoDashExplicitWrapper<TValue & Cancelable>;
+    }
+
+    // defer
+
+    interface LoDashStatic {
+        /**
+         * Defers invoking the func until the current call stack has cleared. Any additional arguments are provided to
+         * func when it’s invoked.
+         *
+         * @param func The function to defer.
+         * @param args The arguments to invoke the function with.
+         * @return Returns the timer id.
+         */
+        defer(
+            func: (...args: any[]) => any,
+            ...args: any[]
+        ): number;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.defer
+         */
+        defer(...args: any[]): LoDashImplicitWrapper<number>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.defer
+         */
+        defer(...args: any[]): LoDashExplicitWrapper<number>;
+    }
+
+    // delay
+
+    interface LoDashStatic {
+        /**
+         * Invokes func after wait milliseconds. Any additional arguments are provided to func when it’s invoked.
+         *
+         * @param func The function to delay.
+         * @param wait The number of milliseconds to delay invocation.
+         * @param args The arguments to invoke the function with.
+         * @return Returns the timer id.
+         */
+        delay(
+            func: (...args: any[]) => any,
+            wait: number,
+            ...args: any[]
+        ): number;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.delay
+         */
+        delay(
+            wait: number,
+            ...args: any[]
+        ): LoDashImplicitWrapper<number>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.delay
+         */
+        delay(
+            wait: number,
+            ...args: any[]
+        ): LoDashExplicitWrapper<number>;
+    }
+
+    // flip
+
+    interface LoDashStatic {
+       /**
+        * Creates a function that invokes `func` with arguments reversed.
+        *
+        * @category Function
+        * @param func The function to flip arguments for.
+        * @returns Returns the new function.
+        * @example
+        *
+        * var flipped = _.flip(function() {
+        *   return _.toArray(arguments);
+        * });
+        *
+        * flipped('a', 'b', 'c', 'd');
+        * // => ['d', 'c', 'b', 'a']
+        */
+       flip<T extends (...args: any[]) => any>(func: T): T;
+   }
+
+   interface LoDashWrapper<TValue> {
+       /**
+        * @see _.flip
+        */
+       flip(): this;
+   }
+
+    // memoize
+
+    interface MemoizedFunction {
+        cache: MapCache;
+    }
+
+    interface LoDashStatic {
+        /**
+         * Creates a function that memoizes the result of func. If resolver is provided it determines the cache key for
+         * storing the result based on the arguments provided to the memoized function. By default, the first argument
+         * provided to the memoized function is coerced to a string and used as the cache key. The func is invoked with
+         * the this binding of the memoized function.
+         *
+         * @param func The function to have its output memoized.
+         * @param resolver The function to resolve the cache key.
+         * @return Returns the new memoizing function.
+         */
+        memoize: {
+            <T extends (...args: any[]) => any>(func: T, resolver?: (...args: any[]) => any): T & MemoizedFunction;
+            Cache: MapCacheConstructor;
+        };
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.memoize
+         */
+        memoize(resolver?: (...args: any[]) => any): LoDashImplicitWrapper<TValue & MemoizedFunction>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.memoize
+         */
+        memoize(resolver?: (...args: any[]) => any): LoDashExplicitWrapper<TValue & MemoizedFunction>;
+    }
+
+    // negate
+
+    interface LoDashStatic {
+        /**
+         * Creates a function that negates the result of the predicate func. The func predicate is invoked with
+         * the this binding and arguments of the created function.
+         *
+         * @param predicate The predicate to negate.
+         * @return Returns the new function.
+         */
+        negate<T extends (...args: any[]) => any>(predicate: T): T;
+    }
+
+    interface LoDashWrapper<TValue> {
+        /**
+         * @see _.negate
+         */
+        negate(): this;
+    }
+
+    // once
+
+    interface LoDashStatic {
+        /**
+         * Creates a function that is restricted to invoking func once. Repeat calls to the function return the value
+         * of the first call. The func is invoked with the this binding and arguments of the created function.
+         *
+         * @param func The function to restrict.
+         * @return Returns the new restricted function.
+         */
+        once<T extends (...args: any[]) => any>(func: T): T;
+    }
+
+    interface LoDashWrapper<TValue> {
+        /**
+         * @see _.once
+         */
+        once(): this;
+    }
+
+    // overArgs
+
+   interface LoDashStatic {
+       /**
+        * Creates a function that runs each argument through a corresponding transform function.
+        *
+        * @param func The function to wrap.
+        * @param transforms The functions to transform arguments, specified as individual functions or arrays
+        * of functions.
+        * @return Returns the new function.
+        */
+       overArgs(
+           func: (...args: any[]) => any,
+           ...transforms: Array<Many<(...args: any[]) => any>>
+       ): (...args: any[]) => any;
+   }
+
+   interface LoDashImplicitWrapper<TValue> {
+       /**
+        * @see _.overArgs
+        */
+       overArgs(...transforms: Array<Many<(...args: any[]) => any>>): LoDashImplicitWrapper<(...args: any[]) => any>;
+   }
+
+   interface LoDashExplicitWrapper<TValue> {
+       /**
+        * @see _.overArgs
+        */
+       overArgs(...transforms: Array<Many<(...args: any[]) => any>>): LoDashExplicitWrapper<(...args: any[]) => any>;
+   }
+
+    // partial
+
+    interface LoDashStatic {
+        /**
+        * Creates a function that, when called, invokes func with any additional partial arguments
+        * prepended to those provided to the new function. This method is similar to _.bind except
+        * it does not alter the this binding.
+        * @param func The function to partially apply arguments to.
+        * @param args Arguments to be partially applied.
+        * @return The new partially applied function.
+        **/
+        partial: Partial;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.partial
+         */
+        partial: ImplicitPartial;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.partial
+         */
+        partial: ExplicitPartial;
+    }
+
+    type PH = LoDashStatic;
+
+    type Function0<R> = () => R;
+    type Function1<T1, R> = (t1: T1) => R;
+    type Function2<T1, T2, R> = (t1: T1, t2: T2) => R;
+    type Function3<T1, T2, T3, R> = (t1: T1, t2: T2, t3: T3) => R;
+    type Function4<T1, T2, T3, T4, R> = (t1: T1, t2: T2, t3: T3, t4: T4) => R;
+
+    interface Partial {
+        // arity 0
+        <R>(func: Function0<R>): Function0<R>;
+        // arity 1
+        <T1, R>(func: Function1<T1, R>): Function1<T1, R>;
+        <T1, R>(func: Function1<T1, R>, arg1: T1): Function0<R>;
+        // arity 2
+        <T1, T2, R>(func: Function2<T1, T2, R>):                      Function2<T1, T2, R>;
+        <T1, T2, R>(func: Function2<T1, T2, R>, arg1: T1):            Function1<    T2, R>;
+        <T1, T2, R>(func: Function2<T1, T2, R>, plc1: PH, arg2: T2):  Function1<T1,     R>;
+        <T1, T2, R>(func: Function2<T1, T2, R>, arg1: T1, arg2: T2):  Function0<        R>;
+        // arity 3
+        <T1, T2, T3, R>(func: Function3<T1, T2, T3, R>):                                Function3<T1, T2, T3, R>;
+        <T1, T2, T3, R>(func: Function3<T1, T2, T3, R>, arg1: T1):                      Function2<    T2, T3, R>;
+        <T1, T2, T3, R>(func: Function3<T1, T2, T3, R>, plc1: PH, arg2: T2):            Function2<T1,     T3, R>;
+        <T1, T2, T3, R>(func: Function3<T1, T2, T3, R>, arg1: T1, arg2: T2):            Function1<        T3, R>;
+        <T1, T2, T3, R>(func: Function3<T1, T2, T3, R>, plc1: PH, plc2: PH, arg3: T3):  Function2<T1, T2,     R>;
+        <T1, T2, T3, R>(func: Function3<T1, T2, T3, R>, arg1: T1, plc2: PH, arg3: T3):  Function1<    T2,     R>;
+        <T1, T2, T3, R>(func: Function3<T1, T2, T3, R>, plc1: PH, arg2: T2, arg3: T3):  Function1<T1,         R>;
+        <T1, T2, T3, R>(func: Function3<T1, T2, T3, R>, arg1: T1, arg2: T2, arg3: T3):  Function0<            R>;
+        // arity 4
+        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>):                                          Function4<T1, T2, T3, T4, R>;
+        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1):                                Function3<    T2, T3, T4, R>;
+        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, plc1: PH, arg2: T2):                      Function3<T1,     T3, T4, R>;
+        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1, arg2: T2):                      Function2<        T3, T4, R>;
+        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, plc1: PH, plc2: PH, arg3: T3):            Function3<T1, T2,     T4, R>;
+        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1, plc2: PH, arg3: T3):            Function2<    T2,     T4, R>;
+        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, plc1: PH, arg2: T2, arg3: T3):            Function2<T1,         T4, R>;
+        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1, arg2: T2, arg3: T3):            Function1<            T4, R>;
+        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, plc1: PH, plc2: PH, plc3: PH, arg4: T4):  Function3<T1, T2, T3,     R>;
+        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1, plc2: PH, plc3: PH, arg4: T4):  Function2<    T2, T3,     R>;
+        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, plc1: PH, arg2: T2, plc3: PH, arg4: T4):  Function2<T1,     T3,     R>;
+        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1, arg2: T2, plc3: PH, arg4: T4):  Function1<        T3,     R>;
+        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, plc1: PH, plc2: PH, arg3: T3, arg4: T4):  Function2<T1, T2,         R>;
+        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1, plc2: PH, arg3: T3, arg4: T4):  Function1<    T2,         R>;
+        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, plc1: PH, arg2: T2, arg3: T3, arg4: T4):  Function1<T1,             R>;
+        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1, arg2: T2, arg3: T3, arg4: T4):  Function0<                R>;
+        // catch-all
+        (func: (...args: any[]) => any, ...args: any[]): (...args: any[]) => any;
+    }
+
+    interface ImplicitPartial {
+        // arity 0
+        <R>(this: LoDashImplicitWrapper<Function0<R>>): LoDashImplicitWrapper<Function0<R>>;
+        // arity 1
+        <T1, R>(this: LoDashImplicitWrapper<Function1<T1, R>>): LoDashImplicitWrapper<Function1<T1, R>>;
+        <T1, R>(this: LoDashImplicitWrapper<Function1<T1, R>>, arg1: T1): LoDashImplicitWrapper<Function0<R>>;
+        // arity 2
+        <T1, T2, R>(this: LoDashImplicitWrapper<Function2<T1, T2, R>>):                      LoDashImplicitWrapper<Function2<T1, T2, R>>;
+        <T1, T2, R>(this: LoDashImplicitWrapper<Function2<T1, T2, R>>, arg1: T1):            LoDashImplicitWrapper<Function1<    T2, R>>;
+        <T1, T2, R>(this: LoDashImplicitWrapper<Function2<T1, T2, R>>, plc1: PH, arg2: T2):  LoDashImplicitWrapper<Function1<T1,     R>>;
+        <T1, T2, R>(this: LoDashImplicitWrapper<Function2<T1, T2, R>>, arg1: T1, arg2: T2):  LoDashImplicitWrapper<Function0<        R>>;
+        // arity 3
+        <T1, T2, T3, R>(this: LoDashImplicitWrapper<Function3<T1, T2, T3, R>>):                                LoDashImplicitWrapper<Function3<T1, T2, T3, R>>;
+        <T1, T2, T3, R>(this: LoDashImplicitWrapper<Function3<T1, T2, T3, R>>, arg1: T1):                      LoDashImplicitWrapper<Function2<    T2, T3, R>>;
+        <T1, T2, T3, R>(this: LoDashImplicitWrapper<Function3<T1, T2, T3, R>>, plc1: PH, arg2: T2):            LoDashImplicitWrapper<Function2<T1,     T3, R>>;
+        <T1, T2, T3, R>(this: LoDashImplicitWrapper<Function3<T1, T2, T3, R>>, arg1: T1, arg2: T2):            LoDashImplicitWrapper<Function1<        T3, R>>;
+        <T1, T2, T3, R>(this: LoDashImplicitWrapper<Function3<T1, T2, T3, R>>, plc1: PH, plc2: PH, arg3: T3):  LoDashImplicitWrapper<Function2<T1, T2,     R>>;
+        <T1, T2, T3, R>(this: LoDashImplicitWrapper<Function3<T1, T2, T3, R>>, arg1: T1, plc2: PH, arg3: T3):  LoDashImplicitWrapper<Function1<    T2,     R>>;
+        <T1, T2, T3, R>(this: LoDashImplicitWrapper<Function3<T1, T2, T3, R>>, plc1: PH, arg2: T2, arg3: T3):  LoDashImplicitWrapper<Function1<T1,         R>>;
+        <T1, T2, T3, R>(this: LoDashImplicitWrapper<Function3<T1, T2, T3, R>>, arg1: T1, arg2: T2, arg3: T3):  LoDashImplicitWrapper<Function0<            R>>;
+        // arity 4
+        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>):                                          LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>;
+        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1):                                LoDashImplicitWrapper<Function3<    T2, T3, T4, R>>;
+        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, plc1: PH, arg2: T2):                      LoDashImplicitWrapper<Function3<T1,     T3, T4, R>>;
+        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, arg2: T2):                      LoDashImplicitWrapper<Function2<        T3, T4, R>>;
+        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, plc1: PH, plc2: PH, arg3: T3):            LoDashImplicitWrapper<Function3<T1, T2,     T4, R>>;
+        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, plc2: PH, arg3: T3):            LoDashImplicitWrapper<Function2<    T2,     T4, R>>;
+        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, plc1: PH, arg2: T2, arg3: T3):            LoDashImplicitWrapper<Function2<T1,         T4, R>>;
+        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, arg2: T2, arg3: T3):            LoDashImplicitWrapper<Function1<            T4, R>>;
+        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, plc1: PH, plc2: PH, plc3: PH, arg4: T4):  LoDashImplicitWrapper<Function3<T1, T2, T3,     R>>;
+        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, plc2: PH, plc3: PH, arg4: T4):  LoDashImplicitWrapper<Function2<    T2, T3,     R>>;
+        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, plc1: PH, arg2: T2, plc3: PH, arg4: T4):  LoDashImplicitWrapper<Function2<T1,     T3,     R>>;
+        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, arg2: T2, plc3: PH, arg4: T4):  LoDashImplicitWrapper<Function1<        T3,     R>>;
+        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, plc1: PH, plc2: PH, arg3: T3, arg4: T4):  LoDashImplicitWrapper<Function2<T1, T2,         R>>;
+        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, plc2: PH, arg3: T3, arg4: T4):  LoDashImplicitWrapper<Function1<    T2,         R>>;
+        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, plc1: PH, arg2: T2, arg3: T3, arg4: T4):  LoDashImplicitWrapper<Function1<T1,             R>>;
+        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, arg2: T2, arg3: T3, arg4: T4):  LoDashImplicitWrapper<Function0<                R>>;
+        // catch-all
+        (...args: any[]): LoDashImplicitWrapper<(...args: any[]) => any>;
+    }
+
+    interface ExplicitPartial {
+        // arity 0
+        <R>(this: LoDashExplicitWrapper<Function0<R>>): LoDashExplicitWrapper<Function0<R>>;
+        // arity 1
+        <T1, R>(this: LoDashExplicitWrapper<Function1<T1, R>>): LoDashExplicitWrapper<Function1<T1, R>>;
+        <T1, R>(this: LoDashExplicitWrapper<Function1<T1, R>>, arg1: T1): LoDashExplicitWrapper<Function0<R>>;
+        // arity 2
+        <T1, T2, R>(this: LoDashExplicitWrapper<Function2<T1, T2, R>>):                      LoDashExplicitWrapper<Function2<T1, T2, R>>;
+        <T1, T2, R>(this: LoDashExplicitWrapper<Function2<T1, T2, R>>, arg1: T1):            LoDashExplicitWrapper<Function1<    T2, R>>;
+        <T1, T2, R>(this: LoDashExplicitWrapper<Function2<T1, T2, R>>, plc1: PH, arg2: T2):  LoDashExplicitWrapper<Function1<T1,     R>>;
+        <T1, T2, R>(this: LoDashExplicitWrapper<Function2<T1, T2, R>>, arg1: T1, arg2: T2):  LoDashExplicitWrapper<Function0<        R>>;
+        // arity 3
+        <T1, T2, T3, R>(this: LoDashExplicitWrapper<Function3<T1, T2, T3, R>>):                                LoDashExplicitWrapper<Function3<T1, T2, T3, R>>;
+        <T1, T2, T3, R>(this: LoDashExplicitWrapper<Function3<T1, T2, T3, R>>, arg1: T1):                      LoDashExplicitWrapper<Function2<    T2, T3, R>>;
+        <T1, T2, T3, R>(this: LoDashExplicitWrapper<Function3<T1, T2, T3, R>>, plc1: PH, arg2: T2):            LoDashExplicitWrapper<Function2<T1,     T3, R>>;
+        <T1, T2, T3, R>(this: LoDashExplicitWrapper<Function3<T1, T2, T3, R>>, arg1: T1, arg2: T2):            LoDashExplicitWrapper<Function1<        T3, R>>;
+        <T1, T2, T3, R>(this: LoDashExplicitWrapper<Function3<T1, T2, T3, R>>, plc1: PH, plc2: PH, arg3: T3):  LoDashExplicitWrapper<Function2<T1, T2,     R>>;
+        <T1, T2, T3, R>(this: LoDashExplicitWrapper<Function3<T1, T2, T3, R>>, arg1: T1, plc2: PH, arg3: T3):  LoDashExplicitWrapper<Function1<    T2,     R>>;
+        <T1, T2, T3, R>(this: LoDashExplicitWrapper<Function3<T1, T2, T3, R>>, plc1: PH, arg2: T2, arg3: T3):  LoDashExplicitWrapper<Function1<T1,         R>>;
+        <T1, T2, T3, R>(this: LoDashExplicitWrapper<Function3<T1, T2, T3, R>>, arg1: T1, arg2: T2, arg3: T3):  LoDashExplicitWrapper<Function0<            R>>;
+        // arity 4
+        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>):                                          LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>;
+        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1):                                LoDashExplicitWrapper<Function3<    T2, T3, T4, R>>;
+        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, plc1: PH, arg2: T2):                      LoDashExplicitWrapper<Function3<T1,     T3, T4, R>>;
+        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, arg2: T2):                      LoDashExplicitWrapper<Function2<        T3, T4, R>>;
+        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, plc1: PH, plc2: PH, arg3: T3):            LoDashExplicitWrapper<Function3<T1, T2,     T4, R>>;
+        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, plc2: PH, arg3: T3):            LoDashExplicitWrapper<Function2<    T2,     T4, R>>;
+        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, plc1: PH, arg2: T2, arg3: T3):            LoDashExplicitWrapper<Function2<T1,         T4, R>>;
+        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, arg2: T2, arg3: T3):            LoDashExplicitWrapper<Function1<            T4, R>>;
+        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, plc1: PH, plc2: PH, plc3: PH, arg4: T4):  LoDashExplicitWrapper<Function3<T1, T2, T3,     R>>;
+        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, plc2: PH, plc3: PH, arg4: T4):  LoDashExplicitWrapper<Function2<    T2, T3,     R>>;
+        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, plc1: PH, arg2: T2, plc3: PH, arg4: T4):  LoDashExplicitWrapper<Function2<T1,     T3,     R>>;
+        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, arg2: T2, plc3: PH, arg4: T4):  LoDashExplicitWrapper<Function1<        T3,     R>>;
+        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, plc1: PH, plc2: PH, arg3: T3, arg4: T4):  LoDashExplicitWrapper<Function2<T1, T2,         R>>;
+        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, plc2: PH, arg3: T3, arg4: T4):  LoDashExplicitWrapper<Function1<    T2,         R>>;
+        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, plc1: PH, arg2: T2, arg3: T3, arg4: T4):  LoDashExplicitWrapper<Function1<T1,             R>>;
+        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, arg2: T2, arg3: T3, arg4: T4):  LoDashExplicitWrapper<Function0<                R>>;
+        // catch-all
+        (...args: any[]): LoDashExplicitWrapper<(...args: any[]) => any>;
+    }
+
+    // partialRight
+
+    interface LoDashStatic {
+        /**
+        * This method is like _.partial except that partial arguments are appended to those provided
+        * to the new function.
+        * @param func The function to partially apply arguments to.
+        * @param args Arguments to be partially applied.
+        * @return The new partially applied function.
+        **/
+        partialRight: PartialRight;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.partialRight
+         */
+        partialRight: ImplicitPartialRight;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.partialRight
+         */
+        partialRight: ExplicitPartialRight;
+    }
+
+    interface PartialRight {
+        // arity 0
+        <R>(func: Function0<R>): Function0<R>;
+        // arity 1
+        <T1, R>(func: Function1<T1, R>): Function1<T1, R>;
+        <T1, R>(func: Function1<T1, R>, arg1: T1): Function0<R>;
+        // arity 2
+        <T1, T2, R>(func: Function2<T1, T2, R>):                      Function2<T1, T2, R>;
+        <T1, T2, R>(func: Function2<T1, T2, R>, arg1: T1, plc2: PH):  Function1<    T2, R>;
+        <T1, T2, R>(func: Function2<T1, T2, R>,           arg2: T2):  Function1<T1,     R>;
+        <T1, T2, R>(func: Function2<T1, T2, R>, arg1: T1, arg2: T2):  Function0<        R>;
+        // arity 3
+        <T1, T2, T3, R>(func: Function3<T1, T2, T3, R>):                                Function3<T1, T2, T3, R>;
+        <T1, T2, T3, R>(func: Function3<T1, T2, T3, R>, arg1: T1, plc2: PH, plc3: PH):  Function2<    T2, T3, R>;
+        <T1, T2, T3, R>(func: Function3<T1, T2, T3, R>,           arg2: T2, plc3: PH):  Function2<T1,     T3, R>;
+        <T1, T2, T3, R>(func: Function3<T1, T2, T3, R>, arg1: T1, arg2: T2, plc3: PH):  Function1<        T3, R>;
+        <T1, T2, T3, R>(func: Function3<T1, T2, T3, R>,                     arg3: T3):  Function2<T1, T2,     R>;
+        <T1, T2, T3, R>(func: Function3<T1, T2, T3, R>, arg1: T1, plc2: PH, arg3: T3):  Function1<    T2,     R>;
+        <T1, T2, T3, R>(func: Function3<T1, T2, T3, R>,           arg2: T2, arg3: T3):  Function1<T1,         R>;
+        <T1, T2, T3, R>(func: Function3<T1, T2, T3, R>, arg1: T1, arg2: T2, arg3: T3):  Function0<            R>;
+        // arity 4
+        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>):                                          Function4<T1, T2, T3, T4, R>;
+        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1, plc2: PH, plc3: PH, plc4: PH):  Function3<    T2, T3, T4, R>;
+        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>,           arg2: T2, plc3: PH, plc4: PH):  Function3<T1,     T3, T4, R>;
+        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1, arg2: T2, plc3: PH, plc4: PH):  Function2<        T3, T4, R>;
+        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>,                     arg3: T3, plc4: PH):  Function3<T1, T2,     T4, R>;
+        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1, plc2: PH, arg3: T3, plc4: PH):  Function2<    T2,     T4, R>;
+        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>,           arg2: T2, arg3: T3, plc4: PH):  Function2<T1,         T4, R>;
+        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1, arg2: T2, arg3: T3, plc4: PH):  Function1<            T4, R>;
+        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>,                               arg4: T4):  Function3<T1, T2, T3,     R>;
+        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1, plc2: PH, plc3: PH, arg4: T4):  Function2<    T2, T3,     R>;
+        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>,           arg2: T2, plc3: PH, arg4: T4):  Function2<T1,     T3,     R>;
+        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1, arg2: T2, plc3: PH, arg4: T4):  Function1<        T3,     R>;
+        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>,                     arg3: T3, arg4: T4):  Function2<T1, T2,         R>;
+        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1, plc2: PH, arg3: T3, arg4: T4):  Function1<    T2,         R>;
+        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>,           arg2: T2, arg3: T3, arg4: T4):  Function1<T1,             R>;
+        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1, arg2: T2, arg3: T3, arg4: T4):  Function0<                R>;
+        // catch-all
+        (func: (...args: any[]) => any, ...args: any[]): (...args: any[]) => any;
+    }
+
+    interface ImplicitPartialRight {
+        // arity 0
+        <R>(this: LoDashImplicitWrapper<Function0<R>>): LoDashImplicitWrapper<Function0<R>>;
+        // arity 1
+        <T1, R>(this: LoDashImplicitWrapper<Function1<T1, R>>): LoDashImplicitWrapper<Function1<T1, R>>;
+        <T1, R>(this: LoDashImplicitWrapper<Function1<T1, R>>, arg1: T1): LoDashImplicitWrapper<Function0<R>>;
+        // arity 2
+        <T1, T2, R>(this: LoDashImplicitWrapper<Function2<T1, T2, R>>):                      LoDashImplicitWrapper<Function2<T1, T2, R>>;
+        <T1, T2, R>(this: LoDashImplicitWrapper<Function2<T1, T2, R>>, arg1: T1, plc2: PH):  LoDashImplicitWrapper<Function1<    T2, R>>;
+        <T1, T2, R>(this: LoDashImplicitWrapper<Function2<T1, T2, R>>,           arg2: T2):  LoDashImplicitWrapper<Function1<T1,     R>>;
+        <T1, T2, R>(this: LoDashImplicitWrapper<Function2<T1, T2, R>>, arg1: T1, arg2: T2):  LoDashImplicitWrapper<Function0<        R>>;
+        // arity 3
+        <T1, T2, T3, R>(this: LoDashImplicitWrapper<Function3<T1, T2, T3, R>>):                                LoDashImplicitWrapper<Function3<T1, T2, T3, R>>;
+        <T1, T2, T3, R>(this: LoDashImplicitWrapper<Function3<T1, T2, T3, R>>, arg1: T1, plc2: PH, plc3: PH):  LoDashImplicitWrapper<Function2<    T2, T3, R>>;
+        <T1, T2, T3, R>(this: LoDashImplicitWrapper<Function3<T1, T2, T3, R>>,           arg2: T2, plc3: PH):  LoDashImplicitWrapper<Function2<T1,     T3, R>>;
+        <T1, T2, T3, R>(this: LoDashImplicitWrapper<Function3<T1, T2, T3, R>>, arg1: T1, arg2: T2, plc3: PH):  LoDashImplicitWrapper<Function1<        T3, R>>;
+        <T1, T2, T3, R>(this: LoDashImplicitWrapper<Function3<T1, T2, T3, R>>,                     arg3: T3):  LoDashImplicitWrapper<Function2<T1, T2,     R>>;
+        <T1, T2, T3, R>(this: LoDashImplicitWrapper<Function3<T1, T2, T3, R>>, arg1: T1, plc2: PH, arg3: T3):  LoDashImplicitWrapper<Function1<    T2,     R>>;
+        <T1, T2, T3, R>(this: LoDashImplicitWrapper<Function3<T1, T2, T3, R>>,           arg2: T2, arg3: T3):  LoDashImplicitWrapper<Function1<T1,         R>>;
+        <T1, T2, T3, R>(this: LoDashImplicitWrapper<Function3<T1, T2, T3, R>>, arg1: T1, arg2: T2, arg3: T3):  LoDashImplicitWrapper<Function0<            R>>;
+        // arity 4
+        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>):                                          LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>;
+        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, plc2: PH, plc3: PH, plc4: PH):  LoDashImplicitWrapper<Function3<    T2, T3, T4, R>>;
+        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>,           arg2: T2, plc3: PH, plc4: PH):  LoDashImplicitWrapper<Function3<T1,     T3, T4, R>>;
+        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, arg2: T2, plc3: PH, plc4: PH):  LoDashImplicitWrapper<Function2<        T3, T4, R>>;
+        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>,                     arg3: T3, plc4: PH):  LoDashImplicitWrapper<Function3<T1, T2,     T4, R>>;
+        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, plc2: PH, arg3: T3, plc4: PH):  LoDashImplicitWrapper<Function2<    T2,     T4, R>>;
+        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>,           arg2: T2, arg3: T3, plc4: PH):  LoDashImplicitWrapper<Function2<T1,         T4, R>>;
+        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, arg2: T2, arg3: T3, plc4: PH):  LoDashImplicitWrapper<Function1<            T4, R>>;
+        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>,                               arg4: T4):  LoDashImplicitWrapper<Function3<T1, T2, T3,     R>>;
+        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, plc2: PH, plc3: PH, arg4: T4):  LoDashImplicitWrapper<Function2<    T2, T3,     R>>;
+        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>,           arg2: T2, plc3: PH, arg4: T4):  LoDashImplicitWrapper<Function2<T1,     T3,     R>>;
+        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, arg2: T2, plc3: PH, arg4: T4):  LoDashImplicitWrapper<Function1<        T3,     R>>;
+        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>,                     arg3: T3, arg4: T4):  LoDashImplicitWrapper<Function2<T1, T2,         R>>;
+        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, plc2: PH, arg3: T3, arg4: T4):  LoDashImplicitWrapper<Function1<    T2,         R>>;
+        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>,           arg2: T2, arg3: T3, arg4: T4):  LoDashImplicitWrapper<Function1<T1,             R>>;
+        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, arg2: T2, arg3: T3, arg4: T4):  LoDashImplicitWrapper<Function0<                R>>;
+        // catch-all
+        (...args: any[]): LoDashImplicitWrapper<(...args: any[]) => any>;
+    }
+
+    interface ExplicitPartialRight {
+        // arity 0
+        <R>(this: LoDashExplicitWrapper<Function0<R>>): LoDashExplicitWrapper<Function0<R>>;
+        // arity 1
+        <T1, R>(this: LoDashExplicitWrapper<Function1<T1, R>>): LoDashExplicitWrapper<Function1<T1, R>>;
+        <T1, R>(this: LoDashExplicitWrapper<Function1<T1, R>>, arg1: T1): LoDashExplicitWrapper<Function0<R>>;
+        // arity 2
+        <T1, T2, R>(this: LoDashExplicitWrapper<Function2<T1, T2, R>>):                      LoDashExplicitWrapper<Function2<T1, T2, R>>;
+        <T1, T2, R>(this: LoDashExplicitWrapper<Function2<T1, T2, R>>, arg1: T1, plc2: PH):  LoDashExplicitWrapper<Function1<    T2, R>>;
+        <T1, T2, R>(this: LoDashExplicitWrapper<Function2<T1, T2, R>>,           arg2: T2):  LoDashExplicitWrapper<Function1<T1,     R>>;
+        <T1, T2, R>(this: LoDashExplicitWrapper<Function2<T1, T2, R>>, arg1: T1, arg2: T2):  LoDashExplicitWrapper<Function0<        R>>;
+        // arity 3
+        <T1, T2, T3, R>(this: LoDashExplicitWrapper<Function3<T1, T2, T3, R>>):                                LoDashExplicitWrapper<Function3<T1, T2, T3, R>>;
+        <T1, T2, T3, R>(this: LoDashExplicitWrapper<Function3<T1, T2, T3, R>>, arg1: T1, plc2: PH, plc3: PH):  LoDashExplicitWrapper<Function2<    T2, T3, R>>;
+        <T1, T2, T3, R>(this: LoDashExplicitWrapper<Function3<T1, T2, T3, R>>,           arg2: T2, plc3: PH):  LoDashExplicitWrapper<Function2<T1,     T3, R>>;
+        <T1, T2, T3, R>(this: LoDashExplicitWrapper<Function3<T1, T2, T3, R>>, arg1: T1, arg2: T2, plc3: PH):  LoDashExplicitWrapper<Function1<        T3, R>>;
+        <T1, T2, T3, R>(this: LoDashExplicitWrapper<Function3<T1, T2, T3, R>>,                     arg3: T3):  LoDashExplicitWrapper<Function2<T1, T2,     R>>;
+        <T1, T2, T3, R>(this: LoDashExplicitWrapper<Function3<T1, T2, T3, R>>, arg1: T1, plc2: PH, arg3: T3):  LoDashExplicitWrapper<Function1<    T2,     R>>;
+        <T1, T2, T3, R>(this: LoDashExplicitWrapper<Function3<T1, T2, T3, R>>,           arg2: T2, arg3: T3):  LoDashExplicitWrapper<Function1<T1,         R>>;
+        <T1, T2, T3, R>(this: LoDashExplicitWrapper<Function3<T1, T2, T3, R>>, arg1: T1, arg2: T2, arg3: T3):  LoDashExplicitWrapper<Function0<            R>>;
+        // arity 4
+        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>):                                          LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>;
+        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, plc2: PH, plc3: PH, plc4: PH):  LoDashExplicitWrapper<Function3<    T2, T3, T4, R>>;
+        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>,           arg2: T2, plc3: PH, plc4: PH):  LoDashExplicitWrapper<Function3<T1,     T3, T4, R>>;
+        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, arg2: T2, plc3: PH, plc4: PH):  LoDashExplicitWrapper<Function2<        T3, T4, R>>;
+        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>,                     arg3: T3, plc4: PH):  LoDashExplicitWrapper<Function3<T1, T2,     T4, R>>;
+        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, plc2: PH, arg3: T3, plc4: PH):  LoDashExplicitWrapper<Function2<    T2,     T4, R>>;
+        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>,           arg2: T2, arg3: T3, plc4: PH):  LoDashExplicitWrapper<Function2<T1,         T4, R>>;
+        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, arg2: T2, arg3: T3, plc4: PH):  LoDashExplicitWrapper<Function1<            T4, R>>;
+        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>,                               arg4: T4):  LoDashExplicitWrapper<Function3<T1, T2, T3,     R>>;
+        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, plc2: PH, plc3: PH, arg4: T4):  LoDashExplicitWrapper<Function2<    T2, T3,     R>>;
+        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>,           arg2: T2, plc3: PH, arg4: T4):  LoDashExplicitWrapper<Function2<T1,     T3,     R>>;
+        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, arg2: T2, plc3: PH, arg4: T4):  LoDashExplicitWrapper<Function1<        T3,     R>>;
+        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>,                     arg3: T3, arg4: T4):  LoDashExplicitWrapper<Function2<T1, T2,         R>>;
+        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, plc2: PH, arg3: T3, arg4: T4):  LoDashExplicitWrapper<Function1<    T2,         R>>;
+        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>,           arg2: T2, arg3: T3, arg4: T4):  LoDashExplicitWrapper<Function1<T1,             R>>;
+        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, arg2: T2, arg3: T3, arg4: T4):  LoDashExplicitWrapper<Function0<                R>>;
+        // catch-all
+        (...args: any[]): LoDashExplicitWrapper<(...args: any[]) => any>;
+    }
+
+    // rearg
+
+    interface LoDashStatic {
+        /**
+         * Creates a function that invokes func with arguments arranged according to the specified indexes where the
+         * argument value at the first index is provided as the first argument, the argument value at the second index
+         * is provided as the second argument, and so on.
+         * @param func The function to rearrange arguments for.
+         * @param indexes The arranged argument indexes, specified as individual indexes or arrays of indexes.
+         * @return Returns the new function.
+         */
+        rearg(func: (...args: any[]) => any, ...indexes: Array<Many<number>>): (...args: any[]) => any;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.rearg
+         */
+        rearg(...indexes: Array<Many<number>>): LoDashImplicitWrapper<(...args: any[]) => any>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.rearg
+         */
+        rearg(...indexes: Array<Many<number>>): LoDashExplicitWrapper<(...args: any[]) => any>;
+    }
+
+    // rest
+
+    interface LoDashStatic {
+        /**
+         * Creates a function that invokes func with the this binding of the created function and arguments from start
+         * and beyond provided as an array.
+         *
+         * Note: This method is based on the rest parameter.
+         *
+         * @param func The function to apply a rest parameter to.
+         * @param start The start position of the rest parameter.
+         * @return Returns the new function.
+         */
+        rest(
+            func: (...args: any[]) => any,
+            start?: number
+        ): (...args: any[]) => any;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.rest
+         */
+        rest(start?: number): LoDashImplicitWrapper<(...args: any[]) => any>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.rest
+         */
+        rest(start?: number): LoDashExplicitWrapper<(...args: any[]) => any>;
+    }
+
+    // spread
+
+    interface LoDashStatic {
+        /**
+         * Creates a function that invokes func with the this binding of the created function and an array of arguments
+         * much like Function#apply.
+         *
+         * Note: This method is based on the spread operator.
+         *
+         * @param func The function to spread arguments over.
+         * @return Returns the new function.
+         */
+        spread<TResult>(func: (...args: any[]) => TResult): (...args: any[]) => TResult;
+
+        /**
+         * @see _.spread
+         */
+        spread<TResult>(func: (...args: any[]) => TResult, start: number): (...args: any[]) => TResult;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.spread
+         */
+        spread<TResult>(this: LoDashImplicitWrapper<(...args: any[]) => TResult>): LoDashImplicitWrapper<(...args: any[]) => TResult>;
+
+        /**
+         * @see _.spread
+         */
+        spread<TResult>(this: LoDashImplicitWrapper<(...args: any[]) => TResult>, start: number): LoDashImplicitWrapper<(...args: any[]) => TResult>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.spread
+         */
+        spread<TResult>(this: LoDashExplicitWrapper<(...args: any[]) => TResult>): LoDashExplicitWrapper<(...args: any[]) => TResult>;
+
+        /**
+         * @see _.spread
+         */
+        spread<TResult>(this: LoDashExplicitWrapper<(...args: any[]) => TResult>, start: number): LoDashExplicitWrapper<(...args: any[]) => TResult>;
+    }
+
+    // throttle
+
+    interface ThrottleSettings {
+        /**
+         * If you'd like to disable the leading-edge call, pass this as false.
+         */
+        leading?: boolean;
+
+        /**
+         * If you'd like to disable the execution on the trailing-edge, pass false.
+         */
+        trailing?: boolean;
+    }
+
+    interface LoDashStatic {
+        /**
+         * Creates a throttled function that only invokes func at most once per every wait milliseconds. The throttled
+         * function comes with a cancel method to cancel delayed invocations and a flush method to immediately invoke
+         * them. Provide an options object to indicate that func should be invoked on the leading and/or trailing edge
+         * of the wait timeout. Subsequent calls to the throttled function return the result of the last func call.
+         *
+         * Note: If leading and trailing options are true, func is invoked on the trailing edge of the timeout only if
+         * the the throttled function is invoked more than once during the wait timeout.
+         *
+         * @param func The function to throttle.
+         * @param wait The number of milliseconds to throttle invocations to.
+         * @param options The options object.
+         * @param options.leading Specify invoking on the leading edge of the timeout.
+         * @param options.trailing Specify invoking on the trailing edge of the timeout.
+         * @return Returns the new throttled function.
+         */
+        throttle<T extends (...args: any[]) => any>(
+            func: T,
+            wait?: number,
+            options?: ThrottleSettings
+        ): T & Cancelable;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.throttle
+         */
+        throttle(
+            wait?: number,
+            options?: ThrottleSettings
+        ): LoDashImplicitWrapper<TValue & Cancelable>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.throttle
+         */
+        throttle(
+            wait?: number,
+            options?: ThrottleSettings
+        ): LoDashExplicitWrapper<TValue & Cancelable>;
+    }
+
+    // unary
+
+    interface LoDashStatic {
+        /**
+         * Creates a function that accepts up to one argument, ignoring any
+         * additional arguments.
+         *
+         * @category Function
+         * @param func The function to cap arguments for.
+         * @returns Returns the new function.
+         * @example
+         *
+         * _.map(['6', '8', '10'], _.unary(parseInt));
+         * // => [6, 8, 10]
+         */
+        unary<T, TResult>(func: (arg1: T, ...args: any[]) => TResult): (arg1: T) => TResult;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.unary
+         */
+        unary<T, TResult>(this: LoDashImplicitWrapper<(arg1: T, ...args: any[]) => TResult>): LoDashImplicitWrapper<(arg1: T) => TResult>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.unary
+         */
+        unary<T, TResult>(this: LoDashExplicitWrapper<(arg1: T, ...args: any[]) => TResult>): LoDashExplicitWrapper<(arg1: T) => TResult>;
+    }
+
+    // wrap
+
+    interface LoDashStatic {
+        /**
+         * Creates a function that provides value to the wrapper function as its first argument. Any additional
+         * arguments provided to the function are appended to those provided to the wrapper function. The wrapper is
+         * invoked with the this binding of the created function.
+         *
+         * @param value The value to wrap.
+         * @param wrapper The wrapper function.
+         * @return Returns the new function.
+         */
+        wrap<T, TArgs, TResult>(
+            value: T,
+            wrapper: (value: T, ...args: TArgs[]) => TResult
+        ): (...args: TArgs[]) => TResult;
+
+        /**
+         * @see _.wrap
+         */
+        wrap<T, TResult>(
+            value: T,
+            wrapper: (value: T, ...args: any[]) => TResult
+        ): (...args: any[]) => TResult;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.wrap
+         */
+        wrap<TArgs, TResult>(
+            wrapper: (value: TValue, ...args: TArgs[]) => TResult
+        ): LoDashImplicitWrapper<(...args: TArgs[]) => TResult>;
+
+        /**
+         * @see _.wrap
+         */
+        wrap<TResult>(
+            wrapper: (value: TValue, ...args: any[]) => TResult
+        ): LoDashImplicitWrapper<(...args: any[]) => TResult>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.wrap
+         */
+        /**
+         * @see _.wrap
+         */
+        wrap<TArgs, TResult>(
+            wrapper: (value: TValue, ...args: TArgs[]) => TResult
+        ): LoDashExplicitWrapper<(...args: TArgs[]) => TResult>;
+
+        /**
+         * @see _.wrap
+         */
+        wrap<TResult>(
+            wrapper: (value: TValue, ...args: any[]) => TResult
+        ): LoDashExplicitWrapper<(...args: any[]) => TResult>;
+    }
+}
\ No newline at end of file
diff --git a/types/lodash/common/lang.d.ts b/types/lodash/common/lang.d.ts
new file mode 100644
index 0000000000..43393ab4b6
--- /dev/null
+++ b/types/lodash/common/lang.d.ts
@@ -0,0 +1,1937 @@
+import _ = require("../index");
+declare module "../index" {
+    // castArray
+
+    interface LoDashStatic {
+        /**
+         * Casts value as an array if it’s not one.
+         *
+         * @param value The value to inspect.
+         * @return Returns the cast array.
+         */
+        castArray<T>(value?: Many<T>): T[];
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.castArray
+         */
+        castArray<T>(this: LoDashImplicitWrapper<Many<T>>): LoDashImplicitWrapper<T[]>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.castArray
+         */
+        castArray<T>(this: LoDashExplicitWrapper<Many<T>>): LoDashExplicitWrapper<T[]>;
+    }
+
+    // clone
+
+    interface LoDashStatic {
+        /**
+         * Creates a shallow clone of value.
+         *
+         * Note: This method is loosely based on the structured clone algorithm and supports cloning arrays,
+         * array buffers, booleans, date objects, maps, numbers, Object objects, regexes, sets, strings, symbols,
+         * and typed arrays. The own enumerable properties of arguments objects are cloned as plain objects. An empty
+         * object is returned for uncloneable values such as error objects, functions, DOM nodes, and WeakMaps.
+         *
+         * @param value The value to clone.
+         * @return Returns the cloned value.
+         */
+        clone<T>(value: T): T;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.clone
+         */
+        clone(): TValue;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.clone
+         */
+        clone(): this;
+    }
+
+    // cloneDeep
+
+    interface LoDashStatic {
+        /**
+         * This method is like _.clone except that it recursively clones value.
+         *
+         * @param value The value to recursively clone.
+         * @return Returns the deep cloned value.
+         */
+        cloneDeep<T>(value: T): T;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.cloneDeep
+         */
+        cloneDeep(): TValue;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.cloneDeep
+         */
+        cloneDeep(): this;
+    }
+
+    // cloneDeepWith
+
+    type CloneDeepWithCustomizer<TObject> = (value: any, key: number | string | undefined, object: TObject | undefined, stack: any) => any;
+
+    interface LoDashStatic {
+        /**
+         * This method is like _.cloneWith except that it recursively clones value.
+         *
+         * @param value The value to recursively clone.
+         * @param customizer The function to customize cloning.
+         * @return Returns the deep cloned value.
+         */
+        cloneDeepWith<T>(
+            value: T,
+            customizer: CloneDeepWithCustomizer<T>
+        ): any;
+
+        /**
+         * @see _.cloneDeepWith
+         */
+        cloneDeepWith<T>(value: T): T;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.cloneDeepWith
+         */
+        cloneDeepWith(
+            customizer: CloneDeepWithCustomizer<TValue>
+        ): any;
+
+        /**
+         * @see _.cloneDeepWith
+         */
+        cloneDeepWith(): TValue;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.cloneDeepWith
+         */
+        cloneDeepWith(
+            customizer: CloneDeepWithCustomizer<TValue>
+        ): LoDashExplicitWrapper<any>;
+
+        /**
+         * @see _.cloneDeepWith
+         */
+        cloneDeepWith(): this;
+    }
+
+    // cloneWith
+
+    type CloneWithCustomizer<TValue, TResult> = (value: TValue, key: number | string | undefined, object: any, stack: any) => TResult;
+
+    interface LoDashStatic {
+        /**
+         * This method is like _.clone except that it accepts customizer which is invoked to produce the cloned value.
+         * If customizer returns undefined cloning is handled by the method instead.
+         *
+         * @param value The value to clone.
+         * @param customizer The function to customize cloning.
+         * @return Returns the cloned value.
+         */
+        cloneWith<T, TResult extends object | string | number | boolean | null>(
+            value: T,
+            customizer: CloneWithCustomizer<T, TResult>
+        ): TResult;
+
+        /**
+         * @see _.cloneWith
+         */
+        cloneWith<T, TResult>(
+            value: T,
+            customizer: CloneWithCustomizer<T, TResult | undefined>
+        ): TResult | T;
+
+        /**
+         * @see _.cloneWith
+         */
+        cloneWith<T>(value: T): T;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.cloneWith
+         */
+        cloneWith<TResult extends object | string | number | boolean | null>(
+            customizer: CloneWithCustomizer<TValue, TResult>
+        ): TResult;
+
+        /**
+         * @see _.cloneWith
+         */
+        cloneWith<TResult>(
+            customizer: CloneWithCustomizer<TValue, TResult | undefined>
+        ): TResult | TValue;
+
+        /**
+         * @see _.cloneWith
+         */
+        cloneWith(): TValue;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.cloneWith
+         */
+        cloneWith<TResult extends object | string | number | boolean | null>(
+            customizer: CloneWithCustomizer<TValue, TResult>
+        ): LoDashExplicitWrapper<TResult>;
+
+        /**
+         * @see _.cloneWith
+         */
+        cloneWith<TResult>(
+            customizer: CloneWithCustomizer<TValue, TResult | undefined>
+        ): LoDashExplicitWrapper<TResult | TValue>;
+
+        /**
+         * @see _.cloneWith
+         */
+        cloneWith(): this;
+    }
+
+    // conformsTo
+
+
+    interface LoDashStatic {
+        /**
+         * Checks if object conforms to source by invoking the predicate properties of source with the
+         * corresponding property values of object.
+         *
+         * Note: This method is equivalent to _.conforms when source is partially applied.
+         */
+        conformsTo<T>(object: T, source: ConformsPredicateObject<T>): boolean;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.conformsTo
+         */
+        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<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]
+
+    // eq
+
+    interface LoDashStatic {
+        /**
+         * Performs a [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
+         * comparison between two values to determine if they are equivalent.
+         *
+         * @category Lang
+         * @param value The value to compare.
+         * @param other The other value to compare.
+         * @returns Returns `true` if the values are equivalent, else `false`.
+         * @example
+         *
+         * var object = { 'user': 'fred' };
+         * var other = { 'user': 'fred' };
+         *
+         * _.eq(object, object);
+         * // => true
+         *
+         * _.eq(object, other);
+         * // => false
+         *
+         * _.eq('a', 'a');
+         * // => true
+         *
+         * _.eq('a', Object('a'));
+         * // => false
+         *
+         * _.eq(NaN, NaN);
+         * // => true
+         */
+        eq(
+            value: any,
+            other: any
+        ): boolean;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.eq
+         */
+        eq(
+            other: any
+        ): boolean;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.eq
+         */
+        eq(
+            other: any
+        ): LoDashExplicitWrapper<boolean>;
+    }
+
+    // gt
+
+    interface LoDashStatic {
+        /**
+         * Checks if value is greater than other.
+         *
+         * @param value The value to compare.
+         * @param other The other value to compare.
+         * @return Returns true if value is greater than other, else false.
+         */
+        gt(
+            value: any,
+            other: any
+        ): boolean;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.gt
+         */
+        gt(other: any): boolean;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.gt
+         */
+        gt(other: any): LoDashExplicitWrapper<boolean>;
+    }
+
+    // gte
+
+    interface LoDashStatic {
+        /**
+         * Checks if value is greater than or equal to other.
+         *
+         * @param value The value to compare.
+         * @param other The other value to compare.
+         * @return Returns true if value is greater than or equal to other, else false.
+         */
+        gte(
+            value: any,
+            other: any
+        ): boolean;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.gte
+         */
+        gte(other: any): boolean;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.gte
+         */
+        gte(other: any): LoDashExplicitWrapper<boolean>;
+    }
+
+    // isArguments
+
+    interface LoDashStatic {
+        /**
+         * Checks if value is classified as an arguments object.
+         *
+         * @param value The value to check.
+         * @return Returns true if value is correctly classified, else false.
+         */
+        isArguments(value?: any): value is IArguments;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.isArguments
+         */
+        isArguments(): boolean;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.isArguments
+         */
+        isArguments(): LoDashExplicitWrapper<boolean>;
+    }
+
+    // isArray
+
+    interface LoDashStatic {
+        /**
+         * Checks if value is classified as an Array object.
+         * @param value The value to check.
+         *
+         * @return Returns true if value is correctly classified, else false.
+         */
+        isArray(value?: any): value is any[];
+
+        /**
+         * DEPRECATED
+         */
+        isArray<T>(value?: any): value is any[];
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.isArray
+         */
+        isArray(): boolean;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.isArray
+         */
+        isArray(): LoDashExplicitWrapper<boolean>;
+    }
+
+    // isArrayBuffer
+
+    interface LoDashStatic {
+        /**
+         * Checks if value is classified as an ArrayBuffer object.
+         *
+         * @param value The value to check.
+         * @return Returns true if value is correctly classified, else false.
+         */
+        isArrayBuffer(value?: any): value is ArrayBuffer;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.isArrayBuffer
+         */
+        isArrayBuffer(): boolean;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.isArrayBuffer
+         */
+        isArrayBuffer(): LoDashExplicitWrapper<boolean>;
+    }
+
+    // isArrayLike
+
+    interface LoDashStatic {
+        /**
+         * Checks if `value` is array-like. A value is considered array-like if it's
+         * not a function and has a `value.length` that's an integer greater than or
+         * equal to `0` and less than or equal to `Number.MAX_SAFE_INTEGER`.
+         *
+         * @category Lang
+         * @param value The value to check.
+         * @returns Returns `true` if `value` is array-like, else `false`.
+         * @example
+         *
+         * _.isArrayLike([1, 2, 3]);
+         * // => true
+         *
+         * _.isArrayLike(document.body.children);
+         * // => true
+         *
+         * _.isArrayLike('abc');
+         * // => true
+         *
+         * _.isArrayLike(_.noop);
+         * // => false
+         */
+        isArrayLike<T>(value: T & string & number): boolean; // should only match if T = any
+
+        /**
+         * @see _.isArrayLike
+         */
+        isArrayLike(value: ((...args: any[]) => any) | null | undefined): value is never;
+
+        /**
+         * @see _.isArrayLike
+         */
+        isArrayLike(value: any): value is { length: number };
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.isArrayLike
+         */
+        isArrayLike(): boolean;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.isArrayLike
+         */
+        isArrayLike(): LoDashExplicitWrapper<boolean>;
+    }
+
+    // isArrayLikeObject
+
+    interface LoDashStatic {
+        /**
+         * This method is like `_.isArrayLike` except that it also checks if `value`
+         * is an object.
+         *
+         * @category Lang
+         * @param value The value to check.
+         * @returns Returns `true` if `value` is an array-like object, else `false`.
+         * @example
+         *
+         * _.isArrayLikeObject([1, 2, 3]);
+         * // => true
+         *
+         * _.isArrayLikeObject(document.body.children);
+         * // => true
+         *
+         * _.isArrayLikeObject('abc');
+         * // => false
+         *
+         * _.isArrayLikeObject(_.noop);
+         * // => false
+         */
+        isArrayLikeObject<T>(value: T & string & number): boolean; // should only match if T = any
+
+        /**
+         * @see _.isArrayLike
+         */
+        // tslint:disable-next-line:ban-types (type guard doesn't seem to work correctly without the Function type)
+        isArrayLikeObject(value: ((...args: any[]) => any) | Function | string | boolean | number | null | undefined): value is never;
+
+        /**
+         * @see _.isArrayLike
+         */
+        // tslint:disable-next-line:ban-types (type guard doesn't seem to work correctly without the Function type)
+        isArrayLikeObject<T extends object>(value: T | ((...args: any[]) => any) | Function | string | boolean | number | null | undefined): value is T & { length: number };
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.isArrayLikeObject
+         */
+        isArrayLikeObject(): boolean;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.isArrayLikeObject
+         */
+        isArrayLikeObject(): LoDashExplicitWrapper<boolean>;
+    }
+
+    // isBoolean
+
+    interface LoDashStatic {
+        /**
+         * Checks if value is classified as a boolean primitive or object.
+         *
+         * @param value The value to check.
+         * @return Returns true if value is correctly classified, else false.
+         */
+        isBoolean(value?: any): value is boolean;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.isBoolean
+         */
+        isBoolean(): boolean;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.isBoolean
+         */
+        isBoolean(): LoDashExplicitWrapper<boolean>;
+    }
+
+    // isBuffer
+
+    interface LoDashStatic {
+        /**
+         * Checks if value is a buffer.
+         *
+         * @param value The value to check.
+         * @return Returns true if value is a buffer, else false.
+         */
+        isBuffer(value?: any): boolean;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.isBuffer
+         */
+        isBuffer(): boolean;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.isBuffer
+         */
+        isBuffer(): LoDashExplicitWrapper<boolean>;
+    }
+
+    // isDate
+
+    interface LoDashStatic {
+        /**
+         * Checks if value is classified as a Date object.
+         * @param value The value to check.
+         *
+         * @return Returns true if value is correctly classified, else false.
+         */
+        isDate(value?: any): value is Date;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.isDate
+         */
+        isDate(): boolean;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.isDate
+         */
+        isDate(): LoDashExplicitWrapper<boolean>;
+    }
+
+    // isElement
+
+    interface LoDashStatic {
+        /**
+         * Checks if value is a DOM element.
+         *
+         * @param value The value to check.
+         * @return Returns true if value is a DOM element, else false.
+         */
+        isElement(value?: any): boolean;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.isElement
+         */
+        isElement(): boolean;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.isElement
+         */
+        isElement(): LoDashExplicitWrapper<boolean>;
+    }
+
+    // isEmpty
+
+    interface LoDashStatic {
+        /**
+         * Checks if value is empty. A value is considered empty unless it’s an arguments object, array, string, or
+         * jQuery-like collection with a length greater than 0 or an object with own enumerable properties.
+         *
+         * @param value The value to inspect.
+         * @return Returns true if value is empty, else false.
+         */
+        isEmpty(value?: any): boolean;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.isEmpty
+         */
+        isEmpty(): boolean;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.isEmpty
+         */
+        isEmpty(): LoDashExplicitWrapper<boolean>;
+    }
+
+    // isEqual
+
+    interface LoDashStatic {
+        /**
+         * Performs a deep comparison between two values to determine if they are
+         * equivalent.
+         *
+         * **Note:** This method supports comparing arrays, array buffers, booleans,
+         * date objects, error objects, maps, numbers, `Object` objects, regexes,
+         * sets, strings, symbols, and typed arrays. `Object` objects are compared
+         * by their own, not inherited, enumerable properties. Functions and DOM
+         * nodes are **not** supported.
+         *
+         * @category Lang
+         * @param value The value to compare.
+         * @param other The other value to compare.
+         * @returns Returns `true` if the values are equivalent, else `false`.
+         * @example
+         *
+         * var object = { 'user': 'fred' };
+         * var other = { 'user': 'fred' };
+         *
+         * _.isEqual(object, other);
+         * // => true
+         *
+         * object === other;
+         * // => false
+         */
+        isEqual(
+            value: any,
+            other: any
+        ): boolean;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.isEqual
+         */
+        isEqual(
+            other: any
+        ): boolean;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.isEqual
+         */
+        isEqual(
+            other: any
+        ): LoDashExplicitWrapper<boolean>;
+    }
+
+    // isEqualWith
+
+    type IsEqualCustomizer = (value: any, other: any, indexOrKey: PropertyName | undefined, parent: any, otherParent: any, stack: any) => boolean|undefined;
+
+    interface LoDashStatic {
+        /**
+         * This method is like `_.isEqual` except that it accepts `customizer` which is
+         * invoked to compare values. If `customizer` returns `undefined` comparisons are
+         * handled by the method instead. The `customizer` is invoked with up to seven arguments:
+         * (objValue, othValue [, index|key, object, other, stack]).
+         *
+         * @category Lang
+         * @param value The value to compare.
+         * @param other The other value to compare.
+         * @param [customizer] The function to customize comparisons.
+         * @returns Returns `true` if the values are equivalent, else `false`.
+         * @example
+         *
+         * function isGreeting(value) {
+         *   return /^h(?:i|ello)$/.test(value);
+         * }
+         *
+         * function customizer(objValue, othValue) {
+         *   if (isGreeting(objValue) && isGreeting(othValue)) {
+         *     return true;
+         *   }
+         * }
+         *
+         * var array = ['hello', 'goodbye'];
+         * var other = ['hi', 'goodbye'];
+         *
+         * _.isEqualWith(array, other, customizer);
+         * // => true
+         */
+        isEqualWith(
+            value: any,
+            other: any,
+            customizer?: IsEqualCustomizer
+        ): boolean;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.isEqualWith
+         */
+        isEqualWith(
+            other: any,
+            customizer?: IsEqualCustomizer
+        ): boolean;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.isEqualWith
+         */
+        isEqualWith(
+            other: any,
+            customizer?: IsEqualCustomizer
+        ): LoDashExplicitWrapper<boolean>;
+    }
+
+    // isError
+
+    interface LoDashStatic {
+        /**
+         * Checks if value is an Error, EvalError, RangeError, ReferenceError, SyntaxError, TypeError, or URIError
+         * object.
+         *
+         * @param value The value to check.
+         * @return Returns true if value is an error object, else false.
+         */
+        isError(value: any): value is Error;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.isError
+         */
+        isError(): boolean;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.isError
+         */
+        isError(): LoDashExplicitWrapper<boolean>;
+    }
+
+    // isFinite
+
+    interface LoDashStatic {
+        /**
+         * Checks if value is a finite primitive number.
+         *
+         * Note: This method is based on Number.isFinite.
+         *
+         * @param value The value to check.
+         * @return Returns true if value is a finite number, else false.
+         */
+        isFinite(value?: any): boolean;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.isFinite
+         */
+        isFinite(): boolean;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.isFinite
+         */
+        isFinite(): LoDashExplicitWrapper<boolean>;
+    }
+
+    // isFunction
+
+    interface LoDashStatic {
+        /**
+         * Checks if value is a callable function.
+         *
+         * @param value The value to check.
+         * @return Returns true if value is correctly classified, else false.
+         */
+        isFunction(value: any): value is (...args: any[]) => any;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.isFunction
+         */
+        isFunction(): boolean;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.isFunction
+         */
+        isFunction(): LoDashExplicitWrapper<boolean>;
+    }
+
+    // isInteger
+
+    interface LoDashStatic {
+        /**
+         * Checks if `value` is an integer.
+         *
+         * **Note:** This method is based on [`Number.isInteger`](https://mdn.io/Number/isInteger).
+         *
+         * @category Lang
+         * @param value The value to check.
+         * @returns Returns `true` if `value` is an integer, else `false`.
+         * @example
+         *
+         * _.isInteger(3);
+         * // => true
+         *
+         * _.isInteger(Number.MIN_VALUE);
+         * // => false
+         *
+         * _.isInteger(Infinity);
+         * // => false
+         *
+         * _.isInteger('3');
+         * // => false
+         */
+        isInteger(value?: any): boolean;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.isInteger
+         */
+        isInteger(): boolean;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.isInteger
+         */
+        isInteger(): LoDashExplicitWrapper<boolean>;
+    }
+
+    // isLength
+
+    interface LoDashStatic {
+        /**
+         * Checks if `value` is a valid array-like length.
+         *
+         * **Note:** This function is loosely based on [`ToLength`](http://ecma-international.org/ecma-262/6.0/#sec-tolength).
+         *
+         * @category Lang
+         * @param value The value to check.
+         * @returns Returns `true` if `value` is a valid length, else `false`.
+         * @example
+         *
+         * _.isLength(3);
+         * // => true
+         *
+         * _.isLength(Number.MIN_VALUE);
+         * // => false
+         *
+         * _.isLength(Infinity);
+         * // => false
+         *
+         * _.isLength('3');
+         * // => false
+         */
+        isLength(value?: any): boolean;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.isLength
+         */
+        isLength(): boolean;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.isLength
+         */
+        isLength(): LoDashExplicitWrapper<boolean>;
+    }
+
+    // isMap
+
+    interface LoDashStatic {
+        /**
+         * Checks if value is classified as a Map object.
+         *
+         * @param value The value to check.
+         * @returns Returns true if value is correctly classified, else false.
+         */
+        isMap(value?: any): value is Map<any, any>;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.isMap
+         */
+        isMap(): boolean;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.isMap
+         */
+        isMap(): LoDashExplicitWrapper<boolean>;
+    }
+
+    // isMatch
+
+    type isMatchCustomizer = (value: any, other: any, indexOrKey?: PropertyName) => boolean;
+
+    interface LoDashStatic {
+        /**
+         * Performs a deep comparison between `object` and `source` to determine if
+         * `object` contains equivalent property values.
+         *
+         * **Note:** This method supports comparing the same values as `_.isEqual`.
+         *
+         * @category Lang
+         * @param object The object to inspect.
+         * @param source The object of property values to match.
+         * @returns Returns `true` if `object` is a match, else `false`.
+         * @example
+         *
+         * var object = { 'user': 'fred', 'age': 40 };
+         *
+         * _.isMatch(object, { 'age': 40 });
+         * // => true
+         *
+         * _.isMatch(object, { 'age': 36 });
+         * // => false
+         */
+        isMatch(object: object, source: object): boolean;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.isMatch
+         */
+        isMatch(source: object): boolean;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.isMatch
+         */
+        isMatch(source: object): LoDashExplicitWrapper<boolean>;
+    }
+
+    // isMatchWith
+
+    type isMatchWithCustomizer = (value: any, other: any, indexOrKey: PropertyName) => boolean;
+
+    interface LoDashStatic {
+        /**
+         * This method is like `_.isMatch` except that it accepts `customizer` which
+         * is invoked to compare values. If `customizer` returns `undefined` comparisons
+         * are handled by the method instead. The `customizer` is invoked with three
+         * arguments: (objValue, srcValue, index|key, object, source).
+         *
+         * @category Lang
+         * @param object The object to inspect.
+         * @param source The object of property values to match.
+         * @param [customizer] The function to customize comparisons.
+         * @returns Returns `true` if `object` is a match, else `false`.
+         * @example
+         *
+         * function isGreeting(value) {
+         *   return /^h(?:i|ello)$/.test(value);
+         * }
+         *
+         * function customizer(objValue, srcValue) {
+         *   if (isGreeting(objValue) && isGreeting(srcValue)) {
+         *     return true;
+         *   }
+         * }
+         *
+         * var object = { 'greeting': 'hello' };
+         * var source = { 'greeting': 'hi' };
+         *
+         * _.isMatchWith(object, source, customizer);
+         * // => true
+         */
+        isMatchWith(object: object, source: object, customizer: isMatchWithCustomizer): boolean;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.isMatchWith
+         */
+        isMatchWith(source: object, customizer: isMatchWithCustomizer): boolean;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.isMatchWith
+         */
+        isMatchWith(source: object, customizer: isMatchWithCustomizer): LoDashExplicitWrapper<boolean>;
+    }
+
+    // isNaN
+
+    interface LoDashStatic {
+        /**
+         * Checks if value is NaN.
+         *
+         * Note: This method is not the same as isNaN which returns true for undefined and other non-numeric values.
+         *
+         * @param value The value to check.
+         * @return Returns true if value is NaN, else false.
+         */
+        isNaN(value?: any): boolean;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.isNaN
+         */
+        isNaN(): boolean;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.isNaN
+         */
+        isNaN(): LoDashExplicitWrapper<boolean>;
+    }
+
+    // isNative
+
+    interface LoDashStatic {
+        /**
+         * Checks if value is a native function.
+         * @param value The value to check.
+         *
+         * @retrun Returns true if value is a native function, else false.
+         */
+        isNative(value: any): value is (...args: any[]) => any;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * see _.isNative
+         */
+        isNative(): boolean;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * see _.isNative
+         */
+        isNative(): LoDashExplicitWrapper<boolean>;
+    }
+
+    // isNil
+
+    interface LoDashStatic {
+        /**
+         * Checks if `value` is `null` or `undefined`.
+         *
+         * @category Lang
+         * @param value The value to check.
+         * @returns Returns `true` if `value` is nullish, else `false`.
+         * @example
+         *
+         * _.isNil(null);
+         * // => true
+         *
+         * _.isNil(void 0);
+         * // => true
+         *
+         * _.isNil(NaN);
+         * // => false
+         */
+        isNil(value: any): value is null | undefined;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * see _.isNil
+         */
+        isNil(): boolean;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * see _.isNil
+         */
+        isNil(): LoDashExplicitWrapper<boolean>;
+    }
+
+    // isNull
+
+    interface LoDashStatic {
+        /**
+         * Checks if value is null.
+         *
+         * @param value The value to check.
+         * @return Returns true if value is null, else false.
+         */
+        isNull(value: any): value is null;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * see _.isNull
+         */
+        isNull(): boolean;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * see _.isNull
+         */
+        isNull(): LoDashExplicitWrapper<boolean>;
+    }
+
+    // isNumber
+
+    interface LoDashStatic {
+        /**
+         * Checks if value is classified as a Number primitive or object.
+         *
+         * Note: To exclude Infinity, -Infinity, and NaN, which are classified as numbers, use the _.isFinite method.
+         *
+         * @param value The value to check.
+         * @return Returns true if value is correctly classified, else false.
+         */
+        isNumber(value?: any): value is number;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * see _.isNumber
+         */
+        isNumber(): boolean;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * see _.isNumber
+         */
+        isNumber(): LoDashExplicitWrapper<boolean>;
+    }
+
+    // isObject
+
+    interface LoDashStatic {
+        /**
+         * Checks if value is the language type of Object. (e.g. arrays, functions, objects, regexes, new Number(0),
+         * and new String(''))
+         *
+         * @param value The value to check.
+         * @return Returns true if value is an object, else false.
+         */
+        isObject(value?: any): boolean;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * see _.isObject
+         */
+        isObject(): boolean;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * see _.isObject
+         */
+        isObject(): LoDashExplicitWrapper<boolean>;
+    }
+
+    // isObjectLike
+
+    interface LoDashStatic {
+        /**
+         * Checks if `value` is object-like. A value is object-like if it's not `null`
+         * and has a `typeof` result of "object".
+         *
+         * @category Lang
+         * @param value The value to check.
+         * @returns Returns `true` if `value` is object-like, else `false`.
+         * @example
+         *
+         * _.isObjectLike({});
+         * // => true
+         *
+         * _.isObjectLike([1, 2, 3]);
+         * // => true
+         *
+         * _.isObjectLike(_.noop);
+         * // => false
+         *
+         * _.isObjectLike(null);
+         * // => false
+         */
+        isObjectLike(value?: any): boolean;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * see _.isObjectLike
+         */
+        isObjectLike(): boolean;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * see _.isObjectLike
+         */
+        isObjectLike(): LoDashExplicitWrapper<boolean>;
+    }
+
+    // isPlainObject
+
+    interface LoDashStatic {
+        /**
+         * Checks if value is a plain object, that is, an object created by the Object constructor or one with a
+         * [[Prototype]] of null.
+         *
+         * Note: This method assumes objects created by the Object constructor have no inherited enumerable properties.
+         *
+         * @param value The value to check.
+         * @return Returns true if value is a plain object, else false.
+         */
+        isPlainObject(value?: any): boolean;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * see _.isPlainObject
+         */
+        isPlainObject(): boolean;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * see _.isPlainObject
+         */
+        isPlainObject(): LoDashExplicitWrapper<boolean>;
+    }
+
+    // isRegExp
+
+    interface LoDashStatic {
+        /**
+         * Checks if value is classified as a RegExp object.
+         * @param value The value to check.
+         *
+         * @return Returns true if value is correctly classified, else false.
+         */
+        isRegExp(value?: any): value is RegExp;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * see _.isRegExp
+         */
+        isRegExp(): boolean;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * see _.isRegExp
+         */
+        isRegExp(): LoDashExplicitWrapper<boolean>;
+    }
+
+    // isSafeInteger
+
+    interface LoDashStatic {
+        /**
+         * Checks if `value` is a safe integer. An integer is safe if it's an IEEE-754
+         * double precision number which isn't the result of a rounded unsafe integer.
+         *
+         * **Note:** This method is based on [`Number.isSafeInteger`](https://mdn.io/Number/isSafeInteger).
+         *
+         * @category Lang
+         * @param value The value to check.
+         * @returns Returns `true` if `value` is a safe integer, else `false`.
+         * @example
+         *
+         * _.isSafeInteger(3);
+         * // => true
+         *
+         * _.isSafeInteger(Number.MIN_VALUE);
+         * // => false
+         *
+         * _.isSafeInteger(Infinity);
+         * // => false
+         *
+         * _.isSafeInteger('3');
+         * // => false
+         */
+        isSafeInteger(value: any): boolean;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * see _.isSafeInteger
+         */
+        isSafeInteger(): boolean;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * see _.isSafeInteger
+         */
+        isSafeInteger(): LoDashExplicitWrapper<boolean>;
+    }
+
+    // isSet
+
+    interface LoDashStatic {
+        /**
+         * Checks if value is classified as a Set object.
+         *
+         * @param value The value to check.
+         * @returns Returns true if value is correctly classified, else false.
+         */
+        isSet(value?: any): value is Set<any>;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.isSet
+         */
+        isSet(): boolean;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.isSet
+         */
+        isSet(): LoDashExplicitWrapper<boolean>;
+    }
+
+    // isString
+
+    interface LoDashStatic {
+        /**
+         * Checks if value is classified as a String primitive or object.
+         *
+         * @param value The value to check.
+         * @return Returns true if value is correctly classified, else false.
+         */
+        isString(value?: any): value is string;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * see _.isString
+         */
+        isString(): boolean;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * see _.isString
+         */
+        isString(): LoDashExplicitWrapper<boolean>;
+    }
+
+    // isSymbol
+
+    interface LoDashStatic {
+        /**
+         * Checks if `value` is classified as a `Symbol` primitive or object.
+         *
+         * @category Lang
+         * @param value The value to check.
+         * @returns Returns `true` if `value` is correctly classified, else `false`.
+         * @example
+         *
+         * _.isSymbol(Symbol.iterator);
+         * // => true
+         *
+         * _.isSymbol('abc');
+         * // => false
+         */
+        isSymbol(value: any): boolean;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * see _.isSymbol
+         */
+        isSymbol(): boolean;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * see _.isSymbol
+         */
+        isSymbol(): LoDashExplicitWrapper<boolean>;
+    }
+
+    // isTypedArray
+
+    interface LoDashStatic {
+        /**
+         * Checks if value is classified as a typed array.
+         *
+         * @param value The value to check.
+         * @return Returns true if value is correctly classified, else false.
+         */
+        isTypedArray(value: any): boolean;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * see _.isTypedArray
+         */
+        isTypedArray(): boolean;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * see _.isTypedArray
+         */
+        isTypedArray(): LoDashExplicitWrapper<boolean>;
+    }
+
+    // isUndefined
+
+    interface LoDashStatic {
+        /**
+         * Checks if value is undefined.
+         *
+         * @param value The value to check.
+         * @return Returns true if value is undefined, else false.
+         */
+        isUndefined(value: any): value is undefined;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * see _.isUndefined
+         */
+        isUndefined(): boolean;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * see _.isUndefined
+         */
+        isUndefined(): LoDashExplicitWrapper<boolean>;
+    }
+
+    // isWeakMap
+
+    interface LoDashStatic {
+        /**
+         * Checks if value is classified as a WeakMap object.
+         *
+         * @param value The value to check.
+         * @returns Returns true if value is correctly classified, else false.
+         */
+        isWeakMap(value?: any): value is WeakMap<object, any>;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.isSet
+         */
+        isWeakMap(): boolean;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.isSet
+         */
+        isWeakMap(): LoDashExplicitWrapper<boolean>;
+    }
+
+    // isWeakSet
+
+    interface LoDashStatic {
+        /**
+         * Checks if value is classified as a WeakSet object.
+         *
+         * @param value The value to check.
+         * @returns Returns true if value is correctly classified, else false.
+         */
+        isWeakSet(value?: any): value is WeakSet<object>;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.isWeakSet
+         */
+        isWeakSet(): boolean;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.isWeakSet
+         */
+        isWeakSet(): LoDashExplicitWrapper<boolean>;
+    }
+
+    // lt
+
+    interface LoDashStatic {
+        /**
+         * Checks if value is less than other.
+         *
+         * @param value The value to compare.
+         * @param other The other value to compare.
+         * @return Returns true if value is less than other, else false.
+         */
+        lt(
+            value: any,
+            other: any
+        ): boolean;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.lt
+         */
+        lt(other: any): boolean;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.lt
+         */
+        lt(other: any): LoDashExplicitWrapper<boolean>;
+    }
+
+    // lte
+
+    interface LoDashStatic {
+        /**
+         * Checks if value is less than or equal to other.
+         *
+         * @param value The value to compare.
+         * @param other The other value to compare.
+         * @return Returns true if value is less than or equal to other, else false.
+         */
+        lte(
+            value: any,
+            other: any
+        ): boolean;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.lte
+         */
+        lte(other: any): boolean;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.lte
+         */
+        lte(other: any): LoDashExplicitWrapper<boolean>;
+    }
+
+    // toArray
+
+    interface LoDashStatic {
+        /**
+         * Converts value to an array.
+         *
+         * @param value The value to convert.
+         * @return Returns the converted array.
+         */
+        toArray<T>(value: List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined): T[];
+
+        /**
+         * @see _.toArray
+         */
+        toArray<T>(value: T): Array<T[keyof T]>;
+
+        /**
+         * @see _.toArray
+         */
+        toArray(): any[];
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.toArray
+         */
+        toArray<T>(this: LoDashImplicitWrapper<List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined>): LoDashImplicitWrapper<T[]>;
+
+        /**
+         * @see _.toArray
+         */
+        toArray<T extends object>(this: LoDashImplicitWrapper<T>): LoDashImplicitWrapper<Array<T[keyof T]>>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.toArray
+         */
+        toArray<T>(this: LoDashExplicitWrapper<List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined>): LoDashExplicitWrapper<T[]>;
+
+        /**
+         * @see _.toArray
+         */
+        toArray<T extends object>(this: LoDashImplicitWrapper<T>): LoDashExplicitWrapper<Array<T[keyof T]>>;
+    }
+
+    // toFinite
+
+    interface LoDashStatic {
+        /**
+         * Converts `value` to a finite number.
+         *
+         * @since 4.12.0
+         * @category Lang
+         * @param value The value to convert.
+         * @returns Returns the converted number.
+         * @example
+         *
+         * _.toFinite(3.2);
+         * // => 3.2
+         *
+         * _.toFinite(Number.MIN_VALUE);
+         * // => 5e-324
+         *
+         * _.toFinite(Infinity);
+         * // => 1.7976931348623157e+308
+         *
+         * _.toFinite('3.2');
+         * // => 3.2
+         */
+        toFinite(value: any): number;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.toFinite
+         */
+        toFinite(): number;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.toFinite
+         */
+        toFinite(): LoDashExplicitWrapper<number>;
+    }
+
+    // toInteger
+
+    interface LoDashStatic {
+        /**
+         * Converts `value` to an integer.
+         *
+         * **Note:** This function is loosely based on [`ToInteger`](http://www.ecma-international.org/ecma-262/6.0/#sec-tointeger).
+         *
+         * @category Lang
+         * @param value The value to convert.
+         * @returns Returns the converted integer.
+         * @example
+         *
+         * _.toInteger(3);
+         * // => 3
+         *
+         * _.toInteger(Number.MIN_VALUE);
+         * // => 0
+         *
+         * _.toInteger(Infinity);
+         * // => 1.7976931348623157e+308
+         *
+         * _.toInteger('3');
+         * // => 3
+         */
+        toInteger(value: any): number;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.toInteger
+         */
+        toInteger(): number;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.toInteger
+         */
+        toInteger(): LoDashExplicitWrapper<number>;
+    }
+
+    // toLength
+
+    interface LoDashStatic {
+        /**
+         * Converts `value` to an integer suitable for use as the length of an
+         * array-like object.
+         *
+         * **Note:** This method is based on [`ToLength`](http://ecma-international.org/ecma-262/6.0/#sec-tolength).
+         *
+         * @category Lang
+         * @param value The value to convert.
+         * @return Returns the converted integer.
+         * @example
+         *
+         * _.toLength(3);
+         * // => 3
+         *
+         * _.toLength(Number.MIN_VALUE);
+         * // => 0
+         *
+         * _.toLength(Infinity);
+         * // => 4294967295
+         *
+         * _.toLength('3');
+         * // => 3
+         */
+        toLength(value: any): number;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.toLength
+         */
+        toLength(): number;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.toLength
+         */
+        toLength(): LoDashExplicitWrapper<number>;
+    }
+
+    // toNumber
+
+    interface LoDashStatic {
+        /**
+         * Converts `value` to a number.
+         *
+         * @category Lang
+         * @param value The value to process.
+         * @returns Returns the number.
+         * @example
+         *
+         * _.toNumber(3);
+         * // => 3
+         *
+         * _.toNumber(Number.MIN_VALUE);
+         * // => 5e-324
+         *
+         * _.toNumber(Infinity);
+         * // => Infinity
+         *
+         * _.toNumber('3');
+         * // => 3
+         */
+        toNumber(value: any): number;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.toNumber
+         */
+        toNumber(): number;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.toNumber
+         */
+        toNumber(): LoDashExplicitWrapper<number>;
+    }
+
+    // toPlainObject
+
+    interface LoDashStatic {
+        /**
+         * Converts value to a plain object flattening inherited enumerable properties of value to own properties
+         * of the plain object.
+         *
+         * @param value The value to convert.
+         * @return Returns the converted plain object.
+         */
+        toPlainObject(value?: any): any;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.toPlainObject
+         */
+        toPlainObject(): LoDashImplicitWrapper<any>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.toPlainObject
+         */
+        toPlainObject(): LoDashExplicitWrapper<any>;
+    }
+
+    // toSafeInteger
+
+    interface LoDashStatic {
+        /**
+         * Converts `value` to a safe integer. A safe integer can be compared and
+         * represented correctly.
+         *
+         * @category Lang
+         * @param value The value to convert.
+         * @returns Returns the converted integer.
+         * @example
+         *
+         * _.toSafeInteger(3);
+         * // => 3
+         *
+         * _.toSafeInteger(Number.MIN_VALUE);
+         * // => 0
+         *
+         * _.toSafeInteger(Infinity);
+         * // => 9007199254740991
+         *
+         * _.toSafeInteger('3');
+         * // => 3
+         */
+        toSafeInteger(value: any): number;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.toSafeInteger
+         */
+        toSafeInteger(): number;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.toSafeInteger
+         */
+        toSafeInteger(): LoDashExplicitWrapper<number>;
+    }
+
+    // toString
+
+    interface LoDashStatic {
+        /**
+         * Converts `value` to a string if it's not one. An empty string is returned
+         * for `null` and `undefined` values. The sign of `-0` is preserved.
+         *
+         * @category Lang
+         * @param value The value to process.
+         * @returns Returns the string.
+         * @example
+         *
+         * _.toString(null);
+         * // => ''
+         *
+         * _.toString(-0);
+         * // => '-0'
+         *
+         * _.toString([1, 2, 3]);
+         * // => '1,2,3'
+         */
+        toString(value: any): string;
+    }
+}
\ No newline at end of file
diff --git a/types/lodash/common/math.d.ts b/types/lodash/common/math.d.ts
new file mode 100644
index 0000000000..a0af6114b5
--- /dev/null
+++ b/types/lodash/common/math.d.ts
@@ -0,0 +1,536 @@
+import _ = require("../index");
+declare module "../index" {
+    // add
+
+    interface LoDashStatic {
+        /**
+         * Adds two numbers.
+         *
+         * @param augend The first number to add.
+         * @param addend The second number to add.
+         * @return Returns the sum.
+         */
+        add(
+            augend: number,
+            addend: number
+        ): number;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.add
+         */
+        add(addend: number): number;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.add
+         */
+        add(addend: number): LoDashExplicitWrapper<number>;
+    }
+
+    // ceil
+
+    interface LoDashStatic {
+        /**
+         * Calculates n rounded up to precision.
+         *
+         * @param n The number to round up.
+         * @param precision The precision to round up to.
+         * @return Returns the rounded up number.
+         */
+        ceil(
+            n: number,
+            precision?: number
+        ): number;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.ceil
+         */
+        ceil(precision?: number): number;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.ceil
+         */
+        ceil(precision?: number): LoDashExplicitWrapper<number>;
+    }
+
+    // divide
+
+    interface LoDashStatic {
+       /**
+        * Divide two numbers.
+        *
+        * @param dividend The first number in a division.
+        * @param divisor The second number in a division.
+        * @returns Returns the quotient.
+        */
+        divide(
+            dividend: number,
+            divisor: number
+        ): number;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.divide
+         */
+        divide(divisor: number): number;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.divide
+         */
+        divide(divisor: number): LoDashExplicitWrapper<number>;
+    }
+
+    // floor
+
+    interface LoDashStatic {
+        /**
+         * Calculates n rounded down to precision.
+         *
+         * @param n The number to round down.
+         * @param precision The precision to round down to.
+         * @return Returns the rounded down number.
+         */
+        floor(
+            n: number,
+            precision?: number
+        ): number;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.floor
+         */
+        floor(precision?: number): number;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.floor
+         */
+        floor(precision?: number): LoDashExplicitWrapper<number>;
+    }
+
+    // max
+
+    interface LoDashStatic {
+         /**
+          * Computes the maximum value of `array`. If `array` is empty or falsey
+          * `undefined` is returned.
+          *
+          * @category Math
+          * @param array The array to iterate over.
+          * @returns Returns the maximum value.
+          */
+        max<T>(
+            collection: List<T> | null | undefined
+        ): T | undefined;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.max
+         */
+        max<T>(this: LoDashImplicitWrapper<List<T> | null | undefined>): T | undefined;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.max
+         */
+        max<T>(this: LoDashExplicitWrapper<List<T> | null | undefined>): LoDashExplicitWrapper<T | undefined>;
+    }
+
+    // maxBy
+
+    interface LoDashStatic {
+        /**
+         * This method is like `_.max` except that it accepts `iteratee` which is
+         * invoked for each element in `array` to generate the criterion by which
+         * the value is ranked. The iteratee is invoked with one argument: (value).
+         *
+         * @category Math
+         * @param array The array to iterate over.
+         * @param [iteratee=_.identity] The iteratee invoked per element.
+         * @returns Returns the maximum value.
+         * @example
+         *
+         * var objects = [{ 'n': 1 }, { 'n': 2 }];
+         *
+         * _.maxBy(objects, function(o) { return o.a; });
+         * // => { 'n': 2 }
+         *
+         * // using the `_.property` iteratee shorthand
+         * _.maxBy(objects, 'n');
+         * // => { 'n': 2 }
+         */
+        maxBy<T>(
+            collection: List<T> | null | undefined,
+            iteratee?: ListIteratee<T>
+        ): T | undefined;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.maxBy
+         */
+        maxBy<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            iteratee?: ListIteratee<T>
+        ): T | undefined;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.maxBy
+         */
+        maxBy<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            iteratee?: ListIteratee<T>
+        ): LoDashExplicitWrapper<T | undefined>;
+    }
+
+    // mean
+
+    interface LoDashStatic {
+        /**
+         * Computes the mean of the values in `array`.
+         *
+         * @category Math
+         * @param array The array to iterate over.
+         * @returns Returns the mean.
+         * @example
+         *
+         * _.mean([4, 2, 8, 6]);
+         * // => 5
+         */
+        mean(
+            collection: List<any> | null | undefined
+        ): number;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.mean
+         */
+        mean(): number;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.mean
+         */
+        mean(): LoDashExplicitWrapper<number>;
+    }
+
+    // meanBy
+
+    interface LoDashStatic {
+      /**
+       * Computes the mean of the provided propties of the objects in the `array`
+       *
+       * @category Math
+       * @param array The array to iterate over.
+       * @param [iteratee=_.identity] The iteratee invoked per element.
+       * @returns Returns the mean.
+       * @example
+       *
+       * _.mean([{ 'n': 4 }, { 'n': 2 }, { 'n': 8 }, { 'n': 6 }], 'n');
+       * // => 5
+       */
+        meanBy<T>(
+            collection: List<T> | null | undefined,
+            iteratee?: ListIteratee<T>
+        ): number;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.meanBy
+         */
+        meanBy<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            iteratee?: ListIteratee<T>
+        ): number;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.meanBy
+         */
+        meanBy<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            iteratee?: ListIteratee<T>
+        ): LoDashExplicitWrapper<number>;
+    }
+
+    // min
+
+    interface LoDashStatic {
+        /**
+         * Computes the minimum value of `array`. If `array` is empty or falsey
+         * `undefined` is returned.
+         *
+         * @category Math
+         * @param array The array to iterate over.
+         * @returns Returns the minimum value.
+         */
+        min<T>(
+            collection: List<T> | null | undefined
+        ): T | undefined;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.min
+         */
+        min<T>(this: LoDashImplicitWrapper<List<T> | null | undefined>): T | undefined;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.min
+         */
+        min<T>(this: LoDashExplicitWrapper<List<T> | null | undefined>): LoDashExplicitWrapper<T | undefined>;
+    }
+
+    // minBy
+
+    interface LoDashStatic {
+        /**
+         * This method is like `_.min` except that it accepts `iteratee` which is
+         * invoked for each element in `array` to generate the criterion by which
+         * the value is ranked. The iteratee is invoked with one argument: (value).
+         *
+         * @category Math
+         * @param array The array to iterate over.
+         * @param [iteratee=_.identity] The iteratee invoked per element.
+         * @returns Returns the minimum value.
+         * @example
+         *
+         * var objects = [{ 'n': 1 }, { 'n': 2 }];
+         *
+         * _.minBy(objects, function(o) { return o.a; });
+         * // => { 'n': 1 }
+         *
+         * // using the `_.property` iteratee shorthand
+         * _.minBy(objects, 'n');
+         * // => { 'n': 1 }
+         */
+        minBy<T>(
+            collection: List<T> | null | undefined,
+            iteratee?: ListIteratee<T>
+        ): T | undefined;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.minBy
+         */
+        minBy<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            iteratee?: ListIteratee<T>
+        ): T | undefined;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.minBy
+         */
+        minBy<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            iteratee?: ListIteratee<T>
+        ): LoDashExplicitWrapper<T | undefined>;
+    }
+
+    // multiply
+
+    interface LoDashStatic {
+        /**
+         * Multiply two numbers.
+         * @param multiplier The first number in a multiplication.
+         * @param multiplicand The second number in a multiplication.
+         * @returns Returns the product.
+         */
+        multiply(
+            multiplier: number,
+            multiplicand: number
+        ): number;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.multiply
+         */
+        multiply(multiplicand: number): number;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.multiply
+         */
+        multiply(multiplicand: number): LoDashExplicitWrapper<number>;
+    }
+
+    // round
+
+    interface LoDashStatic {
+        /**
+         * Calculates n rounded to precision.
+         *
+         * @param n The number to round.
+         * @param precision The precision to round to.
+         * @return Returns the rounded number.
+         */
+        round(
+            n: number,
+            precision?: number
+        ): number;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.round
+         */
+        round(precision?: number): number;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.round
+         */
+        round(precision?: number): LoDashExplicitWrapper<number>;
+    }
+
+    // subtract
+
+    interface LoDashStatic {
+        /**
+         * Subtract two numbers.
+         *
+         * @category Math
+         * @param minuend The first number in a subtraction.
+         * @param subtrahend The second number in a subtraction.
+         * @returns Returns the difference.
+         * @example
+         *
+         * _.subtract(6, 4);
+         * // => 2
+         */
+        subtract(
+            minuend: number,
+            subtrahend: number
+        ): number;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.subtract
+         */
+        subtract(
+            subtrahend: number
+        ): number;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.subtract
+         */
+        subtract(
+            subtrahend: number
+        ): LoDashExplicitWrapper<number>;
+    }
+
+    // sum
+
+    interface LoDashStatic {
+        /**
+         * Computes the sum of the values in `array`.
+         *
+         * @category Math
+         * @param array The array to iterate over.
+         * @returns Returns the sum.
+         * @example
+         *
+         * _.sum([4, 2, 8, 6]);
+         * // => 20
+         */
+        sum(collection: List<any> | null | undefined): number;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.sum
+         */
+        sum(): number;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.sum
+         */
+        sum(): LoDashExplicitWrapper<number>;
+    }
+
+    // sumBy
+
+    interface LoDashStatic {
+        /**
+         * This method is like `_.sum` except that it accepts `iteratee` which is
+         * invoked for each element in `array` to generate the value to be summed.
+         * The iteratee is invoked with one argument: (value).
+         *
+         * @category Math
+         * @param array The array to iterate over.
+         * @param [iteratee=_.identity] The iteratee invoked per element.
+         * @returns Returns the sum.
+         * @example
+         *
+         * var objects = [{ 'n': 4 }, { 'n': 2 }, { 'n': 8 }, { 'n': 6 }];
+         *
+         * _.sumBy(objects, function(o) { return o.n; });
+         * // => 20
+         *
+         * // using the `_.property` iteratee shorthand
+         * _.sumBy(objects, 'n');
+         * // => 20
+         */
+        sumBy<T>(
+            collection: List<T> | null | undefined,
+            iteratee?: ((value: T) => number) | string
+        ): number;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.sumBy
+         */
+        sumBy<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            iteratee?: ((value: T) => number) | string
+        ): number;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.sumBy
+         */
+        sumBy<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            iteratee?: ((value: T) => number) | string
+        ): LoDashExplicitWrapper<number>;
+    }
+
+    /**********
+     * Number *
+     **********/
+}
\ No newline at end of file
diff --git a/types/lodash/number/random.d.ts b/types/lodash/common/number.d.ts
similarity index 51%
rename from types/lodash/number/random.d.ts
rename to types/lodash/common/number.d.ts
index a6522326f6..3e6a945855 100644
--- a/types/lodash/number/random.d.ts
+++ b/types/lodash/common/number.d.ts
@@ -1,5 +1,102 @@
 import _ = require("../index");
 declare module "../index" {
+    // clamp
+
+    interface LoDashStatic {
+        /**
+         * Clamps `number` within the inclusive `lower` and `upper` bounds.
+         *
+         * @category Number
+         * @param number The number to clamp.
+         * @param [lower] The lower bound.
+         * @param upper The upper bound.
+         * @returns Returns the clamped number.
+         * @example
+         *
+         * _.clamp(-10, -5, 5);
+         * // => -5
+         *
+         * _.clamp(10, -5, 5);
+         * // => 5
+         */
+        clamp(
+            number: number,
+            lower: number,
+            upper: number
+        ): number;
+        clamp(
+            number: number,
+            upper: number
+        ): number;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.clamp
+         */
+        clamp(
+            lower: number,
+            upper: number
+        ): number;
+        clamp(
+            upper: number
+        ): number;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.clamp
+         */
+        clamp(
+            lower: number,
+            upper: number
+        ): LoDashExplicitWrapper<number>;
+        clamp(
+            upper: number
+        ): LoDashExplicitWrapper<number>;
+    }
+
+    // inRange
+
+    interface LoDashStatic {
+        /**
+         * Checks if n is between start and up to but not including, end. If end is not specified it’s set to start
+         * with start then set to 0.
+         *
+         * @param n The number to check.
+         * @param start The start of the range.
+         * @param end The end of the range.
+         * @return Returns true if n is in the range, else false.
+         */
+        inRange(
+            n: number,
+            start: number,
+            end?: number
+        ): boolean;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.inRange
+         */
+        inRange(
+            start: number,
+            end?: number
+        ): boolean;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.inRange
+         */
+        inRange(
+            start: number,
+            end?: number
+        ): LoDashExplicitWrapper<boolean>;
+    }
+
+    // random
+
     interface LoDashStatic {
         /**
          * Produces a random number between min and max (inclusive). If only one argument is provided a number between
diff --git a/types/lodash/common/object.d.ts b/types/lodash/common/object.d.ts
new file mode 100644
index 0000000000..6100e25c43
--- /dev/null
+++ b/types/lodash/common/object.d.ts
@@ -0,0 +1,3653 @@
+import _ = require("../index");
+declare module "../index" {
+    // assign
+
+    interface LoDashStatic {
+        /**
+         * Assigns own enumerable properties of source objects to the destination
+         * object. Source objects are applied from left to right. Subsequent sources
+         * overwrite property assignments of previous sources.
+         *
+         * **Note:** This method mutates `object` and is loosely based on
+         * [`Object.assign`](https://mdn.io/Object/assign).
+         *
+         * @category Object
+         * @param object The destination object.
+         * @param [sources] The source objects.
+         * @returns Returns `object`.
+         * @example
+         *
+         * function Foo() {
+         *   this.c = 3;
+         * }
+         *
+         * function Bar() {
+         *   this.e = 5;
+         * }
+         *
+         * Foo.prototype.d = 4;
+         * Bar.prototype.f = 6;
+         *
+         * _.assign({ 'a': 1 }, new Foo, new Bar);
+         * // => { 'a': 1, 'c': 3, 'e': 5 }
+         */
+        assign<TObject, TSource>(
+            object: TObject,
+            source: TSource
+        ): TObject & TSource;
+
+        /**
+         * @see assign
+         */
+        assign<TObject, TSource1, TSource2>(
+            object: TObject,
+            source1: TSource1,
+            source2: TSource2
+        ): TObject & TSource1 & TSource2;
+
+        /**
+         * @see assign
+         */
+        assign<TObject, TSource1, TSource2, TSource3>(
+            object: TObject,
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3
+        ): TObject & TSource1 & TSource2 & TSource3;
+
+        /**
+         * @see assign
+         */
+        assign<TObject, TSource1, TSource2, TSource3, TSource4>(
+            object: TObject,
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3,
+            source4: TSource4
+        ): TObject & TSource1 & TSource2 & TSource3 & TSource4;
+
+        /**
+         * @see _.assign
+         */
+        assign<TObject>(object: TObject): TObject;
+
+        /**
+         * @see _.assign
+         */
+        assign(
+            object: any,
+            ...otherArgs: any[]
+        ): any;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.assign
+         */
+        assign<TSource>(
+            source: TSource
+        ): LoDashImplicitWrapper<TValue & TSource>;
+
+        /**
+         * @see assign
+         */
+        assign<TSource1, TSource2>(
+            source1: TSource1,
+            source2: TSource2
+        ): LoDashImplicitWrapper<TValue & TSource1 & TSource2>;
+
+        /**
+         * @see assign
+         */
+        assign<TSource1, TSource2, TSource3>(
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3
+        ): LoDashImplicitWrapper<TValue & TSource1 & TSource2 & TSource3>;
+
+        /**
+         * @see assign
+         */
+        assign<TSource1, TSource2, TSource3, TSource4>(
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3,
+            source4: TSource4
+        ): LoDashImplicitWrapper<TValue & TSource1 & TSource2 & TSource3 & TSource4>;
+
+        /**
+         * @see _.assign
+         */
+        assign(): LoDashImplicitWrapper<TValue>;
+
+        /**
+         * @see _.assign
+         */
+        assign(...otherArgs: any[]): LoDashImplicitWrapper<any>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.assign
+         */
+        assign<TSource>(
+            source: TSource
+        ): LoDashExplicitWrapper<TValue & TSource>;
+
+        /**
+         * @see assign
+         */
+        assign<TSource1, TSource2>(
+            source1: TSource1,
+            source2: TSource2
+        ): LoDashExplicitWrapper<TValue & TSource1 & TSource2>;
+
+        /**
+         * @see assign
+         */
+        assign<TSource1, TSource2, TSource3>(
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3
+        ): LoDashExplicitWrapper<TValue & TSource1 & TSource2 & TSource3>;
+
+        /**
+         * @see assign
+         */
+        assign<TSource1, TSource2, TSource3, TSource4>(
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3,
+            source4: TSource4
+        ): LoDashExplicitWrapper<TValue & TSource1 & TSource2 & TSource3 & TSource4>;
+
+        /**
+         * @see _.assign
+         */
+        assign(): LoDashExplicitWrapper<TValue>;
+
+        /**
+         * @see _.assign
+         */
+        assign(...otherArgs: any[]): LoDashExplicitWrapper<any>;
+    }
+
+    // assignIn
+
+    interface LoDashStatic {
+        /**
+         * This method is like `_.assign` except that it iterates over own and
+         * inherited source properties.
+         *
+         * **Note:** This method mutates `object`.
+         *
+         * @alias extend
+         * @category Object
+         * @param object The destination object.
+         * @param [sources] The source objects.
+         * @returns Returns `object`.
+         * @example
+         *
+         * function Foo() {
+         *   this.b = 2;
+         * }
+         *
+         * function Bar() {
+         *   this.d = 4;
+         * }
+         *
+         * Foo.prototype.c = 3;
+         * Bar.prototype.e = 5;
+         *
+         * _.assignIn({ 'a': 1 }, new Foo, new Bar);
+         * // => { 'a': 1, 'b': 2, 'c': 3, 'd': 4, 'e': 5 }
+         */
+        assignIn<TObject, TSource>(
+            object: TObject,
+            source: TSource
+        ): TObject & TSource;
+
+        /**
+         * @see assignIn
+         */
+        assignIn<TObject, TSource1, TSource2>(
+            object: TObject,
+            source1: TSource1,
+            source2: TSource2
+        ): TObject & TSource1 & TSource2;
+
+        /**
+         * @see assignIn
+         */
+        assignIn<TObject, TSource1, TSource2, TSource3>(
+            object: TObject,
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3
+        ): TObject & TSource1 & TSource2 & TSource3;
+
+        /**
+         * @see assignIn
+         */
+        assignIn<TObject, TSource1, TSource2, TSource3, TSource4>(
+            object: TObject,
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3,
+            source4: TSource4
+        ): TObject & TSource1 & TSource2 & TSource3 & TSource4;
+
+        /**
+         * @see _.assignIn
+         */
+        assignIn<TObject>(object: TObject): TObject;
+
+        /**
+         * @see _.assignIn
+         */
+        assignIn<TResult>(
+            object: any,
+            ...otherArgs: any[]
+        ): TResult;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.assignIn
+         */
+        assignIn<TSource>(
+            source: TSource
+        ): LoDashImplicitWrapper<TValue & TSource>;
+
+        /**
+         * @see assignIn
+         */
+        assignIn<TSource1, TSource2>(
+            source1: TSource1,
+            source2: TSource2
+        ): LoDashImplicitWrapper<TValue & TSource1 & TSource2>;
+
+        /**
+         * @see assignIn
+         */
+        assignIn<TSource1, TSource2, TSource3>(
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3
+        ): LoDashImplicitWrapper<TValue & TSource1 & TSource2 & TSource3>;
+
+        /**
+         * @see assignIn
+         */
+        assignIn<TSource1, TSource2, TSource3, TSource4>(
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3,
+            source4: TSource4
+        ): LoDashImplicitWrapper<TValue & TSource1 & TSource2 & TSource3 & TSource4>;
+
+        /**
+         * @see _.assignIn
+         */
+        assignIn(): LoDashImplicitWrapper<TValue>;
+
+        /**
+         * @see _.assignIn
+         */
+        assignIn<TResult>(...otherArgs: any[]): LoDashImplicitWrapper<TResult>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.assignIn
+         */
+        assignIn<TSource>(
+            source: TSource
+        ): LoDashExplicitWrapper<TValue & TSource>;
+
+        /**
+         * @see assignIn
+         */
+        assignIn<TSource1, TSource2>(
+            source1: TSource1,
+            source2: TSource2
+        ): LoDashExplicitWrapper<TValue & TSource1 & TSource2>;
+
+        /**
+         * @see assignIn
+         */
+        assignIn<TSource1, TSource2, TSource3>(
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3
+        ): LoDashExplicitWrapper<TValue & TSource1 & TSource2 & TSource3>;
+
+        /**
+         * @see assignIn
+         */
+        assignIn<TSource1, TSource2, TSource3, TSource4>(
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3,
+            source4: TSource4
+        ): LoDashExplicitWrapper<TValue & TSource1 & TSource2 & TSource3 & TSource4>;
+
+        /**
+         * @see _.assignIn
+         */
+        assignIn(): LoDashExplicitWrapper<TValue>;
+
+        /**
+         * @see _.assignIn
+         */
+        assignIn(...otherArgs: any[]): LoDashExplicitWrapper<any>;
+    }
+
+    // assignInWith
+
+    type AssignCustomizer = (objectValue: any, sourceValue: any, key?: string, object?: {}, source?: {}) => any;
+
+    interface LoDashStatic {
+        /**
+         * This method is like `_.assignIn` except that it accepts `customizer` which
+         * is invoked to produce the assigned values. If `customizer` returns `undefined`
+         * assignment is handled by the method instead. The `customizer` is invoked
+         * with five arguments: (objValue, srcValue, key, object, source).
+         *
+         * **Note:** This method mutates `object`.
+         *
+         * @alias extendWith
+         * @category Object
+         * @param object The destination object.
+         * @param sources The source objects.
+         * @param [customizer] The function to customize assigned values.
+         * @returns Returns `object`.
+         * @example
+         *
+         * function customizer(objValue, srcValue) {
+         *   return _.isUndefined(objValue) ? srcValue : objValue;
+         * }
+         *
+         * var defaults = _.partialRight(_.assignInWith, customizer);
+         *
+         * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
+         * // => { 'a': 1, 'b': 2 }
+         */
+        assignInWith<TObject, TSource>(
+            object: TObject,
+            source: TSource,
+            customizer: AssignCustomizer
+        ): TObject & TSource;
+
+        /**
+         * @see assignInWith
+         */
+        assignInWith<TObject, TSource1, TSource2>(
+            object: TObject,
+            source1: TSource1,
+            source2: TSource2,
+            customizer: AssignCustomizer
+        ): TObject & TSource1 & TSource2;
+
+        /**
+         * @see assignInWith
+         */
+        assignInWith<TObject, TSource1, TSource2, TSource3>(
+            object: TObject,
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3,
+            customizer: AssignCustomizer
+        ): TObject & TSource1 & TSource2 & TSource3;
+
+        /**
+         * @see assignInWith
+         */
+        assignInWith<TObject, TSource1, TSource2, TSource3, TSource4>(
+            object: TObject,
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3,
+            source4: TSource4,
+            customizer: AssignCustomizer
+        ): TObject & TSource1 & TSource2 & TSource3 & TSource4;
+
+        /**
+         * @see _.assignInWith
+         */
+        assignInWith<TObject>(object: TObject): TObject;
+
+        /**
+         * @see _.assignInWith
+         */
+        assignInWith<TResult>(
+            object: any,
+            ...otherArgs: any[]
+        ): TResult;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.assignInWith
+         */
+        assignInWith<TSource>(
+            source: TSource,
+            customizer: AssignCustomizer
+        ): LoDashImplicitWrapper<TValue & TSource>;
+
+        /**
+         * @see assignInWith
+         */
+        assignInWith<TSource1, TSource2>(
+            source1: TSource1,
+            source2: TSource2,
+            customizer: AssignCustomizer
+        ): LoDashImplicitWrapper<TValue & TSource1 & TSource2>;
+
+        /**
+         * @see assignInWith
+         */
+        assignInWith<TSource1, TSource2, TSource3>(
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3,
+            customizer: AssignCustomizer
+        ): LoDashImplicitWrapper<TValue & TSource1 & TSource2 & TSource3>;
+
+        /**
+         * @see assignInWith
+         */
+        assignInWith<TSource1, TSource2, TSource3, TSource4>(
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3,
+            source4: TSource4,
+            customizer: AssignCustomizer
+        ): LoDashImplicitWrapper<TValue & TSource1 & TSource2 & TSource3 & TSource4>;
+
+        /**
+         * @see _.assignInWith
+         */
+        assignInWith(): LoDashImplicitWrapper<TValue>;
+
+        /**
+         * @see _.assignInWith
+         */
+        assignInWith<TResult>(...otherArgs: any[]): LoDashImplicitWrapper<TResult>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.assignInWith
+         */
+        assignInWith<TSource>(
+            source: TSource,
+            customizer: AssignCustomizer
+        ): LoDashExplicitWrapper<TValue & TSource>;
+
+        /**
+         * @see assignInWith
+         */
+        assignInWith<TSource1, TSource2>(
+            source1: TSource1,
+            source2: TSource2,
+            customizer: AssignCustomizer
+        ): LoDashExplicitWrapper<TValue & TSource1 & TSource2>;
+
+        /**
+         * @see assignInWith
+         */
+        assignInWith<TSource1, TSource2, TSource3>(
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3,
+            customizer: AssignCustomizer
+        ): LoDashExplicitWrapper<TValue & TSource1 & TSource2 & TSource3>;
+
+        /**
+         * @see assignInWith
+         */
+        assignInWith<TSource1, TSource2, TSource3, TSource4>(
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3,
+            source4: TSource4,
+            customizer: AssignCustomizer
+        ): LoDashExplicitWrapper<TValue & TSource1 & TSource2 & TSource3 & TSource4>;
+
+        /**
+         * @see _.assignInWith
+         */
+        assignInWith(): LoDashExplicitWrapper<TValue>;
+
+        /**
+         * @see _.assignInWith
+         */
+        assignInWith(...otherArgs: any[]): LoDashExplicitWrapper<any>;
+    }
+
+    // assignWith
+
+    interface LoDashStatic {
+        /**
+         * This method is like `_.assign` except that it accepts `customizer` which
+         * is invoked to produce the assigned values. If `customizer` returns `undefined`
+         * assignment is handled by the method instead. The `customizer` is invoked
+         * with five arguments: (objValue, srcValue, key, object, source).
+         *
+         * **Note:** This method mutates `object`.
+         *
+         * @category Object
+         * @param object The destination object.
+         * @param sources The source objects.
+         * @param [customizer] The function to customize assigned values.
+         * @returns Returns `object`.
+         * @example
+         *
+         * function customizer(objValue, srcValue) {
+         *   return _.isUndefined(objValue) ? srcValue : objValue;
+         * }
+         *
+         * var defaults = _.partialRight(_.assignWith, customizer);
+         *
+         * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
+         * // => { 'a': 1, 'b': 2 }
+         */
+        assignWith<TObject, TSource>(
+            object: TObject,
+            source: TSource,
+            customizer: AssignCustomizer
+        ): TObject & TSource;
+
+        /**
+         * @see assignWith
+         */
+        assignWith<TObject, TSource1, TSource2>(
+            object: TObject,
+            source1: TSource1,
+            source2: TSource2,
+            customizer: AssignCustomizer
+        ): TObject & TSource1 & TSource2;
+
+        /**
+         * @see assignWith
+         */
+        assignWith<TObject, TSource1, TSource2, TSource3>(
+            object: TObject,
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3,
+            customizer: AssignCustomizer
+        ): TObject & TSource1 & TSource2 & TSource3;
+
+        /**
+         * @see assignWith
+         */
+        assignWith<TObject, TSource1, TSource2, TSource3, TSource4>(
+            object: TObject,
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3,
+            source4: TSource4,
+            customizer: AssignCustomizer
+        ): TObject & TSource1 & TSource2 & TSource3 & TSource4;
+
+        /**
+         * @see _.assignWith
+         */
+        assignWith<TObject>(object: TObject): TObject;
+
+        /**
+         * @see _.assignWith
+         */
+        assignWith<TResult>(
+            object: any,
+            ...otherArgs: any[]
+        ): TResult;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.assignWith
+         */
+        assignWith<TSource>(
+            source: TSource,
+            customizer: AssignCustomizer
+        ): LoDashImplicitWrapper<TValue & TSource>;
+
+        /**
+         * @see assignWith
+         */
+        assignWith<TSource1, TSource2>(
+            source1: TSource1,
+            source2: TSource2,
+            customizer: AssignCustomizer
+        ): LoDashImplicitWrapper<TValue & TSource1 & TSource2>;
+
+        /**
+         * @see assignWith
+         */
+        assignWith<TSource1, TSource2, TSource3>(
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3,
+            customizer: AssignCustomizer
+        ): LoDashImplicitWrapper<TValue & TSource1 & TSource2 & TSource3>;
+
+        /**
+         * @see assignWith
+         */
+        assignWith<TSource1, TSource2, TSource3, TSource4>(
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3,
+            source4: TSource4,
+            customizer: AssignCustomizer
+        ): LoDashImplicitWrapper<TValue & TSource1 & TSource2 & TSource3 & TSource4>;
+
+        /**
+         * @see _.assignWith
+         */
+        assignWith(): LoDashImplicitWrapper<TValue>;
+
+        /**
+         * @see _.assignWith
+         */
+        assignWith<TResult>(...otherArgs: any[]): LoDashImplicitWrapper<TResult>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.assignWith
+         */
+        assignWith<TSource>(
+            source: TSource,
+            customizer: AssignCustomizer
+        ): LoDashExplicitWrapper<TValue & TSource>;
+
+        /**
+         * @see assignWith
+         */
+        assignWith<TSource1, TSource2>(
+            source1: TSource1,
+            source2: TSource2,
+            customizer: AssignCustomizer
+        ): LoDashExplicitWrapper<TValue & TSource1 & TSource2>;
+
+        /**
+         * @see assignWith
+         */
+        assignWith<TSource1, TSource2, TSource3>(
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3,
+            customizer: AssignCustomizer
+        ): LoDashExplicitWrapper<TValue & TSource1 & TSource2 & TSource3>;
+
+        /**
+         * @see assignWith
+         */
+        assignWith<TSource1, TSource2, TSource3, TSource4>(
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3,
+            source4: TSource4,
+            customizer: AssignCustomizer
+        ): LoDashExplicitWrapper<TValue & TSource1 & TSource2 & TSource3 & TSource4>;
+
+        /**
+         * @see _.assignWith
+         */
+        assignWith(): LoDashExplicitWrapper<TValue>;
+
+        /**
+         * @see _.assignWith
+         */
+        assignWith(...otherArgs: any[]): LoDashExplicitWrapper<any>;
+    }
+
+    // at
+
+    interface LoDashStatic {
+        /**
+         * Creates an array of elements corresponding to the given keys, or indexes, of collection. Keys may be
+         * specified as individual arguments or as arrays of keys.
+         *
+         * @param object The object to iterate over.
+         * @param props The property names or indexes of elements to pick, specified individually or in arrays.
+         * @return Returns the new array of picked elements.
+         */
+        at<T>(
+            object: List<T> | Dictionary<T> | null | undefined,
+            ...props: PropertyPath[]
+        ): T[];
+
+        /**
+         * @see _.at
+         */
+        at<T extends object>(
+            object: T | null | undefined,
+            ...props: Array<Many<keyof T>>
+        ): Array<T[keyof T]>;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.at
+         */
+        at<T>(
+            this: LoDashImplicitWrapper<List<T> | Dictionary<T> | null | undefined>,
+            ...props: PropertyPath[]
+        ): LoDashImplicitWrapper<T[]>;
+
+        /**
+         * @see _.at
+         */
+        at<T extends object>(
+            this: LoDashImplicitWrapper<T | null | undefined>,
+            ...props: Array<Many<keyof T>>
+        ): LoDashImplicitWrapper<Array<T[keyof T]>>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.at
+         */
+        at<T>(
+            this: LoDashExplicitWrapper<List<T> | Dictionary<T> | null | undefined>,
+            ...props: PropertyPath[]
+        ): LoDashExplicitWrapper<T[]>;
+
+        /**
+         * @see _.at
+         */
+        at<T extends object>(
+            this: LoDashExplicitWrapper<T | null | undefined>,
+            ...props: Array<Many<keyof T>>
+        ): LoDashExplicitWrapper<Array<T[keyof T]>>;
+    }
+
+    // create
+
+    interface LoDashStatic {
+        /**
+         * Creates an object that inherits from the given prototype object. If a properties object is provided its own
+         * enumerable properties are assigned to the created object.
+         *
+         * @param prototype The object to inherit from.
+         * @param properties The properties to assign to the object.
+         * @return Returns the new object.
+         */
+        create<T extends object, U extends object>(
+            prototype: T,
+            properties?: U
+        ): T & U;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.create
+         */
+        create<U extends object>(properties?: U): LoDashImplicitWrapper<TValue & U>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.create
+         */
+        create<U extends object>(properties?: U): LoDashExplicitWrapper<TValue & U>;
+    }
+
+    // defaults
+
+    interface LoDashStatic {
+        /**
+         * Assigns own enumerable properties of source object(s) to the destination object for all destination
+         * properties that resolve to undefined. Once a property is set, additional values of the same property are
+         * ignored.
+         *
+         * Note: This method mutates object.
+         *
+         * @param object The destination object.
+         * @param sources The source objects.
+         * @return The destination object.
+         */
+        defaults<TObject, TSource>(
+            object: TObject,
+            source: TSource
+        ): TSource & TObject;
+
+        /**
+         * @see _.defaults
+         */
+        defaults<TObject, TSource1, TSource2>(
+            object: TObject,
+            source1: TSource1,
+            source2: TSource2
+        ): TSource2 & TSource1 & TObject;
+
+        /**
+         * @see _.defaults
+         */
+        defaults<TObject, TSource1, TSource2, TSource3>(
+            object: TObject,
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3
+        ): TSource3 & TSource2 & TSource1 & TObject;
+
+        /**
+         * @see _.defaults
+         */
+        defaults<TObject, TSource1, TSource2, TSource3, TSource4>(
+            object: TObject,
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3,
+            source4: TSource4
+        ): TSource4 & TSource3 & TSource2 & TSource1 & TObject;
+
+        /**
+         * @see _.defaults
+         */
+        defaults<TObject>(object: TObject): TObject;
+
+        /**
+         * @see _.defaults
+         */
+        defaults(
+            object: any,
+            ...sources: any[]
+        ): any;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.defaults
+         */
+        defaults<TSource>(
+            source: TSource
+        ): LoDashImplicitWrapper<TSource & TValue>;
+
+        /**
+         * @see _.defaults
+         */
+        defaults<TSource1, TSource2>(
+            source1: TSource1,
+            source2: TSource2
+        ): LoDashImplicitWrapper<TSource2 & TSource1 & TValue>;
+
+        /**
+         * @see _.defaults
+         */
+        defaults<TSource1, TSource2, TSource3>(
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3
+        ): LoDashImplicitWrapper<TSource3 & TSource2 & TSource1 & TValue>;
+
+        /**
+         * @see _.defaults
+         */
+        defaults<TSource1, TSource2, TSource3, TSource4>(
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3,
+            source4: TSource4
+        ): LoDashImplicitWrapper<TSource4 & TSource3 & TSource2 & TSource1 & TValue>;
+
+        /**
+         * @see _.defaults
+         */
+        defaults(): LoDashImplicitWrapper<TValue>;
+
+        /**
+         * @see _.defaults
+         */
+        defaults(...sources: any[]): LoDashImplicitWrapper<any>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.defaults
+         */
+        defaults<TSource>(
+            source: TSource
+        ): LoDashExplicitWrapper<TSource & TValue>;
+
+        /**
+         * @see _.defaults
+         */
+        defaults<TSource1, TSource2>(
+            source1: TSource1,
+            source2: TSource2
+        ): LoDashExplicitWrapper<TSource2 & TSource1 & TValue>;
+
+        /**
+         * @see _.defaults
+         */
+        defaults<TSource1, TSource2, TSource3>(
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3
+        ): LoDashExplicitWrapper<TSource3 & TSource2 & TSource1 & TValue>;
+
+        /**
+         * @see _.defaults
+         */
+        defaults<TSource1, TSource2, TSource3, TSource4>(
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3,
+            source4: TSource4
+        ): LoDashExplicitWrapper<TSource4 & TSource3 & TSource2 & TSource1 & TValue>;
+
+        /**
+         * @see _.defaults
+         */
+        defaults(): LoDashExplicitWrapper<TValue>;
+
+        /**
+         * @see _.defaults
+         */
+        defaults(...sources: any[]): LoDashExplicitWrapper<any>;
+    }
+
+    // defaultsDeep
+
+    interface LoDashStatic {
+        /**
+         * This method is like _.defaults except that it recursively assigns default properties.
+         * @param object The destination object.
+         * @param sources The source objects.
+         * @return Returns object.
+         **/
+        defaultsDeep(
+            object: any,
+            ...sources: any[]): any;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.defaultsDeep
+         **/
+        defaultsDeep(...sources: any[]): LoDashImplicitWrapper<any>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.defaultsDeep
+         **/
+        defaultsDeep(...sources: any[]): LoDashExplicitWrapper<any>;
+    }
+
+    // entries
+
+    interface LoDashStatic {
+        /**
+         * @see _.toPairs
+         */
+        entries<T>(object?: Dictionary<T>): Array<[string, T]>;
+
+        /**
+         * @see _.toPairs
+         */
+        entries(object?: object): Array<[string, any]>;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.toPairs
+         */
+        entries<T>(this: LoDashImplicitWrapper<Dictionary<T>>): LoDashImplicitWrapper<Array<[string, T]>>;
+
+        /**
+         * @see _.toPairs
+         */
+        entries(): LoDashImplicitWrapper<Array<[string, any]>>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.toPairs
+         */
+        entries<T>(this: LoDashExplicitWrapper<Dictionary<T>>): LoDashExplicitWrapper<Array<[string, T]>>;
+
+        /**
+         * @see _.toPairs
+         */
+        entries(): LoDashExplicitWrapper<Array<[string, any]>>;
+    }
+
+    // entriesIn
+
+    interface LoDashStatic {
+        /**
+         * @see _.entriesIn
+         */
+        entriesIn<T>(object?: Dictionary<T>): Array<[string, T]>;
+
+        /**
+         * @see _.entriesIn
+         */
+        entriesIn(object?: object): Array<[string, any]>;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.entriesIn
+         */
+        entriesIn<T>(this: LoDashImplicitWrapper<Dictionary<T>>): LoDashImplicitWrapper<Array<[string, T]>>;
+
+        /**
+         * @see _.entriesIn
+         */
+        entriesIn(): LoDashImplicitWrapper<Array<[string, any]>>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.entriesIn
+         */
+        entriesIn<T>(this: LoDashExplicitWrapper<Dictionary<T>>): LoDashExplicitWrapper<Array<[string, T]>>;
+
+        /**
+         * @see _.entriesIn
+         */
+        entriesIn(): LoDashExplicitWrapper<Array<[string, any]>>;
+    }
+
+    // extend
+
+    interface LoDashStatic {
+        /**
+         * @see _.extend
+         */
+        extend<TObject, TSource>(
+            object: TObject,
+            source: TSource
+        ): TObject & TSource;
+
+        /**
+         * @see _.extend
+         */
+        extend<TObject, TSource1, TSource2>(
+            object: TObject,
+            source1: TSource1,
+            source2: TSource2
+        ): TObject & TSource1 & TSource2;
+
+        /**
+         * @see _.extend
+         */
+        extend<TObject, TSource1, TSource2, TSource3>(
+            object: TObject,
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3
+        ): TObject & TSource1 & TSource2 & TSource3;
+
+        /**
+         * @see _.extend
+         */
+        extend<TObject, TSource1, TSource2, TSource3, TSource4>(
+            object: TObject,
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3,
+            source4: TSource4
+        ): TObject & TSource1 & TSource2 & TSource3 & TSource4;
+
+        /**
+         * @see _.extend
+         */
+        extend<TObject>(object: TObject): TObject;
+
+        /**
+         * @see _.extend
+         */
+        extend<TResult>(
+            object: any,
+            ...otherArgs: any[]
+        ): TResult;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.extend
+         */
+        extend<TSource>(
+            source: TSource
+        ): LoDashImplicitWrapper<TValue & TSource>;
+
+        /**
+         * @see _.extend
+         */
+        extend<TSource1, TSource2>(
+            source1: TSource1,
+            source2: TSource2
+        ): LoDashImplicitWrapper<TValue & TSource1 & TSource2>;
+
+        /**
+         * @see _.extend
+         */
+        extend<TSource1, TSource2, TSource3>(
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3
+        ): LoDashImplicitWrapper<TValue & TSource1 & TSource2 & TSource3>;
+
+        /**
+         * @see _.extend
+         */
+        extend<TSource1, TSource2, TSource3, TSource4>(
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3,
+            source4: TSource4
+        ): LoDashImplicitWrapper<TValue & TSource1 & TSource2 & TSource3 & TSource4>;
+
+        /**
+         * @see _.extend
+         */
+        extend(): LoDashImplicitWrapper<TValue>;
+
+        /**
+         * @see _.extend
+         */
+        extend(...otherArgs: any[]): LoDashImplicitWrapper<any>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.extend
+         */
+        extend<TSource>(
+            source: TSource
+        ): LoDashExplicitWrapper<TValue & TSource>;
+
+        /**
+         * @see _.extend
+         */
+        extend<TSource1, TSource2>(
+            source1: TSource1,
+            source2: TSource2
+        ): LoDashExplicitWrapper<TValue & TSource1 & TSource2>;
+
+        /**
+         * @see _.extend
+         */
+        extend<TSource1, TSource2, TSource3>(
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3
+        ): LoDashExplicitWrapper<TValue & TSource1 & TSource2 & TSource3>;
+
+        /**
+         * @see _.extend
+         */
+        extend<TSource1, TSource2, TSource3, TSource4>(
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3,
+            source4: TSource4
+        ): LoDashExplicitWrapper<TValue & TSource1 & TSource2 & TSource3 & TSource4>;
+
+        /**
+         * @see _.extend
+         */
+        extend(): LoDashExplicitWrapper<TValue>;
+
+        /**
+         * @see _.extend
+         */
+        extend(...otherArgs: any[]): LoDashExplicitWrapper<any>;
+    }
+
+    // extendWith
+
+    interface LoDashStatic {
+        /**
+         * @see _.extendWith
+         */
+        extendWith<TObject, TSource>(
+            object: TObject,
+            source: TSource,
+            customizer: AssignCustomizer
+        ): TObject & TSource;
+
+        /**
+         * @see _.extendWith
+         */
+        extendWith<TObject, TSource1, TSource2>(
+            object: TObject,
+            source1: TSource1,
+            source2: TSource2,
+            customizer: AssignCustomizer
+        ): TObject & TSource1 & TSource2;
+
+        /**
+         * @see _.extendWith
+         */
+        extendWith<TObject, TSource1, TSource2, TSource3>(
+            object: TObject,
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3,
+            customizer: AssignCustomizer
+        ): TObject & TSource1 & TSource2 & TSource3;
+
+        /**
+         * @see _.extendWith
+         */
+        extendWith<TObject, TSource1, TSource2, TSource3, TSource4>(
+            object: TObject,
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3,
+            source4: TSource4,
+            customizer: AssignCustomizer
+        ): TObject & TSource1 & TSource2 & TSource3 & TSource4;
+
+        /**
+         * @see _.extendWith
+         */
+        extendWith<TObject>(object: TObject): TObject;
+
+        /**
+         * @see _.extendWith
+         */
+        extendWith<TResult>(
+            object: any,
+            ...otherArgs: any[]
+        ): TResult;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.extendWith
+         */
+        extendWith<TSource>(
+            source: TSource,
+            customizer: AssignCustomizer
+        ): LoDashImplicitWrapper<TValue & TSource>;
+
+        /**
+         * @see _.extendWith
+         */
+        extendWith<TSource1, TSource2>(
+            source1: TSource1,
+            source2: TSource2,
+            customizer: AssignCustomizer
+        ): LoDashImplicitWrapper<TValue & TSource1 & TSource2>;
+
+        /**
+         * @see _.extendWith
+         */
+        extendWith<TSource1, TSource2, TSource3>(
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3,
+            customizer: AssignCustomizer
+        ): LoDashImplicitWrapper<TValue & TSource1 & TSource2 & TSource3>;
+
+        /**
+         * @see _.extendWith
+         */
+        extendWith<TSource1, TSource2, TSource3, TSource4>(
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3,
+            source4: TSource4,
+            customizer: AssignCustomizer
+        ): LoDashImplicitWrapper<TValue & TSource1 & TSource2 & TSource3 & TSource4>;
+
+        /**
+         * @see _.extendWith
+         */
+        extendWith(): LoDashImplicitWrapper<TValue>;
+
+        /**
+         * @see _.extendWith
+         */
+        extendWith(...otherArgs: any[]): LoDashImplicitWrapper<any>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.extendWith
+         */
+        extendWith<TSource>(
+            source: TSource,
+            customizer: AssignCustomizer
+        ): LoDashExplicitWrapper<TValue & TSource>;
+
+        /**
+         * @see _.extendWith
+         */
+        extendWith<TSource1, TSource2>(
+            source1: TSource1,
+            source2: TSource2,
+            customizer: AssignCustomizer
+        ): LoDashExplicitWrapper<TValue & TSource1 & TSource2>;
+
+        /**
+         * @see _.extendWith
+         */
+        extendWith<TSource1, TSource2, TSource3>(
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3,
+            customizer: AssignCustomizer
+        ): LoDashExplicitWrapper<TValue & TSource1 & TSource2 & TSource3>;
+
+        /**
+         * @see _.extendWith
+         */
+        extendWith<TSource1, TSource2, TSource3, TSource4>(
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3,
+            source4: TSource4,
+            customizer: AssignCustomizer
+        ): LoDashExplicitWrapper<TValue & TSource1 & TSource2 & TSource3 & TSource4>;
+
+        /**
+         * @see _.extendWith
+         */
+        extendWith(): LoDashExplicitWrapper<TValue>;
+
+        /**
+         * @see _.extendWith
+         */
+        extendWith(...otherArgs: any[]): LoDashExplicitWrapper<any>;
+    }
+
+    // findKey
+
+    interface LoDashStatic {
+        /**
+         * This method is like _.find except that it returns the key of the first element predicate returns truthy for
+         * instead of the element itself.
+         *
+         * If a property name is provided for predicate the created _.property style callback returns the property
+         * value of the given element.
+         *
+         * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+         * elements that have a matching property value, else false.
+         *
+         * If an object is provided for predicate the created _.matches style callback returns true for elements that
+         * have the properties of the given object, else false.
+         *
+         * @param object The object to search.
+         * @param predicate The function invoked per iteration.
+         * @param thisArg The this binding of predicate.
+         * @return Returns the key of the matched element, else undefined.
+         */
+        findKey<T>(
+            object: T | null | undefined,
+            predicate?: ObjectIteratee<T>
+        ): string | undefined;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.findKey
+         */
+        findKey<T>(
+            this: LoDashImplicitWrapper<T | null | undefined>,
+            predicate?: ObjectIteratee<T>
+        ): string | undefined;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.findKey
+         */
+        findKey<T>(
+            this: LoDashExplicitWrapper<T | null | undefined>,
+            predicate?: ObjectIteratee<T>
+        ): LoDashExplicitWrapper<string | undefined>;
+    }
+
+    // findLastKey
+
+    interface LoDashStatic {
+        /**
+         * This method is like _.findKey except that it iterates over elements of a collection in the opposite order.
+         *
+         * If a property name is provided for predicate the created _.property style callback returns the property
+         * value of the given element.
+         *
+         * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+         * elements that have a matching property value, else false.
+         *
+         * If an object is provided for predicate the created _.matches style callback returns true for elements that
+         * have the properties of the given object, else false.
+         *
+         * @param object The object to search.
+         * @param predicate The function invoked per iteration.
+         * @param thisArg The this binding of predicate.
+         * @return Returns the key of the matched element, else undefined.
+         */
+        findLastKey<T>(
+            object: T | null | undefined,
+            predicate?: ObjectIteratee<T>
+        ): string | undefined;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.findLastKey
+         */
+        findLastKey<T>(
+            this: LoDashImplicitWrapper<T | null | undefined>,
+            predicate?: ObjectIteratee<T>
+        ): string | undefined;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.findLastKey
+         */
+        findLastKey<T>(
+            this: LoDashExplicitWrapper<T | null | undefined>,
+            predicate?: ObjectIteratee<T>
+        ): LoDashExplicitWrapper<string | undefined>;
+    }
+
+    // forIn
+
+    interface LoDashStatic {
+        /**
+         * Iterates over own and inherited enumerable properties of an object invoking iteratee for each property. The
+         * iteratee is bound to thisArg and invoked with three arguments: (value, key, object). Iteratee functions may
+         * exit iteration early by explicitly returning false.
+         *
+         * @param object The object to iterate over.
+         * @param iteratee The function invoked per iteration.
+         * @param thisArg The this binding of iteratee.
+         * @return Returns object.
+         */
+        forIn<T>(
+            object: T,
+            iteratee?: ObjectIterator<T, any>
+        ): T;
+
+        /**
+         * @see _.forIn
+         */
+        forIn<T>(
+            object: T | null | undefined,
+            iteratee?: ObjectIterator<T, any>
+        ): T | null | undefined;
+    }
+
+    interface LoDashWrapper<TValue> {
+        /**
+         * @see _.forIn
+         */
+        forIn<T>(
+            this: LoDashWrapper<T | null | undefined>,
+            iteratee?: ObjectIterator<T, any>
+        ): this;
+    }
+
+    // forInRight
+
+    interface LoDashStatic {
+        /**
+         * This method is like _.forIn except that it iterates over properties of object in the opposite order.
+         *
+         * @param object The object to iterate over.
+         * @param iteratee The function invoked per iteration.
+         * @param thisArg The this binding of iteratee.
+         * @return Returns object.
+         */
+        forInRight<T>(
+            object: T,
+            iteratee?: ObjectIterator<T, any>
+        ): T;
+
+        /**
+         * @see _.forInRight
+         */
+        forInRight<T>(
+            object: T | null | undefined,
+            iteratee?: ObjectIterator<T, any>
+        ): T | null | undefined;
+    }
+
+    interface LoDashWrapper<TValue> {
+        /**
+         * @see _.forInRight
+         */
+        forInRight<T>(
+            this: LoDashWrapper<T | null | undefined>,
+            iteratee?: ObjectIterator<T, any>
+        ): this;
+    }
+
+    // forOwn
+
+    interface LoDashStatic {
+        /**
+         * Iterates over own enumerable properties of an object invoking iteratee for each property. The iteratee is
+         * bound to thisArg and invoked with three arguments: (value, key, object). Iteratee functions may exit
+         * iteration early by explicitly returning false.
+         *
+         * @param object The object to iterate over.
+         * @param iteratee The function invoked per iteration.
+         * @param thisArg The this binding of iteratee.
+         * @return Returns object.
+         */
+        forOwn<T>(
+            object: T,
+            iteratee?: ObjectIterator<T, any>
+        ): T;
+
+        /**
+         * @see _.forOwn
+         */
+        forOwn<T>(
+            object: T | null | undefined,
+            iteratee?: ObjectIterator<T, any>
+        ): T | null | undefined;
+    }
+
+    interface LoDashWrapper<TValue> {
+        /**
+         * @see _.forOwn
+         */
+        forOwn<T>(
+            this: LoDashWrapper<T | null | undefined>,
+            iteratee?: ObjectIterator<T, any>
+        ): this;
+    }
+
+    // forOwnRight
+
+    interface LoDashStatic {
+        /**
+         * This method is like _.forOwn except that it iterates over properties of object in the opposite order.
+         *
+         * @param object The object to iterate over.
+         * @param iteratee The function invoked per iteration.
+         * @param thisArg The this binding of iteratee.
+         * @return Returns object.
+         */
+        forOwnRight<T>(
+            object: T,
+            iteratee?: ObjectIterator<T, any>
+        ): T;
+
+        /**
+         * @see _.forOwnRight
+         */
+        forOwnRight<T>(
+            object: T | null | undefined,
+            iteratee?: ObjectIterator<T, any>
+        ): T | null | undefined;
+    }
+
+    interface LoDashWrapper<TValue> {
+        /**
+         * @see _.forOwnRight
+         */
+        forOwnRight<T>(
+            this: LoDashWrapper<T | null | undefined>,
+            iteratee?: ObjectIterator<T, any>
+        ): this;
+    }
+
+    // functions
+
+    interface LoDashStatic {
+        /**
+         * Creates an array of function property names from own enumerable properties
+         * of `object`.
+         *
+         * @category Object
+         * @param object The object to inspect.
+         * @returns Returns the new array of property names.
+         * @example
+         *
+         * function Foo() {
+         *   this.a = _.constant('a');
+         *   this.b = _.constant('b');
+         * }
+         *
+         * Foo.prototype.c = _.constant('c');
+         *
+         * _.functions(new Foo);
+         * // => ['a', 'b']
+         */
+        functions(object: any): string[];
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.functions
+         */
+        functions(): LoDashImplicitWrapper<string[]>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.functions
+         */
+        functions(): LoDashExplicitWrapper<string[]>;
+    }
+
+    // functionsIn
+
+    interface LoDashStatic {
+        /**
+         * Creates an array of function property names from own and inherited
+         * enumerable properties of `object`.
+         *
+         * @category Object
+         * @param object The object to inspect.
+         * @returns Returns the new array of property names.
+         * @example
+         *
+         * function Foo() {
+         *   this.a = _.constant('a');
+         *   this.b = _.constant('b');
+         * }
+         *
+         * Foo.prototype.c = _.constant('c');
+         *
+         * _.functionsIn(new Foo);
+         * // => ['a', 'b', 'c']
+         */
+        functionsIn<T extends {}>(object: any): string[];
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.functionsIn
+         */
+        functionsIn(): LoDashImplicitWrapper<string[]>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.functionsIn
+         */
+        functionsIn(): LoDashExplicitWrapper<string[]>;
+    }
+
+    // get
+
+    interface LoDashStatic {
+        /**
+         * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+         * in its place.
+         *
+         * @param object The object to query.
+         * @param path The path of the property to get.
+         * @param defaultValue The value returned if the resolved value is undefined.
+         * @return Returns the resolved value.
+         */
+        get<TObject extends object, TKey extends keyof TObject>(
+            object: TObject,
+            path: TKey | [TKey]
+        ): TObject[TKey];
+
+        /**
+         * @see _.get
+         */
+        get<TObject extends object, TKey extends keyof TObject>(
+            object: TObject | null | undefined,
+            path: TKey | [TKey]
+        ): TObject[TKey] | undefined;
+
+        /**
+         * @see _.get
+         */
+        get<TObject extends object, TKey extends keyof TObject, TDefault>(
+            object: TObject | null | undefined,
+            path: TKey | [TKey],
+            defaultValue: TDefault
+        ): TObject[TKey] | TDefault;
+
+        /**
+         * @see _.get
+         */
+        get<T>(
+            object: NumericDictionary<T>,
+            path: number
+        ): T;
+
+        /**
+         * @see _.get
+         */
+        get<T>(
+            object: NumericDictionary<T> | null | undefined,
+            path: number
+        ): T | undefined;
+
+        /**
+         * @see _.get
+         */
+        get<T, TDefault>(
+            object: NumericDictionary<T> | null | undefined,
+            path: number,
+            defaultValue: TDefault
+        ): T | TDefault;
+
+        /**
+         * @see _.get
+         */
+        get<TDefault>(
+            object: null | undefined,
+            path: PropertyPath,
+            defaultValue: TDefault
+        ): TDefault;
+
+        /**
+         * @see _.get
+         */
+        get(
+            object: null | undefined,
+            path: PropertyPath
+        ): undefined;
+
+        /**
+         * @see _.get
+         */
+        get(
+            object: any,
+            path: PropertyPath,
+            defaultValue?: any
+        ): any;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.get
+         */
+        get<TKey extends keyof TValue>(
+            path: TKey | [TKey]
+        ): TValue[TKey];
+
+        /**
+         * @see _.get
+         */
+        get<TObject extends object, TKey extends keyof TObject>(
+            this: LoDashImplicitWrapper<TObject | null | undefined>,
+            path: TKey | [TKey],
+        ): TObject[TKey] | undefined;
+
+        /**
+         * @see _.get
+         */
+        get<TObject extends object, TKey extends keyof TObject, TDefault>(
+            this: LoDashImplicitWrapper<TObject | null | undefined>,
+            path: TKey | [TKey],
+            defaultValue: TDefault
+        ): TObject[TKey] | TDefault;
+
+        /**
+         * @see _.get
+         */
+        get<T>(
+            this: LoDashImplicitWrapper<NumericDictionary<T>>,
+            path: number
+        ): T;
+
+        /**
+         * @see _.get
+         */
+        get<T>(
+            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
+            path: number
+        ): T | undefined;
+
+        /**
+         * @see _.get
+         */
+        get<T, TDefault>(
+            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
+            path: number,
+            defaultValue: TDefault
+        ): T | TDefault;
+
+        /**
+         * @see _.get
+         */
+        get<TDefault>(
+            this: LoDashImplicitWrapper<null | undefined>,
+            path: PropertyPath,
+            defaultValue: TDefault
+        ): TDefault;
+
+        /**
+         * @see _.get
+         */
+        get(
+            this: LoDashImplicitWrapper<null | undefined>,
+            path: PropertyPath
+        ): undefined;
+
+        /**
+         * @see _.get
+         */
+        get<TResult>(
+            path: PropertyPath,
+            defaultValue?: any
+        ): any;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.get
+         */
+        get<TKey extends keyof TValue>(
+            path: TKey | [TKey]
+        ): LoDashExplicitWrapper<TValue[TKey]>;
+
+        /**
+         * @see _.get
+         */
+        get<TObject extends object, TKey extends keyof TObject>(
+            this: LoDashExplicitWrapper<TObject | null | undefined>,
+            path: TKey | [TKey],
+        ): LoDashExplicitWrapper<TObject[TKey] | undefined>;
+
+        /**
+         * @see _.get
+         */
+        get<TObject extends object, TKey extends keyof TObject, TDefault>(
+            this: LoDashExplicitWrapper<TObject | null | undefined>,
+            path: TKey | [TKey],
+            defaultValue: TDefault
+        ): LoDashExplicitWrapper<TObject[TKey] | TDefault>;
+
+        /**
+         * @see _.get
+         */
+        get<T>(
+            this: LoDashExplicitWrapper<NumericDictionary<T>>,
+            path: number
+        ): LoDashExplicitWrapper<T>;
+
+        /**
+         * @see _.get
+         */
+        get<T>(
+            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
+            path: number
+        ): LoDashExplicitWrapper<T | undefined>;
+
+        /**
+         * @see _.get
+         */
+        get<T, TDefault>(
+            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
+            path: number,
+            defaultValue: TDefault
+        ): LoDashExplicitWrapper<T | undefined>;
+
+        /**
+         * @see _.get
+         */
+        get<TDefault>(
+            this: LoDashExplicitWrapper<null | undefined>,
+            path: PropertyPath,
+            defaultValue: TDefault
+        ): LoDashExplicitWrapper<TDefault>;
+
+        /**
+         * @see _.get
+         */
+        get(
+            this: LoDashExplicitWrapper<null | undefined>,
+            path: PropertyPath
+        ): LoDashExplicitWrapper<undefined>;
+
+        /**
+         * @see _.get
+         */
+        get(
+            path: PropertyPath,
+            defaultValue?: any
+        ): LoDashExplicitWrapper<any>;
+    }
+
+    // has
+
+    interface LoDashStatic {
+        /**
+         * Checks if `path` is a direct property of `object`.
+         *
+         * @category Object
+         * @param object The object to query.
+         * @param path The path to check.
+         * @returns Returns `true` if `path` exists, else `false`.
+         * @example
+         *
+         * var object = { 'a': { 'b': { 'c': 3 } } };
+         * var other = _.create({ 'a': _.create({ 'b': _.create({ 'c': 3 }) }) });
+         *
+         * _.has(object, 'a');
+         * // => true
+         *
+         * _.has(object, 'a.b.c');
+         * // => true
+         *
+         * _.has(object, ['a', 'b', 'c']);
+         * // => true
+         *
+         * _.has(other, 'a');
+         * // => false
+         */
+        has<T>(
+            object: T,
+            path: PropertyPath
+        ): boolean;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.has
+         */
+        has(path: PropertyPath): boolean;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.has
+         */
+        has(path: PropertyPath): LoDashExplicitWrapper<boolean>;
+    }
+
+    // hasIn
+
+    interface LoDashStatic {
+        /**
+         * Checks if `path` is a direct or inherited property of `object`.
+         *
+         * @category Object
+         * @param object The object to query.
+         * @param path The path to check.
+         * @returns Returns `true` if `path` exists, else `false`.
+         * @example
+         *
+         * var object = _.create({ 'a': _.create({ 'b': _.create({ 'c': 3 }) }) });
+         *
+         * _.hasIn(object, 'a');
+         * // => true
+         *
+         * _.hasIn(object, 'a.b.c');
+         * // => true
+         *
+         * _.hasIn(object, ['a', 'b', 'c']);
+         * // => true
+         *
+         * _.hasIn(object, 'b');
+         * // => false
+         */
+        hasIn<T>(
+            object: T,
+            path: PropertyPath
+        ): boolean;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.hasIn
+         */
+        hasIn(path: PropertyPath): boolean;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.hasIn
+         */
+        hasIn(path: PropertyPath): LoDashExplicitWrapper<boolean>;
+    }
+
+    // invert
+
+    interface LoDashStatic {
+        /**
+         * Creates an object composed of the inverted keys and values of object. If object contains duplicate values,
+         * subsequent values overwrite property assignments of previous values unless multiValue is true.
+         *
+         * @param object The object to invert.
+         * @param multiValue Allow multiple values per key.
+         * @return Returns the new inverted object.
+         */
+        invert(
+            object: object
+        ): Dictionary<string>;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.invert
+         */
+        invert(): LoDashImplicitWrapper<Dictionary<string>>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.invert
+         */
+        invert(): LoDashExplicitWrapper<Dictionary<string>>;
+    }
+
+    // invertBy
+
+    interface LoDashStatic {
+        /**
+         * This method is like _.invert except that the inverted object is generated from the results of running each
+         * element of object through iteratee. The corresponding inverted value of each inverted key is an array of
+         * keys responsible for generating the inverted value. The iteratee is invoked with one argument: (value).
+         *
+         * @param object The object to invert.
+         * @param interatee The iteratee invoked per element.
+         * @return Returns the new inverted object.
+         */
+        invertBy<T>(
+            object: List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined,
+            interatee?: ValueIteratee<T>
+        ): Dictionary<string[]>;
+
+        /**
+         * @see _.invertBy
+         */
+        invertBy<T extends object>(
+            object: T | null | undefined,
+            interatee?: ValueIteratee<T[keyof T]>
+        ): Dictionary<string[]>;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.invertBy
+         */
+        invertBy<T>(
+            this: LoDashImplicitWrapper<List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined>,
+            interatee?: ValueIteratee<T>
+        ): LoDashImplicitWrapper<Dictionary<string[]>>;
+
+        /**
+         * @see _.invertBy
+         */
+        invertBy<T extends object>(
+            this: LoDashImplicitWrapper<T | null | undefined>,
+            interatee?: ValueIteratee<T[keyof T]>
+        ): LoDashImplicitWrapper<Dictionary<string[]>>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.invertBy
+         */
+        invertBy<T>(
+            this: LoDashExplicitWrapper<List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined>,
+            interatee?: ValueIteratee<T>
+        ): LoDashExplicitWrapper<Dictionary<string[]>>;
+
+        /**
+         * @see _.invertBy
+         */
+        invertBy<T extends object>(
+            this: LoDashExplicitWrapper<T | null | undefined>,
+            interatee?: ValueIteratee<T[keyof T]>
+        ): LoDashExplicitWrapper<Dictionary<string[]>>;
+    }
+
+    // invoke
+
+    interface LoDashStatic {
+        /**
+        * Invokes the method at path of object.
+        * @param object The object to query.
+        * @param path The path of the method to invoke.
+        * @param args The arguments to invoke the method with.
+        **/
+        invoke(
+            object: any,
+            path: PropertyPath,
+            ...args: any[]): any;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+        * @see _.invoke
+        **/
+        invoke(
+            path: PropertyPath,
+            ...args: any[]): any;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+        * @see _.invoke
+        **/
+        invoke(
+            path: PropertyPath,
+            ...args: any[]): LoDashExplicitWrapper<any>;
+    }
+
+    // keys
+
+    interface LoDashStatic {
+        /**
+         * Creates an array of the own enumerable property names of object.
+         *
+         * Note: Non-object values are coerced to objects. See the ES spec for more details.
+         *
+         * @param object The object to query.
+         * @return Returns the array of property names.
+         */
+        keys(object?: any): string[];
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.keys
+         */
+        keys(): LoDashImplicitWrapper<string[]>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.keys
+         */
+        keys(): LoDashExplicitWrapper<string[]>;
+    }
+
+    // keysIn
+
+    interface LoDashStatic {
+        /**
+         * Creates an array of the own and inherited enumerable property names of object.
+         *
+         * Note: Non-object values are coerced to objects.
+         *
+         * @param object The object to query.
+         * @return An array of property names.
+         */
+        keysIn(object?: any): string[];
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.keysIn
+         */
+        keysIn(): LoDashImplicitWrapper<string[]>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.keysIn
+         */
+        keysIn(): LoDashExplicitWrapper<string[]>;
+    }
+
+    // mapKeys
+
+    interface LoDashStatic {
+        /**
+         * The opposite of _.mapValues; this method creates an object with the same values as object and keys generated
+         * by running each own enumerable property of object through iteratee.
+         *
+         * @param object The object to iterate over.
+         * @param iteratee The function invoked per iteration.
+         * @param thisArg The this binding of iteratee.
+         * @return Returns the new mapped object.
+         */
+        mapKeys<T>(
+            object: List<T> | null | undefined,
+            iteratee?: ListIteratee<T>
+        ): Dictionary<T>;
+
+        /**
+         * @see _.mapKeys
+         */
+        mapKeys<T>(
+            object: Dictionary<T> | null | undefined,
+            iteratee?: DictionaryIteratee<T>
+        ): Dictionary<T>;
+
+        /**
+         * @see _.mapKeys
+         */
+        mapKeys(
+            object: object | null | undefined,
+            iteratee?: ObjectIteratee<any>
+        ): Dictionary<any>;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.mapKeys
+         */
+        mapKeys<T>(
+            this: LoDashImplicitWrapper<List<T> | null | undefined>,
+            iteratee?: ListIteratee<T>
+        ): LoDashImplicitWrapper<Dictionary<T>>;
+
+        /**
+         * @see _.mapKeys
+         */
+        mapKeys<T>(
+            this: LoDashImplicitWrapper<Dictionary<T> | null | undefined>,
+            iteratee?: DictionaryIteratee<T>
+        ): LoDashImplicitWrapper<Dictionary<T>>;
+
+        /**
+         * @see _.mapKeys
+         */
+        mapKeys(
+            this: LoDashImplicitWrapper<object | null | undefined>,
+            iteratee?: ObjectIteratee<any>
+        ): LoDashImplicitWrapper<Dictionary<any>>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.mapKeys
+         */
+        mapKeys<T>(
+            this: LoDashExplicitWrapper<List<T> | null | undefined>,
+            iteratee?: ListIteratee<T>
+        ): LoDashExplicitWrapper<Dictionary<T>>;
+
+        /**
+         * @see _.mapKeys
+         */
+        mapKeys<T>(
+            this: LoDashExplicitWrapper<Dictionary<T> | null | undefined>,
+            iteratee?: DictionaryIteratee<T>
+        ): LoDashExplicitWrapper<Dictionary<T>>;
+
+        /**
+         * @see _.mapKeys
+         */
+        mapKeys(
+            this: LoDashExplicitWrapper<object | null | undefined>,
+            iteratee?: ObjectIteratee<any>
+        ): LoDashExplicitWrapper<Dictionary<any>>;
+    }
+
+    // mapValues
+
+    interface LoDashStatic {
+        /**
+        * Creates an object with the same keys as object and values generated by running each own
+        * enumerable property of object through iteratee. The iteratee function is bound to thisArg
+        * and invoked with three arguments: (value, key, object).
+        *
+        * If a property name is provided iteratee the created "_.property" style callback returns
+        * the property value of the given element.
+        *
+        * If a value is also provided for thisArg the creted "_.matchesProperty" style callback returns
+        * true for elements that have a matching property value, else false;.
+        *
+        * If an object is provided for iteratee the created "_.matches" style callback returns true
+        * for elements that have the properties of the given object, else false.
+        *
+        * @param object The object to iterate over.
+        * @param [iteratee=_.identity]  The function invoked per iteration.
+        * @param [thisArg] The `this` binding of `iteratee`.
+        * @return Returns the new mapped object.
+        */
+        mapValues<T extends object, TResult>(obj: T | null | undefined, callback: ObjectIterator<T, TResult>): { [P in keyof T]: TResult };
+
+        /**
+         * @see _.mapValues
+         */
+        mapValues<T extends object>(obj: T | null | undefined, iteratee: object): { [P in keyof T]: boolean };
+
+        /**
+         * @see _.mapValues
+         */
+        mapValues<T, TKey extends keyof T>(obj: Dictionary<T> | null | undefined, iteratee: TKey): Dictionary<T[TKey]>;
+
+        /**
+         * @see _.mapValues
+         */
+        mapValues<T extends object, TKey extends keyof T>(obj: T | null | undefined, iteratee: string): { [P in keyof T]: any };
+
+        /**
+         * @see _.mapValues
+         */
+        mapValues<TResult>(obj: string | null | undefined, callback: StringIterator<TResult>): NumericDictionary<TResult>;
+
+        /**
+         * @see _.mapValues
+         */
+        mapValues<T>(obj: Dictionary<T> | null | undefined): Dictionary<T>;
+
+        /**
+         * @see _.mapValues
+         */
+        mapValues<T extends object>(obj: T): T;
+
+        /**
+         * @see _.mapValues
+         */
+        mapValues<T extends object>(obj: T | null | undefined): T | {};
+
+        /**
+         * @see _.mapValues
+         */
+        mapValues(obj: string | null | undefined): NumericDictionary<string>;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.mapValues
+         */
+        mapValues<T extends object, TResult>(
+            this: LoDashImplicitWrapper<T | null | undefined>,
+            callback: ObjectIterator<T, TResult>
+        ): LoDashImplicitWrapper<{ [P in keyof T]: TResult }>;
+
+        /**
+         * @see _.mapValues
+         */
+        mapValues<T extends object>(
+            this: LoDashImplicitWrapper<T | null | undefined>,
+            iteratee: object
+        ): LoDashImplicitWrapper<{ [P in keyof T]: boolean }>;
+
+        /**
+         * @see _.mapValues
+         */
+        mapValues<T, TKey extends keyof T>(
+            this: LoDashImplicitWrapper<Dictionary<T> | null | undefined>,
+            iteratee: TKey
+        ): LoDashImplicitWrapper<Dictionary<T[TKey]>>;
+
+        /**
+         * @see _.mapValues
+         */
+        mapValues<T extends object, TKey extends keyof T>(
+            this: LoDashImplicitWrapper<T | null | undefined>,
+            iteratee: string
+        ): LoDashImplicitWrapper<{ [P in keyof T]: any }>;
+
+        /**
+         * @see _.mapValues
+         */
+        mapValues<TResult>(
+            this: LoDashImplicitWrapper<string | null | undefined>,
+            callback: StringIterator<TResult>
+        ): LoDashImplicitWrapper<NumericDictionary<TResult>>;
+
+        /**
+         * @see _.mapValues
+         */
+        mapValues<T>(this: LoDashImplicitWrapper<Dictionary<T> | null | undefined>): LoDashImplicitWrapper<Dictionary<T>>;
+
+        /**
+         * @see _.mapValues
+         */
+        mapValues<T extends object>(this: LoDashImplicitWrapper<T>): LoDashImplicitWrapper<T>;
+
+        /**
+         * @see _.mapValues
+         */
+        mapValues<T extends object>(this: LoDashImplicitWrapper<T | null | undefined>): LoDashImplicitWrapper<T | {}>;
+
+        /**
+         * @see _.mapValues
+         */
+        mapValues(this: LoDashImplicitWrapper<string | null | undefined>): LoDashImplicitWrapper<NumericDictionary<string>>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.mapValues
+         */
+        mapValues<T extends object, TResult>(
+            this: LoDashExplicitWrapper<T | null | undefined>,
+            callback: ObjectIterator<T, TResult>
+        ): LoDashExplicitWrapper<{ [P in keyof T]: TResult }>;
+
+        /**
+         * @see _.mapValues
+         */
+        mapValues<T extends object>(
+            this: LoDashExplicitWrapper<T | null | undefined>,
+            iteratee: object
+        ): LoDashExplicitWrapper<{ [P in keyof T]: boolean }>;
+
+        /**
+         * @see _.mapValues
+         */
+        mapValues<T, TKey extends keyof T>(
+            this: LoDashExplicitWrapper<Dictionary<T> | null | undefined>,
+            iteratee: TKey
+        ): LoDashExplicitWrapper<Dictionary<T[TKey]>>;
+
+        /**
+         * @see _.mapValues
+         */
+        mapValues<T extends object, TKey extends keyof T>(
+            this: LoDashExplicitWrapper<T | null | undefined>,
+            iteratee: string
+        ): LoDashExplicitWrapper<{ [P in keyof T]: any }>;
+
+        /**
+         * @see _.mapValues
+         */
+        mapValues<TResult>(
+            this: LoDashExplicitWrapper<string | null | undefined>,
+            callback: StringIterator<TResult>
+        ): LoDashExplicitWrapper<NumericDictionary<TResult>>;
+
+        /**
+         * @see _.mapValues
+         */
+        mapValues<T>(this: LoDashExplicitWrapper<Dictionary<T> | null | undefined>): LoDashExplicitWrapper<Dictionary<T>>;
+
+        /**
+         * @see _.mapValues
+         */
+        mapValues<T extends object>(this: LoDashExplicitWrapper<T>): LoDashExplicitWrapper<T>;
+
+        /**
+         * @see _.mapValues
+         */
+        mapValues<T extends object>(this: LoDashExplicitWrapper<T | null | undefined>): LoDashExplicitWrapper<T | {}>;
+
+        /**
+         * @see _.mapValues
+         */
+        mapValues(this: LoDashExplicitWrapper<string | null | undefined>): LoDashExplicitWrapper<NumericDictionary<string>>;
+    }
+
+    // merge
+
+    interface LoDashStatic {
+        /**
+         * Recursively merges own and inherited enumerable properties of source
+         * objects into the destination object, skipping source properties that resolve
+         * to `undefined`. Array and plain object properties are merged recursively.
+         * Other objects and value types are overridden by assignment. Source objects
+         * are applied from left to right. Subsequent sources overwrite property
+         * assignments of previous sources.
+         *
+         * **Note:** This method mutates `object`.
+         *
+         * @category Object
+         * @param object The destination object.
+         * @param [sources] The source objects.
+         * @returns Returns `object`.
+         * @example
+         *
+         * var users = {
+         *   'data': [{ 'user': 'barney' }, { 'user': 'fred' }]
+         * };
+         *
+         * var ages = {
+         *   'data': [{ 'age': 36 }, { 'age': 40 }]
+         * };
+         *
+         * _.merge(users, ages);
+         * // => { 'data': [{ 'user': 'barney', 'age': 36 }, { 'user': 'fred', 'age': 40 }] }
+         */
+        merge<TObject, TSource>(
+            object: TObject,
+            source: TSource
+        ): TObject & TSource;
+
+        /**
+         * @see _.merge
+         */
+        merge<TObject, TSource1, TSource2>(
+            object: TObject,
+            source1: TSource1,
+            source2: TSource2
+        ): TObject & TSource1 & TSource2;
+
+        /**
+         * @see _.merge
+         */
+        merge<TObject, TSource1, TSource2, TSource3>(
+            object: TObject,
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3
+        ): TObject & TSource1 & TSource2 & TSource3;
+
+        /**
+         * @see _.merge
+         */
+        merge<TObject, TSource1, TSource2, TSource3, TSource4>(
+            object: TObject,
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3,
+            source4: TSource4
+        ): TObject & TSource1 & TSource2 & TSource3 & TSource4;
+
+        /**
+         * @see _.merge
+         */
+        merge(
+            object: any,
+            ...otherArgs: any[]
+        ): any;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.merge
+         */
+        merge<TSource>(
+            source: TSource
+        ): LoDashImplicitWrapper<TValue & TSource>;
+
+        /**
+         * @see _.merge
+         */
+        merge<TSource1, TSource2>(
+            source1: TSource1,
+            source2: TSource2
+        ): LoDashImplicitWrapper<TValue & TSource1 & TSource2>;
+
+        /**
+         * @see _.merge
+         */
+        merge<TSource1, TSource2, TSource3>(
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3
+        ): LoDashImplicitWrapper<TValue & TSource1 & TSource2 & TSource3>;
+
+        /**
+         * @see _.merge
+         */
+        merge<TSource1, TSource2, TSource3, TSource4>(
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3,
+            source4: TSource4
+        ): LoDashImplicitWrapper<TValue & TSource1 & TSource2 & TSource3 & TSource4>;
+
+        /**
+         * @see _.merge
+         */
+        merge(
+            ...otherArgs: any[]
+        ): LoDashImplicitWrapper<any>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.merge
+         */
+        merge<TSource>(
+            source: TSource
+        ): LoDashExplicitWrapper<TValue & TSource>;
+
+        /**
+         * @see _.merge
+         */
+        merge<TSource1, TSource2>(
+            source1: TSource1,
+            source2: TSource2
+        ): LoDashExplicitWrapper<TValue & TSource1 & TSource2>;
+
+        /**
+         * @see _.merge
+         */
+        merge<TSource1, TSource2, TSource3>(
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3
+        ): LoDashExplicitWrapper<TValue & TSource1 & TSource2 & TSource3>;
+
+        /**
+         * @see _.merge
+         */
+        merge<TSource1, TSource2, TSource3, TSource4>(
+        ): LoDashExplicitWrapper<TValue & TSource1 & TSource2 & TSource3 & TSource4>;
+
+        /**
+         * @see _.merge
+         */
+        merge(
+            ...otherArgs: any[]
+        ): LoDashExplicitWrapper<any>;
+    }
+
+    // mergeWith
+
+    type MergeWithCustomizer = { bivariantHack(value: any, srcValue: any, key: string, object: any, source: any): any; }["bivariantHack"]
+
+    interface LoDashStatic {
+        /**
+         * This method is like `_.merge` except that it accepts `customizer` which
+         * is invoked to produce the merged values of the destination and source
+         * properties. If `customizer` returns `undefined` merging is handled by the
+         * method instead. The `customizer` is invoked with seven arguments:
+         * (objValue, srcValue, key, object, source, stack).
+         *
+         * @category Object
+         * @param object The destination object.
+         * @param sources The source objects.
+         * @param customizer The function to customize assigned values.
+         * @returns Returns `object`.
+         * @example
+         *
+         * function customizer(objValue, srcValue) {
+         *   if (_.isArray(objValue)) {
+         *     return objValue.concat(srcValue);
+         *   }
+         * }
+         *
+         * var object = {
+         *   'fruits': ['apple'],
+         *   'vegetables': ['beet']
+         * };
+         *
+         * var other = {
+         *   'fruits': ['banana'],
+         *   'vegetables': ['carrot']
+         * };
+         *
+         * _.merge(object, other, customizer);
+         * // => { 'fruits': ['apple', 'banana'], 'vegetables': ['beet', 'carrot'] }
+         */
+        mergeWith<TObject, TSource>(
+            object: TObject,
+            source: TSource,
+            customizer: MergeWithCustomizer
+        ): TObject & TSource;
+
+        /**
+         * @see _.mergeWith
+         */
+        mergeWith<TObject, TSource1, TSource2>(
+            object: TObject,
+            source1: TSource1,
+            source2: TSource2,
+            customizer: MergeWithCustomizer
+        ): TObject & TSource1 & TSource2;
+
+        /**
+         * @see _.mergeWith
+         */
+        mergeWith<TObject, TSource1, TSource2, TSource3>(
+            object: TObject,
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3,
+            customizer: MergeWithCustomizer
+        ): TObject & TSource1 & TSource2 & TSource3;
+
+        /**
+         * @see _.mergeWith
+         */
+        mergeWith<TObject, TSource1, TSource2, TSource3, TSource4>(
+            object: TObject,
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3,
+            source4: TSource4,
+            customizer: MergeWithCustomizer
+        ): TObject & TSource1 & TSource2 & TSource3 & TSource4;
+
+        /**
+         * @see _.mergeWith
+         */
+        mergeWith(
+            object: any,
+            ...otherArgs: any[]
+        ): any;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.mergeWith
+         */
+        mergeWith<TSource>(
+            source: TSource,
+            customizer: MergeWithCustomizer
+        ): LoDashImplicitWrapper<TValue & TSource>;
+
+        /**
+         * @see _.mergeWith
+         */
+        mergeWith<TSource1, TSource2>(
+            source1: TSource1,
+            source2: TSource2,
+            customizer: MergeWithCustomizer
+        ): LoDashImplicitWrapper<TValue & TSource1 & TSource2>;
+
+        /**
+         * @see _.mergeWith
+         */
+        mergeWith<TSource1, TSource2, TSource3>(
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3,
+            customizer: MergeWithCustomizer
+        ): LoDashImplicitWrapper<TValue & TSource1 & TSource2 & TSource3>;
+
+        /**
+         * @see _.mergeWith
+         */
+        mergeWith<TSource1, TSource2, TSource3, TSource4>(
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3,
+            source4: TSource4,
+            customizer: MergeWithCustomizer
+        ): LoDashImplicitWrapper<TValue & TSource1 & TSource2 & TSource3 & TSource4>;
+
+        /**
+         * @see _.mergeWith
+         */
+        mergeWith(
+            ...otherArgs: any[]
+        ): LoDashImplicitWrapper<any>;
+    }
+
+    // omit
+
+    interface LoDashStatic {
+        /**
+         * The opposite of `_.pick`; this method creates an object composed of the
+         * own and inherited enumerable properties of `object` that are not omitted.
+         *
+         * @category Object
+         * @param object The source object.
+         * @param [paths] The property names to omit, specified
+         *  individually or in arrays..
+         * @returns Returns the new object.
+         * @example
+         *
+         * var object = { 'a': 1, 'b': '2', 'c': 3 };
+         *
+         * _.omit(object, ['a', 'c']);
+         * // => { 'b': '2' }
+         */
+        omit<T>(
+            object: Dictionary<T>,
+            ...paths: PropertyPath[]
+        ): Dictionary<T>;
+
+        /**
+         * @see _.omit
+         */
+        omit<T extends object>(
+            object: T | null | undefined,
+            ...paths: PropertyPath[]
+        ): PartialObject<T>;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.omit
+         */
+        omit<T>(
+            this: LoDashImplicitWrapper<Dictionary<T>>,
+            ...paths: PropertyPath[]
+        ): LoDashImplicitWrapper<Dictionary<T>>;
+
+        /**
+         * @see _.omit
+         */
+        omit<T extends object>(
+            this: LoDashImplicitWrapper<T | null | undefined>,
+            ...paths: PropertyPath[]
+        ): LoDashImplicitWrapper<PartialObject<T>>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.omit
+         */
+        omit<T>(
+            this: LoDashExplicitWrapper<Dictionary<T>>,
+            ...paths: PropertyPath[]
+        ): LoDashExplicitWrapper<Dictionary<T>>;
+
+        /**
+         * @see _.omit
+         */
+        omit<T extends object>(
+            this: LoDashExplicitWrapper<T | null | undefined>,
+            ...paths: PropertyPath[]
+        ): LoDashExplicitWrapper<PartialObject<T>>;
+    }
+
+    // omitBy
+
+    interface LoDashStatic {
+        /**
+         * The opposite of `_.pickBy`; this method creates an object composed of the
+         * own and inherited enumerable properties of `object` that `predicate`
+         * doesn't return truthy for.
+         *
+         * @category Object
+         * @param object The source object.
+         * @param [predicate=_.identity] The function invoked per property.
+         * @returns Returns the new object.
+         * @example
+         *
+         * var object = { 'a': 1, 'b': '2', 'c': 3 };
+         *
+         * _.omitBy(object, _.isNumber);
+         * // => { 'b': '2' }
+         */
+        omitBy<T extends object>(
+            object: T | null | undefined,
+            predicate: ValueKeyIteratee<T[keyof T]>
+        ): PartialObject<T>;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.omitBy
+         */
+        omitBy<T extends object>(
+            this: LoDashImplicitWrapper<T | null | undefined>,
+            predicate: ValueKeyIteratee<T[keyof T]>
+        ): LoDashImplicitWrapper<PartialObject<T>>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.omitBy
+         */
+        omitBy<T extends object>(
+            this: LoDashExplicitWrapper<T | null | undefined>,
+            predicate: ValueKeyIteratee<T[keyof T]>
+        ): LoDashExplicitWrapper<PartialObject<T>>;
+    }
+
+    // pick
+
+    interface LoDashStatic {
+        /**
+         * Creates an object composed of the picked `object` properties.
+         *
+         * @category Object
+         * @param object The source object.
+         * @param [props] The property names to pick, specified
+         *  individually or in arrays.
+         * @returns Returns the new object.
+         * @example
+         *
+         * var object = { 'a': 1, 'b': '2', 'c': 3 };
+         *
+         * _.pick(object, ['a', 'c']);
+         * // => { 'a': 1, 'c': 3 }
+         */
+        pick<T extends object, U extends keyof T>(
+            object: T,
+             ...props: Array<Many<U>>
+        ): Pick<T, U>;
+
+        /**
+         * @see _.pick
+         */
+        pick<T>(
+            object: T | null | undefined,
+            ...props: PropertyPath[]
+        ): PartialDeep<T>;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.pick
+         */
+        pick<T extends object, U extends keyof T>(
+            this: LoDashImplicitWrapper<T>,
+            ...props: Array<Many<U>>
+        ): LoDashImplicitWrapper<Pick<T, U>>;
+
+        /**
+         * @see _.pick
+         */
+        pick<T extends object>(
+            this: LoDashImplicitWrapper<T | null | undefined>,
+            ...props: PropertyPath[]
+        ): LoDashImplicitWrapper<PartialObject<T>>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.pick
+         */
+        pick<T extends object, U extends keyof T>(
+            this: LoDashExplicitWrapper<T>,
+            ...props: Array<Many<U>>
+        ): LoDashExplicitWrapper<Pick<T, U>>;
+
+        /**
+         * @see _.pick
+         */
+        pick<T extends object>(
+            this: LoDashExplicitWrapper<T | null | undefined>,
+            ...props: PropertyPath[]
+        ): LoDashExplicitWrapper<PartialObject<T>>;
+    }
+
+    // pickBy
+
+    interface LoDashStatic {
+        /**
+         * Creates an object composed of the `object` properties `predicate` returns
+         * truthy for. The predicate is invoked with two arguments: (value, key).
+         *
+         * @category Object
+         * @param object The source object.
+         * @param [predicate=_.identity] The function invoked per property.
+         * @returns Returns the new object.
+         * @example
+         *
+         * var object = { 'a': 1, 'b': '2', 'c': 3 };
+         *
+         * _.pickBy(object, _.isNumber);
+         * // => { 'a': 1, 'c': 3 }
+         */
+        pickBy<T extends object>(
+            object: T | null | undefined,
+            predicate?: ValueKeyIteratee<T[keyof T]>
+        ): PartialObject<T>;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.pickBy
+         */
+        pickBy<T extends object>(
+            this: LoDashImplicitWrapper<T | null | undefined>,
+            predicate?: ValueKeyIteratee<T[keyof T]>
+        ): LoDashImplicitWrapper<PartialObject<T>>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.pickBy
+         */
+        pickBy<T extends object>(
+            this: LoDashExplicitWrapper<T | null | undefined>,
+            predicate?: ValueKeyIteratee<T[keyof T]>
+        ): LoDashExplicitWrapper<PartialObject<T>>;
+    }
+
+    // result
+
+    interface LoDashStatic {
+        /**
+         * This method is like _.get except that if the resolved value is a function it’s invoked with the this binding
+         * of its parent object and its result is returned.
+         *
+         * @param object The object to query.
+         * @param path The path of the property to resolve.
+         * @param defaultValue The value returned if the resolved value is undefined.
+         * @return Returns the resolved value.
+         */
+        result<TResult>(
+            object: any,
+            path: PropertyPath,
+            defaultValue?: TResult|((...args: any[]) => TResult)
+        ): TResult;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.result
+         */
+        result<TResult>(
+            path: PropertyPath,
+            defaultValue?: TResult|((...args: any[]) => TResult)
+        ): TResult;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.result
+         */
+        result<TResult>(
+            path: PropertyPath,
+            defaultValue?: TResult|((...args: any[]) => TResult)
+        ): LoDashExplicitWrapper<TResult>;
+    }
+
+    // set
+
+    interface LoDashStatic {
+        /**
+         * Sets the value at path of object. If a portion of path doesn’t exist it’s created. Arrays are created for
+         * missing index properties while objects are created for all other missing properties. Use _.setWith to
+         * customize path creation.
+         *
+         * @param object The object to modify.
+         * @param path The path of the property to set.
+         * @param value The value to set.
+         * @return Returns object.
+         */
+        set<T extends object>(
+            object: T,
+            path: PropertyPath,
+            value: any
+        ): T;
+
+        /**
+         * @see _.set
+         */
+        set<TResult>(
+            object: object,
+            path: PropertyPath,
+            value: any
+        ): TResult;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.set
+         */
+        set(
+            path: PropertyPath,
+            value: any
+        ): this;
+
+        /**
+         * @see _.set
+         */
+        set<TResult>(
+            path: PropertyPath,
+            value: any
+        ): LoDashImplicitWrapper<TResult>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.set
+         */
+        set(
+            path: PropertyPath,
+            value: any
+        ): this;
+
+        /**
+         * @see _.set
+         */
+        set<TResult>(
+            path: PropertyPath,
+            value: any
+        ): LoDashExplicitWrapper<TResult>;
+    }
+
+    // setWith
+
+    type SetWithCustomizer<T> = (nsValue: any, key: string, nsObject: T) => any;
+
+    interface LoDashStatic {
+        /**
+         * This method is like _.set except that it accepts customizer which is invoked to produce the objects of
+         * path. If customizer returns undefined path creation is handled by the method instead. The customizer is
+         * invoked with three arguments: (nsValue, key, nsObject).
+         *
+         * @param object The object to modify.
+         * @param path The path of the property to set.
+         * @param value The value to set.
+         * @parem customizer The function to customize assigned values.
+         * @return Returns object.
+         */
+        setWith<T extends object>(
+            object: T,
+            path: PropertyPath,
+            value: any,
+            customizer?: SetWithCustomizer<T>
+        ): T;
+
+        setWith<T extends object, TResult>(
+            object: T,
+            path: PropertyPath,
+            value: any,
+            customizer?: SetWithCustomizer<T>
+        ): TResult;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.setWith
+         */
+        setWith(
+            path: PropertyPath,
+            value: any,
+            customizer?: SetWithCustomizer<TValue>
+        ): this;
+
+        /**
+         * @see _.setWith
+         */
+        setWith<TResult>(
+            path: PropertyPath,
+            value: any,
+            customizer?: SetWithCustomizer<TValue>
+        ): LoDashImplicitWrapper<TResult>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.setWith
+         */
+        setWith(
+            path: PropertyPath,
+            value: any,
+            customizer?: SetWithCustomizer<TValue>
+        ): this;
+
+        /**
+         * @see _.setWith
+         */
+        setWith<TResult>(
+            path: PropertyPath,
+            value: any,
+            customizer?: SetWithCustomizer<TValue>
+        ): LoDashExplicitWrapper<TResult>;
+    }
+
+    // toPairs
+
+    interface LoDashStatic {
+        /**
+         * Creates an array of own enumerable key-value pairs for object.
+         *
+         * @param object The object to query.
+         * @return Returns the new array of key-value pairs.
+         */
+        toPairs<T>(object?: Dictionary<T>): Array<[string, T]>;
+
+        /**
+         * @see _.toPairs
+         */
+        toPairs(object?: object): Array<[string, any]>;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.toPairs
+         */
+        toPairs<T>(this: LoDashImplicitWrapper<Dictionary<T>>): LoDashImplicitWrapper<Array<[string, T]>>;
+
+        /**
+         * @see _.toPairs
+         */
+        toPairs(): LoDashImplicitWrapper<Array<[string, any]>>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.toPairs
+         */
+        toPairs<T>(this: LoDashExplicitWrapper<Dictionary<T>>): LoDashExplicitWrapper<Array<[string, T]>>;
+
+        /**
+         * @see _.toPairs
+         */
+        toPairs(): LoDashExplicitWrapper<Array<[string, any]>>;
+    }
+
+    // toPairsIn
+
+    interface LoDashStatic {
+        /**
+         * Creates an array of own and inherited enumerable key-value pairs for object.
+         *
+         * @param object The object to query.
+         * @return Returns the new array of key-value pairs.
+         */
+        toPairsIn<T>(object?: Dictionary<T>): Array<[string, T]>;
+
+        /**
+         * @see _.toPairsIn
+         */
+        toPairsIn(object?: object): Array<[string, any]>;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.toPairsIn
+         */
+        toPairsIn<T>(this: LoDashImplicitWrapper<Dictionary<T>>): LoDashImplicitWrapper<Array<[string, T]>>;
+
+        /**
+         * @see _.toPairsIn
+         */
+        toPairsIn(): LoDashImplicitWrapper<Array<[string, any]>>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.toPairsIn
+         */
+        toPairsIn<T>(this: LoDashExplicitWrapper<Dictionary<T>>): LoDashExplicitWrapper<Array<[string, T]>>;
+
+        /**
+         * @see _.toPairsIn
+         */
+        toPairsIn(): LoDashExplicitWrapper<Array<[string, any]>>;
+    }
+
+    // transform
+
+    interface LoDashStatic {
+        /**
+         * An alternative to _.reduce; this method transforms object to a new accumulator object which is the result of
+         * running each of its own enumerable properties through iteratee, with each invocation potentially mutating
+         * the accumulator object. The iteratee is bound to thisArg and invoked with four arguments: (accumulator,
+         * value, key, object). Iteratee functions may exit iteration early by explicitly returning false.
+         *
+         * @param object The object to iterate over.
+         * @param iteratee The function invoked per iteration.
+         * @param accumulator The custom accumulator value.
+         * @param thisArg The this binding of iteratee.
+         * @return Returns the accumulated value.
+         */
+        transform<T, TResult>(
+            object: T[],
+            iteratee: MemoVoidArrayIterator<T, TResult[]>,
+            accumulator?: TResult[]
+        ): TResult[];
+
+        /**
+         * @see _.transform
+         */
+        transform<T, TResult>(
+            object: T[],
+            iteratee: MemoVoidArrayIterator<T, Dictionary<TResult>>,
+            accumulator: Dictionary<TResult>
+        ): Dictionary<TResult>;
+
+        /**
+         * @see _.transform
+         */
+        transform<T, TResult>(
+            object: Dictionary<T>,
+            iteratee: MemoVoidDictionaryIterator<T, Dictionary<TResult>>,
+            accumulator?: Dictionary<TResult>
+        ): Dictionary<TResult>;
+
+        /**
+         * @see _.transform
+         */
+        transform<T, TResult>(
+            object: Dictionary<T>,
+            iteratee: MemoVoidDictionaryIterator<T, TResult[]>,
+            accumulator: TResult[]
+        ): TResult[];
+
+        /**
+         * @see _.transform
+         */
+        transform(
+            object: any[],
+        ): any[];
+
+        /**
+         * @see _.transform
+         */
+        transform(
+            object: object,
+        ): Dictionary<any>;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.transform
+         */
+        transform<T, TResult>(
+            this: LoDashImplicitWrapper<T[]>,
+            iteratee: MemoVoidArrayIterator<T, TResult[]>,
+            accumulator?: TResult[]
+        ): LoDashImplicitWrapper<TResult[]>;
+
+        /**
+         * @see _.transform
+         */
+        transform<T, TResult>(
+            this: LoDashImplicitWrapper<T[]>,
+            iteratee: MemoVoidArrayIterator<T, Dictionary<TResult>>,
+            accumulator: Dictionary<TResult>
+        ): LoDashImplicitWrapper<Dictionary<TResult>>;
+
+        /**
+         * @see _.transform
+         */
+        transform<T, TResult>(
+            this: LoDashImplicitWrapper<Dictionary<T>>,
+            iteratee: MemoVoidDictionaryIterator<T, Dictionary<TResult>>,
+            accumulator?: Dictionary<TResult>
+        ): LoDashImplicitWrapper<Dictionary<TResult>>;
+
+        /**
+         * @see _.transform
+         */
+        transform<T, TResult>(
+            this: LoDashImplicitWrapper<Dictionary<T>>,
+            iteratee: MemoVoidDictionaryIterator<T, TResult[]>,
+            accumulator: TResult[]
+        ): LoDashImplicitWrapper<TResult[]>;
+
+        /**
+         * @see _.transform
+         */
+        transform(
+            this: LoDashImplicitWrapper<any[]>,
+        ): LoDashImplicitWrapper<any[]>;
+
+        /**
+         * @see _.transform
+         */
+        transform(): LoDashImplicitWrapper<Dictionary<any>>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.transform
+         */
+        transform<T, TResult>(
+            this: LoDashExplicitWrapper<T[]>,
+            iteratee: MemoVoidArrayIterator<T, TResult[]>,
+            accumulator?: TResult[]
+        ): LoDashExplicitWrapper<TResult[]>;
+
+        /**
+         * @see _.transform
+         */
+        transform<T, TResult>(
+            this: LoDashExplicitWrapper<T[]>,
+            iteratee: MemoVoidArrayIterator<T, Dictionary<TResult>>,
+            accumulator?: Dictionary<TResult>
+        ): LoDashExplicitWrapper<Dictionary<TResult>>;
+
+        /**
+         * @see _.transform
+         */
+        transform<T, TResult>(
+            this: LoDashExplicitWrapper<Dictionary<T>>,
+            iteratee: MemoVoidDictionaryIterator<T, Dictionary<TResult>>,
+            accumulator?: Dictionary<TResult>
+        ): LoDashExplicitWrapper<Dictionary<TResult>>;
+
+        /**
+         * @see _.transform
+         */
+        transform<T, TResult>(
+            this: LoDashExplicitWrapper<Dictionary<T>>,
+            iteratee: MemoVoidDictionaryIterator<T, TResult[]>,
+            accumulator?: TResult[]
+        ): LoDashExplicitWrapper<TResult[]>;
+
+        /**
+         * @see _.transform
+         */
+        transform(
+            this: LoDashExplicitWrapper<any[]>,
+        ): LoDashExplicitWrapper<any[]>;
+
+        /**
+         * @see _.transform
+         */
+        transform(): LoDashExplicitWrapper<Dictionary<any>>;
+    }
+
+    // unset
+
+    interface LoDashStatic {
+        /**
+         * Removes the property at path of object.
+         *
+         * Note: This method mutates object.
+         *
+         * @param object The object to modify.
+         * @param path The path of the property to unset.
+         * @return Returns true if the property is deleted, else false.
+         */
+        unset(
+            object: any,
+            path: PropertyPath
+        ): boolean;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.unset
+         */
+        unset(path: PropertyPath): LoDashImplicitWrapper<boolean>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.unset
+         */
+        unset(path: PropertyPath): LoDashExplicitWrapper<boolean>;
+    }
+
+    // update
+
+    interface LoDashStatic {
+        /**
+         * This method is like _.set except that accepts updater to produce the value to set. Use _.updateWith to
+         * customize path creation. The updater is invoked with one argument: (value).
+         *
+         * @param object The object to modify.
+         * @param path The path of the property to set.
+         * @param updater The function to produce the updated value.
+         * @return Returns object.
+         */
+        update(
+            object: object,
+            path: PropertyPath,
+            updater: (value: any) => any
+        ): any;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.update
+         */
+        update(
+            path: PropertyPath,
+            updater: (value: any) => any
+        ): LoDashImplicitWrapper<any>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.update
+         */
+        update(
+            path: PropertyPath,
+            updater: (value: any) => any
+        ): LoDashExplicitWrapper<any>;
+    }
+
+    // updateWith
+
+    interface LoDashStatic {
+        /**
+         * This method is like `_.update` except that it accepts `customizer` which is
+         * invoked to produce the objects of `path`.  If `customizer` returns `undefined`
+         * path creation is handled by the method instead. The `customizer` is invoked
+         * with three arguments: (nsValue, key, nsObject).
+         *
+         * **Note:** This method mutates `object`.
+         *
+         * @since 4.6.0
+         * @category Object
+         * @param object The object to modify.
+         * @param path The path of the property to set.
+         * @param updater The function to produce the updated value.
+         * @param [customizer] The function to customize assigned values.
+         * @returns Returns `object`.
+         * @example
+         *
+         * var object = {};
+         *
+         * _.updateWith(object, '[0][1]', _.constant('a'), Object);
+         * // => { '0': { '1': 'a' } }
+         */
+        updateWith<T extends object>(
+            object: T,
+            path: PropertyPath,
+            updater: (oldValue: any) => any,
+            customizer?: SetWithCustomizer<T>
+        ): T;
+
+        /**
+         * @see _.updateWith
+         */
+        updateWith<T extends object, TResult>(
+            object: T,
+            path: PropertyPath,
+            updater: (oldValue: any) => any,
+            customizer?: SetWithCustomizer<T>
+        ): TResult;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.updateWith
+         */
+        updateWith(
+            path: PropertyPath,
+            updater: (oldValue: any) => any,
+            customizer?: SetWithCustomizer<TValue>
+        ): this;
+
+        /**
+         * @see _.updateWith
+         */
+        updateWith<TResult>(
+            path: PropertyPath,
+            updater: (oldValue: any) => any,
+            customizer?: SetWithCustomizer<TValue>
+        ): LoDashImplicitWrapper<TResult>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.updateWith
+         */
+        updateWith(
+            path: PropertyPath,
+            updater: (oldValue: any) => any,
+            customizer?: SetWithCustomizer<TValue>
+        ): this;
+
+        /**
+         * @see _.updateWith
+         */
+        updateWith<TResult>(
+            path: PropertyPath,
+            updater: (oldValue: any) => any,
+            customizer?: SetWithCustomizer<TValue>
+        ): LoDashExplicitWrapper<TResult>;
+    }
+
+    // values
+
+    interface LoDashStatic {
+        /**
+         * Creates an array of the own enumerable property values of object.
+         *
+         * @param object The object to query.
+         * @return Returns an array of property values.
+         */
+        values<T>(object: Dictionary<T>|NumericDictionary<T>|List<T> | null | undefined): T[];
+
+        /**
+         * @see _.values
+         */
+        values<T extends object>(object: T | null | undefined): Array<T[keyof T]>;
+
+        /**
+         * @see _.values
+         */
+        values(object: any): any[];
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.values
+         */
+        values<T>(this: LoDashImplicitWrapper<Dictionary<T> | NumericDictionary<T> | List<T> | null | undefined>): LoDashImplicitWrapper<T[]>;
+
+        /**
+         * @see _.values
+         */
+        values<T extends object>(this: LoDashImplicitWrapper<T | null | undefined>): LoDashImplicitWrapper<Array<T[keyof T]>>;
+
+        /**
+         * @see _.values
+         */
+        values(): LoDashImplicitWrapper<any[]>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.values
+         */
+        values<T>(this: LoDashExplicitWrapper<Dictionary<T> | NumericDictionary<T> | List<T> | null | undefined>): LoDashExplicitWrapper<T[]>;
+
+        /**
+         * @see _.values
+         */
+        values<T extends object>(this: LoDashExplicitWrapper<T | null | undefined>): LoDashExplicitWrapper<Array<T[keyof T]>>;
+
+        /**
+         * @see _.values
+         */
+        values(): LoDashExplicitWrapper<any[]>;
+    }
+
+    // valuesIn
+
+    interface LoDashStatic {
+        /**
+         * Creates an array of the own and inherited enumerable property values of object.
+         *
+         * @param object The object to query.
+         * @return Returns the array of property values.
+         */
+        valuesIn<T>(object: Dictionary<T>|NumericDictionary<T>|List<T> | null | undefined): T[];
+
+        /**
+         * @see _.valuesIn
+         */
+        valuesIn<T extends object>(object: T | null | undefined): Array<T[keyof T]>;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.valuesIn
+         */
+        valuesIn<T>(this: LoDashImplicitWrapper<Dictionary<T> | NumericDictionary<T> | List<T> | null | undefined>): LoDashImplicitWrapper<T[]>;
+
+        /**
+         * @see _.valuesIn
+         */
+        valuesIn<T extends object>(this: LoDashImplicitWrapper<T | null | undefined>): LoDashImplicitWrapper<Array<T[keyof T]>>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.valuesIn
+         */
+        valuesIn<T>(this: LoDashExplicitWrapper<Dictionary<T> | NumericDictionary<T> | List<T> | null | undefined>): LoDashExplicitWrapper<T[]>;
+
+        /**
+         * @see _.valuesIn
+         */
+        valuesIn<T extends object>(this: LoDashExplicitWrapper<T | null | undefined>): LoDashExplicitWrapper<Array<T[keyof T]>>;
+    }
+}
\ No newline at end of file
diff --git a/types/lodash/common/seq.d.ts b/types/lodash/common/seq.d.ts
new file mode 100644
index 0000000000..f3139056cd
--- /dev/null
+++ b/types/lodash/common/seq.d.ts
@@ -0,0 +1,198 @@
+import _ = require("../index");
+declare module "../index" {
+    // chain
+
+    interface LoDashStatic {
+        /**
+         * Creates a lodash object that wraps value with explicit method chaining enabled.
+         *
+         * @param value The value to wrap.
+         * @return Returns the new lodash wrapper instance.
+         */
+        chain<T>(value: T): LoDashExplicitWrapper<T>;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.chain
+         */
+        chain(): LoDashExplicitWrapper<TValue>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.chain
+         */
+        chain(): this;
+    }
+
+    // prototype.chain
+
+    interface LoDashStatic {
+        /**
+         * Creates a lodash object that wraps value with explicit method chaining enabled.
+         *
+         * @param value The value to wrap.
+         * @return Returns the new lodash wrapper instance.
+         */
+        chain<T>(value: T): LoDashExplicitWrapper<T>;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.chain
+         */
+        chain(): LoDashExplicitWrapper<TValue>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.chain
+         */
+        chain(): this;
+    }
+
+    // prototype.commit
+
+    interface LoDashWrapper<TValue> {
+        /**
+         * Executes the chained sequence and returns the wrapped result.
+         *
+         * @return Returns the new lodash wrapper instance.
+         */
+        commit(): this;
+    }
+
+    // prototype.plant
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * Creates a clone of the chained sequence planting value as the wrapped value.
+         * @param value The value to plant as the wrapped value.
+         * @return Returns the new lodash wrapper instance.
+         */
+        plant<T>(value: T): LoDashImplicitWrapper<T>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.plant
+         */
+        plant<T>(value: T): LoDashExplicitWrapper<T>;
+    }
+
+    // prototype.reverse
+
+    interface LoDashWrapper<TValue> {
+        /**
+         * Reverses the wrapped array so the first element becomes the last, the second element becomes the second to
+         * last, and so on.
+         *
+         * Note: This method mutates the wrapped array.
+         *
+         * @return Returns the new reversed lodash wrapper instance.
+         */
+        reverse(): this;
+    }
+
+    // prototype.toJSON
+
+    interface LoDashWrapper<TValue> {
+        /**
+         * @see _.value
+         */
+        toJSON(): TValue;
+    }
+
+    // prototype.toString
+
+    interface LoDashWrapper<TValue> {
+        /**
+         * Produces the result of coercing the unwrapped value to a string.
+         *
+         * @return Returns the coerced string value.
+         */
+        toString(): string;
+    }
+
+    // prototype.value
+
+    interface LoDashWrapper<TValue> {
+        /**
+         * Executes the chained sequence to extract the unwrapped value.
+         *
+         * @alias _.toJSON, _.valueOf
+         *
+         * @return Returns the resolved unwrapped value.
+         */
+        value(): TValue;
+    }
+
+    // prototype.valueOf
+
+    interface LoDashWrapper<TValue> {
+        /**
+         * @see _.value
+         */
+        valueOf(): TValue;
+    }
+
+    // tap
+
+    interface LoDashStatic {
+        /**
+         * This method invokes interceptor and returns value. The interceptor is bound to thisArg and invoked with one
+         * argument; (value). The purpose of this method is to "tap into" a method chain in order to perform operations
+         * on intermediate results within the chain.
+         *
+         * @param value The value to provide to interceptor.
+         * @param interceptor The function to invoke.
+         * @parem thisArg The this binding of interceptor.
+         * @return Returns value.
+         **/
+        tap<T>(
+            value: T,
+            interceptor: (value: T) => void
+        ): T;
+    }
+
+    interface LoDashWrapper<TValue> {
+        /**
+         * @see _.tap
+         */
+        tap(
+            interceptor: (value: TValue) => void
+        ): this;
+    }
+
+    // thru
+
+    interface LoDashStatic {
+        /**
+         * This method is like _.tap except that it returns the result of interceptor.
+         *
+         * @param value The value to provide to interceptor.
+         * @param interceptor The function to invoke.
+         * @param thisArg The this binding of interceptor.
+         * @return Returns the result of interceptor.
+         */
+        thru<T, TResult>(
+            value: T,
+            interceptor: (value: T) => TResult
+        ): TResult;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.thru
+         */
+        thru<TResult>(interceptor: (value: TValue) => TResult): LoDashImplicitWrapper<TResult>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.thru
+         */
+        thru<TResult>(interceptor: (value: TValue) => TResult): LoDashExplicitWrapper<TResult>;
+    }
+}
\ No newline at end of file
diff --git a/types/lodash/common/string.d.ts b/types/lodash/common/string.d.ts
new file mode 100644
index 0000000000..436a2bb9f1
--- /dev/null
+++ b/types/lodash/common/string.d.ts
@@ -0,0 +1,1059 @@
+import _ = require("../index");
+declare module "../index" {
+    // camelCase
+
+    interface LoDashStatic {
+        /**
+         * Converts string to camel case.
+         *
+         * @param string The string to convert.
+         * @return Returns the camel cased string.
+         */
+        camelCase(string?: string): string;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.camelCase
+         */
+        camelCase(): string;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.camelCase
+         */
+        camelCase(): LoDashExplicitWrapper<string>;
+    }
+
+    // capitalize
+
+    interface LoDashStatic {
+        /**
+         * Converts the first character of string to upper case and the remaining to lower case.
+         *
+         * @param string The string to capitalize.
+         * @return Returns the capitalized string.
+         */
+        capitalize(string?: string): string;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.capitalize
+         */
+        capitalize(): string;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.capitalize
+         */
+        capitalize(): LoDashExplicitWrapper<string>;
+    }
+
+    // deburr
+
+    interface LoDashStatic {
+        /**
+         * Deburrs string by converting latin-1 supplementary letters to basic latin letters and removing combining
+         * diacritical marks.
+         *
+         * @param string The string to deburr.
+         * @return Returns the deburred string.
+         */
+        deburr(string?: string): string;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.deburr
+         */
+        deburr(): string;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.deburr
+         */
+        deburr(): LoDashExplicitWrapper<string>;
+    }
+
+    // endsWith
+
+    interface LoDashStatic {
+        /**
+         * Checks if string ends with the given target string.
+         *
+         * @param string The string to search.
+         * @param target The string to search for.
+         * @param position The position to search from.
+         * @return Returns true if string ends with target, else false.
+         */
+        endsWith(
+            string?: string,
+            target?: string,
+            position?: number
+        ): boolean;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.endsWith
+         */
+        endsWith(
+            target?: string,
+            position?: number
+        ): boolean;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.endsWith
+         */
+        endsWith(
+            target?: string,
+            position?: number
+        ): LoDashExplicitWrapper<boolean>;
+    }
+
+    // escape
+
+    interface LoDashStatic {
+        /**
+         * Converts the characters "&", "<", ">", '"', "'", and "`" in string to their corresponding HTML entities.
+         *
+         * Note: No other characters are escaped. To escape additional characters use a third-party library like he.
+         *
+         * hough the ">" character is escaped for symmetry, characters like ">" and "/" don’t need escaping in HTML
+         * and have no special meaning unless they're part of a tag or unquoted attribute value. See Mathias Bynens’s
+         * article (under "semi-related fun fact") for more details.
+         *
+         * Backticks are escaped because in IE < 9, they can break out of attribute values or HTML comments. See #59,
+         * #102, #108, and #133 of the HTML5 Security Cheatsheet for more details.
+         *
+         * When working with HTML you should always quote attribute values to reduce XSS vectors.
+         *
+         * @param string The string to escape.
+         * @return Returns the escaped string.
+         */
+        escape(string?: string): string;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.escape
+         */
+        escape(): string;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.escape
+         */
+        escape(): LoDashExplicitWrapper<string>;
+    }
+
+    // escapeRegExp
+
+    interface LoDashStatic {
+        /**
+         * Escapes the RegExp special characters "^", "$", "\", ".", "*", "+", "?", "(", ")", "[", "]",
+         * "{", "}", and "|" in string.
+         *
+         * @param string The string to escape.
+         * @return Returns the escaped string.
+         */
+        escapeRegExp(string?: string): string;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.escapeRegExp
+         */
+        escapeRegExp(): string;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.escapeRegExp
+         */
+        escapeRegExp(): LoDashExplicitWrapper<string>;
+    }
+
+    // kebabCase
+
+    interface LoDashStatic {
+        /**
+         * Converts string to kebab case.
+         *
+         * @param string The string to convert.
+         * @return Returns the kebab cased string.
+         */
+        kebabCase(string?: string): string;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.kebabCase
+         */
+        kebabCase(): string;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.kebabCase
+         */
+        kebabCase(): LoDashExplicitWrapper<string>;
+    }
+
+    // lowerCase
+
+    interface LoDashStatic {
+        /**
+         * Converts `string`, as space separated words, to lower case.
+         *
+         * @param string The string to convert.
+         * @return Returns the lower cased string.
+         */
+        lowerCase(string?: string): string;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.lowerCase
+         */
+        lowerCase(): string;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.lowerCase
+         */
+        lowerCase(): LoDashExplicitWrapper<string>;
+    }
+
+    // lowerFirst
+
+    interface LoDashStatic {
+        /**
+         * Converts the first character of `string` to lower case.
+         *
+         * @param string The string to convert.
+         * @return Returns the converted string.
+         */
+        lowerFirst(string?: string): string;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.lowerFirst
+         */
+        lowerFirst(): string;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.lowerFirst
+         */
+        lowerFirst(): LoDashExplicitWrapper<string>;
+    }
+
+    // pad
+
+    interface LoDashStatic {
+        /**
+         * Pads string on the left and right sides if it’s shorter than length. Padding characters are truncated if
+         * they can’t be evenly divided by length.
+         *
+         * @param string The string to pad.
+         * @param length The padding length.
+         * @param chars The string used as padding.
+         * @return Returns the padded string.
+         */
+        pad(
+            string?: string,
+            length?: number,
+            chars?: string
+        ): string;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.pad
+         */
+        pad(
+            length?: number,
+            chars?: string
+        ): string;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.pad
+         */
+        pad(
+            length?: number,
+            chars?: string
+        ): LoDashExplicitWrapper<string>;
+    }
+
+    // padEnd
+
+    interface LoDashStatic {
+        /**
+         * Pads string on the right side if it’s shorter than length. Padding characters are truncated if they exceed
+         * length.
+         *
+         * @param string The string to pad.
+         * @param length The padding length.
+         * @param chars The string used as padding.
+         * @return Returns the padded string.
+         */
+        padEnd(
+            string?: string,
+            length?: number,
+            chars?: string
+        ): string;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.padEnd
+         */
+        padEnd(
+            length?: number,
+            chars?: string
+        ): string;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.padEnd
+         */
+        padEnd(
+            length?: number,
+            chars?: string
+        ): LoDashExplicitWrapper<string>;
+    }
+
+    // padStart
+
+    interface LoDashStatic {
+        /**
+         * Pads string on the left side if it’s shorter than length. Padding characters are truncated if they exceed
+         * length.
+         *
+         * @param string The string to pad.
+         * @param length The padding length.
+         * @param chars The string used as padding.
+         * @return Returns the padded string.
+         */
+        padStart(
+            string?: string,
+            length?: number,
+            chars?: string
+        ): string;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.padStart
+         */
+        padStart(
+            length?: number,
+            chars?: string
+        ): string;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.padStart
+         */
+        padStart(
+            length?: number,
+            chars?: string
+        ): LoDashExplicitWrapper<string>;
+    }
+
+    // parseInt
+
+    interface LoDashStatic {
+        /**
+         * Converts string to an integer of the specified radix. If radix is undefined or 0, a radix of 10 is used
+         * unless value is a hexadecimal, in which case a radix of 16 is used.
+         *
+         * Note: This method aligns with the ES5 implementation of parseInt.
+         *
+         * @param string The string to convert.
+         * @param radix The radix to interpret value by.
+         * @return Returns the converted integer.
+         */
+        parseInt(
+            string: string,
+            radix?: number
+        ): number;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.parseInt
+         */
+        parseInt(radix?: number): number;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.parseInt
+         */
+        parseInt(radix?: number): LoDashExplicitWrapper<number>;
+    }
+
+    // repeat
+
+    interface LoDashStatic {
+        /**
+         * Repeats the given string n times.
+         *
+         * @param string The string to repeat.
+         * @param n The number of times to repeat the string.
+         * @return Returns the repeated string.
+         */
+        repeat(
+            string?: string,
+            n?: number
+        ): string;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.repeat
+         */
+        repeat(n?: number): string;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.repeat
+         */
+        repeat(n?: number): LoDashExplicitWrapper<string>;
+    }
+
+    type ReplaceFunction = (match: string, ...args: any[]) => string;
+
+    // replace
+
+    interface LoDashStatic {
+        /**
+         * Replaces matches for pattern in string with replacement.
+         *
+         * Note: This method is based on String#replace.
+         *
+         * @return Returns the modified string.
+         */
+        replace(
+            string: string,
+            pattern: RegExp | string,
+            replacement: ReplaceFunction | string
+        ): string;
+
+        /**
+         * @see _.replace
+         */
+        replace(
+            pattern: RegExp | string,
+            replacement: ReplaceFunction | string
+        ): string;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.replace
+         */
+        replace(
+            pattern: RegExp|string,
+            replacement: ReplaceFunction | string
+        ): string;
+
+        /**
+         * @see _.replace
+         */
+        replace(
+            replacement: ReplaceFunction | string
+        ): string;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.replace
+         */
+        replace(
+            pattern: RegExp | string,
+            replacement: ReplaceFunction | string
+        ): LoDashExplicitWrapper<string>;
+
+        /**
+         * @see _.replace
+         */
+        replace(
+            replacement: ReplaceFunction | string
+        ): LoDashExplicitWrapper<string>;
+    }
+
+    // snakeCase
+
+    interface LoDashStatic {
+        /**
+         * Converts string to snake case.
+         *
+         * @param string The string to convert.
+         * @return Returns the snake cased string.
+         */
+        snakeCase(string?: string): string;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.snakeCase
+         */
+        snakeCase(): string;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.snakeCase
+         */
+        snakeCase(): LoDashExplicitWrapper<string>;
+    }
+
+    // split
+
+    interface LoDashStatic {
+        /**
+         * Splits string by separator.
+         *
+         * Note: This method is based on String#split.
+         *
+         * @param string The string to trim.
+         * @param separator The separator pattern to split by.
+         * @param limit The length to truncate results to.
+         * @return Returns the new array of string segments.
+         */
+        split(
+            string: string,
+            separator?: RegExp|string,
+            limit?: number
+        ): string[];
+
+        /**
+         * Splits string by separator.
+         *
+         * Note: This method is based on String#split.
+         *
+         * @param string The string to trim.
+         * @param index Not used in this overload.
+         * @param guard Enables use as an iteratee for methods like _.map. You should not pass this parameter directly in your code.
+         * @return Returns the new array of string segments.
+         */
+        split(
+            string: string,
+            index: string | number,
+            guard: object
+        ): string[];
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.split
+         */
+        split(
+            separator?: RegExp|string,
+            limit?: number
+        ): LoDashImplicitWrapper<string[]>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.split
+         */
+        split(
+            separator?: RegExp|string,
+            limit?: number
+        ): LoDashExplicitWrapper<string[]>;
+    }
+
+    // startCase
+
+    interface LoDashStatic {
+        /**
+         * Converts string to start case.
+         *
+         * @param string The string to convert.
+         * @return Returns the start cased string.
+         */
+        startCase(string?: string): string;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.startCase
+         */
+        startCase(): string;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.startCase
+         */
+        startCase(): LoDashExplicitWrapper<string>;
+    }
+
+    // startsWith
+
+    interface LoDashStatic {
+        /**
+         * Checks if string starts with the given target string.
+         *
+         * @param string The string to search.
+         * @param target The string to search for.
+         * @param position The position to search from.
+         * @return Returns true if string starts with target, else false.
+         */
+        startsWith(
+            string?: string,
+            target?: string,
+            position?: number
+        ): boolean;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.startsWith
+         */
+        startsWith(
+            target?: string,
+            position?: number
+        ): boolean;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.startsWith
+         */
+        startsWith(
+            target?: string,
+            position?: number
+        ): LoDashExplicitWrapper<boolean>;
+    }
+
+    // template
+
+    interface TemplateOptions extends TemplateSettings {
+        /**
+         * The sourceURL of the template's compiled source.
+         */
+        sourceURL?: string;
+    }
+
+    interface TemplateExecutor {
+        (data?: object): string;
+        source: string;
+    }
+
+    interface LoDashStatic {
+        /**
+         * Creates a compiled template function that can interpolate data properties in "interpolate" delimiters,
+         * HTML-escape interpolated data properties in "escape" delimiters, and execute JavaScript in "evaluate"
+         * delimiters. Data properties may be accessed as free variables in the template. If a setting object is
+         * provided it takes precedence over _.templateSettings values.
+         *
+         * Note: In the development build _.template utilizes
+         * [sourceURLs](http://www.html5rocks.com/en/tutorials/developertools/sourcemaps/#toc-sourceurl) for easier
+         * debugging.
+         *
+         * For more information on precompiling templates see
+         * [lodash's custom builds documentation](https://lodash.com/custom-builds).
+         *
+         * For more information on Chrome extension sandboxes see
+         * [Chrome's extensions documentation](https://developer.chrome.com/extensions/sandboxingEval).
+         *
+         * @param string The template string.
+         * @param options The options object.
+         * @param options.escape The HTML "escape" delimiter.
+         * @param options.evaluate The "evaluate" delimiter.
+         * @param options.imports An object to import into the template as free variables.
+         * @param options.interpolate The "interpolate" delimiter.
+         * @param options.sourceURL The sourceURL of the template's compiled source.
+         * @param options.variable The data object variable name.
+         * @return Returns the compiled template function.
+         */
+        template(
+            string?: string,
+            options?: TemplateOptions
+        ): TemplateExecutor;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.template
+         */
+        template(options?: TemplateOptions): TemplateExecutor;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.template
+         */
+        template(options?: TemplateOptions): LoDashExplicitWrapper<TemplateExecutor>;
+    }
+
+    // toLower
+
+    interface LoDashStatic {
+        /**
+         * Converts `string`, as a whole, to lower case.
+         *
+         * @param string The string to convert.
+         * @return Returns the lower cased string.
+         */
+        toLower(string?: string): string;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.toLower
+         */
+        toLower(): string;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.toLower
+         */
+        toLower(): LoDashExplicitWrapper<string>;
+    }
+
+    // toUpper
+
+    interface LoDashStatic {
+        /**
+         * Converts `string`, as a whole, to upper case.
+         *
+         * @param string The string to convert.
+         * @return Returns the upper cased string.
+         */
+        toUpper(string?: string): string;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.toUpper
+         */
+        toUpper(): string;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.toUpper
+         */
+        toUpper(): LoDashExplicitWrapper<string>;
+    }
+
+    // trim
+
+    interface LoDashStatic {
+        /**
+         * Removes leading and trailing whitespace or specified characters from string.
+         *
+         * @param string The string to trim.
+         * @param chars The characters to trim.
+         * @return Returns the trimmed string.
+         */
+        trim(
+            string?: string,
+            chars?: string
+        ): string;
+
+        /**
+         * Removes leading and trailing whitespace or specified characters from string.
+         *
+         * @param string The string to trim.
+         * @param index Not used in this overload.
+         * @param guard Enables use as an iteratee for methods like _.map. You should not pass this parameter directly in your code.
+         * @return Returns the trimmed string.
+         */
+        trim(
+            string: string,
+            index: string | number,
+            guard: object
+        ): string;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.trim
+         */
+        trim(chars?: string): string;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.trim
+         */
+        trim(chars?: string): LoDashExplicitWrapper<string>;
+    }
+
+    // trimEnd
+
+    interface LoDashStatic {
+        /**
+         * Removes trailing whitespace or specified characters from string.
+         *
+         * @param string The string to trim.
+         * @param chars The characters to trim.
+         * @return Returns the trimmed string.
+         */
+        trimEnd(
+            string?: string,
+            chars?: string
+        ): string;
+
+        /**
+         * Removes trailing whitespace or specified characters from string.
+         *
+         * @param string The string to trim.
+         * @param index Not used in this overload.
+         * @param guard Enables use as an iteratee for methods like _.map. You should not pass this parameter directly in your code.
+         * @return Returns the trimmed string.
+         */
+        trimEnd(
+            string: string,
+            index: string | number,
+            guard: object
+        ): string;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.trimEnd
+         */
+        trimEnd(chars?: string): string;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.trimEnd
+         */
+        trimEnd(chars?: string): LoDashExplicitWrapper<string>;
+    }
+
+    // trimStart
+
+    interface LoDashStatic {
+        /**
+         * Removes leading whitespace or specified characters from string.
+         *
+         * @param string The string to trim.
+         * @param chars The characters to trim.
+         * @return Returns the trimmed string.
+         */
+        trimStart(
+            string?: string,
+            chars?: string
+        ): string;
+
+        /**
+         * Removes leading whitespace or specified characters from string.
+         *
+         * @param string The string to trim.
+         * @param index Not used in this overload.
+         * @param guard Enables use as an iteratee for methods like _.map. You should not pass this parameter directly in your code.
+         * @return Returns the trimmed string.
+         */
+        trimStart(
+            string: string,
+            index: string | number,
+            guard: object
+        ): string;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.trimStart
+         */
+        trimStart(chars?: string): string;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.trimStart
+         */
+        trimStart(chars?: string): LoDashExplicitWrapper<string>;
+    }
+
+    // truncate
+
+    interface TruncateOptions {
+        /** The maximum string length. */
+        length?: number;
+        /** The string to indicate text is omitted. */
+        omission?: string;
+        /** The separator pattern to truncate to. */
+        separator?: string|RegExp;
+    }
+
+    interface LoDashStatic {
+        /**
+         * Truncates string if it’s longer than the given maximum string length. The last characters of the truncated
+         * string are replaced with the omission string which defaults to "…".
+         *
+         * @param string The string to truncate.
+         * @param options The options object or maximum string length.
+         * @return Returns the truncated string.
+         */
+        truncate(
+            string?: string,
+            options?: TruncateOptions
+        ): string;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.truncate
+         */
+        truncate(options?: TruncateOptions): string;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.truncate
+         */
+        truncate(options?: TruncateOptions): LoDashExplicitWrapper<string>;
+    }
+
+    // unescape
+
+    interface LoDashStatic {
+        /**
+         * The inverse of _.escape; this method converts the HTML entities &amp;, &lt;, &gt;, &quot;, &#39;, and &#96;
+         * in string to their corresponding characters.
+         *
+         * Note: No other HTML entities are unescaped. To unescape additional HTML entities use a third-party library
+         * like he.
+         *
+         * @param string The string to unescape.
+         * @return Returns the unescaped string.
+         */
+        unescape(string?: string): string;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.unescape
+         */
+        unescape(): string;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.unescape
+         */
+        unescape(): LoDashExplicitWrapper<string>;
+    }
+
+    // upperCase
+
+    interface LoDashStatic {
+        /**
+         * Converts `string`, as space separated words, to upper case.
+         *
+         * @param string The string to convert.
+         * @return Returns the upper cased string.
+         */
+        upperCase(string?: string): string;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.upperCase
+         */
+        upperCase(): string;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.upperCase
+         */
+        upperCase(): LoDashExplicitWrapper<string>;
+    }
+
+    // upperFirst
+
+    interface LoDashStatic {
+        /**
+         * Converts the first character of `string` to upper case.
+         *
+         * @param string The string to convert.
+         * @return Returns the converted string.
+         */
+        upperFirst(string?: string): string;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.upperFirst
+         */
+        upperFirst(): string;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.upperFirst
+         */
+        upperFirst(): LoDashExplicitWrapper<string>;
+    }
+
+    // words
+
+    interface LoDashStatic {
+        /**
+         * Splits `string` into an array of its words.
+         *
+         * @param string The string to inspect.
+         * @param pattern The pattern to match words.
+         * @return Returns the words of `string`.
+         */
+        words(
+            string?: string,
+            pattern?: string|RegExp
+        ): string[];
+
+        /**
+         * Splits `string` into an array of its words.
+         *
+         * @param string The string to inspect.
+         * @param index Not used in this overload.
+         * @param guard Enables use as an iteratee for methods like _.map. You should not pass this parameter directly in your code.
+         * @return Returns the words of `string`.
+         */
+        words(
+            string: string,
+            index: string | number,
+            guard: object
+        ): string[];
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.words
+         */
+        words(pattern?: string|RegExp): string[];
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.words
+         */
+        words(pattern?: string|RegExp): LoDashExplicitWrapper<string[]>;
+    }
+}
\ No newline at end of file
diff --git a/types/lodash/common/util.d.ts b/types/lodash/common/util.d.ts
new file mode 100644
index 0000000000..e365750018
--- /dev/null
+++ b/types/lodash/common/util.d.ts
@@ -0,0 +1,1455 @@
+import _ = require("../index");
+declare module "../index" {
+    // attempt
+
+    interface LoDashStatic {
+        /**
+         * Attempts to invoke func, returning either the result or the caught error object. Any additional arguments
+         * are provided to func when it’s invoked.
+         *
+         * @param func The function to attempt.
+         * @return Returns the func result or error object.
+         */
+        attempt<TResult>(func: (...args: any[]) => TResult, ...args: any[]): TResult|Error;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.attempt
+         */
+        attempt<TResult>(...args: any[]): TResult|Error;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.attempt
+         */
+        attempt<TResult>(...args: any[]): LoDashExplicitWrapper<TResult|Error>;
+    }
+
+    // bindAll
+
+    interface LoDashStatic {
+        /**
+         * Binds methods of an object to the object itself, overwriting the existing method. Method names may be
+         * specified as individual arguments or as arrays of method names. If no method names are provided all
+         * enumerable function properties, own and inherited, of object are bound.
+         *
+         * Note: This method does not set the "length" property of bound functions.
+         *
+         * @param object The object to bind and assign the bound methods to.
+         * @param methodNames The object method names to bind, specified as individual method names or arrays of
+         * method names.
+         * @return Returns object.
+         */
+        bindAll<T>(
+            object: T,
+            ...methodNames: Array<Many<string>>
+        ): T;
+    }
+
+    interface LoDashWrapper<TValue> {
+        /**
+         * @see _.bindAll
+         */
+        bindAll(...methodNames: Array<Many<string>>): this;
+    }
+
+    // cond
+
+    interface LoDashStatic {
+        /**
+         * Creates a function that iterates over `pairs` and invokes the corresponding
+         * function of the first predicate to return truthy. The predicate-function
+         * pairs are invoked with the `this` binding and arguments of the created
+         * function.
+         *
+         * @since 4.0.0
+         * @category Util
+         * @param pairs The predicate-function pairs.
+         * @returns Returns the new composite function.
+         * @example
+         *
+         * var func = _.cond([
+         *   [_.matches({ 'a': 1 }),           _.constant('matches A')],
+         *   [_.conforms({ 'b': _.isNumber }), _.constant('matches B')],
+         *   [_.stubTrue,                      _.constant('no match')]
+         * ]);
+         *
+         * func({ 'a': 1, 'b': 2 });
+         * // => 'matches A'
+         *
+         * func({ 'a': 0, 'b': 1 });
+         * // => 'matches B'
+         *
+         * func({ 'a': '1', 'b': '2' });
+         * // => 'no match'
+         */
+        cond<T, R>(pairs: Array<CondPair<T, R>>): (Target: T) => R;
+    }
+
+    // conforms
+
+    type ConformsPredicateObject<T> = {
+        [P in keyof T]?: (val: T[P]) => boolean;
+    };
+
+    interface LoDashStatic {
+        /**
+         * Creates a function that invokes the predicate properties of `source` with the corresponding
+         * property values of a given object, returning true if all predicates return truthy, else false.
+         */
+        conforms<T>(source: ConformsPredicateObject<T>): (value: T) => boolean;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.conforms
+         */
+        conforms<T>(this: LoDashImplicitWrapper<ConformsPredicateObject<T>>): LoDashImplicitWrapper<(value: T) => boolean>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.conforms
+         */
+        conforms<T>(this: LoDashExplicitWrapper<ConformsPredicateObject<T>>): LoDashExplicitWrapper<(value: T) => boolean>;
+    }
+
+    // constant
+
+    interface LoDashStatic {
+        /**
+         * Creates a function that returns value.
+         *
+         * @param value The value to return from the new function.
+         * @return Returns the new function.
+         */
+        constant<T>(value: T): () => T;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.constant
+         */
+        constant(): LoDashImplicitWrapper<() => TValue>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.constant
+         */
+        constant(): LoDashExplicitWrapper<() => TValue>;
+    }
+
+    // defaultTo
+
+    interface LoDashStatic {
+        /**
+         * Checks `value` to determine whether a default value should be returned in
+         * its place. The `defaultValue` is returned if `value` is `NaN`, `null`,
+         * or `undefined`.
+         *
+         * @param value The value to check.
+         * @param defaultValue The default value.
+         * @returns Returns the resolved value.
+         */
+        defaultTo<T>(value: T | null | undefined, defaultValue: T): T;
+
+        /**
+         * @see _.defaultTo
+         */
+        defaultTo<T, TDefault>(
+            value: T | null | undefined,
+            defaultValue: TDefault
+        ): T | TDefault;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.defaultTo
+         */
+        defaultTo<T>(this: LoDashImplicitWrapper<T | null | undefined>, defaultValue: T): T;
+
+        /**
+         * @see _.defaultTo
+         */
+        defaultTo<T, TDefault>(
+            this: LoDashImplicitWrapper<T | null | undefined>,
+            defaultValue: TDefault
+        ): T | TDefault;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.defaultTo
+         */
+        defaultTo<T>(this: LoDashExplicitWrapper<T | null | undefined>, defaultValue: T): LoDashExplicitWrapper<T>;
+
+        /**
+         * @see _.defaultTo
+         */
+        defaultTo<T, TDefault>(
+            this: LoDashExplicitWrapper<T | null | undefined>,
+            defaultValue: TDefault
+        ): LoDashExplicitWrapper<T | TDefault>;
+    }
+
+    // flow
+
+    interface LoDashStatic {
+        /**
+         * Creates a function that returns the result of invoking the provided functions with the this binding of the
+         * created function, where each successive invocation is supplied the return value of the previous.
+         *
+         * @param funcs Functions to invoke.
+         * @return Returns the new function.
+         */
+        // 0-argument first function
+        flow<R1, R2>(f1: () => R1, f2: (a: R1) => R2): () => R2;
+        flow<R1, R2, R3>(f1: () => R1, f2: (a: R1) => R2, f3: (a: R2) => R3): () => R3;
+        flow<R1, R2, R3, R4>(f1: () => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4): () => R4;
+        flow<R1, R2, R3, R4, R5>(f1: () => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5): () => R5;
+        flow<R1, R2, R3, R4, R5, R6>(f1: () => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6): () => R6;
+        flow<R1, R2, R3, R4, R5, R6, R7>(f1: () => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7): () => R7;
+        flow<R1, R2, R3, R4, R5, R6, R7>(f1: () => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7, ...funcs: Array<Many<(a: any) => any>>): () => any;
+        // 1-argument first function
+        flow<A1, R1, R2>(f1: (a1: A1) => R1, f2: (a: R1) => R2): (a1: A1) => R2;
+        flow<A1, R1, R2, R3>(f1: (a1: A1) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3): (a1: A1) => R3;
+        flow<A1, R1, R2, R3, R4>(f1: (a1: A1) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4): (a1: A1) => R4;
+        flow<A1, R1, R2, R3, R4, R5>(f1: (a1: A1) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5): (a1: A1) => R5;
+        flow<A1, R1, R2, R3, R4, R5, R6>(f1: (a1: A1) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6): (a1: A1) => R6;
+        flow<A1, R1, R2, R3, R4, R5, R6, R7>(f1: (a1: A1) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7): (a1: A1) => R7;
+        flow<A1, R1, R2, R3, R4, R5, R6, R7>(f1: (a1: A1) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7, ...funcs: Array<Many<(a: any) => any>>): (a1: A1) => any;
+        // 2-argument first function
+        flow<A1, A2, R1, R2>(f1: (a1: A1, a2: A2) => R1, f2: (a: R1) => R2): (a1: A1, a2: A2) => R2;
+        flow<A1, A2, R1, R2, R3>(f1: (a1: A1, a2: A2) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3): (a1: A1, a2: A2) => R3;
+        flow<A1, A2, R1, R2, R3, R4>(f1: (a1: A1, a2: A2) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4): (a1: A1, a2: A2) => R4;
+        flow<A1, A2, R1, R2, R3, R4, R5>(f1: (a1: A1, a2: A2) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5): (a1: A1, a2: A2) => R5;
+        flow<A1, A2, R1, R2, R3, R4, R5, R6>(f1: (a1: A1, a2: A2) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6): (a1: A1, a2: A2) => R6;
+        flow<A1, A2, R1, R2, R3, R4, R5, R6, R7>(f1: (a1: A1, a2: A2) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7): (a1: A1, a2: A2) => R7;
+        flow<A1, A2, R1, R2, R3, R4, R5, R6, R7>(f1: (a1: A1, a2: A2) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7, ...funcs: Array<Many<(a: any) => any>>): (a1: A1, a2: A2) => any;
+        // 3-argument first function
+        flow<A1, A2, A3, R1, R2>(f1: (a1: A1, a2: A2, a3: A3) => R1, f2: (a: R1) => R2): (a1: A1, a2: A2, a3: A3) => R2;
+        flow<A1, A2, A3, R1, R2, R3>(f1: (a1: A1, a2: A2, a3: A3) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3): (a1: A1, a2: A2, a3: A3) => R3;
+        flow<A1, A2, A3, R1, R2, R3, R4>(f1: (a1: A1, a2: A2, a3: A3) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4): (a1: A1, a2: A2, a3: A3) => R4;
+        flow<A1, A2, A3, R1, R2, R3, R4, R5>(f1: (a1: A1, a2: A2, a3: A3) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5): (a1: A1, a2: A2, a3: A3) => R5;
+        flow<A1, A2, A3, R1, R2, R3, R4, R5, R6>(f1: (a1: A1, a2: A2, a3: A3) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6): (a1: A1, a2: A2, a3: A3) => R6;
+        flow<A1, A2, A3, R1, R2, R3, R4, R5, R6, R7>(f1: (a1: A1, a2: A2, a3: A3) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7): (a1: A1, a2: A2, a3: A3) => R7;
+        flow<A1, A2, A3, R1, R2, R3, R4, R5, R6, R7>(f1: (a1: A1, a2: A2, a3: A3) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7, ...funcs: Array<Many<(a: any) => any>>): (a1: A1, a2: A2, a3: A3) => any;
+        // 4-argument first function
+        flow<A1, A2, A3, A4, R1, R2>(f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1, f2: (a: R1) => R2): (a1: A1, a2: A2, a3: A3, a4: A4) => R2;
+        flow<A1, A2, A3, A4, R1, R2, R3>(f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3): (a1: A1, a2: A2, a3: A3, a4: A4) => R3;
+        flow<A1, A2, A3, A4, R1, R2, R3, R4>(f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4): (a1: A1, a2: A2, a3: A3, a4: A4) => R4;
+        flow<A1, A2, A3, A4, R1, R2, R3, R4, R5>(f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5): (a1: A1, a2: A2, a3: A3, a4: A4) => R5;
+        flow<A1, A2, A3, A4, R1, R2, R3, R4, R5, R6>(f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6): (a1: A1, a2: A2, a3: A3, a4: A4) => R6;
+        flow<A1, A2, A3, A4, R1, R2, R3, R4, R5, R6, R7>(f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7): (a1: A1, a2: A2, a3: A3, a4: A4) => R7;
+        flow<A1, A2, A3, A4, R1, R2, R3, R4, R5, R6, R7>(f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7, ...funcs: Array<Many<(a: any) => any>>): (a1: A1, a2: A2, a3: A3, a4: A4) => any;
+        // any-argument first function
+        flow<A1, A2, A3, A4, R1, R2>(f1: (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1, f2: (a: R1) => R2): (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R2;
+        flow<A1, A2, A3, A4, R1, R2, R3>(f1: (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3): (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R3;
+        flow<A1, A2, A3, A4, R1, R2, R3, R4>(f1: (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4): (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R4;
+        flow<A1, A2, A3, A4, R1, R2, R3, R4, R5>(f1: (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5): (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R5;
+        flow<A1, A2, A3, A4, R1, R2, R3, R4, R5, R6>(f1: (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6): (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R6;
+        flow<A1, A2, A3, A4, R1, R2, R3, R4, R5, R6, R7>(f1: (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7): (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R7;
+        flow<A1, A2, A3, A4, R1, R2, R3, R4, R5, R6, R7>(f1: (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7, ...funcs: Array<Many<(a: any) => any>>): (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => any;
+        flow(funcs: Array<Many<(...args: any[]) => any>>): (...args: any[]) => any;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.flow
+         */
+        // 0-argument first function
+        flow<R1, R2>(this: LoDashImplicitWrapper<() => R1>, f2: (a: R1) => R2): LoDashImplicitWrapper<() => R2>;
+        flow<R1, R2, R3>(this: LoDashImplicitWrapper<() => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3): LoDashImplicitWrapper<() => R3>;
+        flow<R1, R2, R3, R4>(this: LoDashImplicitWrapper<() => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4): LoDashImplicitWrapper<() => R4>;
+        flow<R1, R2, R3, R4, R5>(this: LoDashImplicitWrapper<() => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5): LoDashImplicitWrapper<() => R5>;
+        flow<R1, R2, R3, R4, R5, R6>(this: LoDashImplicitWrapper<() => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6): LoDashImplicitWrapper<() => R6>;
+        flow<R1, R2, R3, R4, R5, R6, R7>(this: LoDashImplicitWrapper<() => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7): LoDashImplicitWrapper<() => R7>;
+        flow<R1, R2, R3, R4, R5, R6, R7>(this: LoDashImplicitWrapper<() => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7, ...funcs: Array<Many<(a: any) => any>>): LoDashImplicitWrapper<() => any>;
+        // 1-argument first function
+        flow<A1, R1, R2>(this: LoDashImplicitWrapper<(a1: A1) => R1>, f2: (a: R1) => R2): LoDashImplicitWrapper<(a1: A1) => R2>;
+        flow<A1, R1, R2, R3>(this: LoDashImplicitWrapper<(a1: A1) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3): LoDashImplicitWrapper<(a1: A1) => R3>;
+        flow<A1, R1, R2, R3, R4>(this: LoDashImplicitWrapper<(a1: A1) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4): LoDashImplicitWrapper<(a1: A1) => R4>;
+        flow<A1, R1, R2, R3, R4, R5>(this: LoDashImplicitWrapper<(a1: A1) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5): LoDashImplicitWrapper<(a1: A1) => R5>;
+        flow<A1, R1, R2, R3, R4, R5, R6>(this: LoDashImplicitWrapper<(a1: A1) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6): LoDashImplicitWrapper<(a1: A1) => R6>;
+        flow<A1, R1, R2, R3, R4, R5, R6, R7>(this: LoDashImplicitWrapper<(a1: A1) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7): LoDashImplicitWrapper<(a1: A1) => R7>;
+        flow<A1, R1, R2, R3, R4, R5, R6, R7>(this: LoDashImplicitWrapper<(a1: A1) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7, ...funcs: Array<Many<(a: any) => any>>): LoDashImplicitWrapper<(a1: A1) => any>;
+        // 2-argument first function
+        flow<A1, A2, R1, R2>(this: LoDashImplicitWrapper<(a1: A1, a2: A2) => R1>, f2: (a: R1) => R2): LoDashImplicitWrapper<(a1: A1, a2: A2) => R2>;
+        flow<A1, A2, R1, R2, R3>(this: LoDashImplicitWrapper<(a1: A1, a2: A2) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3): LoDashImplicitWrapper<(a1: A1, a2: A2) => R3>;
+        flow<A1, A2, R1, R2, R3, R4>(this: LoDashImplicitWrapper<(a1: A1, a2: A2) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4): LoDashImplicitWrapper<(a1: A1, a2: A2) => R4>;
+        flow<A1, A2, R1, R2, R3, R4, R5>(this: LoDashImplicitWrapper<(a1: A1, a2: A2) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5): LoDashImplicitWrapper<(a1: A1, a2: A2) => R5>;
+        flow<A1, A2, R1, R2, R3, R4, R5, R6>(this: LoDashImplicitWrapper<(a1: A1, a2: A2) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6): LoDashImplicitWrapper<(a1: A1, a2: A2) => R6>;
+        flow<A1, A2, R1, R2, R3, R4, R5, R6, R7>(this: LoDashImplicitWrapper<(a1: A1, a2: A2) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7): LoDashImplicitWrapper<(a1: A1, a2: A2) => R7>;
+        flow<A1, A2, R1, R2, R3, R4, R5, R6, R7>(this: LoDashImplicitWrapper<(a1: A1, a2: A2) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7, ...funcs: Array<Many<(a: any) => any>>): LoDashImplicitWrapper<(a1: A1, a2: A2) => any>;
+        // 3-argument first function
+        flow<A1, A2, A3, R1, R2>(this: LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3) => R1>, f2: (a: R1) => R2): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3) => R2>;
+        flow<A1, A2, A3, R1, R2, R3>(this: LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3) => R3>;
+        flow<A1, A2, A3, R1, R2, R3, R4>(this: LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3) => R4>;
+        flow<A1, A2, A3, R1, R2, R3, R4, R5>(this: LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3) => R5>;
+        flow<A1, A2, A3, R1, R2, R3, R4, R5, R6>(this: LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3) => R6>;
+        flow<A1, A2, A3, R1, R2, R3, R4, R5, R6, R7>(this: LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3) => R7>;
+        flow<A1, A2, A3, R1, R2, R3, R4, R5, R6, R7>(this: LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7, ...funcs: Array<Many<(a: any) => any>>): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3) => any>;
+        // 4-argument first function
+        flow<A1, A2, A3, A4, R1, R2>(this: LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R1>, f2: (a: R1) => R2): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R2>;
+        flow<A1, A2, A3, A4, R1, R2, R3>(this: LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R3>;
+        flow<A1, A2, A3, A4, R1, R2, R3, R4>(this: LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R4>;
+        flow<A1, A2, A3, A4, R1, R2, R3, R4, R5>(this: LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R5>;
+        flow<A1, A2, A3, A4, R1, R2, R3, R4, R5, R6>(this: LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R6>;
+        flow<A1, A2, A3, A4, R1, R2, R3, R4, R5, R6, R7>(this: LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R7>;
+        flow<A1, A2, A3, A4, R1, R2, R3, R4, R5, R6, R7>(this: LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7, ...funcs: Array<Many<(a: any) => any>>): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => any>;
+        // any-argument first function
+        flow<A1, A2, A3, A4, R1, R2>(this: LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1>, f2: (a: R1) => R2): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R2>;
+        flow<A1, A2, A3, A4, R1, R2, R3>(this: LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R3>;
+        flow<A1, A2, A3, A4, R1, R2, R3, R4>(this: LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R4>;
+        flow<A1, A2, A3, A4, R1, R2, R3, R4, R5>(this: LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R5>;
+        flow<A1, A2, A3, A4, R1, R2, R3, R4, R5, R6>(this: LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R6>;
+        flow<A1, A2, A3, A4, R1, R2, R3, R4, R5, R6, R7>(this: LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R7>;
+        flow<A1, A2, A3, A4, R1, R2, R3, R4, R5, R6, R7>(this: LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7, ...funcs: Array<Many<(a: any) => any>>): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => any>;
+        flow(this: LoDashImplicitWrapper<(...args: any[]) => any>, funcs: Array<Many<(a: any) => any>>): LoDashImplicitWrapper<(...args: any[]) => any>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.flow
+         */
+        // 0-argument first function
+        flow<R1, R2>(this: LoDashExplicitWrapper<() => R1>, f2: (a: R1) => R2): LoDashExplicitWrapper<() => R2>;
+        flow<R1, R2, R3>(this: LoDashExplicitWrapper<() => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3): LoDashExplicitWrapper<() => R3>;
+        flow<R1, R2, R3, R4>(this: LoDashExplicitWrapper<() => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4): LoDashExplicitWrapper<() => R4>;
+        flow<R1, R2, R3, R4, R5>(this: LoDashExplicitWrapper<() => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5): LoDashExplicitWrapper<() => R5>;
+        flow<R1, R2, R3, R4, R5, R6>(this: LoDashExplicitWrapper<() => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6): LoDashExplicitWrapper<() => R6>;
+        flow<R1, R2, R3, R4, R5, R6, R7>(this: LoDashExplicitWrapper<() => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7): LoDashExplicitWrapper<() => R7>;
+        flow<R1, R2, R3, R4, R5, R6, R7>(this: LoDashExplicitWrapper<() => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7, ...funcs: Array<Many<(a: any) => any>>): LoDashExplicitWrapper<() => any>;
+        // 1-argument first function
+        flow<A1, R1, R2>(this: LoDashExplicitWrapper<(a1: A1) => R1>, f2: (a: R1) => R2): LoDashExplicitWrapper<(a1: A1) => R2>;
+        flow<A1, R1, R2, R3>(this: LoDashExplicitWrapper<(a1: A1) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3): LoDashExplicitWrapper<(a1: A1) => R3>;
+        flow<A1, R1, R2, R3, R4>(this: LoDashExplicitWrapper<(a1: A1) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4): LoDashExplicitWrapper<(a1: A1) => R4>;
+        flow<A1, R1, R2, R3, R4, R5>(this: LoDashExplicitWrapper<(a1: A1) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5): LoDashExplicitWrapper<(a1: A1) => R5>;
+        flow<A1, R1, R2, R3, R4, R5, R6>(this: LoDashExplicitWrapper<(a1: A1) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6): LoDashExplicitWrapper<(a1: A1) => R6>;
+        flow<A1, R1, R2, R3, R4, R5, R6, R7>(this: LoDashExplicitWrapper<(a1: A1) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7): LoDashExplicitWrapper<(a1: A1) => R7>;
+        flow<A1, R1, R2, R3, R4, R5, R6, R7>(this: LoDashExplicitWrapper<(a1: A1) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7, ...funcs: Array<Many<(a: any) => any>>): LoDashExplicitWrapper<(a1: A1) => any>;
+        // 2-argument first function
+        flow<A1, A2, R1, R2>(this: LoDashExplicitWrapper<(a1: A1, a2: A2) => R1>, f2: (a: R1) => R2): LoDashExplicitWrapper<(a1: A1, a2: A2) => R2>;
+        flow<A1, A2, R1, R2, R3>(this: LoDashExplicitWrapper<(a1: A1, a2: A2) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3): LoDashExplicitWrapper<(a1: A1, a2: A2) => R3>;
+        flow<A1, A2, R1, R2, R3, R4>(this: LoDashExplicitWrapper<(a1: A1, a2: A2) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4): LoDashExplicitWrapper<(a1: A1, a2: A2) => R4>;
+        flow<A1, A2, R1, R2, R3, R4, R5>(this: LoDashExplicitWrapper<(a1: A1, a2: A2) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5): LoDashExplicitWrapper<(a1: A1, a2: A2) => R5>;
+        flow<A1, A2, R1, R2, R3, R4, R5, R6>(this: LoDashExplicitWrapper<(a1: A1, a2: A2) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6): LoDashExplicitWrapper<(a1: A1, a2: A2) => R6>;
+        flow<A1, A2, R1, R2, R3, R4, R5, R6, R7>(this: LoDashExplicitWrapper<(a1: A1, a2: A2) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7): LoDashExplicitWrapper<(a1: A1, a2: A2) => R7>;
+        flow<A1, A2, R1, R2, R3, R4, R5, R6, R7>(this: LoDashExplicitWrapper<(a1: A1, a2: A2) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7, ...funcs: Array<Many<(a: any) => any>>): LoDashExplicitWrapper<(a1: A1, a2: A2) => any>;
+        // 3-argument first function
+        flow<A1, A2, A3, R1, R2>(this: LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3) => R1>, f2: (a: R1) => R2): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3) => R2>;
+        flow<A1, A2, A3, R1, R2, R3>(this: LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3) => R3>;
+        flow<A1, A2, A3, R1, R2, R3, R4>(this: LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3) => R4>;
+        flow<A1, A2, A3, R1, R2, R3, R4, R5>(this: LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3) => R5>;
+        flow<A1, A2, A3, R1, R2, R3, R4, R5, R6>(this: LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3) => R6>;
+        flow<A1, A2, A3, R1, R2, R3, R4, R5, R6, R7>(this: LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3) => R7>;
+        flow<A1, A2, A3, R1, R2, R3, R4, R5, R6, R7>(this: LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7, ...funcs: Array<Many<(a: any) => any>>): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3) => any>;
+        // 4-argument first function
+        flow<A1, A2, A3, A4, R1, R2>(this: LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R1>, f2: (a: R1) => R2): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R2>;
+        flow<A1, A2, A3, A4, R1, R2, R3>(this: LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R3>;
+        flow<A1, A2, A3, A4, R1, R2, R3, R4>(this: LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R4>;
+        flow<A1, A2, A3, A4, R1, R2, R3, R4, R5>(this: LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R5>;
+        flow<A1, A2, A3, A4, R1, R2, R3, R4, R5, R6>(this: LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R6>;
+        flow<A1, A2, A3, A4, R1, R2, R3, R4, R5, R6, R7>(this: LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R7>;
+        flow<A1, A2, A3, A4, R1, R2, R3, R4, R5, R6, R7>(this: LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7, ...funcs: Array<Many<(a: any) => any>>): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => any>;
+        // any-argument first function
+        flow<A1, A2, A3, A4, R1, R2>(this: LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1>, f2: (a: R1) => R2): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R2>;
+        flow<A1, A2, A3, A4, R1, R2, R3>(this: LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R3>;
+        flow<A1, A2, A3, A4, R1, R2, R3, R4>(this: LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R4>;
+        flow<A1, A2, A3, A4, R1, R2, R3, R4, R5>(this: LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R5>;
+        flow<A1, A2, A3, A4, R1, R2, R3, R4, R5, R6>(this: LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R6>;
+        flow<A1, A2, A3, A4, R1, R2, R3, R4, R5, R6, R7>(this: LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R7>;
+        flow<A1, A2, A3, A4, R1, R2, R3, R4, R5, R6, R7>(this: LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7, ...funcs: Array<Many<(a: any) => any>>): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => any>;
+        flow(this: LoDashExplicitWrapper<(...args: any[]) => any>, funcs: Array<Many<(a: any) => any>>): LoDashExplicitWrapper<(...args: any[]) => any>;
+    }
+
+    // flowRight
+
+    interface LoDashStatic {
+        /**
+         * This method is like _.flow except that it creates a function that invokes the provided functions from right
+         * to left.
+         *
+         * @param funcs Functions to invoke.
+         * @return Returns the new function.
+         */
+        // 0-argument first function
+        flowRight<R2, R1>(f2: (a: R1) => R2, f1: () => R1): () => R2;
+        flowRight<R3, R2, R1>(f3: (a: R2) => R3, f2: (a: R1) => R2, f1: () => R1): () => R3;
+        flowRight<R4, R3, R2, R1>(f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: () => R1): () => R4;
+        flowRight<R5, R4, R3, R2, R1>(f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: () => R1): () => R5;
+        flowRight<R6, R5, R4, R3, R2, R1>(f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: () => R1): () => R6;
+        flowRight<R7, R6, R5, R4, R3, R2, R1>(f7: (a: R6) => R7, f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: () => R1): () => R7;
+        // 1-argument first function
+        flowRight<A1, R2, R1>(f2: (a: R1) => R2, f1: (a1: A1) => R1): (a1: A1) => R2;
+        flowRight<A1, R3, R2, R1>(f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1) => R1): (a1: A1) => R3;
+        flowRight<A1, R4, R3, R2, R1>(f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1) => R1): (a1: A1) => R4;
+        flowRight<A1, R5, R4, R3, R2, R1>(f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1) => R1): (a1: A1) => R5;
+        flowRight<A1, R6, R5, R4, R3, R2, R1>(f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1) => R1): (a1: A1) => R6;
+        flowRight<A1, R7, R6, R5, R4, R3, R2, R1>(f7: (a: R6) => R7, f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1) => R1): (a1: A1) => R7;
+        // 2-argument first function
+        flowRight<A1, A2, R2, R1>(f2: (a: R1) => R2, f1: (a1: A1, a2: A2) => R1): (a1: A1, a2: A2) => R2;
+        flowRight<A1, A2, R3, R2, R1>(f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2) => R1): (a1: A1, a2: A2) => R3;
+        flowRight<A1, A2, R4, R3, R2, R1>(f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2) => R1): (a1: A1, a2: A2) => R4;
+        flowRight<A1, A2, R5, R4, R3, R2, R1>(f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2) => R1): (a1: A1, a2: A2) => R5;
+        flowRight<A1, A2, R6, R5, R4, R3, R2, R1>(f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2) => R1): (a1: A1, a2: A2) => R6;
+        flowRight<A1, A2, R7, R6, R5, R4, R3, R2, R1>(f7: (a: R6) => R7, f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2) => R1): (a1: A1, a2: A2) => R7;
+        // 3-argument first function
+        flowRight<A1, A2, A3, R2, R1>(f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3) => R1): (a1: A1, a2: A2, a3: A3) => R2;
+        flowRight<A1, A2, A3, R3, R2, R1>(f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3) => R1): (a1: A1, a2: A2, a3: A3) => R3;
+        flowRight<A1, A2, A3, R4, R3, R2, R1>(f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3) => R1): (a1: A1, a2: A2, a3: A3) => R4;
+        flowRight<A1, A2, A3, R5, R4, R3, R2, R1>(f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3) => R1): (a1: A1, a2: A2, a3: A3) => R5;
+        flowRight<A1, A2, A3, R6, R5, R4, R3, R2, R1>(f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3) => R1): (a1: A1, a2: A2, a3: A3) => R6;
+        flowRight<A1, A2, A3, R7, R6, R5, R4, R3, R2, R1>(f7: (a: R6) => R7, f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3) => R1): (a1: A1, a2: A2, a3: A3) => R7;
+        // 4-argument first function
+        flowRight<A1, A2, A3, A4, R2, R1>(f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1): (a1: A1, a2: A2, a3: A3, a4: A4) => R2;
+        flowRight<A1, A2, A3, A4, R3, R2, R1>(f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1): (a1: A1, a2: A2, a3: A3, a4: A4) => R3;
+        flowRight<A1, A2, A3, A4, R4, R3, R2, R1>(f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1): (a1: A1, a2: A2, a3: A3, a4: A4) => R4;
+        flowRight<A1, A2, A3, A4, R5, R4, R3, R2, R1>(f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1): (a1: A1, a2: A2, a3: A3, a4: A4) => R5;
+        flowRight<A1, A2, A3, A4, R6, R5, R4, R3, R2, R1>(f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1): (a1: A1, a2: A2, a3: A3, a4: A4) => R6;
+        flowRight<A1, A2, A3, A4, R7, R6, R5, R4, R3, R2, R1>(f7: (a: R6) => R7, f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1): (a1: A1, a2: A2, a3: A3, a4: A4) => R7;
+        // any-argument first function
+        flowRight<R2, R1>(f2: (a: R1) => R2, f1: (...args: any[]) => R1): (...args: any[]) => R2;
+        flowRight<R3, R2, R1>(f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (...args: any[]) => R1): (...args: any[]) => R3;
+        flowRight<R4, R3, R2, R1>(f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (...args: any[]) => R1): (...args: any[]) => R4;
+        flowRight<R5, R4, R3, R2, R1>(f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (...args: any[]) => R1): (...args: any[]) => R5;
+        flowRight<R6, R5, R4, R3, R2, R1>(f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (...args: any[]) => R1): (...args: any[]) => R6;
+        flowRight<R7, R6, R5, R4, R3, R2, R1>(f7: (a: R6) => R7, f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (...args: any[]) => R1): (...args: any[]) => R7;
+        flowRight(f7: (a: any) => any, f6: (a: any) => any, f5: (a: any) => any, f4: (a: any) => any, f3: (a: any) => any, f2: (a: any) => any, f1: () => any, ...funcs: Array<Many<(...args: any[]) => any>>): (...args: any[]) => any;
+        flowRight(funcs: Array<Many<(...args: any[]) => any>>): (...args: any[]) => any;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.flowRight
+         */
+        // 0-argument first function
+        flowRight<R2, R1>(this: LoDashImplicitWrapper<(a: R1) => R2>, f1: () => R1): LoDashImplicitWrapper<() => R2>;
+        flowRight<R3, R2, R1>(this: LoDashImplicitWrapper<(a: R2) => R3>, f2: (a: R1) => R2, f1: () => R1): LoDashImplicitWrapper<() => R3>;
+        flowRight<R4, R3, R2, R1>(this: LoDashImplicitWrapper<(a: R3) => R4>, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: () => R1): LoDashImplicitWrapper<() => R4>;
+        flowRight<R5, R4, R3, R2, R1>(this: LoDashImplicitWrapper<(a: R4) => R5>, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: () => R1): LoDashImplicitWrapper<() => R5>;
+        flowRight<R6, R5, R4, R3, R2, R1>(this: LoDashImplicitWrapper<(a: R5) => R6>, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: () => R1): LoDashImplicitWrapper<() => R6>;
+        flowRight<R7, R6, R5, R4, R3, R2, R1>(this: LoDashImplicitWrapper<(a: R6) => R7>, f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: () => R1): LoDashImplicitWrapper<() => R7>;
+        // 1-argument first function
+        flowRight<A1, R2, R1>(this: LoDashImplicitWrapper<(a: R1) => R2>, f1: (a1: A1) => R1): LoDashImplicitWrapper<(a1: A1) => R2>;
+        flowRight<A1, R3, R2, R1>(this: LoDashImplicitWrapper<(a: R2) => R3>, f2: (a: R1) => R2, f1: (a1: A1) => R1): LoDashImplicitWrapper<(a1: A1) => R3>;
+        flowRight<A1, R4, R3, R2, R1>(this: LoDashImplicitWrapper<(a: R3) => R4>, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1) => R1): LoDashImplicitWrapper<(a1: A1) => R4>;
+        flowRight<A1, R5, R4, R3, R2, R1>(this: LoDashImplicitWrapper<(a: R4) => R5>, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1) => R1): LoDashImplicitWrapper<(a1: A1) => R5>;
+        flowRight<A1, R6, R5, R4, R3, R2, R1>(this: LoDashImplicitWrapper<(a: R5) => R6>, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1) => R1): LoDashImplicitWrapper<(a1: A1) => R6>;
+        flowRight<A1, R7, R6, R5, R4, R3, R2, R1>(this: LoDashImplicitWrapper<(a: R6) => R7>, f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1) => R1): LoDashImplicitWrapper<(a1: A1) => R7>;
+        // 2-argument first function
+        flowRight<A1, A2, R2, R1>(this: LoDashImplicitWrapper<(a: R1) => R2>, f1: (a1: A1, a2: A2) => R1): LoDashImplicitWrapper<(a1: A1, a2: A2) => R2>;
+        flowRight<A1, A2, R3, R2, R1>(this: LoDashImplicitWrapper<(a: R2) => R3>, f2: (a: R1) => R2, f1: (a1: A1, a2: A2) => R1): LoDashImplicitWrapper<(a1: A1, a2: A2) => R3>;
+        flowRight<A1, A2, R4, R3, R2, R1>(this: LoDashImplicitWrapper<(a: R3) => R4>, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2) => R1): LoDashImplicitWrapper<(a1: A1, a2: A2) => R4>;
+        flowRight<A1, A2, R5, R4, R3, R2, R1>(this: LoDashImplicitWrapper<(a: R4) => R5>, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2) => R1): LoDashImplicitWrapper<(a1: A1, a2: A2) => R5>;
+        flowRight<A1, A2, R6, R5, R4, R3, R2, R1>(this: LoDashImplicitWrapper<(a: R5) => R6>, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2) => R1): LoDashImplicitWrapper<(a1: A1, a2: A2) => R6>;
+        flowRight<A1, A2, R7, R6, R5, R4, R3, R2, R1>(this: LoDashImplicitWrapper<(a: R6) => R7>, f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2) => R1): LoDashImplicitWrapper<(a1: A1, a2: A2) => R7>;
+        // 3-argument first function
+        flowRight<A1, A2, A3, R2, R1>(this: LoDashImplicitWrapper<(a: R1) => R2>, f1: (a1: A1, a2: A2, a3: A3) => R1): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3) => R2>;
+        flowRight<A1, A2, A3, R3, R2, R1>(this: LoDashImplicitWrapper<(a: R2) => R3>, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3) => R1): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3) => R3>;
+        flowRight<A1, A2, A3, R4, R3, R2, R1>(this: LoDashImplicitWrapper<(a: R3) => R4>, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3) => R1): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3) => R4>;
+        flowRight<A1, A2, A3, R5, R4, R3, R2, R1>(this: LoDashImplicitWrapper<(a: R4) => R5>, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3) => R1): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3) => R5>;
+        flowRight<A1, A2, A3, R6, R5, R4, R3, R2, R1>(this: LoDashImplicitWrapper<(a: R5) => R6>, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3) => R1): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3) => R6>;
+        flowRight<A1, A2, A3, R7, R6, R5, R4, R3, R2, R1>(this: LoDashImplicitWrapper<(a: R6) => R7>, f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3) => R1): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3) => R7>;
+        // 4-argument first function
+        flowRight<A1, A2, A3, A4, R2, R1>(this: LoDashImplicitWrapper<(a: R1) => R2>, f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R2>;
+        flowRight<A1, A2, A3, A4, R3, R2, R1>(this: LoDashImplicitWrapper<(a: R2) => R3>, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R3>;
+        flowRight<A1, A2, A3, A4, R4, R3, R2, R1>(this: LoDashImplicitWrapper<(a: R3) => R4>, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R4>;
+        flowRight<A1, A2, A3, A4, R5, R4, R3, R2, R1>(this: LoDashImplicitWrapper<(a: R4) => R5>, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R5>;
+        flowRight<A1, A2, A3, A4, R6, R5, R4, R3, R2, R1>(this: LoDashImplicitWrapper<(a: R5) => R6>, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R6>;
+        flowRight<A1, A2, A3, A4, R7, R6, R5, R4, R3, R2, R1>(this: LoDashImplicitWrapper<(a: R6) => R7>, f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R7>;
+        // any-argument first function
+        flowRight<R2, R1>(this: LoDashImplicitWrapper<(a: R1) => R2>, f1: (...args: any[]) => R1): LoDashImplicitWrapper<(...args: any[]) => R2>;
+        flowRight<R3, R2, R1>(this: LoDashImplicitWrapper<(a: R1) => R2>, f2: (a: R1) => R2, f1: (...args: any[]) => R1): LoDashImplicitWrapper<(...args: any[]) => R3>;
+        flowRight<R4, R3, R2, R1>(this: LoDashImplicitWrapper<(a: R1) => R2>, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (...args: any[]) => R1): LoDashImplicitWrapper<(...args: any[]) => R4>;
+        flowRight<R5, R4, R3, R2, R1>(this: LoDashImplicitWrapper<(a: R1) => R2>, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (...args: any[]) => R1): LoDashImplicitWrapper<(...args: any[]) => R5>;
+        flowRight<R6, R5, R4, R3, R2, R1>(this: LoDashImplicitWrapper<(a: R1) => R2>, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (...args: any[]) => R1): LoDashImplicitWrapper<(...args: any[]) => R6>;
+        flowRight<R7, R6, R5, R4, R3, R2, R1>(this: LoDashImplicitWrapper<(a: R1) => R2>, f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (...args: any[]) => R1): LoDashImplicitWrapper<(...args: any[]) => R7>;
+        flowRight(this: LoDashImplicitWrapper<(a: any) => any>, f6: (a: any) => any, f5: (a: any) => any, f4: (a: any) => any, f3: (a: any) => any, f2: (a: any) => any, f1: () => any, ...funcs: Array<Many<(...args: any[]) => any>>): LoDashImplicitWrapper<(...args: any[]) => any>;
+        flowRight(this: LoDashImplicitWrapper<(a: any) => any>, funcs: Array<Many<(...args: any[]) => any>>): LoDashImplicitWrapper<(...args: any[]) => any>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.flowRight
+         */
+        // 0-argument first function
+        flowRight<R2, R1>(this: LoDashExplicitWrapper<(a: R1) => R2>, f1: () => R1): LoDashExplicitWrapper<() => R2>;
+        flowRight<R3, R2, R1>(this: LoDashExplicitWrapper<(a: R2) => R3>, f2: (a: R1) => R2, f1: () => R1): LoDashExplicitWrapper<() => R3>;
+        flowRight<R4, R3, R2, R1>(this: LoDashExplicitWrapper<(a: R3) => R4>, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: () => R1): LoDashExplicitWrapper<() => R4>;
+        flowRight<R5, R4, R3, R2, R1>(this: LoDashExplicitWrapper<(a: R4) => R5>, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: () => R1): LoDashExplicitWrapper<() => R5>;
+        flowRight<R6, R5, R4, R3, R2, R1>(this: LoDashExplicitWrapper<(a: R5) => R6>, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: () => R1): LoDashExplicitWrapper<() => R6>;
+        flowRight<R7, R6, R5, R4, R3, R2, R1>(this: LoDashExplicitWrapper<(a: R6) => R7>, f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: () => R1): LoDashExplicitWrapper<() => R7>;
+        // 1-argument first function
+        flowRight<A1, R2, R1>(this: LoDashExplicitWrapper<(a: R1) => R2>, f1: (a1: A1) => R1): LoDashExplicitWrapper<(a1: A1) => R2>;
+        flowRight<A1, R3, R2, R1>(this: LoDashExplicitWrapper<(a: R2) => R3>, f2: (a: R1) => R2, f1: (a1: A1) => R1): LoDashExplicitWrapper<(a1: A1) => R3>;
+        flowRight<A1, R4, R3, R2, R1>(this: LoDashExplicitWrapper<(a: R3) => R4>, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1) => R1): LoDashExplicitWrapper<(a1: A1) => R4>;
+        flowRight<A1, R5, R4, R3, R2, R1>(this: LoDashExplicitWrapper<(a: R4) => R5>, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1) => R1): LoDashExplicitWrapper<(a1: A1) => R5>;
+        flowRight<A1, R6, R5, R4, R3, R2, R1>(this: LoDashExplicitWrapper<(a: R5) => R6>, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1) => R1): LoDashExplicitWrapper<(a1: A1) => R6>;
+        flowRight<A1, R7, R6, R5, R4, R3, R2, R1>(this: LoDashExplicitWrapper<(a: R6) => R7>, f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1) => R1): LoDashExplicitWrapper<(a1: A1) => R7>;
+        // 2-argument first function
+        flowRight<A1, A2, R2, R1>(this: LoDashExplicitWrapper<(a: R1) => R2>, f1: (a1: A1, a2: A2) => R1): LoDashExplicitWrapper<(a1: A1, a2: A2) => R2>;
+        flowRight<A1, A2, R3, R2, R1>(this: LoDashExplicitWrapper<(a: R2) => R3>, f2: (a: R1) => R2, f1: (a1: A1, a2: A2) => R1): LoDashExplicitWrapper<(a1: A1, a2: A2) => R3>;
+        flowRight<A1, A2, R4, R3, R2, R1>(this: LoDashExplicitWrapper<(a: R3) => R4>, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2) => R1): LoDashExplicitWrapper<(a1: A1, a2: A2) => R4>;
+        flowRight<A1, A2, R5, R4, R3, R2, R1>(this: LoDashExplicitWrapper<(a: R4) => R5>, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2) => R1): LoDashExplicitWrapper<(a1: A1, a2: A2) => R5>;
+        flowRight<A1, A2, R6, R5, R4, R3, R2, R1>(this: LoDashExplicitWrapper<(a: R5) => R6>, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2) => R1): LoDashExplicitWrapper<(a1: A1, a2: A2) => R6>;
+        flowRight<A1, A2, R7, R6, R5, R4, R3, R2, R1>(this: LoDashExplicitWrapper<(a: R6) => R7>, f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2) => R1): LoDashExplicitWrapper<(a1: A1, a2: A2) => R7>;
+        // 3-argument first function
+        flowRight<A1, A2, A3, R2, R1>(this: LoDashExplicitWrapper<(a: R1) => R2>, f1: (a1: A1, a2: A2, a3: A3) => R1): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3) => R2>;
+        flowRight<A1, A2, A3, R3, R2, R1>(this: LoDashExplicitWrapper<(a: R2) => R3>, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3) => R1): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3) => R3>;
+        flowRight<A1, A2, A3, R4, R3, R2, R1>(this: LoDashExplicitWrapper<(a: R3) => R4>, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3) => R1): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3) => R4>;
+        flowRight<A1, A2, A3, R5, R4, R3, R2, R1>(this: LoDashExplicitWrapper<(a: R4) => R5>, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3) => R1): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3) => R5>;
+        flowRight<A1, A2, A3, R6, R5, R4, R3, R2, R1>(this: LoDashExplicitWrapper<(a: R5) => R6>, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3) => R1): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3) => R6>;
+        flowRight<A1, A2, A3, R7, R6, R5, R4, R3, R2, R1>(this: LoDashExplicitWrapper<(a: R6) => R7>, f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3) => R1): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3) => R7>;
+        // 4-argument first function
+        flowRight<A1, A2, A3, A4, R2, R1>(this: LoDashExplicitWrapper<(a: R1) => R2>, f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R2>;
+        flowRight<A1, A2, A3, A4, R3, R2, R1>(this: LoDashExplicitWrapper<(a: R2) => R3>, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R3>;
+        flowRight<A1, A2, A3, A4, R4, R3, R2, R1>(this: LoDashExplicitWrapper<(a: R3) => R4>, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R4>;
+        flowRight<A1, A2, A3, A4, R5, R4, R3, R2, R1>(this: LoDashExplicitWrapper<(a: R4) => R5>, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R5>;
+        flowRight<A1, A2, A3, A4, R6, R5, R4, R3, R2, R1>(this: LoDashExplicitWrapper<(a: R5) => R6>, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R6>;
+        flowRight<A1, A2, A3, A4, R7, R6, R5, R4, R3, R2, R1>(this: LoDashExplicitWrapper<(a: R6) => R7>, f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R7>;
+        // any-argument first function
+        flowRight<R2, R1>(this: LoDashExplicitWrapper<(a: R1) => R2>, f1: (...args: any[]) => R1): LoDashExplicitWrapper<(...args: any[]) => R2>;
+        flowRight<R3, R2, R1>(this: LoDashExplicitWrapper<(a: R1) => R2>, f2: (a: R1) => R2, f1: (...args: any[]) => R1): LoDashExplicitWrapper<(...args: any[]) => R3>;
+        flowRight<R4, R3, R2, R1>(this: LoDashExplicitWrapper<(a: R1) => R2>, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (...args: any[]) => R1): LoDashExplicitWrapper<(...args: any[]) => R4>;
+        flowRight<R5, R4, R3, R2, R1>(this: LoDashExplicitWrapper<(a: R1) => R2>, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (...args: any[]) => R1): LoDashExplicitWrapper<(...args: any[]) => R5>;
+        flowRight<R6, R5, R4, R3, R2, R1>(this: LoDashExplicitWrapper<(a: R1) => R2>, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (...args: any[]) => R1): LoDashExplicitWrapper<(...args: any[]) => R6>;
+        flowRight<R7, R6, R5, R4, R3, R2, R1>(this: LoDashExplicitWrapper<(a: R1) => R2>, f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (...args: any[]) => R1): LoDashExplicitWrapper<(...args: any[]) => R7>;
+        flowRight(this: LoDashExplicitWrapper<(a: any) => any>, f6: (a: any) => any, f5: (a: any) => any, f4: (a: any) => any, f3: (a: any) => any, f2: (a: any) => any, f1: () => any, ...funcs: Array<Many<(...args: any[]) => any>>): LoDashExplicitWrapper<(...args: any[]) => any>;
+        flowRight(this: LoDashExplicitWrapper<(a: any) => any>, funcs: Array<Many<(...args: any[]) => any>>): LoDashExplicitWrapper<(...args: any[]) => any>;
+    }
+
+    // identity
+
+    interface LoDashStatic {
+        /**
+         * This method returns the first argument provided to it.
+         *
+         * @param value Any value.
+         * @return Returns value.
+         */
+        identity<T>(value: T): T;
+
+        /**
+         * @see _.identity
+         */
+        identity(): undefined;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.identity
+         */
+        identity(): TValue;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.identity
+         */
+        identity(): this;
+    }
+
+    // iteratee
+
+    interface LoDashStatic {
+        /**
+         * Creates a function that invokes `func` with the arguments of the created
+         * function. If `func` is a property name the created callback returns the
+         * property value for a given element. If `func` is an object the created
+         * callback returns `true` for elements that contain the equivalent object properties, otherwise it returns `false`.
+         *
+         * @category Util
+         * @param [func=_.identity] The value to convert to a callback.
+         * @returns Returns the callback.
+         * @example
+         *
+         * var users = [
+         *   { 'user': 'barney', 'age': 36 },
+         *   { 'user': 'fred',   'age': 40 }
+         * ];
+         *
+         * // create custom iteratee shorthands
+         * _.iteratee = _.wrap(_.iteratee, function(callback, func) {
+         *   var p = /^(\S+)\s*([<>])\s*(\S+)$/.exec(func);
+         *   return !p ? callback(func) : function(object) {
+         *     return (p[2] == '>' ? object[p[1]] > p[3] : object[p[1]] < p[3]);
+         *   };
+         * });
+         *
+         * _.filter(users, 'age > 36');
+         * // => [{ 'user': 'fred', 'age': 40 }]
+         */
+        iteratee<TFunction extends (...args: any[]) => any>(
+            func: TFunction | string | object
+        ): TFunction;
+
+        /**
+         * @see _.iteratee
+         */
+        iteratee(): typeof _.identity; // tslint:disable-line:no-unnecessary-qualifier
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.iteratee
+         */
+        iteratee<TFunction extends (...args: any[]) => any>(
+            this: LoDashImplicitWrapper<TFunction | string | object>
+        ): LoDashImplicitWrapper<TFunction>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.iteratee
+         */
+        iteratee<TFunction extends (...args: any[]) => any>(
+            this: LoDashExplicitWrapper<TFunction | string | object>
+        ): LoDashExplicitWrapper<TFunction>;
+    }
+
+    // matches
+
+    interface LoDashStatic {
+        /**
+         * Creates a function that performs a deep comparison between a given object and source, returning true if the
+         * given object has equivalent property values, else false.
+         *
+         * Note: This method supports comparing arrays, booleans, Date objects, numbers, Object objects, regexes, and
+         * strings. Objects are compared by their own, not inherited, enumerable properties. For comparing a single own
+         * or inherited property value see _.matchesProperty.
+         *
+         * @param source The object of property values to match.
+         * @return Returns the new function.
+         */
+        matches<T>(source: T): (value: any) => boolean;
+
+        /**
+         * @see _.matches
+         */
+        matches<T, V>(source: T): (value: V) => boolean;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.matches
+         */
+        matches<V>(): LoDashImplicitWrapper<(value: V) => boolean>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.matches
+         */
+        matches<V>(): LoDashExplicitWrapper<(value: V) => boolean>;
+    }
+
+    // matchesProperty
+
+    interface LoDashStatic {
+        /**
+         * Creates a function that compares the property value of path on a given object to value.
+         *
+         * Note: This method supports comparing arrays, booleans, Date objects, numbers, Object objects, regexes, and
+         * strings. Objects are compared by their own, not inherited, enumerable properties.
+         *
+         * @param path The path of the property to get.
+         * @param srcValue The value to match.
+         * @return Returns the new function.
+         */
+        matchesProperty<T>(
+            path: PropertyPath,
+            srcValue: T
+        ): (value: any) => boolean;
+
+        /**
+         * @see _.matchesProperty
+         */
+        matchesProperty<T, V>(
+            path: PropertyPath,
+            srcValue: T
+        ): (value: V) => boolean;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.matchesProperty
+         */
+        matchesProperty<SrcValue>(
+            srcValue: SrcValue
+        ): LoDashImplicitWrapper<(value: any) => boolean>;
+
+        /**
+         * @see _.matchesProperty
+         */
+        matchesProperty<SrcValue, Value>(
+            srcValue: SrcValue
+        ): LoDashImplicitWrapper<(value: Value) => boolean>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.matchesProperty
+         */
+        matchesProperty<SrcValue>(
+            srcValue: SrcValue
+        ): LoDashExplicitWrapper<(value: any) => boolean>;
+
+        /**
+         * @see _.matchesProperty
+         */
+        matchesProperty<SrcValue, Value>(
+            srcValue: SrcValue
+        ): LoDashExplicitWrapper<(value: Value) => boolean>;
+    }
+
+    // method
+
+    interface LoDashStatic {
+        /**
+         * Creates a function that invokes the method at path on a given object. Any additional arguments are provided
+         * to the invoked method.
+         *
+         * @param path The path of the method to invoke.
+         * @param args The arguments to invoke the method with.
+         * @return Returns the new function.
+         */
+        method(
+            path: PropertyPath,
+            ...args: any[]
+        ): (object: any) => any;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.method
+         */
+        method(...args: any[]): LoDashImplicitWrapper<(object: any) => any>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.method
+         */
+        method(...args: any[]): LoDashExplicitWrapper<(object: any) => any>;
+    }
+
+    // methodOf
+
+    interface LoDashStatic {
+        /**
+         * The opposite of _.method; this method creates a function that invokes the method at a given path on object.
+         * Any additional arguments are provided to the invoked method.
+         *
+         * @param object The object to query.
+         * @param args The arguments to invoke the method with.
+         * @return Returns the new function.
+         */
+        methodOf(
+            object: object,
+            ...args: any[]
+        ): (path: PropertyPath) => any;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.methodOf
+         */
+        methodOf(
+            ...args: any[]
+        ): LoDashImplicitWrapper<(path: PropertyPath) => any>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.methodOf
+         */
+        methodOf(
+            ...args: any[]
+        ): LoDashExplicitWrapper<(path: PropertyPath) => any>;
+    }
+
+    // mixin
+
+    interface MixinOptions {
+        chain?: boolean;
+    }
+
+    interface LoDashStatic {
+        /**
+         * Adds all own enumerable function properties of a source object to the destination object. If object is a
+         * function then methods are added to its prototype as well.
+         *
+         * Note: Use _.runInContext to create a pristine lodash function to avoid conflicts caused by modifying
+         * the original.
+         *
+         * @param object The destination object.
+         * @param source The object of functions to add.
+         * @param options The options object.
+         * @param options.chain Specify whether the functions added are chainable.
+         * @return Returns object.
+         */
+        mixin<TObject>(
+            object: TObject,
+            source: Dictionary<(...args: any[]) => any>,
+            options?: MixinOptions
+        ): TObject;
+
+        /**
+         * @see _.mixin
+         */
+        mixin<TResult>(
+            source: Dictionary<(...args: any[]) => any>,
+            options?: MixinOptions
+        ): LoDashStatic;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.mixin
+         */
+        mixin(
+            source: Dictionary<(...args: any[]) => any>,
+            options?: MixinOptions
+        ): this;
+
+        /**
+         * @see _.mixin
+         */
+        mixin(
+            options?: MixinOptions
+        ): LoDashImplicitWrapper<LoDashStatic>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.mixin
+         */
+        mixin(
+            source: Dictionary<(...args: any[]) => any>,
+            options?: MixinOptions
+        ): this;
+
+        /**
+         * @see _.mixin
+         */
+        mixin(
+            options?: MixinOptions
+        ): LoDashExplicitWrapper<LoDashStatic>;
+    }
+
+    // noConflict
+
+    interface LoDashStatic {
+        /**
+         * Reverts the _ variable to its previous value and returns a reference to the lodash function.
+         *
+         * @return Returns the lodash function.
+         */
+        noConflict(): typeof _;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.noConflict
+         */
+        noConflict(): typeof _;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.noConflict
+         */
+        noConflict(): LoDashExplicitWrapper<typeof _>;
+    }
+
+    // noop
+
+    interface LoDashStatic {
+        /**
+         * A no-operation function that returns undefined regardless of the arguments it receives.
+         *
+         * @return undefined
+         */
+        noop(...args: any[]): void;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.noop
+         */
+        noop(...args: any[]): void;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.noop
+         */
+        noop(...args: any[]): LoDashExplicitWrapper<undefined>;
+    }
+
+    // nthArg
+
+    interface LoDashStatic {
+        /**
+         * Creates a function that returns its nth argument.
+         *
+         * @param n The index of the argument to return.
+         * @return Returns the new function.
+         */
+        nthArg(n?: number): (...args: any[]) => any;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.nthArg
+         */
+        nthArg(): LoDashImplicitWrapper<(...args: any[]) => any>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.nthArg
+         */
+        nthArg(): LoDashExplicitWrapper<(...args: any[]) => any>;
+    }
+
+    // over
+
+    interface LoDashStatic {
+        /**
+         * Creates a function that invokes iteratees with the arguments provided to the created function and returns
+         * their results.
+         *
+         * @param iteratees The iteratees to invoke.
+         * @return Returns the new function.
+         */
+        over<TResult>(...iteratees: Array<Many<(...args: any[]) => TResult>>): (...args: any[]) => TResult[];
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.over
+         */
+        over<TResult>(
+            this: LoDashImplicitWrapper<Many<(...args: any[]) => TResult>>,
+            ...iteratees: Array<Many<(...args: any[]) => TResult>>
+        ): LoDashImplicitWrapper<(...args: any[]) => TResult[]>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.over
+         */
+        over<TResult>(
+            this: LoDashExplicitWrapper<Many<(...args: any[]) => TResult>>,
+            ...iteratees: Array<Many<(...args: any[]) => TResult>>
+        ): LoDashExplicitWrapper<(...args: any[]) => TResult[]>;
+    }
+
+    // overEvery
+
+    interface LoDashStatic {
+        /**
+         * Creates a function that checks if all of the predicates return truthy when invoked with the arguments
+         * provided to the created function.
+         *
+         * @param predicates The predicates to check.
+         * @return Returns the new function.
+         */
+        overEvery<T>(...predicates: Array<Many<(...args: T[]) => boolean>>): (...args: T[]) => boolean;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.overEvery
+         */
+        overEvery<T>(...predicates: Array<Many<(...args: T[]) => boolean>>): LoDashImplicitWrapper<(...args: T[]) => boolean>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.overEvery
+         */
+        overEvery<T>(...predicates: Array<Many<(...args: T[]) => boolean>>): LoDashExplicitWrapper<(...args: T[]) => boolean>;
+    }
+
+    // overSome
+
+    interface LoDashStatic {
+        /**
+         * Creates a function that checks if any of the predicates return truthy when invoked with the arguments
+         * provided to the created function.
+         *
+         * @param predicates The predicates to check.
+         * @return Returns the new function.
+         */
+        overSome<T>(...predicates: Array<Many<(...args: T[]) => boolean>>): (...args: T[]) => boolean;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.overSome
+         */
+        overSome<T>(...predicates: Array<Many<(...args: T[]) => boolean>>): LoDashImplicitWrapper<(...args: T[]) => boolean>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.overSome
+         */
+        overSome<T>(...predicates: Array<Many<(...args: T[]) => boolean>>): LoDashExplicitWrapper<(...args: T[]) => boolean>;
+    }
+
+    // property
+
+    interface LoDashStatic {
+        /**
+         * Creates a function that returns the property value at path on a given object.
+         *
+         * @param path The path of the property to get.
+         * @return Returns the new function.
+         */
+        property<TObj, TResult>(path: PropertyPath): (obj: TObj) => TResult;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.property
+         */
+        property<TObj, TResult>(): LoDashImplicitWrapper<(obj: TObj) => TResult>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.property
+         */
+        property<TObj, TResult>(): LoDashExplicitWrapper<(obj: TObj) => TResult>;
+    }
+
+    // propertyOf
+
+    interface LoDashStatic {
+        /**
+         * The opposite of _.property; this method creates a function that returns the property value at a given path
+         * on object.
+         *
+         * @param object The object to query.
+         * @return Returns the new function.
+         */
+        propertyOf<T extends {}>(object: T): (path: PropertyPath) => any;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.propertyOf
+         */
+        propertyOf(): LoDashImplicitWrapper<(path: PropertyPath) => any>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.propertyOf
+         */
+        propertyOf(): LoDashExplicitWrapper<(path: PropertyPath) => any>;
+    }
+
+    // range
+
+    interface LoDashStatic {
+        /**
+         * Creates an array of numbers (positive and/or negative) progressing from start up to, but not including, end.
+         * If end is not specified it’s set to start with start then set to 0. If end is less than start a zero-length
+         * range is created unless a negative step is specified.
+         *
+         * @param start The start of the range.
+         * @param end The end of the range.
+         * @param step The value to increment or decrement by.
+         * @return Returns a new range array.
+         */
+        range(
+            start: number,
+            end?: number,
+            step?: number
+        ): number[];
+
+        /**
+         * Creates an array of numbers (positive and/or negative) progressing from start up to, but not including, end.
+         * If end is not specified it’s set to start with start then set to 0. If end is less than start a zero-length
+         * range is created unless a negative step is specified.
+         *
+         * @param start The start of the range.
+         * @param index Not used in this overload.
+         * @param guard Enables use as an iteratee for methods like _.map. You should not pass this parameter directly in your code.
+         * @return Returns a new range array.
+         */
+        range(
+            end: number,
+            index: string | number,
+            guard: object
+        ): number[];
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.range
+         */
+        range(
+            end?: number,
+            step?: number
+        ): LoDashImplicitWrapper<number[]>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.range
+         */
+        range(
+            end?: number,
+            step?: number
+        ): LoDashExplicitWrapper<number[]>;
+    }
+
+    // rangeRight
+
+    interface LoDashStatic {
+        /**
+         * This method is like `_.range` except that it populates values in
+         * descending order.
+         *
+         * @category Util
+         * @param start The start of the range.
+         * @param end The end of the range.
+         * @param step The value to increment or decrement by.
+         * @returns Returns the new array of numbers.
+         * @example
+         *
+         * _.rangeRight(4);
+         * // => [3, 2, 1, 0]
+         *
+         * _.rangeRight(-4);
+         * // => [-3, -2, -1, 0]
+         *
+         * _.rangeRight(1, 5);
+         * // => [4, 3, 2, 1]
+         *
+         * _.rangeRight(0, 20, 5);
+         * // => [15, 10, 5, 0]
+         *
+         * _.rangeRight(0, -4, -1);
+         * // => [-3, -2, -1, 0]
+         *
+         * _.rangeRight(1, 4, 0);
+         * // => [1, 1, 1]
+         *
+         * _.rangeRight(0);
+         * // => []
+         */
+        rangeRight(
+            start: number,
+            end?: number,
+            step?: number
+        ): number[];
+
+        /**
+         * This method is like _.range except that it populates values in
+         * descending order.
+         *
+         * @param start The start of the range.
+         * @param index Not used in this overload.
+         * @param guard Enables use as an iteratee for methods like _.map. You should not pass this parameter directly in your code.
+         * @return Returns a new range array.
+         */
+        rangeRight(
+            end: number,
+            index: string | number,
+            guard: object
+        ): number[];
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.rangeRight
+         */
+        rangeRight(
+            end?: number,
+            step?: number
+        ): LoDashImplicitWrapper<number[]>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.rangeRight
+         */
+        rangeRight(
+            end?: number,
+            step?: number
+        ): LoDashExplicitWrapper<number[]>;
+    }
+
+    // runInContext
+
+    interface LoDashStatic {
+        /**
+         * Create a new pristine lodash function using the given context object.
+         *
+         * @param context The context object.
+         * @return Returns a new lodash function.
+         */
+        runInContext(context?: object): typeof _;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.runInContext
+         */
+        runInContext(): typeof _;
+    }
+
+    // stubArray
+
+    interface LoDashStatic {
+        /**
+         * This method returns a new empty array.
+         *
+         * @returns Returns the new empty array.
+         */
+        stubArray(): any[];
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.stubArray
+         */
+        stubArray(): any[];
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.stubArray
+         */
+        stubArray(): LoDashExplicitWrapper<any[]>;
+    }
+
+    // stubFalse
+
+    interface LoDashStatic {
+        /**
+         * This method returns `false`.
+         *
+         * @returns Returns `false`.
+         */
+        stubFalse(): boolean;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.stubFalse
+         */
+        stubFalse(): boolean;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.stubFalse
+         */
+        stubFalse(): LoDashExplicitWrapper<boolean>;
+    }
+
+    // stubObject
+
+    interface LoDashStatic {
+        /**
+         * This method returns a new empty object.
+         *
+         * @returns Returns the new empty object.
+         */
+        stubObject(): any;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.stubObject
+         */
+        stubObject(): any;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.stubObject
+         */
+        stubObject(): LoDashExplicitWrapper<any>;
+    }
+
+    // stubString
+
+    interface LoDashStatic {
+        /**
+         * This method returns an empty string.
+         *
+         * @returns Returns the empty string.
+         */
+        stubString(): string;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.stubString
+         */
+        stubString(): string;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.stubString
+         */
+        stubString(): LoDashExplicitWrapper<string>;
+    }
+
+    // stubTrue
+
+    interface LoDashStatic {
+        /**
+         * This method returns `true`.
+         *
+         * @returns Returns `true`.
+         */
+        stubTrue(): boolean;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.stubTrue
+         */
+        stubTrue(): boolean;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.stubTrue
+         */
+        stubTrue(): LoDashExplicitWrapper<boolean>;
+    }
+
+    // times
+
+    interface LoDashStatic {
+        /**
+         * Invokes the iteratee function n times, returning an array of the results of each invocation. The iteratee
+         * is invoked with one argument; (index).
+         *
+         * @param n The number of times to invoke iteratee.
+         * @param iteratee The function invoked per iteration.
+         * @return Returns the array of results.
+         */
+        times<TResult>(
+            n: number,
+            iteratee: (num: number) => TResult
+        ): TResult[];
+
+        /**
+         * @see _.times
+         */
+        times(n: number): number[];
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.times
+         */
+        times<TResult>(
+            iteratee: (num: number) => TResult
+        ): TResult[];
+
+        /**
+         * @see _.times
+         */
+        times(): number[];
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.times
+         */
+        times<TResult>(
+            iteratee: (num: number) => TResult
+        ): LoDashExplicitWrapper<TResult[]>;
+
+        /**
+         * @see _.times
+         */
+        times(): LoDashExplicitWrapper<number[]>;
+    }
+
+    // toPath
+
+    interface LoDashStatic {
+        /**
+         * Converts `value` to a property path array.
+         *
+         * @category Util
+         * @param value The value to convert.
+         * @returns Returns the new property path array.
+         * @example
+         *
+         * _.toPath('a.b.c');
+         * // => ['a', 'b', 'c']
+         *
+         * _.toPath('a[0].b.c');
+         * // => ['a', '0', 'b', 'c']
+         *
+         * var path = ['a', 'b', 'c'],
+         *     newPath = _.toPath(path);
+         *
+         * console.log(newPath);
+         * // => ['a', 'b', 'c']
+         *
+         * console.log(path === newPath);
+         * // => false
+         */
+        toPath(value: any): string[];
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.toPath
+         */
+        toPath(): LoDashImplicitWrapper<string[]>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.toPath
+         */
+        toPath(): LoDashExplicitWrapper<string[]>;
+    }
+
+    // uniqueId
+
+    interface LoDashStatic {
+        /**
+         * Generates a unique ID. If prefix is provided the ID is appended to it.
+         *
+         * @param prefix The value to prefix the ID with.
+         * @return Returns the unique ID.
+         */
+        uniqueId(prefix?: string): string;
+    }
+
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.uniqueId
+         */
+        uniqueId(): string;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.uniqueId
+         */
+        uniqueId(): LoDashExplicitWrapper<string>;
+    }
+}
\ No newline at end of file
diff --git a/types/lodash/function/after.d.ts b/types/lodash/function/after.d.ts
deleted file mode 100644
index 94b60497e1..0000000000
--- a/types/lodash/function/after.d.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * The opposite of _.before; this method creates a function that invokes func once it’s called n or more times.
-         *
-         * @param n The number of calls before func is invoked.
-         * @param func The function to restrict.
-         * @return Returns the new restricted function.
-         */
-        after<TFunc extends (...args: any[]) => any>(
-            n: number,
-            func: TFunc
-        ): TFunc;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-        * @see _.after
-        **/
-        after<TFunc extends (...args: any[]) => any>(func: TFunc): LoDashImplicitWrapper<TFunc>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.after
-         **/
-        after<TFunc extends (...args: any[]) => any>(func: TFunc): LoDashExplicitWrapper<TFunc>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/function/ary.d.ts b/types/lodash/function/ary.d.ts
deleted file mode 100644
index 94bcc7f25e..0000000000
--- a/types/lodash/function/ary.d.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Creates a function that accepts up to n arguments ignoring any additional arguments.
-         *
-         * @param func The function to cap arguments for.
-         * @param n The arity cap.
-         * @returns Returns the new function.
-         */
-        ary(
-            func: (...args: any[]) => any,
-            n?: number
-        ): (...args: any[]) => any;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.ary
-         */
-        ary(n?: number): LoDashImplicitWrapper<(...args: any[]) => any>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.ary
-         */
-        ary(n?: number): LoDashExplicitWrapper<(...args: any[]) => any>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/function/before.d.ts b/types/lodash/function/before.d.ts
deleted file mode 100644
index 2a3b840e8e..0000000000
--- a/types/lodash/function/before.d.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Creates a function that invokes func, with the this binding and arguments of the created function, while
-         * it’s called less than n times. Subsequent calls to the created function return the result of the last func
-         * invocation.
-         *
-         * @param n The number of calls at which func is no longer invoked.
-         * @param func The function to restrict.
-         * @return Returns the new restricted function.
-         */
-        before<TFunc extends (...args: any[]) => any>(
-            n: number,
-            func: TFunc
-        ): TFunc;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.before
-         **/
-        before<TFunc extends (...args: any[]) => any>(func: TFunc): LoDashImplicitWrapper<TFunc>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.before
-         **/
-        before<TFunc extends (...args: any[]) => any>(func: TFunc): LoDashExplicitWrapper<TFunc>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/function/bind.d.ts b/types/lodash/function/bind.d.ts
deleted file mode 100644
index 28034aec12..0000000000
--- a/types/lodash/function/bind.d.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface FunctionBind {
-        placeholder: any;
-
-        (
-            func: (...args: any[]) => any,
-            thisArg: any,
-            ...partials: any[]
-        ): (...args: any[]) => any;
-    }
-
-    interface LoDashStatic {
-        /**
-         * Creates a function that invokes func with the this binding of thisArg and prepends any additional _.bind
-         * arguments to those provided to the bound function.
-         *
-         * The _.bind.placeholder value, which defaults to _ in monolithic builds, may be used as a placeholder for
-         * partially applied arguments.
-         *
-         * Note: Unlike native Function#bind this method does not set the "length" property of bound functions.
-         *
-         * @param func The function to bind.
-         * @param thisArg The this binding of func.
-         * @param partials The arguments to be partially applied.
-         * @return Returns the new bound function.
-         */
-        bind: FunctionBind;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.bind
-         */
-        bind(
-            thisArg: any,
-            ...partials: any[]
-        ): LoDashImplicitWrapper<(...args: any[]) => any>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.bind
-         */
-        bind(
-            thisArg: any,
-            ...partials: any[]
-        ): LoDashExplicitWrapper<(...args: any[]) => any>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/function/bindKey.d.ts b/types/lodash/function/bindKey.d.ts
deleted file mode 100644
index bab46527c9..0000000000
--- a/types/lodash/function/bindKey.d.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface FunctionBindKey {
-        placeholder: any;
-
-        (
-            object: object,
-            key: string,
-            ...partials: any[]
-        ): (...args: any[]) => any;
-    }
-
-    interface LoDashStatic {
-        /**
-         * Creates a function that invokes the method at object[key] and prepends any additional _.bindKey arguments
-         * to those provided to the bound function.
-         *
-         * This method differs from _.bind by allowing bound functions to reference methods that may be redefined
-         * or don’t yet exist. See Peter Michaux’s article for more details.
-         *
-         * The _.bindKey.placeholder value, which defaults to _ in monolithic builds, may be used as a placeholder
-         * for partially applied arguments.
-         *
-         * @param object The object the method belongs to.
-         * @param key The key of the method.
-         * @param partials The arguments to be partially applied.
-         * @return Returns the new bound function.
-         */
-        bindKey: FunctionBindKey;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.bindKey
-         */
-        bindKey(
-            key: string,
-            ...partials: any[]
-        ): LoDashImplicitWrapper<(...args: any[]) => any>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.bindKey
-         */
-        bindKey(
-            key: string,
-            ...partials: any[]
-        ): LoDashExplicitWrapper<(...args: any[]) => any>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/function/curry.d.ts b/types/lodash/function/curry.d.ts
deleted file mode 100644
index 03ff949438..0000000000
--- a/types/lodash/function/curry.d.ts
+++ /dev/null
@@ -1,203 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Creates a function that accepts one or more arguments of func that when called either invokes func returning
-         * its result, if all func arguments have been provided, or returns a function that accepts one or more of the
-         * remaining func arguments, and so on. The arity of func may be specified if func.length is not sufficient.
-         * @param func The function to curry.
-         * @param arity The arity of func.
-         * @return Returns the new curried function.
-         */
-        curry<T1, R>(func: (t1: T1) => R, arity?: number):
-            CurriedFunction1<T1, R>;
-        /**
-         * Creates a function that accepts one or more arguments of func that when called either invokes func returning
-         * its result, if all func arguments have been provided, or returns a function that accepts one or more of the
-         * remaining func arguments, and so on. The arity of func may be specified if func.length is not sufficient.
-         * @param func The function to curry.
-         * @param arity The arity of func.
-         * @return Returns the new curried function.
-         */
-        curry<T1, T2, R>(func: (t1: T1, t2: T2) => R, arity?: number):
-            CurriedFunction2<T1, T2, R>;
-        /**
-         * Creates a function that accepts one or more arguments of func that when called either invokes func returning
-         * its result, if all func arguments have been provided, or returns a function that accepts one or more of the
-         * remaining func arguments, and so on. The arity of func may be specified if func.length is not sufficient.
-         * @param func The function to curry.
-         * @param arity The arity of func.
-         * @return Returns the new curried function.
-         */
-        curry<T1, T2, T3, R>(func: (t1: T1, t2: T2, t3: T3) => R, arity?: number):
-            CurriedFunction3<T1, T2, T3, R>;
-        /**
-         * Creates a function that accepts one or more arguments of func that when called either invokes func returning
-         * its result, if all func arguments have been provided, or returns a function that accepts one or more of the
-         * remaining func arguments, and so on. The arity of func may be specified if func.length is not sufficient.
-         * @param func The function to curry.
-         * @param arity The arity of func.
-         * @return Returns the new curried function.
-         */
-        curry<T1, T2, T3, T4, R>(func: (t1: T1, t2: T2, t3: T3, t4: T4) => R, arity?: number):
-            CurriedFunction4<T1, T2, T3, T4, R>;
-        /**
-         * Creates a function that accepts one or more arguments of func that when called either invokes func returning
-         * its result, if all func arguments have been provided, or returns a function that accepts one or more of the
-         * remaining func arguments, and so on. The arity of func may be specified if func.length is not sufficient.
-         * @param func The function to curry.
-         * @param arity The arity of func.
-         * @return Returns the new curried function.
-         */
-        curry<T1, T2, T3, T4, T5, R>(func: (t1: T1, t2: T2, t3: T3, t4: T4, t5: T5) => R, arity?: number):
-            CurriedFunction5<T1, T2, T3, T4, T5, R>;
-        /**
-         * Creates a function that accepts one or more arguments of func that when called either invokes func returning
-         * its result, if all func arguments have been provided, or returns a function that accepts one or more of the
-         * remaining func arguments, and so on. The arity of func may be specified if func.length is not sufficient.
-         * @param func The function to curry.
-         * @param arity The arity of func.
-         * @return Returns the new curried function.
-         */
-        curry(func: (...args: any[]) => any, arity?: number): (...args: any[]) => any;
-    }
-
-    interface CurriedFunction1<T1, R> {
-        (): CurriedFunction1<T1, R>;
-        (t1: T1): R;
-    }
-
-    interface CurriedFunction2<T1, T2, R> {
-        (): CurriedFunction2<T1, T2, R>;
-        (t1: T1): CurriedFunction1<T2, R>;
-        (t1: T1, t2: T2): R;
-    }
-
-    interface CurriedFunction3<T1, T2, T3, R> {
-        (): CurriedFunction3<T1, T2, T3, R>;
-        (t1: T1): CurriedFunction2<T2, T3, R>;
-        (t1: T1, t2: T2): CurriedFunction1<T3, R>;
-        (t1: T1, t2: T2, t3: T3): R;
-    }
-
-    interface CurriedFunction4<T1, T2, T3, T4, R> {
-        (): CurriedFunction4<T1, T2, T3, T4, R>;
-        (t1: T1): CurriedFunction3<T2, T3, T4, R>;
-        (t1: T1, t2: T2): CurriedFunction2<T3, T4, R>;
-        (t1: T1, t2: T2, t3: T3): CurriedFunction1<T4, R>;
-        (t1: T1, t2: T2, t3: T3, t4: T4): R;
-    }
-
-    interface CurriedFunction5<T1, T2, T3, T4, T5, R> {
-        (): CurriedFunction5<T1, T2, T3, T4, T5, R>;
-        (t1: T1): CurriedFunction4<T2, T3, T4, T5, R>;
-        (t1: T1, t2: T2): CurriedFunction3<T3, T4, T5, R>;
-        (t1: T1, t2: T2, t3: T3): CurriedFunction2<T4, T5, R>;
-        (t1: T1, t2: T2, t3: T3, t4: T4): CurriedFunction1<T5, R>;
-        (t1: T1, t2: T2, t3: T3, t4: T4, t5: T5): R;
-    }
-    interface RightCurriedFunction1<T1, R> {
-        (): RightCurriedFunction1<T1, R>;
-        (t1: T1): R;
-    }
-    interface RightCurriedFunction2<T1, T2, R> {
-        (): RightCurriedFunction2<T1, T2, R>;
-        (t2: T2): RightCurriedFunction1<T1, R>;
-        (t1: T1, t2: T2): R;
-    }
-    interface RightCurriedFunction3<T1, T2, T3, R> {
-        (): RightCurriedFunction3<T1, T2, T3, R>;
-        (t3: T3): RightCurriedFunction2<T1, T2, R>;
-        (t2: T2, t3: T3): RightCurriedFunction1<T1, R>;
-        (t1: T1, t2: T2, t3: T3): R;
-    }
-    interface RightCurriedFunction4<T1, T2, T3, T4, R> {
-        (): RightCurriedFunction4<T1, T2, T3, T4, R>;
-        (t4: T4): RightCurriedFunction3<T1, T2, T3, R>;
-        (t3: T3, t4: T4): RightCurriedFunction2<T1, T2, R>;
-        (t2: T2, t3: T3, t4: T4): RightCurriedFunction1<T1, R>;
-        (t1: T1, t2: T2, t3: T3, t4: T4): R;
-    }
-    interface RightCurriedFunction5<T1, T2, T3, T4, T5, R> {
-        (): RightCurriedFunction5<T1, T2, T3, T4, T5, R>;
-        (t5: T5): RightCurriedFunction4<T1, T2, T3, T4, R>;
-        (t4: T4, t5: T5): RightCurriedFunction3<T1, T2, T3, R>;
-        (t3: T3, t4: T4, t5: T5): RightCurriedFunction2<T1, T2, R>;
-        (t2: T2, t3: T3, t4: T4, t5: T5): RightCurriedFunction1<T1, R>;
-        (t1: T1, t2: T2, t3: T3, t4: T4, t5: T5): R;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-        * @see _.curry
-        **/
-        curry<T1, R>(this: LoDashImplicitWrapper<(t1: T1) => R>, arity?: number):
-            LoDashImplicitWrapper<CurriedFunction1<T1, R>>;
-
-        /**
-        * @see _.curry
-        **/
-        curry<T1, T2, R>(this: LoDashImplicitWrapper<(t1: T1, t2: T2) => R>, arity?: number):
-            LoDashImplicitWrapper<CurriedFunction2<T1, T2, R>>;
-
-        /**
-        * @see _.curry
-        **/
-        curry<T1, T2, T3, R>(this: LoDashImplicitWrapper<(t1: T1, t2: T2, t3: T3) => R>, arity?: number):
-            LoDashImplicitWrapper<CurriedFunction3<T1, T2, T3, R>>;
-
-        /**
-        * @see _.curry
-        **/
-        curry<T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<(t1: T1, t2: T2, t3: T3, t4: T4) => R>, arity?: number):
-            LoDashImplicitWrapper<CurriedFunction4<T1, T2, T3, T4, R>>;
-
-        /**
-        * @see _.curry
-        **/
-        curry<T1, T2, T3, T4, T5, R>(this: LoDashImplicitWrapper<(t1: T1, t2: T2, t3: T3, t4: T4, t5: T5) => R>, arity?: number):
-            LoDashImplicitWrapper<CurriedFunction5<T1, T2, T3, T4, T5, R>>;
-
-        /**
-        * @see _.curry
-        **/
-        curry(arity?: number): LoDashImplicitWrapper<(...args: any[]) => any>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-        * @see _.curry
-        **/
-        curry<T1, R>(this: LoDashExplicitWrapper<(t1: T1) => R>):
-            LoDashExplicitWrapper<CurriedFunction1<T1, R>>;
-
-        /**
-        * @see _.curry
-        **/
-        curry<T1, T2, R>(this: LoDashExplicitWrapper<(t1: T1, t2: T2) => R>):
-            LoDashExplicitWrapper<CurriedFunction2<T1, T2, R>>;
-
-        /**
-        * @see _.curry
-        **/
-        curry<T1, T2, T3, R>(this: LoDashExplicitWrapper<(t1: T1, t2: T2, t3: T3) => R>):
-            LoDashExplicitWrapper<CurriedFunction3<T1, T2, T3, R>>;
-
-        /**
-        * @see _.curry
-        **/
-        curry<T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<(t1: T1, t2: T2, t3: T3, t4: T4) => R>):
-            LoDashExplicitWrapper<CurriedFunction4<T1, T2, T3, T4, R>>;
-
-        /**
-        * @see _.curry
-        **/
-        curry<T1, T2, T3, T4, T5, R>(this: LoDashExplicitWrapper<(t1: T1, t2: T2, t3: T3, t4: T4, t5: T5) => R>):
-            LoDashExplicitWrapper<CurriedFunction5<T1, T2, T3, T4, T5, R>>;
-
-        /**
-        * @see _.curry
-        **/
-        curry(arity?: number): LoDashExplicitWrapper<(...args: any[]) => any>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/function/curryRight.d.ts b/types/lodash/function/curryRight.d.ts
deleted file mode 100644
index 044e98d5a2..0000000000
--- a/types/lodash/function/curryRight.d.ts
+++ /dev/null
@@ -1,132 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * This method is like _.curry except that arguments are applied to func in the manner of _.partialRight
-         * instead of _.partial.
-         * @param func The function to curry.
-         * @param arity The arity of func.
-         * @return Returns the new curried function.
-         */
-        curryRight<T1, R>(func: (t1: T1) => R, arity?: number):
-            RightCurriedFunction1<T1, R>;
-        /**
-         * This method is like _.curry except that arguments are applied to func in the manner of _.partialRight
-         * instead of _.partial.
-         * @param func The function to curry.
-         * @param arity The arity of func.
-         * @return Returns the new curried function.
-         */
-        curryRight<T1, T2, R>(func: (t1: T1, t2: T2) => R, arity?: number):
-            RightCurriedFunction2<T1, T2, R>;
-        /**
-         * This method is like _.curry except that arguments are applied to func in the manner of _.partialRight
-         * instead of _.partial.
-         * @param func The function to curry.
-         * @param arity The arity of func.
-         * @return Returns the new curried function.
-         */
-        curryRight<T1, T2, T3, R>(func: (t1: T1, t2: T2, t3: T3) => R, arity?: number):
-            RightCurriedFunction3<T1, T2, T3, R>;
-        /**
-         * This method is like _.curry except that arguments are applied to func in the manner of _.partialRight
-         * instead of _.partial.
-         * @param func The function to curry.
-         * @param arity The arity of func.
-         * @return Returns the new curried function.
-         */
-        curryRight<T1, T2, T3, T4, R>(func: (t1: T1, t2: T2, t3: T3, t4: T4) => R, arity?: number):
-            RightCurriedFunction4<T1, T2, T3, T4, R>;
-        /**
-         * This method is like _.curry except that arguments are applied to func in the manner of _.partialRight
-         * instead of _.partial.
-         * @param func The function to curry.
-         * @param arity The arity of func.
-         * @return Returns the new curried function.
-         */
-        curryRight<T1, T2, T3, T4, T5, R>(func: (t1: T1, t2: T2, t3: T3, t4: T4, t5: T5) => R, arity?: number):
-            RightCurriedFunction5<T1, T2, T3, T4, T5, R>;
-        /**
-         * This method is like _.curry except that arguments are applied to func in the manner of _.partialRight
-         * instead of _.partial.
-         * @param func The function to curry.
-         * @param arity The arity of func.
-         * @return Returns the new curried function.
-         */
-        curryRight(func: (...args: any[]) => any, arity?: number): (...args: any[]) => any;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.curryRight
-         **/
-        curryRight<T1, R>(this: LoDashImplicitWrapper<(t1: T1) => R>, arity?: number):
-            LoDashImplicitWrapper<RightCurriedFunction1<T1, R>>;
-
-        /**
-         * @see _.curryRight
-         **/
-        curryRight<T1, T2, R>(this: LoDashImplicitWrapper<(t1: T1, t2: T2) => R>, arity?: number):
-            LoDashImplicitWrapper<RightCurriedFunction2<T1, T2, R>>;
-
-        /**
-         * @see _.curryRight
-         **/
-        curryRight<T1, T2, T3, R>(this: LoDashImplicitWrapper<(t1: T1, t2: T2, t3: T3) => R>, arity?: number):
-            LoDashImplicitWrapper<RightCurriedFunction3<T1, T2, T3, R>>;
-
-        /**
-         * @see _.curryRight
-         **/
-        curryRight<T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<(t1: T1, t2: T2, t3: T3, t4: T4) => R>, arity?: number):
-            LoDashImplicitWrapper<RightCurriedFunction4<T1, T2, T3, T4, R>>;
-
-        /**
-         * @see _.curryRight
-         **/
-        curryRight<T1, T2, T3, T4, T5, R>(this: LoDashImplicitWrapper<(t1: T1, t2: T2, t3: T3, t4: T4, t5: T5) => R>, arity?: number):
-            LoDashImplicitWrapper<RightCurriedFunction5<T1, T2, T3, T4, T5, R>>;
-
-        /**
-         * @see _.curryRight
-         **/
-        curryRight(arity?: number): LoDashImplicitWrapper<(...args: any[]) => any>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.curryRight
-         **/
-        curryRight<T1, R>(this: LoDashExplicitWrapper<(t1: T1) => R>, arity?: number):
-            LoDashExplicitWrapper<RightCurriedFunction1<T1, R>>;
-
-        /**
-         * @see _.curryRight
-         **/
-        curryRight<T1, T2, R>(this: LoDashExplicitWrapper<(t1: T1, t2: T2) => R>, arity?: number):
-            LoDashExplicitWrapper<RightCurriedFunction2<T1, T2, R>>;
-
-        /**
-         * @see _.curryRight
-         **/
-        curryRight<T1, T2, T3, R>(this: LoDashExplicitWrapper<(t1: T1, t2: T2, t3: T3) => R>, arity?: number):
-            LoDashExplicitWrapper<RightCurriedFunction3<T1, T2, T3, R>>;
-
-        /**
-         * @see _.curryRight
-         **/
-        curryRight<T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<(t1: T1, t2: T2, t3: T3, t4: T4) => R>, arity?: number):
-            LoDashExplicitWrapper<RightCurriedFunction4<T1, T2, T3, T4, R>>;
-
-        /**
-         * @see _.curryRight
-         **/
-        curryRight<T1, T2, T3, T4, T5, R>(this: LoDashExplicitWrapper<(t1: T1, t2: T2, t3: T3, t4: T4, t5: T5) => R>, arity?: number):
-            LoDashExplicitWrapper<RightCurriedFunction5<T1, T2, T3, T4, T5, R>>;
-
-        /**
-         * @see _.curryRight
-         **/
-        curryRight(arity?: number): LoDashExplicitWrapper<(...args: any[]) => any>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/function/debounce.d.ts b/types/lodash/function/debounce.d.ts
deleted file mode 100644
index 9ff85bd972..0000000000
--- a/types/lodash/function/debounce.d.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface DebounceSettings {
-        /**
-         * Specify invoking on the leading edge of the timeout.
-         */
-        leading?: boolean;
-
-        /**
-         * The maximum time func is allowed to be delayed before it’s invoked.
-         */
-        maxWait?: number;
-
-        /**
-         * Specify invoking on the trailing edge of the timeout.
-         */
-        trailing?: boolean;
-    }
-
-    interface LoDashStatic {
-        /**
-         * Creates a debounced function that delays invoking func until after wait milliseconds have elapsed since
-         * the last time the debounced function was invoked. The debounced function comes with a cancel method to
-         * cancel delayed invocations and a flush method to immediately invoke them. Provide an options object to
-         * indicate that func should be invoked on the leading and/or trailing edge of the wait timeout. Subsequent
-         * calls to the debounced function return the result of the last func invocation.
-         *
-         * Note: If leading and trailing options are true, func is invoked on the trailing edge of the timeout only
-         * if the the debounced function is invoked more than once during the wait timeout.
-         *
-         * See David Corbacho’s article for details over the differences between _.debounce and _.throttle.
-         *
-         * @param func The function to debounce.
-         * @param wait The number of milliseconds to delay.
-         * @param options The options object.
-         * @param options.leading Specify invoking on the leading edge of the timeout.
-         * @param options.maxWait The maximum time func is allowed to be delayed before it’s invoked.
-         * @param options.trailing Specify invoking on the trailing edge of the timeout.
-         * @return Returns the new debounced function.
-         */
-        debounce<T extends (...args: any[]) => any>(
-            func: T,
-            wait?: number,
-            options?: DebounceSettings
-        ): T & Cancelable;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.debounce
-         */
-        debounce(
-            wait?: number,
-            options?: DebounceSettings
-        ): LoDashImplicitWrapper<TValue & Cancelable>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.debounce
-         */
-        debounce(
-            wait?: number,
-            options?: DebounceSettings
-        ): LoDashExplicitWrapper<TValue & Cancelable>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/function/defer.d.ts b/types/lodash/function/defer.d.ts
deleted file mode 100644
index 1968749ecd..0000000000
--- a/types/lodash/function/defer.d.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Defers invoking the func until the current call stack has cleared. Any additional arguments are provided to
-         * func when it’s invoked.
-         *
-         * @param func The function to defer.
-         * @param args The arguments to invoke the function with.
-         * @return Returns the timer id.
-         */
-        defer(
-            func: (...args: any[]) => any,
-            ...args: any[]
-        ): number;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.defer
-         */
-        defer(...args: any[]): LoDashImplicitWrapper<number>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.defer
-         */
-        defer(...args: any[]): LoDashExplicitWrapper<number>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/function/delay.d.ts b/types/lodash/function/delay.d.ts
deleted file mode 100644
index 72e2b4151e..0000000000
--- a/types/lodash/function/delay.d.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Invokes func after wait milliseconds. Any additional arguments are provided to func when it’s invoked.
-         *
-         * @param func The function to delay.
-         * @param wait The number of milliseconds to delay invocation.
-         * @param args The arguments to invoke the function with.
-         * @return Returns the timer id.
-         */
-        delay(
-            func: (...args: any[]) => any,
-            wait: number,
-            ...args: any[]
-        ): number;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.delay
-         */
-        delay(
-            wait: number,
-            ...args: any[]
-        ): LoDashImplicitWrapper<number>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.delay
-         */
-        delay(
-            wait: number,
-            ...args: any[]
-        ): LoDashExplicitWrapper<number>;
-    }
-}
diff --git a/types/lodash/function/flip.d.ts b/types/lodash/function/flip.d.ts
deleted file mode 100644
index e2699e3fd7..0000000000
--- a/types/lodash/function/flip.d.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-       /**
-        * Creates a function that invokes `func` with arguments reversed.
-        *
-        * @category Function
-        * @param func The function to flip arguments for.
-        * @returns Returns the new function.
-        * @example
-        *
-        * var flipped = _.flip(function() {
-        *   return _.toArray(arguments);
-        * });
-        *
-        * flipped('a', 'b', 'c', 'd');
-        * // => ['d', 'c', 'b', 'a']
-        */
-       flip<T extends (...args: any[]) => any>(func: T): T;
-   }
-
-   interface LoDashWrapper<TValue> {
-       /**
-        * @see _.flip
-        */
-       flip(): this;
-   }
-}
\ No newline at end of file
diff --git a/types/lodash/function/memoize.d.ts b/types/lodash/function/memoize.d.ts
deleted file mode 100644
index c74cf2a32c..0000000000
--- a/types/lodash/function/memoize.d.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface MemoizedFunction {
-        cache: MapCache;
-    }
-
-    interface LoDashStatic {
-        /**
-         * Creates a function that memoizes the result of func. If resolver is provided it determines the cache key for
-         * storing the result based on the arguments provided to the memoized function. By default, the first argument
-         * provided to the memoized function is coerced to a string and used as the cache key. The func is invoked with
-         * the this binding of the memoized function.
-         *
-         * @param func The function to have its output memoized.
-         * @param resolver The function to resolve the cache key.
-         * @return Returns the new memoizing function.
-         */
-        memoize: {
-            <T extends (...args: any[]) => any>(func: T, resolver?: (...args: any[]) => any): T & MemoizedFunction;
-            Cache: MapCacheConstructor;
-        };
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.memoize
-         */
-        memoize(resolver?: (...args: any[]) => any): LoDashImplicitWrapper<TValue & MemoizedFunction>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.memoize
-         */
-        memoize(resolver?: (...args: any[]) => any): LoDashExplicitWrapper<TValue & MemoizedFunction>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/function/negate.d.ts b/types/lodash/function/negate.d.ts
deleted file mode 100644
index c4e3b7bea4..0000000000
--- a/types/lodash/function/negate.d.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Creates a function that negates the result of the predicate func. The func predicate is invoked with
-         * the this binding and arguments of the created function.
-         *
-         * @param predicate The predicate to negate.
-         * @return Returns the new function.
-         */
-        negate<T extends (...args: any[]) => any>(predicate: T): T;
-    }
-
-    interface LoDashWrapper<TValue> {
-        /**
-         * @see _.negate
-         */
-        negate(): this;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/function/once.d.ts b/types/lodash/function/once.d.ts
deleted file mode 100644
index b64562ac16..0000000000
--- a/types/lodash/function/once.d.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Creates a function that is restricted to invoking func once. Repeat calls to the function return the value
-         * of the first call. The func is invoked with the this binding and arguments of the created function.
-         *
-         * @param func The function to restrict.
-         * @return Returns the new restricted function.
-         */
-        once<T extends (...args: any[]) => any>(func: T): T;
-    }
-
-    interface LoDashWrapper<TValue> {
-        /**
-         * @see _.once
-         */
-        once(): this;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/function/overArgs.d.ts b/types/lodash/function/overArgs.d.ts
deleted file mode 100644
index 265f79981b..0000000000
--- a/types/lodash/function/overArgs.d.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-   interface LoDashStatic {
-       /**
-        * Creates a function that runs each argument through a corresponding transform function.
-        *
-        * @param func The function to wrap.
-        * @param transforms The functions to transform arguments, specified as individual functions or arrays
-        * of functions.
-        * @return Returns the new function.
-        */
-       overArgs(
-           func: (...args: any[]) => any,
-           ...transforms: Array<Many<(...args: any[]) => any>>
-       ): (...args: any[]) => any;
-   }
-
-   interface LoDashImplicitWrapper<TValue> {
-       /**
-        * @see _.overArgs
-        */
-       overArgs(...transforms: Array<Many<(...args: any[]) => any>>): LoDashImplicitWrapper<(...args: any[]) => any>;
-   }
-
-   interface LoDashExplicitWrapper<TValue> {
-       /**
-        * @see _.overArgs
-        */
-       overArgs(...transforms: Array<Many<(...args: any[]) => any>>): LoDashExplicitWrapper<(...args: any[]) => any>;
-   }
-}
\ No newline at end of file
diff --git a/types/lodash/function/partial.d.ts b/types/lodash/function/partial.d.ts
deleted file mode 100644
index 6e729971a6..0000000000
--- a/types/lodash/function/partial.d.ts
+++ /dev/null
@@ -1,159 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-        * Creates a function that, when called, invokes func with any additional partial arguments
-        * prepended to those provided to the new function. This method is similar to _.bind except
-        * it does not alter the this binding.
-        * @param func The function to partially apply arguments to.
-        * @param args Arguments to be partially applied.
-        * @return The new partially applied function.
-        **/
-        partial: Partial;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.partial
-         */
-        partial: ImplicitPartial;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.partial
-         */
-        partial: ExplicitPartial;
-    }
-
-    type PH = LoDashStatic;
-
-    type Function0<R> = () => R;
-    type Function1<T1, R> = (t1: T1) => R;
-    type Function2<T1, T2, R> = (t1: T1, t2: T2) => R;
-    type Function3<T1, T2, T3, R> = (t1: T1, t2: T2, t3: T3) => R;
-    type Function4<T1, T2, T3, T4, R> = (t1: T1, t2: T2, t3: T3, t4: T4) => R;
-
-    interface Partial {
-        // arity 0
-        <R>(func: Function0<R>): Function0<R>;
-        // arity 1
-        <T1, R>(func: Function1<T1, R>): Function1<T1, R>;
-        <T1, R>(func: Function1<T1, R>, arg1: T1): Function0<R>;
-        // arity 2
-        <T1, T2, R>(func: Function2<T1, T2, R>):                      Function2<T1, T2, R>;
-        <T1, T2, R>(func: Function2<T1, T2, R>, arg1: T1):            Function1<    T2, R>;
-        <T1, T2, R>(func: Function2<T1, T2, R>, plc1: PH, arg2: T2):  Function1<T1,     R>;
-        <T1, T2, R>(func: Function2<T1, T2, R>, arg1: T1, arg2: T2):  Function0<        R>;
-        // arity 3
-        <T1, T2, T3, R>(func: Function3<T1, T2, T3, R>):                                Function3<T1, T2, T3, R>;
-        <T1, T2, T3, R>(func: Function3<T1, T2, T3, R>, arg1: T1):                      Function2<    T2, T3, R>;
-        <T1, T2, T3, R>(func: Function3<T1, T2, T3, R>, plc1: PH, arg2: T2):            Function2<T1,     T3, R>;
-        <T1, T2, T3, R>(func: Function3<T1, T2, T3, R>, arg1: T1, arg2: T2):            Function1<        T3, R>;
-        <T1, T2, T3, R>(func: Function3<T1, T2, T3, R>, plc1: PH, plc2: PH, arg3: T3):  Function2<T1, T2,     R>;
-        <T1, T2, T3, R>(func: Function3<T1, T2, T3, R>, arg1: T1, plc2: PH, arg3: T3):  Function1<    T2,     R>;
-        <T1, T2, T3, R>(func: Function3<T1, T2, T3, R>, plc1: PH, arg2: T2, arg3: T3):  Function1<T1,         R>;
-        <T1, T2, T3, R>(func: Function3<T1, T2, T3, R>, arg1: T1, arg2: T2, arg3: T3):  Function0<            R>;
-        // arity 4
-        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>):                                          Function4<T1, T2, T3, T4, R>;
-        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1):                                Function3<    T2, T3, T4, R>;
-        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, plc1: PH, arg2: T2):                      Function3<T1,     T3, T4, R>;
-        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1, arg2: T2):                      Function2<        T3, T4, R>;
-        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, plc1: PH, plc2: PH, arg3: T3):            Function3<T1, T2,     T4, R>;
-        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1, plc2: PH, arg3: T3):            Function2<    T2,     T4, R>;
-        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, plc1: PH, arg2: T2, arg3: T3):            Function2<T1,         T4, R>;
-        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1, arg2: T2, arg3: T3):            Function1<            T4, R>;
-        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, plc1: PH, plc2: PH, plc3: PH, arg4: T4):  Function3<T1, T2, T3,     R>;
-        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1, plc2: PH, plc3: PH, arg4: T4):  Function2<    T2, T3,     R>;
-        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, plc1: PH, arg2: T2, plc3: PH, arg4: T4):  Function2<T1,     T3,     R>;
-        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1, arg2: T2, plc3: PH, arg4: T4):  Function1<        T3,     R>;
-        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, plc1: PH, plc2: PH, arg3: T3, arg4: T4):  Function2<T1, T2,         R>;
-        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1, plc2: PH, arg3: T3, arg4: T4):  Function1<    T2,         R>;
-        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, plc1: PH, arg2: T2, arg3: T3, arg4: T4):  Function1<T1,             R>;
-        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1, arg2: T2, arg3: T3, arg4: T4):  Function0<                R>;
-        // catch-all
-        (func: (...args: any[]) => any, ...args: any[]): (...args: any[]) => any;
-    }
-
-    interface ImplicitPartial {
-        // arity 0
-        <R>(this: LoDashImplicitWrapper<Function0<R>>): LoDashImplicitWrapper<Function0<R>>;
-        // arity 1
-        <T1, R>(this: LoDashImplicitWrapper<Function1<T1, R>>): LoDashImplicitWrapper<Function1<T1, R>>;
-        <T1, R>(this: LoDashImplicitWrapper<Function1<T1, R>>, arg1: T1): LoDashImplicitWrapper<Function0<R>>;
-        // arity 2
-        <T1, T2, R>(this: LoDashImplicitWrapper<Function2<T1, T2, R>>):                      LoDashImplicitWrapper<Function2<T1, T2, R>>;
-        <T1, T2, R>(this: LoDashImplicitWrapper<Function2<T1, T2, R>>, arg1: T1):            LoDashImplicitWrapper<Function1<    T2, R>>;
-        <T1, T2, R>(this: LoDashImplicitWrapper<Function2<T1, T2, R>>, plc1: PH, arg2: T2):  LoDashImplicitWrapper<Function1<T1,     R>>;
-        <T1, T2, R>(this: LoDashImplicitWrapper<Function2<T1, T2, R>>, arg1: T1, arg2: T2):  LoDashImplicitWrapper<Function0<        R>>;
-        // arity 3
-        <T1, T2, T3, R>(this: LoDashImplicitWrapper<Function3<T1, T2, T3, R>>):                                LoDashImplicitWrapper<Function3<T1, T2, T3, R>>;
-        <T1, T2, T3, R>(this: LoDashImplicitWrapper<Function3<T1, T2, T3, R>>, arg1: T1):                      LoDashImplicitWrapper<Function2<    T2, T3, R>>;
-        <T1, T2, T3, R>(this: LoDashImplicitWrapper<Function3<T1, T2, T3, R>>, plc1: PH, arg2: T2):            LoDashImplicitWrapper<Function2<T1,     T3, R>>;
-        <T1, T2, T3, R>(this: LoDashImplicitWrapper<Function3<T1, T2, T3, R>>, arg1: T1, arg2: T2):            LoDashImplicitWrapper<Function1<        T3, R>>;
-        <T1, T2, T3, R>(this: LoDashImplicitWrapper<Function3<T1, T2, T3, R>>, plc1: PH, plc2: PH, arg3: T3):  LoDashImplicitWrapper<Function2<T1, T2,     R>>;
-        <T1, T2, T3, R>(this: LoDashImplicitWrapper<Function3<T1, T2, T3, R>>, arg1: T1, plc2: PH, arg3: T3):  LoDashImplicitWrapper<Function1<    T2,     R>>;
-        <T1, T2, T3, R>(this: LoDashImplicitWrapper<Function3<T1, T2, T3, R>>, plc1: PH, arg2: T2, arg3: T3):  LoDashImplicitWrapper<Function1<T1,         R>>;
-        <T1, T2, T3, R>(this: LoDashImplicitWrapper<Function3<T1, T2, T3, R>>, arg1: T1, arg2: T2, arg3: T3):  LoDashImplicitWrapper<Function0<            R>>;
-        // arity 4
-        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>):                                          LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>;
-        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1):                                LoDashImplicitWrapper<Function3<    T2, T3, T4, R>>;
-        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, plc1: PH, arg2: T2):                      LoDashImplicitWrapper<Function3<T1,     T3, T4, R>>;
-        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, arg2: T2):                      LoDashImplicitWrapper<Function2<        T3, T4, R>>;
-        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, plc1: PH, plc2: PH, arg3: T3):            LoDashImplicitWrapper<Function3<T1, T2,     T4, R>>;
-        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, plc2: PH, arg3: T3):            LoDashImplicitWrapper<Function2<    T2,     T4, R>>;
-        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, plc1: PH, arg2: T2, arg3: T3):            LoDashImplicitWrapper<Function2<T1,         T4, R>>;
-        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, arg2: T2, arg3: T3):            LoDashImplicitWrapper<Function1<            T4, R>>;
-        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, plc1: PH, plc2: PH, plc3: PH, arg4: T4):  LoDashImplicitWrapper<Function3<T1, T2, T3,     R>>;
-        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, plc2: PH, plc3: PH, arg4: T4):  LoDashImplicitWrapper<Function2<    T2, T3,     R>>;
-        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, plc1: PH, arg2: T2, plc3: PH, arg4: T4):  LoDashImplicitWrapper<Function2<T1,     T3,     R>>;
-        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, arg2: T2, plc3: PH, arg4: T4):  LoDashImplicitWrapper<Function1<        T3,     R>>;
-        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, plc1: PH, plc2: PH, arg3: T3, arg4: T4):  LoDashImplicitWrapper<Function2<T1, T2,         R>>;
-        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, plc2: PH, arg3: T3, arg4: T4):  LoDashImplicitWrapper<Function1<    T2,         R>>;
-        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, plc1: PH, arg2: T2, arg3: T3, arg4: T4):  LoDashImplicitWrapper<Function1<T1,             R>>;
-        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, arg2: T2, arg3: T3, arg4: T4):  LoDashImplicitWrapper<Function0<                R>>;
-        // catch-all
-        (...args: any[]): LoDashImplicitWrapper<(...args: any[]) => any>;
-    }
-
-    interface ExplicitPartial {
-        // arity 0
-        <R>(this: LoDashExplicitWrapper<Function0<R>>): LoDashExplicitWrapper<Function0<R>>;
-        // arity 1
-        <T1, R>(this: LoDashExplicitWrapper<Function1<T1, R>>): LoDashExplicitWrapper<Function1<T1, R>>;
-        <T1, R>(this: LoDashExplicitWrapper<Function1<T1, R>>, arg1: T1): LoDashExplicitWrapper<Function0<R>>;
-        // arity 2
-        <T1, T2, R>(this: LoDashExplicitWrapper<Function2<T1, T2, R>>):                      LoDashExplicitWrapper<Function2<T1, T2, R>>;
-        <T1, T2, R>(this: LoDashExplicitWrapper<Function2<T1, T2, R>>, arg1: T1):            LoDashExplicitWrapper<Function1<    T2, R>>;
-        <T1, T2, R>(this: LoDashExplicitWrapper<Function2<T1, T2, R>>, plc1: PH, arg2: T2):  LoDashExplicitWrapper<Function1<T1,     R>>;
-        <T1, T2, R>(this: LoDashExplicitWrapper<Function2<T1, T2, R>>, arg1: T1, arg2: T2):  LoDashExplicitWrapper<Function0<        R>>;
-        // arity 3
-        <T1, T2, T3, R>(this: LoDashExplicitWrapper<Function3<T1, T2, T3, R>>):                                LoDashExplicitWrapper<Function3<T1, T2, T3, R>>;
-        <T1, T2, T3, R>(this: LoDashExplicitWrapper<Function3<T1, T2, T3, R>>, arg1: T1):                      LoDashExplicitWrapper<Function2<    T2, T3, R>>;
-        <T1, T2, T3, R>(this: LoDashExplicitWrapper<Function3<T1, T2, T3, R>>, plc1: PH, arg2: T2):            LoDashExplicitWrapper<Function2<T1,     T3, R>>;
-        <T1, T2, T3, R>(this: LoDashExplicitWrapper<Function3<T1, T2, T3, R>>, arg1: T1, arg2: T2):            LoDashExplicitWrapper<Function1<        T3, R>>;
-        <T1, T2, T3, R>(this: LoDashExplicitWrapper<Function3<T1, T2, T3, R>>, plc1: PH, plc2: PH, arg3: T3):  LoDashExplicitWrapper<Function2<T1, T2,     R>>;
-        <T1, T2, T3, R>(this: LoDashExplicitWrapper<Function3<T1, T2, T3, R>>, arg1: T1, plc2: PH, arg3: T3):  LoDashExplicitWrapper<Function1<    T2,     R>>;
-        <T1, T2, T3, R>(this: LoDashExplicitWrapper<Function3<T1, T2, T3, R>>, plc1: PH, arg2: T2, arg3: T3):  LoDashExplicitWrapper<Function1<T1,         R>>;
-        <T1, T2, T3, R>(this: LoDashExplicitWrapper<Function3<T1, T2, T3, R>>, arg1: T1, arg2: T2, arg3: T3):  LoDashExplicitWrapper<Function0<            R>>;
-        // arity 4
-        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>):                                          LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>;
-        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1):                                LoDashExplicitWrapper<Function3<    T2, T3, T4, R>>;
-        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, plc1: PH, arg2: T2):                      LoDashExplicitWrapper<Function3<T1,     T3, T4, R>>;
-        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, arg2: T2):                      LoDashExplicitWrapper<Function2<        T3, T4, R>>;
-        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, plc1: PH, plc2: PH, arg3: T3):            LoDashExplicitWrapper<Function3<T1, T2,     T4, R>>;
-        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, plc2: PH, arg3: T3):            LoDashExplicitWrapper<Function2<    T2,     T4, R>>;
-        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, plc1: PH, arg2: T2, arg3: T3):            LoDashExplicitWrapper<Function2<T1,         T4, R>>;
-        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, arg2: T2, arg3: T3):            LoDashExplicitWrapper<Function1<            T4, R>>;
-        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, plc1: PH, plc2: PH, plc3: PH, arg4: T4):  LoDashExplicitWrapper<Function3<T1, T2, T3,     R>>;
-        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, plc2: PH, plc3: PH, arg4: T4):  LoDashExplicitWrapper<Function2<    T2, T3,     R>>;
-        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, plc1: PH, arg2: T2, plc3: PH, arg4: T4):  LoDashExplicitWrapper<Function2<T1,     T3,     R>>;
-        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, arg2: T2, plc3: PH, arg4: T4):  LoDashExplicitWrapper<Function1<        T3,     R>>;
-        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, plc1: PH, plc2: PH, arg3: T3, arg4: T4):  LoDashExplicitWrapper<Function2<T1, T2,         R>>;
-        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, plc2: PH, arg3: T3, arg4: T4):  LoDashExplicitWrapper<Function1<    T2,         R>>;
-        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, plc1: PH, arg2: T2, arg3: T3, arg4: T4):  LoDashExplicitWrapper<Function1<T1,             R>>;
-        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, arg2: T2, arg3: T3, arg4: T4):  LoDashExplicitWrapper<Function0<                R>>;
-        // catch-all
-        (...args: any[]): LoDashExplicitWrapper<(...args: any[]) => any>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/function/partialRight.d.ts b/types/lodash/function/partialRight.d.ts
deleted file mode 100644
index 24b4c47d20..0000000000
--- a/types/lodash/function/partialRight.d.ts
+++ /dev/null
@@ -1,150 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-        * This method is like _.partial except that partial arguments are appended to those provided
-        * to the new function.
-        * @param func The function to partially apply arguments to.
-        * @param args Arguments to be partially applied.
-        * @return The new partially applied function.
-        **/
-        partialRight: PartialRight;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.partialRight
-         */
-        partialRight: ImplicitPartialRight;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.partialRight
-         */
-        partialRight: ExplicitPartialRight;
-    }
-
-    interface PartialRight {
-        // arity 0
-        <R>(func: Function0<R>): Function0<R>;
-        // arity 1
-        <T1, R>(func: Function1<T1, R>): Function1<T1, R>;
-        <T1, R>(func: Function1<T1, R>, arg1: T1): Function0<R>;
-        // arity 2
-        <T1, T2, R>(func: Function2<T1, T2, R>):                      Function2<T1, T2, R>;
-        <T1, T2, R>(func: Function2<T1, T2, R>, arg1: T1, plc2: PH):  Function1<    T2, R>;
-        <T1, T2, R>(func: Function2<T1, T2, R>,           arg2: T2):  Function1<T1,     R>;
-        <T1, T2, R>(func: Function2<T1, T2, R>, arg1: T1, arg2: T2):  Function0<        R>;
-        // arity 3
-        <T1, T2, T3, R>(func: Function3<T1, T2, T3, R>):                                Function3<T1, T2, T3, R>;
-        <T1, T2, T3, R>(func: Function3<T1, T2, T3, R>, arg1: T1, plc2: PH, plc3: PH):  Function2<    T2, T3, R>;
-        <T1, T2, T3, R>(func: Function3<T1, T2, T3, R>,           arg2: T2, plc3: PH):  Function2<T1,     T3, R>;
-        <T1, T2, T3, R>(func: Function3<T1, T2, T3, R>, arg1: T1, arg2: T2, plc3: PH):  Function1<        T3, R>;
-        <T1, T2, T3, R>(func: Function3<T1, T2, T3, R>,                     arg3: T3):  Function2<T1, T2,     R>;
-        <T1, T2, T3, R>(func: Function3<T1, T2, T3, R>, arg1: T1, plc2: PH, arg3: T3):  Function1<    T2,     R>;
-        <T1, T2, T3, R>(func: Function3<T1, T2, T3, R>,           arg2: T2, arg3: T3):  Function1<T1,         R>;
-        <T1, T2, T3, R>(func: Function3<T1, T2, T3, R>, arg1: T1, arg2: T2, arg3: T3):  Function0<            R>;
-        // arity 4
-        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>):                                          Function4<T1, T2, T3, T4, R>;
-        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1, plc2: PH, plc3: PH, plc4: PH):  Function3<    T2, T3, T4, R>;
-        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>,           arg2: T2, plc3: PH, plc4: PH):  Function3<T1,     T3, T4, R>;
-        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1, arg2: T2, plc3: PH, plc4: PH):  Function2<        T3, T4, R>;
-        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>,                     arg3: T3, plc4: PH):  Function3<T1, T2,     T4, R>;
-        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1, plc2: PH, arg3: T3, plc4: PH):  Function2<    T2,     T4, R>;
-        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>,           arg2: T2, arg3: T3, plc4: PH):  Function2<T1,         T4, R>;
-        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1, arg2: T2, arg3: T3, plc4: PH):  Function1<            T4, R>;
-        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>,                               arg4: T4):  Function3<T1, T2, T3,     R>;
-        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1, plc2: PH, plc3: PH, arg4: T4):  Function2<    T2, T3,     R>;
-        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>,           arg2: T2, plc3: PH, arg4: T4):  Function2<T1,     T3,     R>;
-        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1, arg2: T2, plc3: PH, arg4: T4):  Function1<        T3,     R>;
-        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>,                     arg3: T3, arg4: T4):  Function2<T1, T2,         R>;
-        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1, plc2: PH, arg3: T3, arg4: T4):  Function1<    T2,         R>;
-        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>,           arg2: T2, arg3: T3, arg4: T4):  Function1<T1,             R>;
-        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1, arg2: T2, arg3: T3, arg4: T4):  Function0<                R>;
-        // catch-all
-        (func: (...args: any[]) => any, ...args: any[]): (...args: any[]) => any;
-    }
-
-    interface ImplicitPartialRight {
-        // arity 0
-        <R>(this: LoDashImplicitWrapper<Function0<R>>): LoDashImplicitWrapper<Function0<R>>;
-        // arity 1
-        <T1, R>(this: LoDashImplicitWrapper<Function1<T1, R>>): LoDashImplicitWrapper<Function1<T1, R>>;
-        <T1, R>(this: LoDashImplicitWrapper<Function1<T1, R>>, arg1: T1): LoDashImplicitWrapper<Function0<R>>;
-        // arity 2
-        <T1, T2, R>(this: LoDashImplicitWrapper<Function2<T1, T2, R>>):                      LoDashImplicitWrapper<Function2<T1, T2, R>>;
-        <T1, T2, R>(this: LoDashImplicitWrapper<Function2<T1, T2, R>>, arg1: T1, plc2: PH):  LoDashImplicitWrapper<Function1<    T2, R>>;
-        <T1, T2, R>(this: LoDashImplicitWrapper<Function2<T1, T2, R>>,           arg2: T2):  LoDashImplicitWrapper<Function1<T1,     R>>;
-        <T1, T2, R>(this: LoDashImplicitWrapper<Function2<T1, T2, R>>, arg1: T1, arg2: T2):  LoDashImplicitWrapper<Function0<        R>>;
-        // arity 3
-        <T1, T2, T3, R>(this: LoDashImplicitWrapper<Function3<T1, T2, T3, R>>):                                LoDashImplicitWrapper<Function3<T1, T2, T3, R>>;
-        <T1, T2, T3, R>(this: LoDashImplicitWrapper<Function3<T1, T2, T3, R>>, arg1: T1, plc2: PH, plc3: PH):  LoDashImplicitWrapper<Function2<    T2, T3, R>>;
-        <T1, T2, T3, R>(this: LoDashImplicitWrapper<Function3<T1, T2, T3, R>>,           arg2: T2, plc3: PH):  LoDashImplicitWrapper<Function2<T1,     T3, R>>;
-        <T1, T2, T3, R>(this: LoDashImplicitWrapper<Function3<T1, T2, T3, R>>, arg1: T1, arg2: T2, plc3: PH):  LoDashImplicitWrapper<Function1<        T3, R>>;
-        <T1, T2, T3, R>(this: LoDashImplicitWrapper<Function3<T1, T2, T3, R>>,                     arg3: T3):  LoDashImplicitWrapper<Function2<T1, T2,     R>>;
-        <T1, T2, T3, R>(this: LoDashImplicitWrapper<Function3<T1, T2, T3, R>>, arg1: T1, plc2: PH, arg3: T3):  LoDashImplicitWrapper<Function1<    T2,     R>>;
-        <T1, T2, T3, R>(this: LoDashImplicitWrapper<Function3<T1, T2, T3, R>>,           arg2: T2, arg3: T3):  LoDashImplicitWrapper<Function1<T1,         R>>;
-        <T1, T2, T3, R>(this: LoDashImplicitWrapper<Function3<T1, T2, T3, R>>, arg1: T1, arg2: T2, arg3: T3):  LoDashImplicitWrapper<Function0<            R>>;
-        // arity 4
-        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>):                                          LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>;
-        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, plc2: PH, plc3: PH, plc4: PH):  LoDashImplicitWrapper<Function3<    T2, T3, T4, R>>;
-        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>,           arg2: T2, plc3: PH, plc4: PH):  LoDashImplicitWrapper<Function3<T1,     T3, T4, R>>;
-        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, arg2: T2, plc3: PH, plc4: PH):  LoDashImplicitWrapper<Function2<        T3, T4, R>>;
-        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>,                     arg3: T3, plc4: PH):  LoDashImplicitWrapper<Function3<T1, T2,     T4, R>>;
-        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, plc2: PH, arg3: T3, plc4: PH):  LoDashImplicitWrapper<Function2<    T2,     T4, R>>;
-        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>,           arg2: T2, arg3: T3, plc4: PH):  LoDashImplicitWrapper<Function2<T1,         T4, R>>;
-        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, arg2: T2, arg3: T3, plc4: PH):  LoDashImplicitWrapper<Function1<            T4, R>>;
-        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>,                               arg4: T4):  LoDashImplicitWrapper<Function3<T1, T2, T3,     R>>;
-        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, plc2: PH, plc3: PH, arg4: T4):  LoDashImplicitWrapper<Function2<    T2, T3,     R>>;
-        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>,           arg2: T2, plc3: PH, arg4: T4):  LoDashImplicitWrapper<Function2<T1,     T3,     R>>;
-        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, arg2: T2, plc3: PH, arg4: T4):  LoDashImplicitWrapper<Function1<        T3,     R>>;
-        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>,                     arg3: T3, arg4: T4):  LoDashImplicitWrapper<Function2<T1, T2,         R>>;
-        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, plc2: PH, arg3: T3, arg4: T4):  LoDashImplicitWrapper<Function1<    T2,         R>>;
-        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>,           arg2: T2, arg3: T3, arg4: T4):  LoDashImplicitWrapper<Function1<T1,             R>>;
-        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, arg2: T2, arg3: T3, arg4: T4):  LoDashImplicitWrapper<Function0<                R>>;
-        // catch-all
-        (...args: any[]): LoDashImplicitWrapper<(...args: any[]) => any>;
-    }
-
-    interface ExplicitPartialRight {
-        // arity 0
-        <R>(this: LoDashExplicitWrapper<Function0<R>>): LoDashExplicitWrapper<Function0<R>>;
-        // arity 1
-        <T1, R>(this: LoDashExplicitWrapper<Function1<T1, R>>): LoDashExplicitWrapper<Function1<T1, R>>;
-        <T1, R>(this: LoDashExplicitWrapper<Function1<T1, R>>, arg1: T1): LoDashExplicitWrapper<Function0<R>>;
-        // arity 2
-        <T1, T2, R>(this: LoDashExplicitWrapper<Function2<T1, T2, R>>):                      LoDashExplicitWrapper<Function2<T1, T2, R>>;
-        <T1, T2, R>(this: LoDashExplicitWrapper<Function2<T1, T2, R>>, arg1: T1, plc2: PH):  LoDashExplicitWrapper<Function1<    T2, R>>;
-        <T1, T2, R>(this: LoDashExplicitWrapper<Function2<T1, T2, R>>,           arg2: T2):  LoDashExplicitWrapper<Function1<T1,     R>>;
-        <T1, T2, R>(this: LoDashExplicitWrapper<Function2<T1, T2, R>>, arg1: T1, arg2: T2):  LoDashExplicitWrapper<Function0<        R>>;
-        // arity 3
-        <T1, T2, T3, R>(this: LoDashExplicitWrapper<Function3<T1, T2, T3, R>>):                                LoDashExplicitWrapper<Function3<T1, T2, T3, R>>;
-        <T1, T2, T3, R>(this: LoDashExplicitWrapper<Function3<T1, T2, T3, R>>, arg1: T1, plc2: PH, plc3: PH):  LoDashExplicitWrapper<Function2<    T2, T3, R>>;
-        <T1, T2, T3, R>(this: LoDashExplicitWrapper<Function3<T1, T2, T3, R>>,           arg2: T2, plc3: PH):  LoDashExplicitWrapper<Function2<T1,     T3, R>>;
-        <T1, T2, T3, R>(this: LoDashExplicitWrapper<Function3<T1, T2, T3, R>>, arg1: T1, arg2: T2, plc3: PH):  LoDashExplicitWrapper<Function1<        T3, R>>;
-        <T1, T2, T3, R>(this: LoDashExplicitWrapper<Function3<T1, T2, T3, R>>,                     arg3: T3):  LoDashExplicitWrapper<Function2<T1, T2,     R>>;
-        <T1, T2, T3, R>(this: LoDashExplicitWrapper<Function3<T1, T2, T3, R>>, arg1: T1, plc2: PH, arg3: T3):  LoDashExplicitWrapper<Function1<    T2,     R>>;
-        <T1, T2, T3, R>(this: LoDashExplicitWrapper<Function3<T1, T2, T3, R>>,           arg2: T2, arg3: T3):  LoDashExplicitWrapper<Function1<T1,         R>>;
-        <T1, T2, T3, R>(this: LoDashExplicitWrapper<Function3<T1, T2, T3, R>>, arg1: T1, arg2: T2, arg3: T3):  LoDashExplicitWrapper<Function0<            R>>;
-        // arity 4
-        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>):                                          LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>;
-        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, plc2: PH, plc3: PH, plc4: PH):  LoDashExplicitWrapper<Function3<    T2, T3, T4, R>>;
-        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>,           arg2: T2, plc3: PH, plc4: PH):  LoDashExplicitWrapper<Function3<T1,     T3, T4, R>>;
-        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, arg2: T2, plc3: PH, plc4: PH):  LoDashExplicitWrapper<Function2<        T3, T4, R>>;
-        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>,                     arg3: T3, plc4: PH):  LoDashExplicitWrapper<Function3<T1, T2,     T4, R>>;
-        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, plc2: PH, arg3: T3, plc4: PH):  LoDashExplicitWrapper<Function2<    T2,     T4, R>>;
-        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>,           arg2: T2, arg3: T3, plc4: PH):  LoDashExplicitWrapper<Function2<T1,         T4, R>>;
-        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, arg2: T2, arg3: T3, plc4: PH):  LoDashExplicitWrapper<Function1<            T4, R>>;
-        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>,                               arg4: T4):  LoDashExplicitWrapper<Function3<T1, T2, T3,     R>>;
-        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, plc2: PH, plc3: PH, arg4: T4):  LoDashExplicitWrapper<Function2<    T2, T3,     R>>;
-        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>,           arg2: T2, plc3: PH, arg4: T4):  LoDashExplicitWrapper<Function2<T1,     T3,     R>>;
-        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, arg2: T2, plc3: PH, arg4: T4):  LoDashExplicitWrapper<Function1<        T3,     R>>;
-        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>,                     arg3: T3, arg4: T4):  LoDashExplicitWrapper<Function2<T1, T2,         R>>;
-        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, plc2: PH, arg3: T3, arg4: T4):  LoDashExplicitWrapper<Function1<    T2,         R>>;
-        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>,           arg2: T2, arg3: T3, arg4: T4):  LoDashExplicitWrapper<Function1<T1,             R>>;
-        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, arg2: T2, arg3: T3, arg4: T4):  LoDashExplicitWrapper<Function0<                R>>;
-        // catch-all
-        (...args: any[]): LoDashExplicitWrapper<(...args: any[]) => any>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/function/rearg.d.ts b/types/lodash/function/rearg.d.ts
deleted file mode 100644
index bff0a45b0c..0000000000
--- a/types/lodash/function/rearg.d.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Creates a function that invokes func with arguments arranged according to the specified indexes where the
-         * argument value at the first index is provided as the first argument, the argument value at the second index
-         * is provided as the second argument, and so on.
-         * @param func The function to rearrange arguments for.
-         * @param indexes The arranged argument indexes, specified as individual indexes or arrays of indexes.
-         * @return Returns the new function.
-         */
-        rearg(func: (...args: any[]) => any, ...indexes: Array<Many<number>>): (...args: any[]) => any;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.rearg
-         */
-        rearg(...indexes: Array<Many<number>>): LoDashImplicitWrapper<(...args: any[]) => any>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.rearg
-         */
-        rearg(...indexes: Array<Many<number>>): LoDashExplicitWrapper<(...args: any[]) => any>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/function/rest.d.ts b/types/lodash/function/rest.d.ts
deleted file mode 100644
index c05349f0f9..0000000000
--- a/types/lodash/function/rest.d.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Creates a function that invokes func with the this binding of the created function and arguments from start
-         * and beyond provided as an array.
-         *
-         * Note: This method is based on the rest parameter.
-         *
-         * @param func The function to apply a rest parameter to.
-         * @param start The start position of the rest parameter.
-         * @return Returns the new function.
-         */
-        rest(
-            func: (...args: any[]) => any,
-            start?: number
-        ): (...args: any[]) => any;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.rest
-         */
-        rest(start?: number): LoDashImplicitWrapper<(...args: any[]) => any>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.rest
-         */
-        rest(start?: number): LoDashExplicitWrapper<(...args: any[]) => any>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/function/spread.d.ts b/types/lodash/function/spread.d.ts
deleted file mode 100644
index 29c8b5e8cf..0000000000
--- a/types/lodash/function/spread.d.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Creates a function that invokes func with the this binding of the created function and an array of arguments
-         * much like Function#apply.
-         *
-         * Note: This method is based on the spread operator.
-         *
-         * @param func The function to spread arguments over.
-         * @return Returns the new function.
-         */
-        spread<TResult>(func: (...args: any[]) => TResult): (...args: any[]) => TResult;
-
-        /**
-         * @see _.spread
-         */
-        spread<TResult>(func: (...args: any[]) => TResult, start: number): (...args: any[]) => TResult;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.spread
-         */
-        spread<TResult>(this: LoDashImplicitWrapper<(...args: any[]) => TResult>): LoDashImplicitWrapper<(...args: any[]) => TResult>;
-
-        /**
-         * @see _.spread
-         */
-        spread<TResult>(this: LoDashImplicitWrapper<(...args: any[]) => TResult>, start: number): LoDashImplicitWrapper<(...args: any[]) => TResult>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.spread
-         */
-        spread<TResult>(this: LoDashExplicitWrapper<(...args: any[]) => TResult>): LoDashExplicitWrapper<(...args: any[]) => TResult>;
-
-        /**
-         * @see _.spread
-         */
-        spread<TResult>(this: LoDashExplicitWrapper<(...args: any[]) => TResult>, start: number): LoDashExplicitWrapper<(...args: any[]) => TResult>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/function/throttle.d.ts b/types/lodash/function/throttle.d.ts
deleted file mode 100644
index 0b0fc10039..0000000000
--- a/types/lodash/function/throttle.d.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface ThrottleSettings {
-        /**
-         * If you'd like to disable the leading-edge call, pass this as false.
-         */
-        leading?: boolean;
-
-        /**
-         * If you'd like to disable the execution on the trailing-edge, pass false.
-         */
-        trailing?: boolean;
-    }
-
-    interface LoDashStatic {
-        /**
-         * Creates a throttled function that only invokes func at most once per every wait milliseconds. The throttled
-         * function comes with a cancel method to cancel delayed invocations and a flush method to immediately invoke
-         * them. Provide an options object to indicate that func should be invoked on the leading and/or trailing edge
-         * of the wait timeout. Subsequent calls to the throttled function return the result of the last func call.
-         *
-         * Note: If leading and trailing options are true, func is invoked on the trailing edge of the timeout only if
-         * the the throttled function is invoked more than once during the wait timeout.
-         *
-         * @param func The function to throttle.
-         * @param wait The number of milliseconds to throttle invocations to.
-         * @param options The options object.
-         * @param options.leading Specify invoking on the leading edge of the timeout.
-         * @param options.trailing Specify invoking on the trailing edge of the timeout.
-         * @return Returns the new throttled function.
-         */
-        throttle<T extends (...args: any[]) => any>(
-            func: T,
-            wait?: number,
-            options?: ThrottleSettings
-        ): T & Cancelable;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.throttle
-         */
-        throttle(
-            wait?: number,
-            options?: ThrottleSettings
-        ): LoDashImplicitWrapper<TValue & Cancelable>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.throttle
-         */
-        throttle(
-            wait?: number,
-            options?: ThrottleSettings
-        ): LoDashExplicitWrapper<TValue & Cancelable>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/function/unary.d.ts b/types/lodash/function/unary.d.ts
deleted file mode 100644
index 8714529b10..0000000000
--- a/types/lodash/function/unary.d.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Creates a function that accepts up to one argument, ignoring any
-         * additional arguments.
-         *
-         * @category Function
-         * @param func The function to cap arguments for.
-         * @returns Returns the new function.
-         * @example
-         *
-         * _.map(['6', '8', '10'], _.unary(parseInt));
-         * // => [6, 8, 10]
-         */
-        unary<T, TResult>(func: (arg1: T, ...args: any[]) => TResult): (arg1: T) => TResult;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.unary
-         */
-        unary<T, TResult>(this: LoDashImplicitWrapper<(arg1: T, ...args: any[]) => TResult>): LoDashImplicitWrapper<(arg1: T) => TResult>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.unary
-         */
-        unary<T, TResult>(this: LoDashExplicitWrapper<(arg1: T, ...args: any[]) => TResult>): LoDashExplicitWrapper<(arg1: T) => TResult>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/function/wrap.d.ts b/types/lodash/function/wrap.d.ts
deleted file mode 100644
index f0bb2693ff..0000000000
--- a/types/lodash/function/wrap.d.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Creates a function that provides value to the wrapper function as its first argument. Any additional
-         * arguments provided to the function are appended to those provided to the wrapper function. The wrapper is
-         * invoked with the this binding of the created function.
-         *
-         * @param value The value to wrap.
-         * @param wrapper The wrapper function.
-         * @return Returns the new function.
-         */
-        wrap<T, TArgs, TResult>(
-            value: T,
-            wrapper: (value: T, ...args: TArgs[]) => TResult
-        ): (...args: TArgs[]) => TResult;
-
-        /**
-         * @see _.wrap
-         */
-        wrap<T, TResult>(
-            value: T,
-            wrapper: (value: T, ...args: any[]) => TResult
-        ): (...args: any[]) => TResult;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.wrap
-         */
-        wrap<TArgs, TResult>(
-            wrapper: (value: TValue, ...args: TArgs[]) => TResult
-        ): LoDashImplicitWrapper<(...args: TArgs[]) => TResult>;
-
-        /**
-         * @see _.wrap
-         */
-        wrap<TResult>(
-            wrapper: (value: TValue, ...args: any[]) => TResult
-        ): LoDashImplicitWrapper<(...args: any[]) => TResult>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.wrap
-         */
-        /**
-         * @see _.wrap
-         */
-        wrap<TArgs, TResult>(
-            wrapper: (value: TValue, ...args: TArgs[]) => TResult
-        ): LoDashExplicitWrapper<(...args: TArgs[]) => TResult>;
-
-        /**
-         * @see _.wrap
-         */
-        wrap<TResult>(
-            wrapper: (value: TValue, ...args: any[]) => TResult
-        ): LoDashExplicitWrapper<(...args: any[]) => TResult>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/index.d.ts b/types/lodash/index.d.ts
index fd421681c1..67e9c8f0cb 100644
--- a/types/lodash/index.d.ts
+++ b/types/lodash/index.d.ts
@@ -3,7 +3,6 @@
 // Definitions by: Brian Zengel <https://github.com/bczengel>,
 //                 Ilya Mochalov <https://github.com/chrootsu>,
 //                 Stepan Mikhaylyuk <https://github.com/stepancar>,
-//                 Eric L Anderson <https://github.com/ericanderson>,
 //                 AJ Richardson <https://github.com/aj-r>,
 //                 Junyoung Clare Jang <https://github.com/ailrun>,
 //                 e-cloud <https://github.com/e-cloud>,
@@ -13,344 +12,18 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
-// common
 /// <reference path="./common/common.d.ts" />
-
-// array
-/// <reference path="./array/chunk.d.ts" />
-/// <reference path="./array/compact.d.ts" />
-/// <reference path="./array/concat.d.ts" />
-/// <reference path="./array/difference.d.ts" />
-/// <reference path="./array/differenceBy.d.ts" />
-/// <reference path="./array/differenceWith.d.ts" />
-/// <reference path="./array/drop.d.ts" />
-/// <reference path="./array/dropRight.d.ts" />
-/// <reference path="./array/dropRightWhile.d.ts" />
-/// <reference path="./array/dropWhile.d.ts" />
-/// <reference path="./array/fill.d.ts" />
-/// <reference path="./array/findIndex.d.ts" />
-/// <reference path="./array/findLastIndex.d.ts" />
-/// <reference path="./array/first.d.ts" />
-/// <reference path="./array/flatten.d.ts" />
-/// <reference path="./array/flattenDeep.d.ts" />
-/// <reference path="./array/flattenDepth.d.ts" />
-/// <reference path="./array/fromPairs.d.ts" />
-/// <reference path="./array/head.d.ts" />
-/// <reference path="./array/indexOf.d.ts" />
-/// <reference path="./array/initial.d.ts" />
-/// <reference path="./array/intersection.d.ts" />
-/// <reference path="./array/intersectionBy.d.ts" />
-/// <reference path="./array/intersectionWith.d.ts" />
-/// <reference path="./array/join.d.ts" />
-/// <reference path="./array/last.d.ts" />
-/// <reference path="./array/lastIndexOf.d.ts" />
-/// <reference path="./array/nth.d.ts" />
-/// <reference path="./array/pull.d.ts" />
-/// <reference path="./array/pullAll.d.ts" />
-/// <reference path="./array/pullAllBy.d.ts" />
-/// <reference path="./array/pullAllWith.d.ts" />
-/// <reference path="./array/pullAt.d.ts" />
-/// <reference path="./array/remove.d.ts" />
-/// <reference path="./array/reverse.d.ts" />
-/// <reference path="./array/slice.d.ts" />
-/// <reference path="./array/sortedIndex.d.ts" />
-/// <reference path="./array/sortedIndexBy.d.ts" />
-/// <reference path="./array/sortedIndexOf.d.ts" />
-/// <reference path="./array/sortedLastIndex.d.ts" />
-/// <reference path="./array/sortedLastIndexBy.d.ts" />
-/// <reference path="./array/sortedLastIndexOf.d.ts" />
-/// <reference path="./array/sortedUniq.d.ts" />
-/// <reference path="./array/sortedUniqBy.d.ts" />
-/// <reference path="./array/tail.d.ts" />
-/// <reference path="./array/take.d.ts" />
-/// <reference path="./array/takeRight.d.ts" />
-/// <reference path="./array/takeRightWhile.d.ts" />
-/// <reference path="./array/takeWhile.d.ts" />
-/// <reference path="./array/union.d.ts" />
-/// <reference path="./array/unionBy.d.ts" />
-/// <reference path="./array/unionWith.d.ts" />
-/// <reference path="./array/uniq.d.ts" />
-/// <reference path="./array/uniqBy.d.ts" />
-/// <reference path="./array/uniqWith.d.ts" />
-/// <reference path="./array/unzip.d.ts" />
-/// <reference path="./array/unzipWith.d.ts" />
-/// <reference path="./array/without.d.ts" />
-/// <reference path="./array/xor.d.ts" />
-/// <reference path="./array/xorBy.d.ts" />
-/// <reference path="./array/xorWith.d.ts" />
-/// <reference path="./array/zip.d.ts" />
-/// <reference path="./array/zipObject.d.ts" />
-/// <reference path="./array/zipObjectDeep.d.ts" />
-/// <reference path="./array/zipWith.d.ts" />
-
-// collection
-/// <reference path="./collection/countBy.d.ts" />
-/// <reference path="./collection/each.d.ts" />
-/// <reference path="./collection/eachRight.d.ts" />
-/// <reference path="./collection/every.d.ts" />
-/// <reference path="./collection/filter.d.ts" />
-/// <reference path="./collection/find.d.ts" />
-/// <reference path="./collection/findLast.d.ts" />
-/// <reference path="./collection/flatMap.d.ts" />
-/// <reference path="./collection/flatMapDeep.d.ts" />
-/// <reference path="./collection/flatMapDepth.d.ts" />
-/// <reference path="./collection/forEach.d.ts" />
-/// <reference path="./collection/forEachRight.d.ts" />
-/// <reference path="./collection/groupBy.d.ts" />
-/// <reference path="./collection/includes.d.ts" />
-/// <reference path="./collection/invokeMap.d.ts" />
-/// <reference path="./collection/keyBy.d.ts" />
-/// <reference path="./collection/map.d.ts" />
-/// <reference path="./collection/orderBy.d.ts" />
-/// <reference path="./collection/partition.d.ts" />
-/// <reference path="./collection/reduce.d.ts" />
-/// <reference path="./collection/reduceRight.d.ts" />
-/// <reference path="./collection/reject.d.ts" />
-/// <reference path="./collection/sample.d.ts" />
-/// <reference path="./collection/sampleSize.d.ts" />
-/// <reference path="./collection/shuffle.d.ts" />
-/// <reference path="./collection/size.d.ts" />
-/// <reference path="./collection/some.d.ts" />
-/// <reference path="./collection/sortBy.d.ts" />
-
-// date
-/// <reference path="./date/now.d.ts" />
-
-// function
-/// <reference path="./function/after.d.ts" />
-/// <reference path="./function/ary.d.ts" />
-/// <reference path="./function/before.d.ts" />
-/// <reference path="./function/bind.d.ts" />
-/// <reference path="./function/bindKey.d.ts" />
-/// <reference path="./function/curry.d.ts" />
-/// <reference path="./function/curryRight.d.ts" />
-/// <reference path="./function/debounce.d.ts" />
-/// <reference path="./function/defer.d.ts" />
-/// <reference path="./function/delay.d.ts" />
-/// <reference path="./function/flip.d.ts" />
-/// <reference path="./function/memoize.d.ts" />
-/// <reference path="./function/negate.d.ts" />
-/// <reference path="./function/once.d.ts" />
-/// <reference path="./function/overArgs.d.ts" />
-/// <reference path="./function/partial.d.ts" />
-/// <reference path="./function/partialRight.d.ts" />
-/// <reference path="./function/rearg.d.ts" />
-/// <reference path="./function/rest.d.ts" />
-/// <reference path="./function/spread.d.ts" />
-/// <reference path="./function/throttle.d.ts" />
-/// <reference path="./function/unary.d.ts" />
-/// <reference path="./function/wrap.d.ts" />
-
-// lang
-/// <reference path="./lang/castArray.d.ts" />
-/// <reference path="./lang/clone.d.ts" />
-/// <reference path="./lang/cloneDeep.d.ts" />
-/// <reference path="./lang/cloneDeepWith.d.ts" />
-/// <reference path="./lang/cloneWith.d.ts" />
-/// <reference path="./lang/conformsTo.d.ts" />
-/// <reference path="./lang/eq.d.ts" />
-/// <reference path="./lang/gt.d.ts" />
-/// <reference path="./lang/gte.d.ts" />
-/// <reference path="./lang/isArguments.d.ts" />
-/// <reference path="./lang/isArray.d.ts" />
-/// <reference path="./lang/isArrayBuffer.d.ts" />
-/// <reference path="./lang/isArrayLike.d.ts" />
-/// <reference path="./lang/isArrayLikeObject.d.ts" />
-/// <reference path="./lang/isBoolean.d.ts" />
-/// <reference path="./lang/isBuffer.d.ts" />
-/// <reference path="./lang/isDate.d.ts" />
-/// <reference path="./lang/isElement.d.ts" />
-/// <reference path="./lang/isEmpty.d.ts" />
-/// <reference path="./lang/isEqual.d.ts" />
-/// <reference path="./lang/isEqualWith.d.ts" />
-/// <reference path="./lang/isError.d.ts" />
-/// <reference path="./lang/isFinite.d.ts" />
-/// <reference path="./lang/isFunction.d.ts" />
-/// <reference path="./lang/isInteger.d.ts" />
-/// <reference path="./lang/isLength.d.ts" />
-/// <reference path="./lang/isMap.d.ts" />
-/// <reference path="./lang/isMatch.d.ts" />
-/// <reference path="./lang/isMatchWith.d.ts" />
-/// <reference path="./lang/isNaN.d.ts" />
-/// <reference path="./lang/isNative.d.ts" />
-/// <reference path="./lang/isNil.d.ts" />
-/// <reference path="./lang/isNull.d.ts" />
-/// <reference path="./lang/isNumber.d.ts" />
-/// <reference path="./lang/isObject.d.ts" />
-/// <reference path="./lang/isObjectLike.d.ts" />
-/// <reference path="./lang/isPlainObject.d.ts" />
-/// <reference path="./lang/isRegExp.d.ts" />
-/// <reference path="./lang/isSafeInteger.d.ts" />
-/// <reference path="./lang/isSet.d.ts" />
-/// <reference path="./lang/isString.d.ts" />
-/// <reference path="./lang/isSymbol.d.ts" />
-/// <reference path="./lang/isTypedArray.d.ts" />
-/// <reference path="./lang/isUndefined.d.ts" />
-/// <reference path="./lang/isWeakMap.d.ts" />
-/// <reference path="./lang/isWeakSet.d.ts" />
-/// <reference path="./lang/lt.d.ts" />
-/// <reference path="./lang/lte.d.ts" />
-/// <reference path="./lang/toArray.d.ts" />
-/// <reference path="./lang/toFinite.d.ts" />
-/// <reference path="./lang/toInteger.d.ts" />
-/// <reference path="./lang/toLength.d.ts" />
-/// <reference path="./lang/toNumber.d.ts" />
-/// <reference path="./lang/toPlainObject.d.ts" />
-/// <reference path="./lang/toSafeInteger.d.ts" />
-/// <reference path="./lang/toString.d.ts" />
-
-// math
-/// <reference path="./math/add.d.ts" />
-/// <reference path="./math/ceil.d.ts" />
-/// <reference path="./math/divide.d.ts" />
-/// <reference path="./math/floor.d.ts" />
-/// <reference path="./math/max.d.ts" />
-/// <reference path="./math/maxBy.d.ts" />
-/// <reference path="./math/mean.d.ts" />
-/// <reference path="./math/meanBy.d.ts" />
-/// <reference path="./math/min.d.ts" />
-/// <reference path="./math/minBy.d.ts" />
-/// <reference path="./math/multiply.d.ts" />
-/// <reference path="./math/round.d.ts" />
-/// <reference path="./math/subtract.d.ts" />
-/// <reference path="./math/sum.d.ts" />
-/// <reference path="./math/sumBy.d.ts" />
-
-// number
-/// <reference path="./number/clamp.d.ts" />
-/// <reference path="./number/inRange.d.ts" />
-/// <reference path="./number/random.d.ts" />
-
-// object
-/// <reference path="./object/assign.d.ts" />
-/// <reference path="./object/assignIn.d.ts" />
-/// <reference path="./object/assignInWith.d.ts" />
-/// <reference path="./object/assignWith.d.ts" />
-/// <reference path="./object/at.d.ts" />
-/// <reference path="./object/create.d.ts" />
-/// <reference path="./object/defaults.d.ts" />
-/// <reference path="./object/defaultsDeep.d.ts" />
-/// <reference path="./object/entries.d.ts" />
-/// <reference path="./object/entriesIn.d.ts" />
-/// <reference path="./object/extend.d.ts" />
-/// <reference path="./object/extendWith.d.ts" />
-/// <reference path="./object/findKey.d.ts" />
-/// <reference path="./object/findLastKey.d.ts" />
-/// <reference path="./object/forIn.d.ts" />
-/// <reference path="./object/forInRight.d.ts" />
-/// <reference path="./object/forOwn.d.ts" />
-/// <reference path="./object/forOwnRight.d.ts" />
-/// <reference path="./object/functions.d.ts" />
-/// <reference path="./object/functionsIn.d.ts" />
-/// <reference path="./object/get.d.ts" />
-/// <reference path="./object/has.d.ts" />
-/// <reference path="./object/hasIn.d.ts" />
-/// <reference path="./object/invert.d.ts" />
-/// <reference path="./object/invertBy.d.ts" />
-/// <reference path="./object/invoke.d.ts" />
-/// <reference path="./object/keys.d.ts" />
-/// <reference path="./object/keysIn.d.ts" />
-/// <reference path="./object/mapKeys.d.ts" />
-/// <reference path="./object/mapValues.d.ts" />
-/// <reference path="./object/merge.d.ts" />
-/// <reference path="./object/mergeWith.d.ts" />
-/// <reference path="./object/omit.d.ts" />
-/// <reference path="./object/omitBy.d.ts" />
-/// <reference path="./object/pick.d.ts" />
-/// <reference path="./object/pickBy.d.ts" />
-/// <reference path="./object/result.d.ts" />
-/// <reference path="./object/set.d.ts" />
-/// <reference path="./object/setWith.d.ts" />
-/// <reference path="./object/toPairs.d.ts" />
-/// <reference path="./object/toPairsIn.d.ts" />
-/// <reference path="./object/transform.d.ts" />
-/// <reference path="./object/unset.d.ts" />
-/// <reference path="./object/update.d.ts" />
-/// <reference path="./object/updateWith.d.ts" />
-/// <reference path="./object/values.d.ts" />
-/// <reference path="./object/valuesIn.d.ts" />
-
-// _
-/// <reference path="./seq/chain.d.ts" />
-/// <reference path="./seq/tap.d.ts" />
-/// <reference path="./seq/thru.d.ts" />
-/// <reference path="./seq/prototype.at.d.ts" />
-/// <reference path="./seq/prototype.chain.d.ts" />
-/// <reference path="./seq/prototype.commit.d.ts" />
-/// <reference path="./seq/prototype.plant.d.ts" />
-/// <reference path="./seq/prototype.reverse.d.ts" />
-/// <reference path="./seq/prototype.toJSON.d.ts" />
-/// <reference path="./seq/prototype.toString.d.ts" />
-/// <reference path="./seq/prototype.value.d.ts" />
-/// <reference path="./seq/prototype.valueOf.d.ts" />
-
-// string
-/// <reference path="./string/camelCase.d.ts" />
-/// <reference path="./string/capitalize.d.ts" />
-/// <reference path="./string/deburr.d.ts" />
-/// <reference path="./string/endsWith.d.ts" />
-/// <reference path="./string/escape.d.ts" />
-/// <reference path="./string/escapeRegExp.d.ts" />
-/// <reference path="./string/kebabCase.d.ts" />
-/// <reference path="./string/lowerCase.d.ts" />
-/// <reference path="./string/lowerFirst.d.ts" />
-/// <reference path="./string/pad.d.ts" />
-/// <reference path="./string/padEnd.d.ts" />
-/// <reference path="./string/padStart.d.ts" />
-/// <reference path="./string/parseInt.d.ts" />
-/// <reference path="./string/repeat.d.ts" />
-/// <reference path="./string/replace.d.ts" />
-/// <reference path="./string/snakeCase.d.ts" />
-/// <reference path="./string/split.d.ts" />
-/// <reference path="./string/startCase.d.ts" />
-/// <reference path="./string/startsWith.d.ts" />
-/// <reference path="./string/template.d.ts" />
-/// <reference path="./string/toLower.d.ts" />
-/// <reference path="./string/toUpper.d.ts" />
-/// <reference path="./string/trim.d.ts" />
-/// <reference path="./string/trimEnd.d.ts" />
-/// <reference path="./string/trimStart.d.ts" />
-/// <reference path="./string/truncate.d.ts" />
-/// <reference path="./string/unescape.d.ts" />
-/// <reference path="./string/upperCase.d.ts" />
-/// <reference path="./string/upperFirst.d.ts" />
-/// <reference path="./string/words.d.ts" />
-
-// util
-/// <reference path="./util/attempt.d.ts" />
-/// <reference path="./util/bindAll.d.ts" />
-/// <reference path="./util/cond.d.ts" />
-/// <reference path="./util/conforms.d.ts" />
-/// <reference path="./util/constant.d.ts" />
-/// <reference path="./util/defaultTo.d.ts" />
-/// <reference path="./util/flow.d.ts" />
-/// <reference path="./util/flowRight.d.ts" />
-/// <reference path="./util/identity.d.ts" />
-/// <reference path="./util/iteratee.d.ts" />
-/// <reference path="./util/matches.d.ts" />
-/// <reference path="./util/matchesProperty.d.ts" />
-/// <reference path="./util/method.d.ts" />
-/// <reference path="./util/methodOf.d.ts" />
-/// <reference path="./util/mixin.d.ts" />
-/// <reference path="./util/noConflict.d.ts" />
-/// <reference path="./util/noop.d.ts" />
-/// <reference path="./util/nthArg.d.ts" />
-/// <reference path="./util/over.d.ts" />
-/// <reference path="./util/overEvery.d.ts" />
-/// <reference path="./util/overSome.d.ts" />
-/// <reference path="./util/property.d.ts" />
-/// <reference path="./util/propertyOf.d.ts" />
-/// <reference path="./util/range.d.ts" />
-/// <reference path="./util/rangeRight.d.ts" />
-/// <reference path="./util/runInContext.d.ts" />
-/// <reference path="./util/stubArray.d.ts" />
-/// <reference path="./util/stubFalse.d.ts" />
-/// <reference path="./util/stubObject.d.ts" />
-/// <reference path="./util/stubString.d.ts" />
-/// <reference path="./util/stubTrue.d.ts" />
-/// <reference path="./util/times.d.ts" />
-/// <reference path="./util/toPath.d.ts" />
-/// <reference path="./util/uniqueId.d.ts" />
+/// <reference path="./common/array.d.ts" />
+/// <reference path="./common/collection.d.ts" />
+/// <reference path="./common/date.d.ts" />
+/// <reference path="./common/function.d.ts" />
+/// <reference path="./common/lang.d.ts" />
+/// <reference path="./common/math.d.ts" />
+/// <reference path="./common/number.d.ts" />
+/// <reference path="./common/object.d.ts" />
+/// <reference path="./common/seq.d.ts" />
+/// <reference path="./common/string.d.ts" />
+/// <reference path="./common/util.d.ts" />
 
 export = _;
 export as namespace _;
diff --git a/types/lodash/lang/castArray.d.ts b/types/lodash/lang/castArray.d.ts
deleted file mode 100644
index 5f385c5ed5..0000000000
--- a/types/lodash/lang/castArray.d.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Casts value as an array if it’s not one.
-         *
-         * @param value The value to inspect.
-         * @return Returns the cast array.
-         */
-        castArray<T>(value?: Many<T>): T[];
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.castArray
-         */
-        castArray<T>(this: LoDashImplicitWrapper<Many<T>>): LoDashImplicitWrapper<T[]>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.castArray
-         */
-        castArray<T>(this: LoDashExplicitWrapper<Many<T>>): LoDashExplicitWrapper<T[]>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/lang/clone.d.ts b/types/lodash/lang/clone.d.ts
deleted file mode 100644
index 794e2383fb..0000000000
--- a/types/lodash/lang/clone.d.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Creates a shallow clone of value.
-         *
-         * Note: This method is loosely based on the structured clone algorithm and supports cloning arrays,
-         * array buffers, booleans, date objects, maps, numbers, Object objects, regexes, sets, strings, symbols,
-         * and typed arrays. The own enumerable properties of arguments objects are cloned as plain objects. An empty
-         * object is returned for uncloneable values such as error objects, functions, DOM nodes, and WeakMaps.
-         *
-         * @param value The value to clone.
-         * @return Returns the cloned value.
-         */
-        clone<T>(value: T): T;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.clone
-         */
-        clone(): TValue;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.clone
-         */
-        clone(): this;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/lang/cloneDeep.d.ts b/types/lodash/lang/cloneDeep.d.ts
deleted file mode 100644
index 0a49e67ea9..0000000000
--- a/types/lodash/lang/cloneDeep.d.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * This method is like _.clone except that it recursively clones value.
-         *
-         * @param value The value to recursively clone.
-         * @return Returns the deep cloned value.
-         */
-        cloneDeep<T>(value: T): T;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.cloneDeep
-         */
-        cloneDeep(): TValue;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.cloneDeep
-         */
-        cloneDeep(): this;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/lang/cloneDeepWith.d.ts b/types/lodash/lang/cloneDeepWith.d.ts
deleted file mode 100644
index b46fc766ac..0000000000
--- a/types/lodash/lang/cloneDeepWith.d.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    type CloneDeepWithCustomizer<TObject> = (value: any, key: number | string | undefined, object: TObject | undefined, stack: any) => any;
-
-    interface LoDashStatic {
-        /**
-         * This method is like _.cloneWith except that it recursively clones value.
-         *
-         * @param value The value to recursively clone.
-         * @param customizer The function to customize cloning.
-         * @return Returns the deep cloned value.
-         */
-        cloneDeepWith<T>(
-            value: T,
-            customizer: CloneDeepWithCustomizer<T>
-        ): any;
-
-        /**
-         * @see _.cloneDeepWith
-         */
-        cloneDeepWith<T>(value: T): T;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.cloneDeepWith
-         */
-        cloneDeepWith(
-            customizer: CloneDeepWithCustomizer<TValue>
-        ): any;
-
-        /**
-         * @see _.cloneDeepWith
-         */
-        cloneDeepWith(): TValue;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.cloneDeepWith
-         */
-        cloneDeepWith(
-            customizer: CloneDeepWithCustomizer<TValue>
-        ): LoDashExplicitWrapper<any>;
-
-        /**
-         * @see _.cloneDeepWith
-         */
-        cloneDeepWith(): this;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/lang/cloneWith.d.ts b/types/lodash/lang/cloneWith.d.ts
deleted file mode 100644
index 22c00be038..0000000000
--- a/types/lodash/lang/cloneWith.d.ts
+++ /dev/null
@@ -1,74 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    type CloneWithCustomizer<TValue, TResult> = (value: TValue, key: number | string | undefined, object: any, stack: any) => TResult;
-
-    interface LoDashStatic {
-        /**
-         * This method is like _.clone except that it accepts customizer which is invoked to produce the cloned value.
-         * If customizer returns undefined cloning is handled by the method instead.
-         *
-         * @param value The value to clone.
-         * @param customizer The function to customize cloning.
-         * @return Returns the cloned value.
-         */
-        cloneWith<T, TResult extends object | string | number | boolean | null>(
-            value: T,
-            customizer: CloneWithCustomizer<T, TResult>
-        ): TResult;
-
-        /**
-         * @see _.cloneWith
-         */
-        cloneWith<T, TResult>(
-            value: T,
-            customizer: CloneWithCustomizer<T, TResult | undefined>
-        ): TResult | T;
-
-        /**
-         * @see _.cloneWith
-         */
-        cloneWith<T>(value: T): T;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.cloneWith
-         */
-        cloneWith<TResult extends object | string | number | boolean | null>(
-            customizer: CloneWithCustomizer<TValue, TResult>
-        ): TResult;
-
-        /**
-         * @see _.cloneWith
-         */
-        cloneWith<TResult>(
-            customizer: CloneWithCustomizer<TValue, TResult | undefined>
-        ): TResult | TValue;
-
-        /**
-         * @see _.cloneWith
-         */
-        cloneWith(): TValue;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.cloneWith
-         */
-        cloneWith<TResult extends object | string | number | boolean | null>(
-            customizer: CloneWithCustomizer<TValue, TResult>
-        ): LoDashExplicitWrapper<TResult>;
-
-        /**
-         * @see _.cloneWith
-         */
-        cloneWith<TResult>(
-            customizer: CloneWithCustomizer<TValue, TResult | undefined>
-        ): LoDashExplicitWrapper<TResult | TValue>;
-
-        /**
-         * @see _.cloneWith
-         */
-        cloneWith(): this;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/lang/conformsTo.d.ts b/types/lodash/lang/conformsTo.d.ts
deleted file mode 100644
index f069e15e73..0000000000
--- a/types/lodash/lang/conformsTo.d.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-
-    interface LoDashStatic {
-        /**
-         * Checks if object conforms to source by invoking the predicate properties of source with the
-         * corresponding property values of object.
-         *
-         * Note: This method is equivalent to _.conforms when source is partially applied.
-         */
-        conformsTo<T>(object: T, source: ConformsPredicateObject<T>): boolean;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.conformsTo
-         */
-        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<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]
-}
\ No newline at end of file
diff --git a/types/lodash/lang/eq.d.ts b/types/lodash/lang/eq.d.ts
deleted file mode 100644
index 808ec0cf39..0000000000
--- a/types/lodash/lang/eq.d.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Performs a [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
-         * comparison between two values to determine if they are equivalent.
-         *
-         * @category Lang
-         * @param value The value to compare.
-         * @param other The other value to compare.
-         * @returns Returns `true` if the values are equivalent, else `false`.
-         * @example
-         *
-         * var object = { 'user': 'fred' };
-         * var other = { 'user': 'fred' };
-         *
-         * _.eq(object, object);
-         * // => true
-         *
-         * _.eq(object, other);
-         * // => false
-         *
-         * _.eq('a', 'a');
-         * // => true
-         *
-         * _.eq('a', Object('a'));
-         * // => false
-         *
-         * _.eq(NaN, NaN);
-         * // => true
-         */
-        eq(
-            value: any,
-            other: any
-        ): boolean;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.eq
-         */
-        eq(
-            other: any
-        ): boolean;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.eq
-         */
-        eq(
-            other: any
-        ): LoDashExplicitWrapper<boolean>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/lang/gt.d.ts b/types/lodash/lang/gt.d.ts
deleted file mode 100644
index 3ae27eaccf..0000000000
--- a/types/lodash/lang/gt.d.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Checks if value is greater than other.
-         *
-         * @param value The value to compare.
-         * @param other The other value to compare.
-         * @return Returns true if value is greater than other, else false.
-         */
-        gt(
-            value: any,
-            other: any
-        ): boolean;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.gt
-         */
-        gt(other: any): boolean;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.gt
-         */
-        gt(other: any): LoDashExplicitWrapper<boolean>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/lang/gte.d.ts b/types/lodash/lang/gte.d.ts
deleted file mode 100644
index b68cc05c7d..0000000000
--- a/types/lodash/lang/gte.d.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Checks if value is greater than or equal to other.
-         *
-         * @param value The value to compare.
-         * @param other The other value to compare.
-         * @return Returns true if value is greater than or equal to other, else false.
-         */
-        gte(
-            value: any,
-            other: any
-        ): boolean;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.gte
-         */
-        gte(other: any): boolean;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.gte
-         */
-        gte(other: any): LoDashExplicitWrapper<boolean>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/lang/isArguments.d.ts b/types/lodash/lang/isArguments.d.ts
deleted file mode 100644
index 20c90752bf..0000000000
--- a/types/lodash/lang/isArguments.d.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Checks if value is classified as an arguments object.
-         *
-         * @param value The value to check.
-         * @return Returns true if value is correctly classified, else false.
-         */
-        isArguments(value?: any): value is IArguments;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.isArguments
-         */
-        isArguments(): boolean;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.isArguments
-         */
-        isArguments(): LoDashExplicitWrapper<boolean>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/lang/isArray.d.ts b/types/lodash/lang/isArray.d.ts
deleted file mode 100644
index 3d0676791c..0000000000
--- a/types/lodash/lang/isArray.d.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Checks if value is classified as an Array object.
-         * @param value The value to check.
-         *
-         * @return Returns true if value is correctly classified, else false.
-         */
-        isArray(value?: any): value is any[];
-
-        /**
-         * DEPRECATED
-         */
-        isArray<T>(value?: any): value is any[];
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.isArray
-         */
-        isArray(): boolean;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.isArray
-         */
-        isArray(): LoDashExplicitWrapper<boolean>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/lang/isArrayBuffer.d.ts b/types/lodash/lang/isArrayBuffer.d.ts
deleted file mode 100644
index b22e954086..0000000000
--- a/types/lodash/lang/isArrayBuffer.d.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Checks if value is classified as an ArrayBuffer object.
-         *
-         * @param value The value to check.
-         * @return Returns true if value is correctly classified, else false.
-         */
-        isArrayBuffer(value?: any): value is ArrayBuffer;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.isArrayBuffer
-         */
-        isArrayBuffer(): boolean;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.isArrayBuffer
-         */
-        isArrayBuffer(): LoDashExplicitWrapper<boolean>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/lang/isArrayLike.d.ts b/types/lodash/lang/isArrayLike.d.ts
deleted file mode 100644
index 59c75a70b7..0000000000
--- a/types/lodash/lang/isArrayLike.d.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Checks if `value` is array-like. A value is considered array-like if it's
-         * not a function and has a `value.length` that's an integer greater than or
-         * equal to `0` and less than or equal to `Number.MAX_SAFE_INTEGER`.
-         *
-         * @category Lang
-         * @param value The value to check.
-         * @returns Returns `true` if `value` is array-like, else `false`.
-         * @example
-         *
-         * _.isArrayLike([1, 2, 3]);
-         * // => true
-         *
-         * _.isArrayLike(document.body.children);
-         * // => true
-         *
-         * _.isArrayLike('abc');
-         * // => true
-         *
-         * _.isArrayLike(_.noop);
-         * // => false
-         */
-        isArrayLike<T>(value: T & string & number): boolean; // should only match if T = any
-
-        /**
-         * @see _.isArrayLike
-         */
-        isArrayLike(value: ((...args: any[]) => any) | null | undefined): value is never;
-
-        /**
-         * @see _.isArrayLike
-         */
-        isArrayLike(value: any): value is { length: number };
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.isArrayLike
-         */
-        isArrayLike(): boolean;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.isArrayLike
-         */
-        isArrayLike(): LoDashExplicitWrapper<boolean>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/lang/isArrayLikeObject.d.ts b/types/lodash/lang/isArrayLikeObject.d.ts
deleted file mode 100644
index 6613d7d410..0000000000
--- a/types/lodash/lang/isArrayLikeObject.d.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * This method is like `_.isArrayLike` except that it also checks if `value`
-         * is an object.
-         *
-         * @category Lang
-         * @param value The value to check.
-         * @returns Returns `true` if `value` is an array-like object, else `false`.
-         * @example
-         *
-         * _.isArrayLikeObject([1, 2, 3]);
-         * // => true
-         *
-         * _.isArrayLikeObject(document.body.children);
-         * // => true
-         *
-         * _.isArrayLikeObject('abc');
-         * // => false
-         *
-         * _.isArrayLikeObject(_.noop);
-         * // => false
-         */
-        isArrayLikeObject<T>(value: T & string & number): boolean; // should only match if T = any
-
-        /**
-         * @see _.isArrayLike
-         */
-        // tslint:disable-next-line:ban-types (type guard doesn't seem to work correctly without the Function type)
-        isArrayLikeObject(value: ((...args: any[]) => any) | Function | string | boolean | number | null | undefined): value is never;
-
-        /**
-         * @see _.isArrayLike
-         */
-        // tslint:disable-next-line:ban-types (type guard doesn't seem to work correctly without the Function type)
-        isArrayLikeObject<T extends object>(value: T | ((...args: any[]) => any) | Function | string | boolean | number | null | undefined): value is T & { length: number };
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.isArrayLikeObject
-         */
-        isArrayLikeObject(): boolean;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.isArrayLikeObject
-         */
-        isArrayLikeObject(): LoDashExplicitWrapper<boolean>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/lang/isBoolean.d.ts b/types/lodash/lang/isBoolean.d.ts
deleted file mode 100644
index 060d3eae5e..0000000000
--- a/types/lodash/lang/isBoolean.d.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Checks if value is classified as a boolean primitive or object.
-         *
-         * @param value The value to check.
-         * @return Returns true if value is correctly classified, else false.
-         */
-        isBoolean(value?: any): value is boolean;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.isBoolean
-         */
-        isBoolean(): boolean;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.isBoolean
-         */
-        isBoolean(): LoDashExplicitWrapper<boolean>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/lang/isBuffer.d.ts b/types/lodash/lang/isBuffer.d.ts
deleted file mode 100644
index 971cd4cc42..0000000000
--- a/types/lodash/lang/isBuffer.d.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Checks if value is a buffer.
-         *
-         * @param value The value to check.
-         * @return Returns true if value is a buffer, else false.
-         */
-        isBuffer(value?: any): boolean;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.isBuffer
-         */
-        isBuffer(): boolean;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.isBuffer
-         */
-        isBuffer(): LoDashExplicitWrapper<boolean>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/lang/isDate.d.ts b/types/lodash/lang/isDate.d.ts
deleted file mode 100644
index ac6dc058f8..0000000000
--- a/types/lodash/lang/isDate.d.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Checks if value is classified as a Date object.
-         * @param value The value to check.
-         *
-         * @return Returns true if value is correctly classified, else false.
-         */
-        isDate(value?: any): value is Date;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.isDate
-         */
-        isDate(): boolean;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.isDate
-         */
-        isDate(): LoDashExplicitWrapper<boolean>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/lang/isElement.d.ts b/types/lodash/lang/isElement.d.ts
deleted file mode 100644
index 9b818bc1cf..0000000000
--- a/types/lodash/lang/isElement.d.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Checks if value is a DOM element.
-         *
-         * @param value The value to check.
-         * @return Returns true if value is a DOM element, else false.
-         */
-        isElement(value?: any): boolean;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.isElement
-         */
-        isElement(): boolean;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.isElement
-         */
-        isElement(): LoDashExplicitWrapper<boolean>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/lang/isEmpty.d.ts b/types/lodash/lang/isEmpty.d.ts
deleted file mode 100644
index b84fd2e125..0000000000
--- a/types/lodash/lang/isEmpty.d.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Checks if value is empty. A value is considered empty unless it’s an arguments object, array, string, or
-         * jQuery-like collection with a length greater than 0 or an object with own enumerable properties.
-         *
-         * @param value The value to inspect.
-         * @return Returns true if value is empty, else false.
-         */
-        isEmpty(value?: any): boolean;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.isEmpty
-         */
-        isEmpty(): boolean;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.isEmpty
-         */
-        isEmpty(): LoDashExplicitWrapper<boolean>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/lang/isEqual.d.ts b/types/lodash/lang/isEqual.d.ts
deleted file mode 100644
index ae7b0eedd8..0000000000
--- a/types/lodash/lang/isEqual.d.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Performs a deep comparison between two values to determine if they are
-         * equivalent.
-         *
-         * **Note:** This method supports comparing arrays, array buffers, booleans,
-         * date objects, error objects, maps, numbers, `Object` objects, regexes,
-         * sets, strings, symbols, and typed arrays. `Object` objects are compared
-         * by their own, not inherited, enumerable properties. Functions and DOM
-         * nodes are **not** supported.
-         *
-         * @category Lang
-         * @param value The value to compare.
-         * @param other The other value to compare.
-         * @returns Returns `true` if the values are equivalent, else `false`.
-         * @example
-         *
-         * var object = { 'user': 'fred' };
-         * var other = { 'user': 'fred' };
-         *
-         * _.isEqual(object, other);
-         * // => true
-         *
-         * object === other;
-         * // => false
-         */
-        isEqual(
-            value: any,
-            other: any
-        ): boolean;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.isEqual
-         */
-        isEqual(
-            other: any
-        ): boolean;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.isEqual
-         */
-        isEqual(
-            other: any
-        ): LoDashExplicitWrapper<boolean>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/lang/isEqualWith.d.ts b/types/lodash/lang/isEqualWith.d.ts
deleted file mode 100644
index 44ab134546..0000000000
--- a/types/lodash/lang/isEqualWith.d.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    type IsEqualCustomizer = (value: any, other: any, indexOrKey: PropertyName | undefined, parent: any, otherParent: any, stack: any) => boolean|undefined;
-
-    interface LoDashStatic {
-        /**
-         * This method is like `_.isEqual` except that it accepts `customizer` which is
-         * invoked to compare values. If `customizer` returns `undefined` comparisons are
-         * handled by the method instead. The `customizer` is invoked with up to seven arguments:
-         * (objValue, othValue [, index|key, object, other, stack]).
-         *
-         * @category Lang
-         * @param value The value to compare.
-         * @param other The other value to compare.
-         * @param [customizer] The function to customize comparisons.
-         * @returns Returns `true` if the values are equivalent, else `false`.
-         * @example
-         *
-         * function isGreeting(value) {
-         *   return /^h(?:i|ello)$/.test(value);
-         * }
-         *
-         * function customizer(objValue, othValue) {
-         *   if (isGreeting(objValue) && isGreeting(othValue)) {
-         *     return true;
-         *   }
-         * }
-         *
-         * var array = ['hello', 'goodbye'];
-         * var other = ['hi', 'goodbye'];
-         *
-         * _.isEqualWith(array, other, customizer);
-         * // => true
-         */
-        isEqualWith(
-            value: any,
-            other: any,
-            customizer?: IsEqualCustomizer
-        ): boolean;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.isEqualWith
-         */
-        isEqualWith(
-            other: any,
-            customizer?: IsEqualCustomizer
-        ): boolean;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.isEqualWith
-         */
-        isEqualWith(
-            other: any,
-            customizer?: IsEqualCustomizer
-        ): LoDashExplicitWrapper<boolean>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/lang/isError.d.ts b/types/lodash/lang/isError.d.ts
deleted file mode 100644
index a5bd5d378b..0000000000
--- a/types/lodash/lang/isError.d.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Checks if value is an Error, EvalError, RangeError, ReferenceError, SyntaxError, TypeError, or URIError
-         * object.
-         *
-         * @param value The value to check.
-         * @return Returns true if value is an error object, else false.
-         */
-        isError(value: any): value is Error;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.isError
-         */
-        isError(): boolean;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.isError
-         */
-        isError(): LoDashExplicitWrapper<boolean>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/lang/isFinite.d.ts b/types/lodash/lang/isFinite.d.ts
deleted file mode 100644
index e5015e8d49..0000000000
--- a/types/lodash/lang/isFinite.d.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Checks if value is a finite primitive number.
-         *
-         * Note: This method is based on Number.isFinite.
-         *
-         * @param value The value to check.
-         * @return Returns true if value is a finite number, else false.
-         */
-        isFinite(value?: any): boolean;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.isFinite
-         */
-        isFinite(): boolean;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.isFinite
-         */
-        isFinite(): LoDashExplicitWrapper<boolean>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/lang/isFunction.d.ts b/types/lodash/lang/isFunction.d.ts
deleted file mode 100644
index 7f6ae1feea..0000000000
--- a/types/lodash/lang/isFunction.d.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Checks if value is a callable function.
-         *
-         * @param value The value to check.
-         * @return Returns true if value is correctly classified, else false.
-         */
-        isFunction(value: any): value is (...args: any[]) => any;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.isFunction
-         */
-        isFunction(): boolean;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.isFunction
-         */
-        isFunction(): LoDashExplicitWrapper<boolean>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/lang/isInteger.d.ts b/types/lodash/lang/isInteger.d.ts
deleted file mode 100644
index a1919bf21d..0000000000
--- a/types/lodash/lang/isInteger.d.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Checks if `value` is an integer.
-         *
-         * **Note:** This method is based on [`Number.isInteger`](https://mdn.io/Number/isInteger).
-         *
-         * @category Lang
-         * @param value The value to check.
-         * @returns Returns `true` if `value` is an integer, else `false`.
-         * @example
-         *
-         * _.isInteger(3);
-         * // => true
-         *
-         * _.isInteger(Number.MIN_VALUE);
-         * // => false
-         *
-         * _.isInteger(Infinity);
-         * // => false
-         *
-         * _.isInteger('3');
-         * // => false
-         */
-        isInteger(value?: any): boolean;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.isInteger
-         */
-        isInteger(): boolean;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.isInteger
-         */
-        isInteger(): LoDashExplicitWrapper<boolean>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/lang/isLength.d.ts b/types/lodash/lang/isLength.d.ts
deleted file mode 100644
index b8c012460e..0000000000
--- a/types/lodash/lang/isLength.d.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Checks if `value` is a valid array-like length.
-         *
-         * **Note:** This function is loosely based on [`ToLength`](http://ecma-international.org/ecma-262/6.0/#sec-tolength).
-         *
-         * @category Lang
-         * @param value The value to check.
-         * @returns Returns `true` if `value` is a valid length, else `false`.
-         * @example
-         *
-         * _.isLength(3);
-         * // => true
-         *
-         * _.isLength(Number.MIN_VALUE);
-         * // => false
-         *
-         * _.isLength(Infinity);
-         * // => false
-         *
-         * _.isLength('3');
-         * // => false
-         */
-        isLength(value?: any): boolean;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.isLength
-         */
-        isLength(): boolean;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.isLength
-         */
-        isLength(): LoDashExplicitWrapper<boolean>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/lang/isMap.d.ts b/types/lodash/lang/isMap.d.ts
deleted file mode 100644
index b71a3d750f..0000000000
--- a/types/lodash/lang/isMap.d.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Checks if value is classified as a Map object.
-         *
-         * @param value The value to check.
-         * @returns Returns true if value is correctly classified, else false.
-         */
-        isMap(value?: any): value is Map<any, any>;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.isMap
-         */
-        isMap(): boolean;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.isMap
-         */
-        isMap(): LoDashExplicitWrapper<boolean>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/lang/isMatch.d.ts b/types/lodash/lang/isMatch.d.ts
deleted file mode 100644
index dfb072c59b..0000000000
--- a/types/lodash/lang/isMatch.d.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    type isMatchCustomizer = (value: any, other: any, indexOrKey?: PropertyName) => boolean;
-
-    interface LoDashStatic {
-        /**
-         * Performs a deep comparison between `object` and `source` to determine if
-         * `object` contains equivalent property values.
-         *
-         * **Note:** This method supports comparing the same values as `_.isEqual`.
-         *
-         * @category Lang
-         * @param object The object to inspect.
-         * @param source The object of property values to match.
-         * @returns Returns `true` if `object` is a match, else `false`.
-         * @example
-         *
-         * var object = { 'user': 'fred', 'age': 40 };
-         *
-         * _.isMatch(object, { 'age': 40 });
-         * // => true
-         *
-         * _.isMatch(object, { 'age': 36 });
-         * // => false
-         */
-        isMatch(object: object, source: object): boolean;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.isMatch
-         */
-        isMatch(source: object): boolean;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.isMatch
-         */
-        isMatch(source: object): LoDashExplicitWrapper<boolean>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/lang/isMatchWith.d.ts b/types/lodash/lang/isMatchWith.d.ts
deleted file mode 100644
index fb47f327b4..0000000000
--- a/types/lodash/lang/isMatchWith.d.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    type isMatchWithCustomizer = (value: any, other: any, indexOrKey: PropertyName) => boolean;
-
-    interface LoDashStatic {
-        /**
-         * This method is like `_.isMatch` except that it accepts `customizer` which
-         * is invoked to compare values. If `customizer` returns `undefined` comparisons
-         * are handled by the method instead. The `customizer` is invoked with three
-         * arguments: (objValue, srcValue, index|key, object, source).
-         *
-         * @category Lang
-         * @param object The object to inspect.
-         * @param source The object of property values to match.
-         * @param [customizer] The function to customize comparisons.
-         * @returns Returns `true` if `object` is a match, else `false`.
-         * @example
-         *
-         * function isGreeting(value) {
-         *   return /^h(?:i|ello)$/.test(value);
-         * }
-         *
-         * function customizer(objValue, srcValue) {
-         *   if (isGreeting(objValue) && isGreeting(srcValue)) {
-         *     return true;
-         *   }
-         * }
-         *
-         * var object = { 'greeting': 'hello' };
-         * var source = { 'greeting': 'hi' };
-         *
-         * _.isMatchWith(object, source, customizer);
-         * // => true
-         */
-        isMatchWith(object: object, source: object, customizer: isMatchWithCustomizer): boolean;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.isMatchWith
-         */
-        isMatchWith(source: object, customizer: isMatchWithCustomizer): boolean;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.isMatchWith
-         */
-        isMatchWith(source: object, customizer: isMatchWithCustomizer): LoDashExplicitWrapper<boolean>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/lang/isNaN.d.ts b/types/lodash/lang/isNaN.d.ts
deleted file mode 100644
index b016c91c74..0000000000
--- a/types/lodash/lang/isNaN.d.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Checks if value is NaN.
-         *
-         * Note: This method is not the same as isNaN which returns true for undefined and other non-numeric values.
-         *
-         * @param value The value to check.
-         * @return Returns true if value is NaN, else false.
-         */
-        isNaN(value?: any): boolean;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.isNaN
-         */
-        isNaN(): boolean;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.isNaN
-         */
-        isNaN(): LoDashExplicitWrapper<boolean>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/lang/isNative.d.ts b/types/lodash/lang/isNative.d.ts
deleted file mode 100644
index 72f74e7148..0000000000
--- a/types/lodash/lang/isNative.d.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Checks if value is a native function.
-         * @param value The value to check.
-         *
-         * @retrun Returns true if value is a native function, else false.
-         */
-        isNative(value: any): value is (...args: any[]) => any;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * see _.isNative
-         */
-        isNative(): boolean;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * see _.isNative
-         */
-        isNative(): LoDashExplicitWrapper<boolean>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/lang/isNil.d.ts b/types/lodash/lang/isNil.d.ts
deleted file mode 100644
index 2b0cb04fbc..0000000000
--- a/types/lodash/lang/isNil.d.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Checks if `value` is `null` or `undefined`.
-         *
-         * @category Lang
-         * @param value The value to check.
-         * @returns Returns `true` if `value` is nullish, else `false`.
-         * @example
-         *
-         * _.isNil(null);
-         * // => true
-         *
-         * _.isNil(void 0);
-         * // => true
-         *
-         * _.isNil(NaN);
-         * // => false
-         */
-        isNil(value: any): value is null | undefined;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * see _.isNil
-         */
-        isNil(): boolean;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * see _.isNil
-         */
-        isNil(): LoDashExplicitWrapper<boolean>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/lang/isNull.d.ts b/types/lodash/lang/isNull.d.ts
deleted file mode 100644
index 04dfb18cea..0000000000
--- a/types/lodash/lang/isNull.d.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Checks if value is null.
-         *
-         * @param value The value to check.
-         * @return Returns true if value is null, else false.
-         */
-        isNull(value: any): value is null;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * see _.isNull
-         */
-        isNull(): boolean;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * see _.isNull
-         */
-        isNull(): LoDashExplicitWrapper<boolean>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/lang/isNumber.d.ts b/types/lodash/lang/isNumber.d.ts
deleted file mode 100644
index 81479cb4c9..0000000000
--- a/types/lodash/lang/isNumber.d.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Checks if value is classified as a Number primitive or object.
-         *
-         * Note: To exclude Infinity, -Infinity, and NaN, which are classified as numbers, use the _.isFinite method.
-         *
-         * @param value The value to check.
-         * @return Returns true if value is correctly classified, else false.
-         */
-        isNumber(value?: any): value is number;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * see _.isNumber
-         */
-        isNumber(): boolean;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * see _.isNumber
-         */
-        isNumber(): LoDashExplicitWrapper<boolean>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/lang/isObject.d.ts b/types/lodash/lang/isObject.d.ts
deleted file mode 100644
index e014fd9620..0000000000
--- a/types/lodash/lang/isObject.d.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Checks if value is the language type of Object. (e.g. arrays, functions, objects, regexes, new Number(0),
-         * and new String(''))
-         *
-         * @param value The value to check.
-         * @return Returns true if value is an object, else false.
-         */
-        isObject(value?: any): boolean;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * see _.isObject
-         */
-        isObject(): boolean;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * see _.isObject
-         */
-        isObject(): LoDashExplicitWrapper<boolean>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/lang/isObjectLike.d.ts b/types/lodash/lang/isObjectLike.d.ts
deleted file mode 100644
index 1665ec8a69..0000000000
--- a/types/lodash/lang/isObjectLike.d.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Checks if `value` is object-like. A value is object-like if it's not `null`
-         * and has a `typeof` result of "object".
-         *
-         * @category Lang
-         * @param value The value to check.
-         * @returns Returns `true` if `value` is object-like, else `false`.
-         * @example
-         *
-         * _.isObjectLike({});
-         * // => true
-         *
-         * _.isObjectLike([1, 2, 3]);
-         * // => true
-         *
-         * _.isObjectLike(_.noop);
-         * // => false
-         *
-         * _.isObjectLike(null);
-         * // => false
-         */
-        isObjectLike(value?: any): boolean;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * see _.isObjectLike
-         */
-        isObjectLike(): boolean;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * see _.isObjectLike
-         */
-        isObjectLike(): LoDashExplicitWrapper<boolean>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/lang/isPlainObject.d.ts b/types/lodash/lang/isPlainObject.d.ts
deleted file mode 100644
index bb5070f535..0000000000
--- a/types/lodash/lang/isPlainObject.d.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Checks if value is a plain object, that is, an object created by the Object constructor or one with a
-         * [[Prototype]] of null.
-         *
-         * Note: This method assumes objects created by the Object constructor have no inherited enumerable properties.
-         *
-         * @param value The value to check.
-         * @return Returns true if value is a plain object, else false.
-         */
-        isPlainObject(value?: any): boolean;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * see _.isPlainObject
-         */
-        isPlainObject(): boolean;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * see _.isPlainObject
-         */
-        isPlainObject(): LoDashExplicitWrapper<boolean>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/lang/isRegExp.d.ts b/types/lodash/lang/isRegExp.d.ts
deleted file mode 100644
index 4199940091..0000000000
--- a/types/lodash/lang/isRegExp.d.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Checks if value is classified as a RegExp object.
-         * @param value The value to check.
-         *
-         * @return Returns true if value is correctly classified, else false.
-         */
-        isRegExp(value?: any): value is RegExp;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * see _.isRegExp
-         */
-        isRegExp(): boolean;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * see _.isRegExp
-         */
-        isRegExp(): LoDashExplicitWrapper<boolean>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/lang/isSafeInteger.d.ts b/types/lodash/lang/isSafeInteger.d.ts
deleted file mode 100644
index 0ca1b4809a..0000000000
--- a/types/lodash/lang/isSafeInteger.d.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Checks if `value` is a safe integer. An integer is safe if it's an IEEE-754
-         * double precision number which isn't the result of a rounded unsafe integer.
-         *
-         * **Note:** This method is based on [`Number.isSafeInteger`](https://mdn.io/Number/isSafeInteger).
-         *
-         * @category Lang
-         * @param value The value to check.
-         * @returns Returns `true` if `value` is a safe integer, else `false`.
-         * @example
-         *
-         * _.isSafeInteger(3);
-         * // => true
-         *
-         * _.isSafeInteger(Number.MIN_VALUE);
-         * // => false
-         *
-         * _.isSafeInteger(Infinity);
-         * // => false
-         *
-         * _.isSafeInteger('3');
-         * // => false
-         */
-        isSafeInteger(value: any): boolean;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * see _.isSafeInteger
-         */
-        isSafeInteger(): boolean;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * see _.isSafeInteger
-         */
-        isSafeInteger(): LoDashExplicitWrapper<boolean>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/lang/isSet.d.ts b/types/lodash/lang/isSet.d.ts
deleted file mode 100644
index af7f4ad9e9..0000000000
--- a/types/lodash/lang/isSet.d.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Checks if value is classified as a Set object.
-         *
-         * @param value The value to check.
-         * @returns Returns true if value is correctly classified, else false.
-         */
-        isSet(value?: any): value is Set<any>;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.isSet
-         */
-        isSet(): boolean;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.isSet
-         */
-        isSet(): LoDashExplicitWrapper<boolean>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/lang/isString.d.ts b/types/lodash/lang/isString.d.ts
deleted file mode 100644
index d39917345e..0000000000
--- a/types/lodash/lang/isString.d.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Checks if value is classified as a String primitive or object.
-         *
-         * @param value The value to check.
-         * @return Returns true if value is correctly classified, else false.
-         */
-        isString(value?: any): value is string;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * see _.isString
-         */
-        isString(): boolean;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * see _.isString
-         */
-        isString(): LoDashExplicitWrapper<boolean>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/lang/isSymbol.d.ts b/types/lodash/lang/isSymbol.d.ts
deleted file mode 100644
index 2f0a6aa4f5..0000000000
--- a/types/lodash/lang/isSymbol.d.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Checks if `value` is classified as a `Symbol` primitive or object.
-         *
-         * @category Lang
-         * @param value The value to check.
-         * @returns Returns `true` if `value` is correctly classified, else `false`.
-         * @example
-         *
-         * _.isSymbol(Symbol.iterator);
-         * // => true
-         *
-         * _.isSymbol('abc');
-         * // => false
-         */
-        isSymbol(value: any): boolean;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * see _.isSymbol
-         */
-        isSymbol(): boolean;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * see _.isSymbol
-         */
-        isSymbol(): LoDashExplicitWrapper<boolean>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/lang/isTypedArray.d.ts b/types/lodash/lang/isTypedArray.d.ts
deleted file mode 100644
index dffc9e43d0..0000000000
--- a/types/lodash/lang/isTypedArray.d.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Checks if value is classified as a typed array.
-         *
-         * @param value The value to check.
-         * @return Returns true if value is correctly classified, else false.
-         */
-        isTypedArray(value: any): boolean;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * see _.isTypedArray
-         */
-        isTypedArray(): boolean;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * see _.isTypedArray
-         */
-        isTypedArray(): LoDashExplicitWrapper<boolean>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/lang/isUndefined.d.ts b/types/lodash/lang/isUndefined.d.ts
deleted file mode 100644
index dad9ed7cc3..0000000000
--- a/types/lodash/lang/isUndefined.d.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Checks if value is undefined.
-         *
-         * @param value The value to check.
-         * @return Returns true if value is undefined, else false.
-         */
-        isUndefined(value: any): value is undefined;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * see _.isUndefined
-         */
-        isUndefined(): boolean;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * see _.isUndefined
-         */
-        isUndefined(): LoDashExplicitWrapper<boolean>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/lang/isWeakMap.d.ts b/types/lodash/lang/isWeakMap.d.ts
deleted file mode 100644
index 8dae9d20f5..0000000000
--- a/types/lodash/lang/isWeakMap.d.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Checks if value is classified as a WeakMap object.
-         *
-         * @param value The value to check.
-         * @returns Returns true if value is correctly classified, else false.
-         */
-        isWeakMap(value?: any): value is WeakMap<object, any>;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.isSet
-         */
-        isWeakMap(): boolean;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.isSet
-         */
-        isWeakMap(): LoDashExplicitWrapper<boolean>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/lang/isWeakSet.d.ts b/types/lodash/lang/isWeakSet.d.ts
deleted file mode 100644
index 2c08c521aa..0000000000
--- a/types/lodash/lang/isWeakSet.d.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Checks if value is classified as a WeakSet object.
-         *
-         * @param value The value to check.
-         * @returns Returns true if value is correctly classified, else false.
-         */
-        isWeakSet(value?: any): value is WeakSet<object>;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.isWeakSet
-         */
-        isWeakSet(): boolean;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.isWeakSet
-         */
-        isWeakSet(): LoDashExplicitWrapper<boolean>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/lang/lt.d.ts b/types/lodash/lang/lt.d.ts
deleted file mode 100644
index 434b1476d0..0000000000
--- a/types/lodash/lang/lt.d.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Checks if value is less than other.
-         *
-         * @param value The value to compare.
-         * @param other The other value to compare.
-         * @return Returns true if value is less than other, else false.
-         */
-        lt(
-            value: any,
-            other: any
-        ): boolean;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.lt
-         */
-        lt(other: any): boolean;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.lt
-         */
-        lt(other: any): LoDashExplicitWrapper<boolean>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/lang/lte.d.ts b/types/lodash/lang/lte.d.ts
deleted file mode 100644
index 84cc6b22fe..0000000000
--- a/types/lodash/lang/lte.d.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Checks if value is less than or equal to other.
-         *
-         * @param value The value to compare.
-         * @param other The other value to compare.
-         * @return Returns true if value is less than or equal to other, else false.
-         */
-        lte(
-            value: any,
-            other: any
-        ): boolean;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.lte
-         */
-        lte(other: any): boolean;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.lte
-         */
-        lte(other: any): LoDashExplicitWrapper<boolean>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/lang/toArray.d.ts b/types/lodash/lang/toArray.d.ts
deleted file mode 100644
index d0fd0b93f2..0000000000
--- a/types/lodash/lang/toArray.d.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Converts value to an array.
-         *
-         * @param value The value to convert.
-         * @return Returns the converted array.
-         */
-        toArray<T>(value: List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined): T[];
-
-        /**
-         * @see _.toArray
-         */
-        toArray<T>(value: T): Array<T[keyof T]>;
-
-        /**
-         * @see _.toArray
-         */
-        toArray(): any[];
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.toArray
-         */
-        toArray<T>(this: LoDashImplicitWrapper<List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined>): LoDashImplicitWrapper<T[]>;
-
-        /**
-         * @see _.toArray
-         */
-        toArray<T extends object>(this: LoDashImplicitWrapper<T>): LoDashImplicitWrapper<Array<T[keyof T]>>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.toArray
-         */
-        toArray<T>(this: LoDashExplicitWrapper<List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined>): LoDashExplicitWrapper<T[]>;
-
-        /**
-         * @see _.toArray
-         */
-        toArray<T extends object>(this: LoDashImplicitWrapper<T>): LoDashExplicitWrapper<Array<T[keyof T]>>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/lang/toFinite.d.ts b/types/lodash/lang/toFinite.d.ts
deleted file mode 100644
index 3007bf3674..0000000000
--- a/types/lodash/lang/toFinite.d.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Converts `value` to a finite number.
-         *
-         * @since 4.12.0
-         * @category Lang
-         * @param value The value to convert.
-         * @returns Returns the converted number.
-         * @example
-         *
-         * _.toFinite(3.2);
-         * // => 3.2
-         *
-         * _.toFinite(Number.MIN_VALUE);
-         * // => 5e-324
-         *
-         * _.toFinite(Infinity);
-         * // => 1.7976931348623157e+308
-         *
-         * _.toFinite('3.2');
-         * // => 3.2
-         */
-        toFinite(value: any): number;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.toFinite
-         */
-        toFinite(): number;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.toFinite
-         */
-        toFinite(): LoDashExplicitWrapper<number>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/lang/toInteger.d.ts b/types/lodash/lang/toInteger.d.ts
deleted file mode 100644
index 2f4c2f217c..0000000000
--- a/types/lodash/lang/toInteger.d.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Converts `value` to an integer.
-         *
-         * **Note:** This function is loosely based on [`ToInteger`](http://www.ecma-international.org/ecma-262/6.0/#sec-tointeger).
-         *
-         * @category Lang
-         * @param value The value to convert.
-         * @returns Returns the converted integer.
-         * @example
-         *
-         * _.toInteger(3);
-         * // => 3
-         *
-         * _.toInteger(Number.MIN_VALUE);
-         * // => 0
-         *
-         * _.toInteger(Infinity);
-         * // => 1.7976931348623157e+308
-         *
-         * _.toInteger('3');
-         * // => 3
-         */
-        toInteger(value: any): number;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.toInteger
-         */
-        toInteger(): number;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.toInteger
-         */
-        toInteger(): LoDashExplicitWrapper<number>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/lang/toLength.d.ts b/types/lodash/lang/toLength.d.ts
deleted file mode 100644
index 62e9b059fe..0000000000
--- a/types/lodash/lang/toLength.d.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Converts `value` to an integer suitable for use as the length of an
-         * array-like object.
-         *
-         * **Note:** This method is based on [`ToLength`](http://ecma-international.org/ecma-262/6.0/#sec-tolength).
-         *
-         * @category Lang
-         * @param value The value to convert.
-         * @return Returns the converted integer.
-         * @example
-         *
-         * _.toLength(3);
-         * // => 3
-         *
-         * _.toLength(Number.MIN_VALUE);
-         * // => 0
-         *
-         * _.toLength(Infinity);
-         * // => 4294967295
-         *
-         * _.toLength('3');
-         * // => 3
-         */
-        toLength(value: any): number;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.toLength
-         */
-        toLength(): number;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.toLength
-         */
-        toLength(): LoDashExplicitWrapper<number>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/lang/toNumber.d.ts b/types/lodash/lang/toNumber.d.ts
deleted file mode 100644
index 5099f7ad89..0000000000
--- a/types/lodash/lang/toNumber.d.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Converts `value` to a number.
-         *
-         * @category Lang
-         * @param value The value to process.
-         * @returns Returns the number.
-         * @example
-         *
-         * _.toNumber(3);
-         * // => 3
-         *
-         * _.toNumber(Number.MIN_VALUE);
-         * // => 5e-324
-         *
-         * _.toNumber(Infinity);
-         * // => Infinity
-         *
-         * _.toNumber('3');
-         * // => 3
-         */
-        toNumber(value: any): number;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.toNumber
-         */
-        toNumber(): number;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.toNumber
-         */
-        toNumber(): LoDashExplicitWrapper<number>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/lang/toPlainObject.d.ts b/types/lodash/lang/toPlainObject.d.ts
deleted file mode 100644
index 60b9c1a7b1..0000000000
--- a/types/lodash/lang/toPlainObject.d.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Converts value to a plain object flattening inherited enumerable properties of value to own properties
-         * of the plain object.
-         *
-         * @param value The value to convert.
-         * @return Returns the converted plain object.
-         */
-        toPlainObject(value?: any): any;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.toPlainObject
-         */
-        toPlainObject(): LoDashImplicitWrapper<any>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.toPlainObject
-         */
-        toPlainObject(): LoDashExplicitWrapper<any>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/lang/toSafeInteger.d.ts b/types/lodash/lang/toSafeInteger.d.ts
deleted file mode 100644
index a4e1729dbb..0000000000
--- a/types/lodash/lang/toSafeInteger.d.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Converts `value` to a safe integer. A safe integer can be compared and
-         * represented correctly.
-         *
-         * @category Lang
-         * @param value The value to convert.
-         * @returns Returns the converted integer.
-         * @example
-         *
-         * _.toSafeInteger(3);
-         * // => 3
-         *
-         * _.toSafeInteger(Number.MIN_VALUE);
-         * // => 0
-         *
-         * _.toSafeInteger(Infinity);
-         * // => 9007199254740991
-         *
-         * _.toSafeInteger('3');
-         * // => 3
-         */
-        toSafeInteger(value: any): number;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.toSafeInteger
-         */
-        toSafeInteger(): number;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.toSafeInteger
-         */
-        toSafeInteger(): LoDashExplicitWrapper<number>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/lang/toString.d.ts b/types/lodash/lang/toString.d.ts
deleted file mode 100644
index 559f05f66f..0000000000
--- a/types/lodash/lang/toString.d.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Converts `value` to a string if it's not one. An empty string is returned
-         * for `null` and `undefined` values. The sign of `-0` is preserved.
-         *
-         * @category Lang
-         * @param value The value to process.
-         * @returns Returns the string.
-         * @example
-         *
-         * _.toString(null);
-         * // => ''
-         *
-         * _.toString(-0);
-         * // => '-0'
-         *
-         * _.toString([1, 2, 3]);
-         * // => '1,2,3'
-         */
-        toString(value: any): string;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/lodash-tests.ts b/types/lodash/lodash-tests.ts
index c30a3276f7..ca33017323 100644
--- a/types/lodash/lodash-tests.ts
+++ b/types/lodash/lodash-tests.ts
@@ -3775,77 +3775,75 @@ namespace TestCommit {
 
 // _.prototype.concat
 namespace TestConcat {
-    {
-        let result: _.LoDashImplicitArrayWrapper<number>;
+    const numberROA: ReadonlyArray<number> = [0];
 
-        result = _(1).concat<number>(2);
-        result = _(1).concat<number>(2, 3);
-        result = _(1).concat<number>(2, 3, 4);
+    _.concat(1); // $ExpectType number[]
+    _.concat([1]); // $ExpectType number[]
+    _.concat(numberROA); // $ExpectType number[]
+    _.concat(1, 2); // $ExpectType number[]
+    _.concat(1, [1]); // $ExpectType number[]
+    _.concat(1, [1], numberROA); // $ExpectType number[]
 
-        result = _(1).concat(2);
-        result = _(1).concat(2, 3);
-        result = _(1).concat(2, 3, 4);
-    }
+    _(1).concat(2); // $ExpectType LoDashImplicitWrapper<number[]>
+    _(1).concat([1]); // $ExpectType LoDashImplicitWrapper<number[]>
+    _(1).concat([2], numberROA); // $ExpectType LoDashImplicitWrapper<number[]>
+    _([1]).concat(2); // $ExpectType LoDashImplicitWrapper<number[]>
+    _(numberROA).concat(numberROA); // $ExpectType LoDashImplicitWrapper<number[]>
+    _(numberROA).concat(numberROA, numberROA); // $ExpectType LoDashImplicitWrapper<number[]>
 
-    {
-        let result: _.LoDashImplicitArrayWrapper<string>;
+    _.chain(1).concat(2); // $ExpectType LoDashExplicitWrapper<number[]>
+    _.chain(1).concat([1]); // $ExpectType LoDashExplicitWrapper<number[]>
+    _.chain(1).concat([2], numberROA); // $ExpectType LoDashExplicitWrapper<number[]>
+    _.chain([1]).concat(2); // $ExpectType LoDashExplicitWrapper<number[]>
+    _.chain(numberROA).concat(numberROA); // $ExpectType LoDashExplicitWrapper<number[]>
+    _.chain(numberROA).concat(numberROA, numberROA); // $ExpectType LoDashExplicitWrapper<number[]>
 
-        result = _(['']).concat<string>(['']);
-        result = _(['']).concat<string>([''], ['']);
-        result = _(['']).concat<string>([''], [''], ['']);
+    const stringROA: ReadonlyArray<string> = [''];
 
-        result = _(['']).concat(['']);
-        result = _(['']).concat([''], ['']);
-        result = _(['']).concat([''], [''], ['']);
-    }
+    _.concat('a'); // $ExpectType string[]
+    _.concat(['a']); // $ExpectType string[]
+    _.concat(stringROA); // $ExpectType string[]
+    _.concat('a', 'b'); // $ExpectType string[]
+    _.concat('a', ['a']); // $ExpectType string[]
+    _.concat('a', ['a'], stringROA); // $ExpectType string[]
 
-    {
-        let result: _.LoDashImplicitArrayWrapper<{a: string}>;
+    _('a').concat('b'); // $ExpectType LoDashImplicitWrapper<string[]>
+    _('a').concat(['a']); // $ExpectType LoDashImplicitWrapper<string[]>
+    _('a').concat(['b'], stringROA); // $ExpectType LoDashImplicitWrapper<string[]>
+    _(['a']).concat('b'); // $ExpectType LoDashImplicitWrapper<string[]>
+    _(stringROA).concat(stringROA); // $ExpectType LoDashImplicitWrapper<string[]>
+    _(stringROA).concat(stringROA, stringROA); // $ExpectType LoDashImplicitWrapper<string[]>
 
-        result = _({a: ''}).concat<{a: string}>({a: ''});
-        result = _({a: ''}).concat<{a: string}>({a: ''}, {a: ''});
-        result = _({a: ''}).concat<{a: string}>({a: ''}, {a: ''}, {a: ''});
+    _.chain('a').concat('b'); // $ExpectType LoDashExplicitWrapper<string[]>
+    _.chain('a').concat(['a']); // $ExpectType LoDashExplicitWrapper<string[]>
+    _.chain('a').concat(['b'], stringROA); // $ExpectType LoDashExplicitWrapper<string[]>
+    _.chain(['a']).concat('b'); // $ExpectType LoDashExplicitWrapper<string[]>
+    _.chain(stringROA).concat(stringROA); // $ExpectType LoDashExplicitWrapper<string[]>
+    _.chain(stringROA).concat(stringROA, stringROA); // $ExpectType LoDashExplicitWrapper<string[]>
 
-        result = _({a: ''}).concat({a: ''});
-        result = _({a: ''}).concat({a: ''}, {a: ''});
-        result = _({a: ''}).concat({a: ''}, {a: ''}, {a: ''});
-    }
+    const abcObject: AbcObject = { a: 1, b: 'foo', c: true };
+    const objectROA: ReadonlyArray<AbcObject> = [{ a: 1, b: 'foo', c: true }];
 
-    {
-        let result: _.LoDashExplicitArrayWrapper<number>;
+    _.concat(abcObject); // $ExpectType AbcObject[]
+    _.concat([abcObject]); // $ExpectType AbcObject[]
+    _.concat(objectROA); // $ExpectType AbcObject[]
+    _.concat(abcObject, abcObject); // $ExpectType AbcObject[]
+    _.concat(abcObject, [abcObject]); // $ExpectType AbcObject[]
+    _.concat(abcObject, [abcObject], objectROA); // $ExpectType AbcObject[]
 
-        result = _(1).chain().concat<number>(2);
-        result = _(1).chain().concat<number>(2, 3);
-        result = _(1).chain().concat<number>(2, 3, 4);
+    _(abcObject).concat(abcObject); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(abcObject).concat([abcObject]); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(abcObject).concat([abcObject], objectROA); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _([abcObject]).concat(abcObject); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(objectROA).concat(objectROA); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(objectROA).concat(objectROA, objectROA); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
 
-        result = _(1).chain().concat(2);
-        result = _(1).chain().concat(2, 3);
-        result = _(1).chain().concat(2, 3, 4);
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<string>;
-
-        result = _(['']).chain().concat<string>(['']);
-        result = _(['']).chain().concat<string>([''], ['']);
-        result = _(['']).chain().concat<string>([''], [''], ['']);
-
-        result = _(['']).chain().concat(['']);
-        result = _(['']).chain().concat([''], ['']);
-        result = _(['']).chain().concat([''], [''], ['']);
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<{a: string}>;
-
-        result = _({a: ''}).chain().concat<{a: string}>({a: ''});
-        result = _({a: ''}).chain().concat<{a: string}>({a: ''}, {a: ''});
-        result = _({a: ''}).chain().concat<{a: string}>({a: ''}, {a: ''}, {a: ''});
-
-        result = _({a: ''}).chain().concat({a: ''});
-        result = _({a: ''}).chain().concat({a: ''}, {a: ''});
-        result = _({a: ''}).chain().concat({a: ''}, {a: ''}, {a: ''});
-    }
+    _.chain(abcObject).concat(abcObject); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(abcObject).concat([abcObject]); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(abcObject).concat([abcObject], objectROA); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain([abcObject]).concat(abcObject); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(objectROA).concat(objectROA); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(objectROA).concat(objectROA, objectROA); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
 }
 
 // _.prototype.plant
@@ -11802,52 +11800,35 @@ namespace TestOmitBy {
 
 // _.pick
 namespace TestPick {
-    let obj1: AbcObject | null | undefined = anything;
-    let obj2: AbcObject = anything;
+    const obj1: AbcObject | null | undefined = anything;
+    const obj2: AbcObject = anything;
+    const readonlyArray: ReadonlyArray<string> = ['a', 'b'];
+    const literalsArray = ['a' as 'a', 'b' as 'b'];
+    const roLiteralsArray: ReadonlyArray<'a' | 'b'> = literalsArray;
 
-    {
-        let result: Partial<AbcObject>;
+    _.pick(obj1, 'a'); // $ExpectType PartialDeep<AbcObject>
+    _.pick(obj1, 0, 'a'); // $ExpectType PartialDeep<AbcObject>
+    _.pick(obj1, ['b', 1], 0, 'a'); // $ExpectType PartialDeep<AbcObject>
+    _.pick(obj1, readonlyArray); // $ExpectType PartialDeep<AbcObject>
+    _.pick(obj2, 'a', 'b'); // $ExpectType Pick<AbcObject, "a" | "b">
+    _.pick(obj2, literalsArray); // $ExpectType Pick<AbcObject, "a" | "b">
+    _.pick(obj2, roLiteralsArray); // $ExpectType Pick<AbcObject, "a" | "b">
 
-        result = _.pick(obj1, 'a');
-        result = _.pick(obj1, 0, 'a');
-        result = _.pick(obj1, ['b', 1], 0, 'a');
-    }
+    _(obj1).pick('a'); // $ExpectType LoDashImplicitWrapper<Partial<AbcObject>>
+    _(obj1).pick(0, 'a'); // $ExpectType LoDashImplicitWrapper<Partial<AbcObject>>
+    _(obj1).pick(['b', 1], 0, 'a'); // $ExpectType LoDashImplicitWrapper<Partial<AbcObject>>
+    _(obj1).pick(readonlyArray); // $ExpectType LoDashImplicitWrapper<Partial<AbcObject>>
+    _(obj2).pick('a', 'b'); // $ExpectType LoDashImplicitWrapper<Pick<AbcObject, "a" | "b">>
+    _(obj2).pick(literalsArray); // $ExpectType LoDashImplicitWrapper<Pick<AbcObject, "a" | "b">>
+    _(obj2).pick(roLiteralsArray); // $ExpectType LoDashImplicitWrapper<Pick<AbcObject, "a" | "b">>
 
-    {
-        let result: Pick<AbcObject, 'a' | 'b'>;
-        result = _.pick(obj2, 'a', 'b');
-        result = _.pick(obj2, ['a' as 'a', 'b' as 'b']);
-    }
-
-    {
-        let result: _.LoDashImplicitWrapper<Partial<AbcObject>>;
-
-        result = _(obj1).pick('a');
-        result = _(obj1).pick(0, 'a');
-        result = _(obj1).pick(['b', 1], 0, 'a');
-    }
-
-    {
-        let result: _.LoDashImplicitWrapper<Pick<AbcObject, 'a' | 'b'>>;
-
-        result = _(obj2).pick('a', 'b');
-        result = _(obj2).pick(['a' as 'a', 'b' as 'b']);
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<Partial<AbcObject>>;
-
-        result = _(obj1).chain().pick('a');
-        result = _(obj1).chain().pick(0, 'a');
-        result = _(obj1).chain().pick(['b', 1], 0, 'a');
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<Pick<AbcObject, 'a' | 'b'>>;
-
-        result = _(obj2).chain().pick('a', 'b');
-        result = _(obj2).chain().pick(['a' as 'a', 'b' as 'b']);
-    }
+    _.chain(obj1).pick('a'); // $ExpectType LoDashExplicitWrapper<Partial<AbcObject>>
+    _.chain(obj1).pick(0, 'a'); // $ExpectType LoDashExplicitWrapper<Partial<AbcObject>>
+    _.chain(obj1).pick(['b', 1], 0, 'a'); // $ExpectType LoDashExplicitWrapper<Partial<AbcObject>>
+    _.chain(obj1).pick(readonlyArray); // $ExpectType LoDashExplicitWrapper<Partial<AbcObject>>
+    _.chain(obj2).pick('a', 'b'); // $ExpectType LoDashExplicitWrapper<Pick<AbcObject, "a" | "b">>
+    _.chain(obj2).pick(literalsArray); // $ExpectType LoDashExplicitWrapper<Pick<AbcObject, "a" | "b">>
+    _.chain(obj2).pick(roLiteralsArray); // $ExpectType LoDashExplicitWrapper<Pick<AbcObject, "a" | "b">>
 }
 
 // _.pickBy
diff --git a/types/lodash/math/add.d.ts b/types/lodash/math/add.d.ts
deleted file mode 100644
index 573178e0f4..0000000000
--- a/types/lodash/math/add.d.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Adds two numbers.
-         *
-         * @param augend The first number to add.
-         * @param addend The second number to add.
-         * @return Returns the sum.
-         */
-        add(
-            augend: number,
-            addend: number
-        ): number;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.add
-         */
-        add(addend: number): number;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.add
-         */
-        add(addend: number): LoDashExplicitWrapper<number>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/math/ceil.d.ts b/types/lodash/math/ceil.d.ts
deleted file mode 100644
index a51048c2f2..0000000000
--- a/types/lodash/math/ceil.d.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Calculates n rounded up to precision.
-         *
-         * @param n The number to round up.
-         * @param precision The precision to round up to.
-         * @return Returns the rounded up number.
-         */
-        ceil(
-            n: number,
-            precision?: number
-        ): number;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.ceil
-         */
-        ceil(precision?: number): number;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.ceil
-         */
-        ceil(precision?: number): LoDashExplicitWrapper<number>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/math/divide.d.ts b/types/lodash/math/divide.d.ts
deleted file mode 100644
index be6bc0abbd..0000000000
--- a/types/lodash/math/divide.d.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-       /**
-        * Divide two numbers.
-        *
-        * @param dividend The first number in a division.
-        * @param divisor The second number in a division.
-        * @returns Returns the quotient.
-        */
-        divide(
-            dividend: number,
-            divisor: number
-        ): number;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.divide
-         */
-        divide(divisor: number): number;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.divide
-         */
-        divide(divisor: number): LoDashExplicitWrapper<number>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/math/floor.d.ts b/types/lodash/math/floor.d.ts
deleted file mode 100644
index 81b490af1d..0000000000
--- a/types/lodash/math/floor.d.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Calculates n rounded down to precision.
-         *
-         * @param n The number to round down.
-         * @param precision The precision to round down to.
-         * @return Returns the rounded down number.
-         */
-        floor(
-            n: number,
-            precision?: number
-        ): number;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.floor
-         */
-        floor(precision?: number): number;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.floor
-         */
-        floor(precision?: number): LoDashExplicitWrapper<number>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/math/max.d.ts b/types/lodash/math/max.d.ts
deleted file mode 100644
index 20efcebef6..0000000000
--- a/types/lodash/math/max.d.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-         /**
-          * Computes the maximum value of `array`. If `array` is empty or falsey
-          * `undefined` is returned.
-          *
-          * @category Math
-          * @param array The array to iterate over.
-          * @returns Returns the maximum value.
-          */
-        max<T>(
-            collection: List<T> | null | undefined
-        ): T | undefined;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.max
-         */
-        max<T>(this: LoDashImplicitWrapper<List<T> | null | undefined>): T | undefined;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.max
-         */
-        max<T>(this: LoDashExplicitWrapper<List<T> | null | undefined>): LoDashExplicitWrapper<T | undefined>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/math/maxBy.d.ts b/types/lodash/math/maxBy.d.ts
deleted file mode 100644
index adc787a911..0000000000
--- a/types/lodash/math/maxBy.d.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * This method is like `_.max` except that it accepts `iteratee` which is
-         * invoked for each element in `array` to generate the criterion by which
-         * the value is ranked. The iteratee is invoked with one argument: (value).
-         *
-         * @category Math
-         * @param array The array to iterate over.
-         * @param [iteratee=_.identity] The iteratee invoked per element.
-         * @returns Returns the maximum value.
-         * @example
-         *
-         * var objects = [{ 'n': 1 }, { 'n': 2 }];
-         *
-         * _.maxBy(objects, function(o) { return o.a; });
-         * // => { 'n': 2 }
-         *
-         * // using the `_.property` iteratee shorthand
-         * _.maxBy(objects, 'n');
-         * // => { 'n': 2 }
-         */
-        maxBy<T>(
-            collection: List<T> | null | undefined,
-            iteratee?: ListIteratee<T>
-        ): T | undefined;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.maxBy
-         */
-        maxBy<T>(
-            this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            iteratee?: ListIteratee<T>
-        ): T | undefined;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.maxBy
-         */
-        maxBy<T>(
-            this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            iteratee?: ListIteratee<T>
-        ): LoDashExplicitWrapper<T | undefined>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/math/mean.d.ts b/types/lodash/math/mean.d.ts
deleted file mode 100644
index ebaa42ce32..0000000000
--- a/types/lodash/math/mean.d.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Computes the mean of the values in `array`.
-         *
-         * @category Math
-         * @param array The array to iterate over.
-         * @returns Returns the mean.
-         * @example
-         *
-         * _.mean([4, 2, 8, 6]);
-         * // => 5
-         */
-        mean(
-            collection: List<any> | null | undefined
-        ): number;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.mean
-         */
-        mean(): number;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.mean
-         */
-        mean(): LoDashExplicitWrapper<number>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/math/meanBy.d.ts b/types/lodash/math/meanBy.d.ts
deleted file mode 100644
index a6bf558754..0000000000
--- a/types/lodash/math/meanBy.d.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-      /**
-       * Computes the mean of the provided propties of the objects in the `array`
-       *
-       * @category Math
-       * @param array The array to iterate over.
-       * @param [iteratee=_.identity] The iteratee invoked per element.
-       * @returns Returns the mean.
-       * @example
-       *
-       * _.mean([{ 'n': 4 }, { 'n': 2 }, { 'n': 8 }, { 'n': 6 }], 'n');
-       * // => 5
-       */
-        meanBy<T>(
-            collection: List<T> | null | undefined,
-            iteratee?: ListIteratee<T>
-        ): number;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.meanBy
-         */
-        meanBy<T>(
-            this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            iteratee?: ListIteratee<T>
-        ): number;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.meanBy
-         */
-        meanBy<T>(
-            this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            iteratee?: ListIteratee<T>
-        ): LoDashExplicitWrapper<number>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/math/min.d.ts b/types/lodash/math/min.d.ts
deleted file mode 100644
index ac441afa83..0000000000
--- a/types/lodash/math/min.d.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Computes the minimum value of `array`. If `array` is empty or falsey
-         * `undefined` is returned.
-         *
-         * @category Math
-         * @param array The array to iterate over.
-         * @returns Returns the minimum value.
-         */
-        min<T>(
-            collection: List<T> | null | undefined
-        ): T | undefined;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.min
-         */
-        min<T>(this: LoDashImplicitWrapper<List<T> | null | undefined>): T | undefined;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.min
-         */
-        min<T>(this: LoDashExplicitWrapper<List<T> | null | undefined>): LoDashExplicitWrapper<T | undefined>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/math/minBy.d.ts b/types/lodash/math/minBy.d.ts
deleted file mode 100644
index fad6e5a284..0000000000
--- a/types/lodash/math/minBy.d.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * This method is like `_.min` except that it accepts `iteratee` which is
-         * invoked for each element in `array` to generate the criterion by which
-         * the value is ranked. The iteratee is invoked with one argument: (value).
-         *
-         * @category Math
-         * @param array The array to iterate over.
-         * @param [iteratee=_.identity] The iteratee invoked per element.
-         * @returns Returns the minimum value.
-         * @example
-         *
-         * var objects = [{ 'n': 1 }, { 'n': 2 }];
-         *
-         * _.minBy(objects, function(o) { return o.a; });
-         * // => { 'n': 1 }
-         *
-         * // using the `_.property` iteratee shorthand
-         * _.minBy(objects, 'n');
-         * // => { 'n': 1 }
-         */
-        minBy<T>(
-            collection: List<T> | null | undefined,
-            iteratee?: ListIteratee<T>
-        ): T | undefined;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.minBy
-         */
-        minBy<T>(
-            this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            iteratee?: ListIteratee<T>
-        ): T | undefined;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.minBy
-         */
-        minBy<T>(
-            this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            iteratee?: ListIteratee<T>
-        ): LoDashExplicitWrapper<T | undefined>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/math/multiply.d.ts b/types/lodash/math/multiply.d.ts
deleted file mode 100644
index 0767ee1154..0000000000
--- a/types/lodash/math/multiply.d.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Multiply two numbers.
-         * @param multiplier The first number in a multiplication.
-         * @param multiplicand The second number in a multiplication.
-         * @returns Returns the product.
-         */
-        multiply(
-            multiplier: number,
-            multiplicand: number
-        ): number;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.multiply
-         */
-        multiply(multiplicand: number): number;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.multiply
-         */
-        multiply(multiplicand: number): LoDashExplicitWrapper<number>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/math/round.d.ts b/types/lodash/math/round.d.ts
deleted file mode 100644
index 59f97c3144..0000000000
--- a/types/lodash/math/round.d.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Calculates n rounded to precision.
-         *
-         * @param n The number to round.
-         * @param precision The precision to round to.
-         * @return Returns the rounded number.
-         */
-        round(
-            n: number,
-            precision?: number
-        ): number;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.round
-         */
-        round(precision?: number): number;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.round
-         */
-        round(precision?: number): LoDashExplicitWrapper<number>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/math/subtract.d.ts b/types/lodash/math/subtract.d.ts
deleted file mode 100644
index 5b627db982..0000000000
--- a/types/lodash/math/subtract.d.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Subtract two numbers.
-         *
-         * @category Math
-         * @param minuend The first number in a subtraction.
-         * @param subtrahend The second number in a subtraction.
-         * @returns Returns the difference.
-         * @example
-         *
-         * _.subtract(6, 4);
-         * // => 2
-         */
-        subtract(
-            minuend: number,
-            subtrahend: number
-        ): number;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.subtract
-         */
-        subtract(
-            subtrahend: number
-        ): number;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.subtract
-         */
-        subtract(
-            subtrahend: number
-        ): LoDashExplicitWrapper<number>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/math/sum.d.ts b/types/lodash/math/sum.d.ts
deleted file mode 100644
index ab9222900d..0000000000
--- a/types/lodash/math/sum.d.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Computes the sum of the values in `array`.
-         *
-         * @category Math
-         * @param array The array to iterate over.
-         * @returns Returns the sum.
-         * @example
-         *
-         * _.sum([4, 2, 8, 6]);
-         * // => 20
-         */
-        sum(collection: List<any> | null | undefined): number;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.sum
-         */
-        sum(): number;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.sum
-         */
-        sum(): LoDashExplicitWrapper<number>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/math/sumBy.d.ts b/types/lodash/math/sumBy.d.ts
deleted file mode 100644
index 240dca6919..0000000000
--- a/types/lodash/math/sumBy.d.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * This method is like `_.sum` except that it accepts `iteratee` which is
-         * invoked for each element in `array` to generate the value to be summed.
-         * The iteratee is invoked with one argument: (value).
-         *
-         * @category Math
-         * @param array The array to iterate over.
-         * @param [iteratee=_.identity] The iteratee invoked per element.
-         * @returns Returns the sum.
-         * @example
-         *
-         * var objects = [{ 'n': 4 }, { 'n': 2 }, { 'n': 8 }, { 'n': 6 }];
-         *
-         * _.sumBy(objects, function(o) { return o.n; });
-         * // => 20
-         *
-         * // using the `_.property` iteratee shorthand
-         * _.sumBy(objects, 'n');
-         * // => 20
-         */
-        sumBy<T>(
-            collection: List<T> | null | undefined,
-            iteratee?: ((value: T) => number) | string
-        ): number;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.sumBy
-         */
-        sumBy<T>(
-            this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            iteratee?: ((value: T) => number) | string
-        ): number;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.sumBy
-         */
-        sumBy<T>(
-            this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            iteratee?: ((value: T) => number) | string
-        ): LoDashExplicitWrapper<number>;
-    }
-
-    /**********
-     * Number *
-     **********/
-}
\ No newline at end of file
diff --git a/types/lodash/number/clamp.d.ts b/types/lodash/number/clamp.d.ts
deleted file mode 100644
index af2b47c995..0000000000
--- a/types/lodash/number/clamp.d.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Clamps `number` within the inclusive `lower` and `upper` bounds.
-         *
-         * @category Number
-         * @param number The number to clamp.
-         * @param [lower] The lower bound.
-         * @param upper The upper bound.
-         * @returns Returns the clamped number.
-         * @example
-         *
-         * _.clamp(-10, -5, 5);
-         * // => -5
-         *
-         * _.clamp(10, -5, 5);
-         * // => 5
-         */
-        clamp(
-            number: number,
-            lower: number,
-            upper: number
-        ): number;
-        clamp(
-            number: number,
-            upper: number
-        ): number;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.clamp
-         */
-        clamp(
-            lower: number,
-            upper: number
-        ): number;
-        clamp(
-            upper: number
-        ): number;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.clamp
-         */
-        clamp(
-            lower: number,
-            upper: number
-        ): LoDashExplicitWrapper<number>;
-        clamp(
-            upper: number
-        ): LoDashExplicitWrapper<number>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/number/inRange.d.ts b/types/lodash/number/inRange.d.ts
deleted file mode 100644
index c3215a1c0f..0000000000
--- a/types/lodash/number/inRange.d.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Checks if n is between start and up to but not including, end. If end is not specified it’s set to start
-         * with start then set to 0.
-         *
-         * @param n The number to check.
-         * @param start The start of the range.
-         * @param end The end of the range.
-         * @return Returns true if n is in the range, else false.
-         */
-        inRange(
-            n: number,
-            start: number,
-            end?: number
-        ): boolean;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.inRange
-         */
-        inRange(
-            start: number,
-            end?: number
-        ): boolean;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.inRange
-         */
-        inRange(
-            start: number,
-            end?: number
-        ): LoDashExplicitWrapper<boolean>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/object/assign.d.ts b/types/lodash/object/assign.d.ts
deleted file mode 100644
index 17d282a8ec..0000000000
--- a/types/lodash/object/assign.d.ts
+++ /dev/null
@@ -1,172 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Assigns own enumerable properties of source objects to the destination
-         * object. Source objects are applied from left to right. Subsequent sources
-         * overwrite property assignments of previous sources.
-         *
-         * **Note:** This method mutates `object` and is loosely based on
-         * [`Object.assign`](https://mdn.io/Object/assign).
-         *
-         * @category Object
-         * @param object The destination object.
-         * @param [sources] The source objects.
-         * @returns Returns `object`.
-         * @example
-         *
-         * function Foo() {
-         *   this.c = 3;
-         * }
-         *
-         * function Bar() {
-         *   this.e = 5;
-         * }
-         *
-         * Foo.prototype.d = 4;
-         * Bar.prototype.f = 6;
-         *
-         * _.assign({ 'a': 1 }, new Foo, new Bar);
-         * // => { 'a': 1, 'c': 3, 'e': 5 }
-         */
-        assign<TObject, TSource>(
-            object: TObject,
-            source: TSource
-        ): TObject & TSource;
-
-        /**
-         * @see assign
-         */
-        assign<TObject, TSource1, TSource2>(
-            object: TObject,
-            source1: TSource1,
-            source2: TSource2
-        ): TObject & TSource1 & TSource2;
-
-        /**
-         * @see assign
-         */
-        assign<TObject, TSource1, TSource2, TSource3>(
-            object: TObject,
-            source1: TSource1,
-            source2: TSource2,
-            source3: TSource3
-        ): TObject & TSource1 & TSource2 & TSource3;
-
-        /**
-         * @see assign
-         */
-        assign<TObject, TSource1, TSource2, TSource3, TSource4>(
-            object: TObject,
-            source1: TSource1,
-            source2: TSource2,
-            source3: TSource3,
-            source4: TSource4
-        ): TObject & TSource1 & TSource2 & TSource3 & TSource4;
-
-        /**
-         * @see _.assign
-         */
-        assign<TObject>(object: TObject): TObject;
-
-        /**
-         * @see _.assign
-         */
-        assign(
-            object: any,
-            ...otherArgs: any[]
-        ): any;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.assign
-         */
-        assign<TSource>(
-            source: TSource
-        ): LoDashImplicitWrapper<TValue & TSource>;
-
-        /**
-         * @see assign
-         */
-        assign<TSource1, TSource2>(
-            source1: TSource1,
-            source2: TSource2
-        ): LoDashImplicitWrapper<TValue & TSource1 & TSource2>;
-
-        /**
-         * @see assign
-         */
-        assign<TSource1, TSource2, TSource3>(
-            source1: TSource1,
-            source2: TSource2,
-            source3: TSource3
-        ): LoDashImplicitWrapper<TValue & TSource1 & TSource2 & TSource3>;
-
-        /**
-         * @see assign
-         */
-        assign<TSource1, TSource2, TSource3, TSource4>(
-            source1: TSource1,
-            source2: TSource2,
-            source3: TSource3,
-            source4: TSource4
-        ): LoDashImplicitWrapper<TValue & TSource1 & TSource2 & TSource3 & TSource4>;
-
-        /**
-         * @see _.assign
-         */
-        assign(): LoDashImplicitWrapper<TValue>;
-
-        /**
-         * @see _.assign
-         */
-        assign(...otherArgs: any[]): LoDashImplicitWrapper<any>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.assign
-         */
-        assign<TSource>(
-            source: TSource
-        ): LoDashExplicitWrapper<TValue & TSource>;
-
-        /**
-         * @see assign
-         */
-        assign<TSource1, TSource2>(
-            source1: TSource1,
-            source2: TSource2
-        ): LoDashExplicitWrapper<TValue & TSource1 & TSource2>;
-
-        /**
-         * @see assign
-         */
-        assign<TSource1, TSource2, TSource3>(
-            source1: TSource1,
-            source2: TSource2,
-            source3: TSource3
-        ): LoDashExplicitWrapper<TValue & TSource1 & TSource2 & TSource3>;
-
-        /**
-         * @see assign
-         */
-        assign<TSource1, TSource2, TSource3, TSource4>(
-            source1: TSource1,
-            source2: TSource2,
-            source3: TSource3,
-            source4: TSource4
-        ): LoDashExplicitWrapper<TValue & TSource1 & TSource2 & TSource3 & TSource4>;
-
-        /**
-         * @see _.assign
-         */
-        assign(): LoDashExplicitWrapper<TValue>;
-
-        /**
-         * @see _.assign
-         */
-        assign(...otherArgs: any[]): LoDashExplicitWrapper<any>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/object/assignIn.d.ts b/types/lodash/object/assignIn.d.ts
deleted file mode 100644
index 01b38f7efa..0000000000
--- a/types/lodash/object/assignIn.d.ts
+++ /dev/null
@@ -1,171 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * This method is like `_.assign` except that it iterates over own and
-         * inherited source properties.
-         *
-         * **Note:** This method mutates `object`.
-         *
-         * @alias extend
-         * @category Object
-         * @param object The destination object.
-         * @param [sources] The source objects.
-         * @returns Returns `object`.
-         * @example
-         *
-         * function Foo() {
-         *   this.b = 2;
-         * }
-         *
-         * function Bar() {
-         *   this.d = 4;
-         * }
-         *
-         * Foo.prototype.c = 3;
-         * Bar.prototype.e = 5;
-         *
-         * _.assignIn({ 'a': 1 }, new Foo, new Bar);
-         * // => { 'a': 1, 'b': 2, 'c': 3, 'd': 4, 'e': 5 }
-         */
-        assignIn<TObject, TSource>(
-            object: TObject,
-            source: TSource
-        ): TObject & TSource;
-
-        /**
-         * @see assignIn
-         */
-        assignIn<TObject, TSource1, TSource2>(
-            object: TObject,
-            source1: TSource1,
-            source2: TSource2
-        ): TObject & TSource1 & TSource2;
-
-        /**
-         * @see assignIn
-         */
-        assignIn<TObject, TSource1, TSource2, TSource3>(
-            object: TObject,
-            source1: TSource1,
-            source2: TSource2,
-            source3: TSource3
-        ): TObject & TSource1 & TSource2 & TSource3;
-
-        /**
-         * @see assignIn
-         */
-        assignIn<TObject, TSource1, TSource2, TSource3, TSource4>(
-            object: TObject,
-            source1: TSource1,
-            source2: TSource2,
-            source3: TSource3,
-            source4: TSource4
-        ): TObject & TSource1 & TSource2 & TSource3 & TSource4;
-
-        /**
-         * @see _.assignIn
-         */
-        assignIn<TObject>(object: TObject): TObject;
-
-        /**
-         * @see _.assignIn
-         */
-        assignIn<TResult>(
-            object: any,
-            ...otherArgs: any[]
-        ): TResult;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.assignIn
-         */
-        assignIn<TSource>(
-            source: TSource
-        ): LoDashImplicitWrapper<TValue & TSource>;
-
-        /**
-         * @see assignIn
-         */
-        assignIn<TSource1, TSource2>(
-            source1: TSource1,
-            source2: TSource2
-        ): LoDashImplicitWrapper<TValue & TSource1 & TSource2>;
-
-        /**
-         * @see assignIn
-         */
-        assignIn<TSource1, TSource2, TSource3>(
-            source1: TSource1,
-            source2: TSource2,
-            source3: TSource3
-        ): LoDashImplicitWrapper<TValue & TSource1 & TSource2 & TSource3>;
-
-        /**
-         * @see assignIn
-         */
-        assignIn<TSource1, TSource2, TSource3, TSource4>(
-            source1: TSource1,
-            source2: TSource2,
-            source3: TSource3,
-            source4: TSource4
-        ): LoDashImplicitWrapper<TValue & TSource1 & TSource2 & TSource3 & TSource4>;
-
-        /**
-         * @see _.assignIn
-         */
-        assignIn(): LoDashImplicitWrapper<TValue>;
-
-        /**
-         * @see _.assignIn
-         */
-        assignIn<TResult>(...otherArgs: any[]): LoDashImplicitWrapper<TResult>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.assignIn
-         */
-        assignIn<TSource>(
-            source: TSource
-        ): LoDashExplicitWrapper<TValue & TSource>;
-
-        /**
-         * @see assignIn
-         */
-        assignIn<TSource1, TSource2>(
-            source1: TSource1,
-            source2: TSource2
-        ): LoDashExplicitWrapper<TValue & TSource1 & TSource2>;
-
-        /**
-         * @see assignIn
-         */
-        assignIn<TSource1, TSource2, TSource3>(
-            source1: TSource1,
-            source2: TSource2,
-            source3: TSource3
-        ): LoDashExplicitWrapper<TValue & TSource1 & TSource2 & TSource3>;
-
-        /**
-         * @see assignIn
-         */
-        assignIn<TSource1, TSource2, TSource3, TSource4>(
-            source1: TSource1,
-            source2: TSource2,
-            source3: TSource3,
-            source4: TSource4
-        ): LoDashExplicitWrapper<TValue & TSource1 & TSource2 & TSource3 & TSource4>;
-
-        /**
-         * @see _.assignIn
-         */
-        assignIn(): LoDashExplicitWrapper<TValue>;
-
-        /**
-         * @see _.assignIn
-         */
-        assignIn(...otherArgs: any[]): LoDashExplicitWrapper<any>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/object/assignInWith.d.ts b/types/lodash/object/assignInWith.d.ts
deleted file mode 100644
index 776a81b580..0000000000
--- a/types/lodash/object/assignInWith.d.ts
+++ /dev/null
@@ -1,183 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    type AssignCustomizer = (objectValue: any, sourceValue: any, key?: string, object?: {}, source?: {}) => any;
-
-    interface LoDashStatic {
-        /**
-         * This method is like `_.assignIn` except that it accepts `customizer` which
-         * is invoked to produce the assigned values. If `customizer` returns `undefined`
-         * assignment is handled by the method instead. The `customizer` is invoked
-         * with five arguments: (objValue, srcValue, key, object, source).
-         *
-         * **Note:** This method mutates `object`.
-         *
-         * @alias extendWith
-         * @category Object
-         * @param object The destination object.
-         * @param sources The source objects.
-         * @param [customizer] The function to customize assigned values.
-         * @returns Returns `object`.
-         * @example
-         *
-         * function customizer(objValue, srcValue) {
-         *   return _.isUndefined(objValue) ? srcValue : objValue;
-         * }
-         *
-         * var defaults = _.partialRight(_.assignInWith, customizer);
-         *
-         * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
-         * // => { 'a': 1, 'b': 2 }
-         */
-        assignInWith<TObject, TSource>(
-            object: TObject,
-            source: TSource,
-            customizer: AssignCustomizer
-        ): TObject & TSource;
-
-        /**
-         * @see assignInWith
-         */
-        assignInWith<TObject, TSource1, TSource2>(
-            object: TObject,
-            source1: TSource1,
-            source2: TSource2,
-            customizer: AssignCustomizer
-        ): TObject & TSource1 & TSource2;
-
-        /**
-         * @see assignInWith
-         */
-        assignInWith<TObject, TSource1, TSource2, TSource3>(
-            object: TObject,
-            source1: TSource1,
-            source2: TSource2,
-            source3: TSource3,
-            customizer: AssignCustomizer
-        ): TObject & TSource1 & TSource2 & TSource3;
-
-        /**
-         * @see assignInWith
-         */
-        assignInWith<TObject, TSource1, TSource2, TSource3, TSource4>(
-            object: TObject,
-            source1: TSource1,
-            source2: TSource2,
-            source3: TSource3,
-            source4: TSource4,
-            customizer: AssignCustomizer
-        ): TObject & TSource1 & TSource2 & TSource3 & TSource4;
-
-        /**
-         * @see _.assignInWith
-         */
-        assignInWith<TObject>(object: TObject): TObject;
-
-        /**
-         * @see _.assignInWith
-         */
-        assignInWith<TResult>(
-            object: any,
-            ...otherArgs: any[]
-        ): TResult;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.assignInWith
-         */
-        assignInWith<TSource>(
-            source: TSource,
-            customizer: AssignCustomizer
-        ): LoDashImplicitWrapper<TValue & TSource>;
-
-        /**
-         * @see assignInWith
-         */
-        assignInWith<TSource1, TSource2>(
-            source1: TSource1,
-            source2: TSource2,
-            customizer: AssignCustomizer
-        ): LoDashImplicitWrapper<TValue & TSource1 & TSource2>;
-
-        /**
-         * @see assignInWith
-         */
-        assignInWith<TSource1, TSource2, TSource3>(
-            source1: TSource1,
-            source2: TSource2,
-            source3: TSource3,
-            customizer: AssignCustomizer
-        ): LoDashImplicitWrapper<TValue & TSource1 & TSource2 & TSource3>;
-
-        /**
-         * @see assignInWith
-         */
-        assignInWith<TSource1, TSource2, TSource3, TSource4>(
-            source1: TSource1,
-            source2: TSource2,
-            source3: TSource3,
-            source4: TSource4,
-            customizer: AssignCustomizer
-        ): LoDashImplicitWrapper<TValue & TSource1 & TSource2 & TSource3 & TSource4>;
-
-        /**
-         * @see _.assignInWith
-         */
-        assignInWith(): LoDashImplicitWrapper<TValue>;
-
-        /**
-         * @see _.assignInWith
-         */
-        assignInWith<TResult>(...otherArgs: any[]): LoDashImplicitWrapper<TResult>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.assignInWith
-         */
-        assignInWith<TSource>(
-            source: TSource,
-            customizer: AssignCustomizer
-        ): LoDashExplicitWrapper<TValue & TSource>;
-
-        /**
-         * @see assignInWith
-         */
-        assignInWith<TSource1, TSource2>(
-            source1: TSource1,
-            source2: TSource2,
-            customizer: AssignCustomizer
-        ): LoDashExplicitWrapper<TValue & TSource1 & TSource2>;
-
-        /**
-         * @see assignInWith
-         */
-        assignInWith<TSource1, TSource2, TSource3>(
-            source1: TSource1,
-            source2: TSource2,
-            source3: TSource3,
-            customizer: AssignCustomizer
-        ): LoDashExplicitWrapper<TValue & TSource1 & TSource2 & TSource3>;
-
-        /**
-         * @see assignInWith
-         */
-        assignInWith<TSource1, TSource2, TSource3, TSource4>(
-            source1: TSource1,
-            source2: TSource2,
-            source3: TSource3,
-            source4: TSource4,
-            customizer: AssignCustomizer
-        ): LoDashExplicitWrapper<TValue & TSource1 & TSource2 & TSource3 & TSource4>;
-
-        /**
-         * @see _.assignInWith
-         */
-        assignInWith(): LoDashExplicitWrapper<TValue>;
-
-        /**
-         * @see _.assignInWith
-         */
-        assignInWith(...otherArgs: any[]): LoDashExplicitWrapper<any>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/object/assignWith.d.ts b/types/lodash/object/assignWith.d.ts
deleted file mode 100644
index 4b98ad5e53..0000000000
--- a/types/lodash/object/assignWith.d.ts
+++ /dev/null
@@ -1,180 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * This method is like `_.assign` except that it accepts `customizer` which
-         * is invoked to produce the assigned values. If `customizer` returns `undefined`
-         * assignment is handled by the method instead. The `customizer` is invoked
-         * with five arguments: (objValue, srcValue, key, object, source).
-         *
-         * **Note:** This method mutates `object`.
-         *
-         * @category Object
-         * @param object The destination object.
-         * @param sources The source objects.
-         * @param [customizer] The function to customize assigned values.
-         * @returns Returns `object`.
-         * @example
-         *
-         * function customizer(objValue, srcValue) {
-         *   return _.isUndefined(objValue) ? srcValue : objValue;
-         * }
-         *
-         * var defaults = _.partialRight(_.assignWith, customizer);
-         *
-         * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
-         * // => { 'a': 1, 'b': 2 }
-         */
-        assignWith<TObject, TSource>(
-            object: TObject,
-            source: TSource,
-            customizer: AssignCustomizer
-        ): TObject & TSource;
-
-        /**
-         * @see assignWith
-         */
-        assignWith<TObject, TSource1, TSource2>(
-            object: TObject,
-            source1: TSource1,
-            source2: TSource2,
-            customizer: AssignCustomizer
-        ): TObject & TSource1 & TSource2;
-
-        /**
-         * @see assignWith
-         */
-        assignWith<TObject, TSource1, TSource2, TSource3>(
-            object: TObject,
-            source1: TSource1,
-            source2: TSource2,
-            source3: TSource3,
-            customizer: AssignCustomizer
-        ): TObject & TSource1 & TSource2 & TSource3;
-
-        /**
-         * @see assignWith
-         */
-        assignWith<TObject, TSource1, TSource2, TSource3, TSource4>(
-            object: TObject,
-            source1: TSource1,
-            source2: TSource2,
-            source3: TSource3,
-            source4: TSource4,
-            customizer: AssignCustomizer
-        ): TObject & TSource1 & TSource2 & TSource3 & TSource4;
-
-        /**
-         * @see _.assignWith
-         */
-        assignWith<TObject>(object: TObject): TObject;
-
-        /**
-         * @see _.assignWith
-         */
-        assignWith<TResult>(
-            object: any,
-            ...otherArgs: any[]
-        ): TResult;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.assignWith
-         */
-        assignWith<TSource>(
-            source: TSource,
-            customizer: AssignCustomizer
-        ): LoDashImplicitWrapper<TValue & TSource>;
-
-        /**
-         * @see assignWith
-         */
-        assignWith<TSource1, TSource2>(
-            source1: TSource1,
-            source2: TSource2,
-            customizer: AssignCustomizer
-        ): LoDashImplicitWrapper<TValue & TSource1 & TSource2>;
-
-        /**
-         * @see assignWith
-         */
-        assignWith<TSource1, TSource2, TSource3>(
-            source1: TSource1,
-            source2: TSource2,
-            source3: TSource3,
-            customizer: AssignCustomizer
-        ): LoDashImplicitWrapper<TValue & TSource1 & TSource2 & TSource3>;
-
-        /**
-         * @see assignWith
-         */
-        assignWith<TSource1, TSource2, TSource3, TSource4>(
-            source1: TSource1,
-            source2: TSource2,
-            source3: TSource3,
-            source4: TSource4,
-            customizer: AssignCustomizer
-        ): LoDashImplicitWrapper<TValue & TSource1 & TSource2 & TSource3 & TSource4>;
-
-        /**
-         * @see _.assignWith
-         */
-        assignWith(): LoDashImplicitWrapper<TValue>;
-
-        /**
-         * @see _.assignWith
-         */
-        assignWith<TResult>(...otherArgs: any[]): LoDashImplicitWrapper<TResult>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.assignWith
-         */
-        assignWith<TSource>(
-            source: TSource,
-            customizer: AssignCustomizer
-        ): LoDashExplicitWrapper<TValue & TSource>;
-
-        /**
-         * @see assignWith
-         */
-        assignWith<TSource1, TSource2>(
-            source1: TSource1,
-            source2: TSource2,
-            customizer: AssignCustomizer
-        ): LoDashExplicitWrapper<TValue & TSource1 & TSource2>;
-
-        /**
-         * @see assignWith
-         */
-        assignWith<TSource1, TSource2, TSource3>(
-            source1: TSource1,
-            source2: TSource2,
-            source3: TSource3,
-            customizer: AssignCustomizer
-        ): LoDashExplicitWrapper<TValue & TSource1 & TSource2 & TSource3>;
-
-        /**
-         * @see assignWith
-         */
-        assignWith<TSource1, TSource2, TSource3, TSource4>(
-            source1: TSource1,
-            source2: TSource2,
-            source3: TSource3,
-            source4: TSource4,
-            customizer: AssignCustomizer
-        ): LoDashExplicitWrapper<TValue & TSource1 & TSource2 & TSource3 & TSource4>;
-
-        /**
-         * @see _.assignWith
-         */
-        assignWith(): LoDashExplicitWrapper<TValue>;
-
-        /**
-         * @see _.assignWith
-         */
-        assignWith(...otherArgs: any[]): LoDashExplicitWrapper<any>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/object/at.d.ts b/types/lodash/object/at.d.ts
deleted file mode 100644
index c95f8c9600..0000000000
--- a/types/lodash/object/at.d.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Creates an array of elements corresponding to the given keys, or indexes, of collection. Keys may be
-         * specified as individual arguments or as arrays of keys.
-         *
-         * @param object The object to iterate over.
-         * @param props The property names or indexes of elements to pick, specified individually or in arrays.
-         * @return Returns the new array of picked elements.
-         */
-        at<T>(
-            object: List<T> | Dictionary<T> | null | undefined,
-            ...props: PropertyPath[]
-        ): T[];
-
-        /**
-         * @see _.at
-         */
-        at<T extends object>(
-            object: T | null | undefined,
-            ...props: Array<Many<keyof T>>
-        ): Array<T[keyof T]>;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.at
-         */
-        at<T>(
-            this: LoDashImplicitWrapper<List<T> | Dictionary<T> | null | undefined>,
-            ...props: PropertyPath[]
-        ): LoDashImplicitWrapper<T[]>;
-
-        /**
-         * @see _.at
-         */
-        at<T extends object>(
-            this: LoDashImplicitWrapper<T | null | undefined>,
-            ...props: Array<Many<keyof T>>
-        ): LoDashImplicitWrapper<Array<T[keyof T]>>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.at
-         */
-        at<T>(
-            this: LoDashExplicitWrapper<List<T> | Dictionary<T> | null | undefined>,
-            ...props: PropertyPath[]
-        ): LoDashExplicitWrapper<T[]>;
-
-        /**
-         * @see _.at
-         */
-        at<T extends object>(
-            this: LoDashExplicitWrapper<T | null | undefined>,
-            ...props: Array<Many<keyof T>>
-        ): LoDashExplicitWrapper<Array<T[keyof T]>>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/object/create.d.ts b/types/lodash/object/create.d.ts
deleted file mode 100644
index 836cc05425..0000000000
--- a/types/lodash/object/create.d.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Creates an object that inherits from the given prototype object. If a properties object is provided its own
-         * enumerable properties are assigned to the created object.
-         *
-         * @param prototype The object to inherit from.
-         * @param properties The properties to assign to the object.
-         * @return Returns the new object.
-         */
-        create<T extends object, U extends object>(
-            prototype: T,
-            properties?: U
-        ): T & U;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.create
-         */
-        create<U extends object>(properties?: U): LoDashImplicitWrapper<TValue & U>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.create
-         */
-        create<U extends object>(properties?: U): LoDashExplicitWrapper<TValue & U>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/object/defaults.d.ts b/types/lodash/object/defaults.d.ts
deleted file mode 100644
index 956d5b4022..0000000000
--- a/types/lodash/object/defaults.d.ts
+++ /dev/null
@@ -1,155 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Assigns own enumerable properties of source object(s) to the destination object for all destination
-         * properties that resolve to undefined. Once a property is set, additional values of the same property are
-         * ignored.
-         *
-         * Note: This method mutates object.
-         *
-         * @param object The destination object.
-         * @param sources The source objects.
-         * @return The destination object.
-         */
-        defaults<TObject, TSource>(
-            object: TObject,
-            source: TSource
-        ): TSource & TObject;
-
-        /**
-         * @see _.defaults
-         */
-        defaults<TObject, TSource1, TSource2>(
-            object: TObject,
-            source1: TSource1,
-            source2: TSource2
-        ): TSource2 & TSource1 & TObject;
-
-        /**
-         * @see _.defaults
-         */
-        defaults<TObject, TSource1, TSource2, TSource3>(
-            object: TObject,
-            source1: TSource1,
-            source2: TSource2,
-            source3: TSource3
-        ): TSource3 & TSource2 & TSource1 & TObject;
-
-        /**
-         * @see _.defaults
-         */
-        defaults<TObject, TSource1, TSource2, TSource3, TSource4>(
-            object: TObject,
-            source1: TSource1,
-            source2: TSource2,
-            source3: TSource3,
-            source4: TSource4
-        ): TSource4 & TSource3 & TSource2 & TSource1 & TObject;
-
-        /**
-         * @see _.defaults
-         */
-        defaults<TObject>(object: TObject): TObject;
-
-        /**
-         * @see _.defaults
-         */
-        defaults(
-            object: any,
-            ...sources: any[]
-        ): any;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.defaults
-         */
-        defaults<TSource>(
-            source: TSource
-        ): LoDashImplicitWrapper<TSource & TValue>;
-
-        /**
-         * @see _.defaults
-         */
-        defaults<TSource1, TSource2>(
-            source1: TSource1,
-            source2: TSource2
-        ): LoDashImplicitWrapper<TSource2 & TSource1 & TValue>;
-
-        /**
-         * @see _.defaults
-         */
-        defaults<TSource1, TSource2, TSource3>(
-            source1: TSource1,
-            source2: TSource2,
-            source3: TSource3
-        ): LoDashImplicitWrapper<TSource3 & TSource2 & TSource1 & TValue>;
-
-        /**
-         * @see _.defaults
-         */
-        defaults<TSource1, TSource2, TSource3, TSource4>(
-            source1: TSource1,
-            source2: TSource2,
-            source3: TSource3,
-            source4: TSource4
-        ): LoDashImplicitWrapper<TSource4 & TSource3 & TSource2 & TSource1 & TValue>;
-
-        /**
-         * @see _.defaults
-         */
-        defaults(): LoDashImplicitWrapper<TValue>;
-
-        /**
-         * @see _.defaults
-         */
-        defaults(...sources: any[]): LoDashImplicitWrapper<any>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.defaults
-         */
-        defaults<TSource>(
-            source: TSource
-        ): LoDashExplicitWrapper<TSource & TValue>;
-
-        /**
-         * @see _.defaults
-         */
-        defaults<TSource1, TSource2>(
-            source1: TSource1,
-            source2: TSource2
-        ): LoDashExplicitWrapper<TSource2 & TSource1 & TValue>;
-
-        /**
-         * @see _.defaults
-         */
-        defaults<TSource1, TSource2, TSource3>(
-            source1: TSource1,
-            source2: TSource2,
-            source3: TSource3
-        ): LoDashExplicitWrapper<TSource3 & TSource2 & TSource1 & TValue>;
-
-        /**
-         * @see _.defaults
-         */
-        defaults<TSource1, TSource2, TSource3, TSource4>(
-            source1: TSource1,
-            source2: TSource2,
-            source3: TSource3,
-            source4: TSource4
-        ): LoDashExplicitWrapper<TSource4 & TSource3 & TSource2 & TSource1 & TValue>;
-
-        /**
-         * @see _.defaults
-         */
-        defaults(): LoDashExplicitWrapper<TValue>;
-
-        /**
-         * @see _.defaults
-         */
-        defaults(...sources: any[]): LoDashExplicitWrapper<any>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/object/defaultsDeep.d.ts b/types/lodash/object/defaultsDeep.d.ts
deleted file mode 100644
index a9aa5d6b53..0000000000
--- a/types/lodash/object/defaultsDeep.d.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * This method is like _.defaults except that it recursively assigns default properties.
-         * @param object The destination object.
-         * @param sources The source objects.
-         * @return Returns object.
-         **/
-        defaultsDeep(
-            object: any,
-            ...sources: any[]): any;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.defaultsDeep
-         **/
-        defaultsDeep(...sources: any[]): LoDashImplicitWrapper<any>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.defaultsDeep
-         **/
-        defaultsDeep(...sources: any[]): LoDashExplicitWrapper<any>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/object/entries.d.ts b/types/lodash/object/entries.d.ts
deleted file mode 100644
index 786b2a7abd..0000000000
--- a/types/lodash/object/entries.d.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * @see _.toPairs
-         */
-        entries<T>(object?: Dictionary<T>): Array<[string, T]>;
-
-        /**
-         * @see _.toPairs
-         */
-        entries(object?: object): Array<[string, any]>;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.toPairs
-         */
-        entries<T>(this: LoDashImplicitWrapper<Dictionary<T>>): LoDashImplicitWrapper<Array<[string, T]>>;
-
-        /**
-         * @see _.toPairs
-         */
-        entries(): LoDashImplicitWrapper<Array<[string, any]>>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.toPairs
-         */
-        entries<T>(this: LoDashExplicitWrapper<Dictionary<T>>): LoDashExplicitWrapper<Array<[string, T]>>;
-
-        /**
-         * @see _.toPairs
-         */
-        entries(): LoDashExplicitWrapper<Array<[string, any]>>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/object/entriesIn.d.ts b/types/lodash/object/entriesIn.d.ts
deleted file mode 100644
index fcd378032e..0000000000
--- a/types/lodash/object/entriesIn.d.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * @see _.entriesIn
-         */
-        entriesIn<T>(object?: Dictionary<T>): Array<[string, T]>;
-
-        /**
-         * @see _.entriesIn
-         */
-        entriesIn(object?: object): Array<[string, any]>;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.entriesIn
-         */
-        entriesIn<T>(this: LoDashImplicitWrapper<Dictionary<T>>): LoDashImplicitWrapper<Array<[string, T]>>;
-
-        /**
-         * @see _.entriesIn
-         */
-        entriesIn(): LoDashImplicitWrapper<Array<[string, any]>>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.entriesIn
-         */
-        entriesIn<T>(this: LoDashExplicitWrapper<Dictionary<T>>): LoDashExplicitWrapper<Array<[string, T]>>;
-
-        /**
-         * @see _.entriesIn
-         */
-        entriesIn(): LoDashExplicitWrapper<Array<[string, any]>>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/object/extend.d.ts b/types/lodash/object/extend.d.ts
deleted file mode 100644
index 3bdace2de1..0000000000
--- a/types/lodash/object/extend.d.ts
+++ /dev/null
@@ -1,147 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * @see _.extend
-         */
-        extend<TObject, TSource>(
-            object: TObject,
-            source: TSource
-        ): TObject & TSource;
-
-        /**
-         * @see _.extend
-         */
-        extend<TObject, TSource1, TSource2>(
-            object: TObject,
-            source1: TSource1,
-            source2: TSource2
-        ): TObject & TSource1 & TSource2;
-
-        /**
-         * @see _.extend
-         */
-        extend<TObject, TSource1, TSource2, TSource3>(
-            object: TObject,
-            source1: TSource1,
-            source2: TSource2,
-            source3: TSource3
-        ): TObject & TSource1 & TSource2 & TSource3;
-
-        /**
-         * @see _.extend
-         */
-        extend<TObject, TSource1, TSource2, TSource3, TSource4>(
-            object: TObject,
-            source1: TSource1,
-            source2: TSource2,
-            source3: TSource3,
-            source4: TSource4
-        ): TObject & TSource1 & TSource2 & TSource3 & TSource4;
-
-        /**
-         * @see _.extend
-         */
-        extend<TObject>(object: TObject): TObject;
-
-        /**
-         * @see _.extend
-         */
-        extend<TResult>(
-            object: any,
-            ...otherArgs: any[]
-        ): TResult;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.extend
-         */
-        extend<TSource>(
-            source: TSource
-        ): LoDashImplicitWrapper<TValue & TSource>;
-
-        /**
-         * @see _.extend
-         */
-        extend<TSource1, TSource2>(
-            source1: TSource1,
-            source2: TSource2
-        ): LoDashImplicitWrapper<TValue & TSource1 & TSource2>;
-
-        /**
-         * @see _.extend
-         */
-        extend<TSource1, TSource2, TSource3>(
-            source1: TSource1,
-            source2: TSource2,
-            source3: TSource3
-        ): LoDashImplicitWrapper<TValue & TSource1 & TSource2 & TSource3>;
-
-        /**
-         * @see _.extend
-         */
-        extend<TSource1, TSource2, TSource3, TSource4>(
-            source1: TSource1,
-            source2: TSource2,
-            source3: TSource3,
-            source4: TSource4
-        ): LoDashImplicitWrapper<TValue & TSource1 & TSource2 & TSource3 & TSource4>;
-
-        /**
-         * @see _.extend
-         */
-        extend(): LoDashImplicitWrapper<TValue>;
-
-        /**
-         * @see _.extend
-         */
-        extend(...otherArgs: any[]): LoDashImplicitWrapper<any>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.extend
-         */
-        extend<TSource>(
-            source: TSource
-        ): LoDashExplicitWrapper<TValue & TSource>;
-
-        /**
-         * @see _.extend
-         */
-        extend<TSource1, TSource2>(
-            source1: TSource1,
-            source2: TSource2
-        ): LoDashExplicitWrapper<TValue & TSource1 & TSource2>;
-
-        /**
-         * @see _.extend
-         */
-        extend<TSource1, TSource2, TSource3>(
-            source1: TSource1,
-            source2: TSource2,
-            source3: TSource3
-        ): LoDashExplicitWrapper<TValue & TSource1 & TSource2 & TSource3>;
-
-        /**
-         * @see _.extend
-         */
-        extend<TSource1, TSource2, TSource3, TSource4>(
-            source1: TSource1,
-            source2: TSource2,
-            source3: TSource3,
-            source4: TSource4
-        ): LoDashExplicitWrapper<TValue & TSource1 & TSource2 & TSource3 & TSource4>;
-
-        /**
-         * @see _.extend
-         */
-        extend(): LoDashExplicitWrapper<TValue>;
-
-        /**
-         * @see _.extend
-         */
-        extend(...otherArgs: any[]): LoDashExplicitWrapper<any>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/object/extendWith.d.ts b/types/lodash/object/extendWith.d.ts
deleted file mode 100644
index 191c69dd8b..0000000000
--- a/types/lodash/object/extendWith.d.ts
+++ /dev/null
@@ -1,159 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * @see _.extendWith
-         */
-        extendWith<TObject, TSource>(
-            object: TObject,
-            source: TSource,
-            customizer: AssignCustomizer
-        ): TObject & TSource;
-
-        /**
-         * @see _.extendWith
-         */
-        extendWith<TObject, TSource1, TSource2>(
-            object: TObject,
-            source1: TSource1,
-            source2: TSource2,
-            customizer: AssignCustomizer
-        ): TObject & TSource1 & TSource2;
-
-        /**
-         * @see _.extendWith
-         */
-        extendWith<TObject, TSource1, TSource2, TSource3>(
-            object: TObject,
-            source1: TSource1,
-            source2: TSource2,
-            source3: TSource3,
-            customizer: AssignCustomizer
-        ): TObject & TSource1 & TSource2 & TSource3;
-
-        /**
-         * @see _.extendWith
-         */
-        extendWith<TObject, TSource1, TSource2, TSource3, TSource4>(
-            object: TObject,
-            source1: TSource1,
-            source2: TSource2,
-            source3: TSource3,
-            source4: TSource4,
-            customizer: AssignCustomizer
-        ): TObject & TSource1 & TSource2 & TSource3 & TSource4;
-
-        /**
-         * @see _.extendWith
-         */
-        extendWith<TObject>(object: TObject): TObject;
-
-        /**
-         * @see _.extendWith
-         */
-        extendWith<TResult>(
-            object: any,
-            ...otherArgs: any[]
-        ): TResult;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.extendWith
-         */
-        extendWith<TSource>(
-            source: TSource,
-            customizer: AssignCustomizer
-        ): LoDashImplicitWrapper<TValue & TSource>;
-
-        /**
-         * @see _.extendWith
-         */
-        extendWith<TSource1, TSource2>(
-            source1: TSource1,
-            source2: TSource2,
-            customizer: AssignCustomizer
-        ): LoDashImplicitWrapper<TValue & TSource1 & TSource2>;
-
-        /**
-         * @see _.extendWith
-         */
-        extendWith<TSource1, TSource2, TSource3>(
-            source1: TSource1,
-            source2: TSource2,
-            source3: TSource3,
-            customizer: AssignCustomizer
-        ): LoDashImplicitWrapper<TValue & TSource1 & TSource2 & TSource3>;
-
-        /**
-         * @see _.extendWith
-         */
-        extendWith<TSource1, TSource2, TSource3, TSource4>(
-            source1: TSource1,
-            source2: TSource2,
-            source3: TSource3,
-            source4: TSource4,
-            customizer: AssignCustomizer
-        ): LoDashImplicitWrapper<TValue & TSource1 & TSource2 & TSource3 & TSource4>;
-
-        /**
-         * @see _.extendWith
-         */
-        extendWith(): LoDashImplicitWrapper<TValue>;
-
-        /**
-         * @see _.extendWith
-         */
-        extendWith(...otherArgs: any[]): LoDashImplicitWrapper<any>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.extendWith
-         */
-        extendWith<TSource>(
-            source: TSource,
-            customizer: AssignCustomizer
-        ): LoDashExplicitWrapper<TValue & TSource>;
-
-        /**
-         * @see _.extendWith
-         */
-        extendWith<TSource1, TSource2>(
-            source1: TSource1,
-            source2: TSource2,
-            customizer: AssignCustomizer
-        ): LoDashExplicitWrapper<TValue & TSource1 & TSource2>;
-
-        /**
-         * @see _.extendWith
-         */
-        extendWith<TSource1, TSource2, TSource3>(
-            source1: TSource1,
-            source2: TSource2,
-            source3: TSource3,
-            customizer: AssignCustomizer
-        ): LoDashExplicitWrapper<TValue & TSource1 & TSource2 & TSource3>;
-
-        /**
-         * @see _.extendWith
-         */
-        extendWith<TSource1, TSource2, TSource3, TSource4>(
-            source1: TSource1,
-            source2: TSource2,
-            source3: TSource3,
-            source4: TSource4,
-            customizer: AssignCustomizer
-        ): LoDashExplicitWrapper<TValue & TSource1 & TSource2 & TSource3 & TSource4>;
-
-        /**
-         * @see _.extendWith
-         */
-        extendWith(): LoDashExplicitWrapper<TValue>;
-
-        /**
-         * @see _.extendWith
-         */
-        extendWith(...otherArgs: any[]): LoDashExplicitWrapper<any>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/object/findKey.d.ts b/types/lodash/object/findKey.d.ts
deleted file mode 100644
index 2e35165e24..0000000000
--- a/types/lodash/object/findKey.d.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * This method is like _.find except that it returns the key of the first element predicate returns truthy for
-         * instead of the element itself.
-         *
-         * If a property name is provided for predicate the created _.property style callback returns the property
-         * value of the given element.
-         *
-         * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-         * elements that have a matching property value, else false.
-         *
-         * If an object is provided for predicate the created _.matches style callback returns true for elements that
-         * have the properties of the given object, else false.
-         *
-         * @param object The object to search.
-         * @param predicate The function invoked per iteration.
-         * @param thisArg The this binding of predicate.
-         * @return Returns the key of the matched element, else undefined.
-         */
-        findKey<T>(
-            object: T | null | undefined,
-            predicate?: ObjectIteratee<T>
-        ): string | undefined;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.findKey
-         */
-        findKey<T>(
-            this: LoDashImplicitWrapper<T | null | undefined>,
-            predicate?: ObjectIteratee<T>
-        ): string | undefined;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.findKey
-         */
-        findKey<T>(
-            this: LoDashExplicitWrapper<T | null | undefined>,
-            predicate?: ObjectIteratee<T>
-        ): LoDashExplicitWrapper<string | undefined>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/object/findLastKey.d.ts b/types/lodash/object/findLastKey.d.ts
deleted file mode 100644
index 6a43330138..0000000000
--- a/types/lodash/object/findLastKey.d.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * This method is like _.findKey except that it iterates over elements of a collection in the opposite order.
-         *
-         * If a property name is provided for predicate the created _.property style callback returns the property
-         * value of the given element.
-         *
-         * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-         * elements that have a matching property value, else false.
-         *
-         * If an object is provided for predicate the created _.matches style callback returns true for elements that
-         * have the properties of the given object, else false.
-         *
-         * @param object The object to search.
-         * @param predicate The function invoked per iteration.
-         * @param thisArg The this binding of predicate.
-         * @return Returns the key of the matched element, else undefined.
-         */
-        findLastKey<T>(
-            object: T | null | undefined,
-            predicate?: ObjectIteratee<T>
-        ): string | undefined;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.findLastKey
-         */
-        findLastKey<T>(
-            this: LoDashImplicitWrapper<T | null | undefined>,
-            predicate?: ObjectIteratee<T>
-        ): string | undefined;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.findLastKey
-         */
-        findLastKey<T>(
-            this: LoDashExplicitWrapper<T | null | undefined>,
-            predicate?: ObjectIteratee<T>
-        ): LoDashExplicitWrapper<string | undefined>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/object/forIn.d.ts b/types/lodash/object/forIn.d.ts
deleted file mode 100644
index 7fa7e14a33..0000000000
--- a/types/lodash/object/forIn.d.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Iterates over own and inherited enumerable properties of an object invoking iteratee for each property. The
-         * iteratee is bound to thisArg and invoked with three arguments: (value, key, object). Iteratee functions may
-         * exit iteration early by explicitly returning false.
-         *
-         * @param object The object to iterate over.
-         * @param iteratee The function invoked per iteration.
-         * @param thisArg The this binding of iteratee.
-         * @return Returns object.
-         */
-        forIn<T>(
-            object: T,
-            iteratee?: ObjectIterator<T, any>
-        ): T;
-
-        /**
-         * @see _.forIn
-         */
-        forIn<T>(
-            object: T | null | undefined,
-            iteratee?: ObjectIterator<T, any>
-        ): T | null | undefined;
-    }
-
-    interface LoDashWrapper<TValue> {
-        /**
-         * @see _.forIn
-         */
-        forIn<T>(
-            this: LoDashWrapper<T | null | undefined>,
-            iteratee?: ObjectIterator<T, any>
-        ): this;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/object/forInRight.d.ts b/types/lodash/object/forInRight.d.ts
deleted file mode 100644
index 0364db0403..0000000000
--- a/types/lodash/object/forInRight.d.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * This method is like _.forIn except that it iterates over properties of object in the opposite order.
-         *
-         * @param object The object to iterate over.
-         * @param iteratee The function invoked per iteration.
-         * @param thisArg The this binding of iteratee.
-         * @return Returns object.
-         */
-        forInRight<T>(
-            object: T,
-            iteratee?: ObjectIterator<T, any>
-        ): T;
-
-        /**
-         * @see _.forInRight
-         */
-        forInRight<T>(
-            object: T | null | undefined,
-            iteratee?: ObjectIterator<T, any>
-        ): T | null | undefined;
-    }
-
-    interface LoDashWrapper<TValue> {
-        /**
-         * @see _.forInRight
-         */
-        forInRight<T>(
-            this: LoDashWrapper<T | null | undefined>,
-            iteratee?: ObjectIterator<T, any>
-        ): this;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/object/forOwn.d.ts b/types/lodash/object/forOwn.d.ts
deleted file mode 100644
index eeeb4adef6..0000000000
--- a/types/lodash/object/forOwn.d.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Iterates over own enumerable properties of an object invoking iteratee for each property. The iteratee is
-         * bound to thisArg and invoked with three arguments: (value, key, object). Iteratee functions may exit
-         * iteration early by explicitly returning false.
-         *
-         * @param object The object to iterate over.
-         * @param iteratee The function invoked per iteration.
-         * @param thisArg The this binding of iteratee.
-         * @return Returns object.
-         */
-        forOwn<T>(
-            object: T,
-            iteratee?: ObjectIterator<T, any>
-        ): T;
-
-        /**
-         * @see _.forOwn
-         */
-        forOwn<T>(
-            object: T | null | undefined,
-            iteratee?: ObjectIterator<T, any>
-        ): T | null | undefined;
-    }
-
-    interface LoDashWrapper<TValue> {
-        /**
-         * @see _.forOwn
-         */
-        forOwn<T>(
-            this: LoDashWrapper<T | null | undefined>,
-            iteratee?: ObjectIterator<T, any>
-        ): this;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/object/forOwnRight.d.ts b/types/lodash/object/forOwnRight.d.ts
deleted file mode 100644
index e760dfa78f..0000000000
--- a/types/lodash/object/forOwnRight.d.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * This method is like _.forOwn except that it iterates over properties of object in the opposite order.
-         *
-         * @param object The object to iterate over.
-         * @param iteratee The function invoked per iteration.
-         * @param thisArg The this binding of iteratee.
-         * @return Returns object.
-         */
-        forOwnRight<T>(
-            object: T,
-            iteratee?: ObjectIterator<T, any>
-        ): T;
-
-        /**
-         * @see _.forOwnRight
-         */
-        forOwnRight<T>(
-            object: T | null | undefined,
-            iteratee?: ObjectIterator<T, any>
-        ): T | null | undefined;
-    }
-
-    interface LoDashWrapper<TValue> {
-        /**
-         * @see _.forOwnRight
-         */
-        forOwnRight<T>(
-            this: LoDashWrapper<T | null | undefined>,
-            iteratee?: ObjectIterator<T, any>
-        ): this;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/object/functions.d.ts b/types/lodash/object/functions.d.ts
deleted file mode 100644
index bcc15d01e8..0000000000
--- a/types/lodash/object/functions.d.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Creates an array of function property names from own enumerable properties
-         * of `object`.
-         *
-         * @category Object
-         * @param object The object to inspect.
-         * @returns Returns the new array of property names.
-         * @example
-         *
-         * function Foo() {
-         *   this.a = _.constant('a');
-         *   this.b = _.constant('b');
-         * }
-         *
-         * Foo.prototype.c = _.constant('c');
-         *
-         * _.functions(new Foo);
-         * // => ['a', 'b']
-         */
-        functions(object: any): string[];
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.functions
-         */
-        functions(): LoDashImplicitWrapper<string[]>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.functions
-         */
-        functions(): LoDashExplicitWrapper<string[]>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/object/functionsIn.d.ts b/types/lodash/object/functionsIn.d.ts
deleted file mode 100644
index 84b8e88959..0000000000
--- a/types/lodash/object/functionsIn.d.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Creates an array of function property names from own and inherited
-         * enumerable properties of `object`.
-         *
-         * @category Object
-         * @param object The object to inspect.
-         * @returns Returns the new array of property names.
-         * @example
-         *
-         * function Foo() {
-         *   this.a = _.constant('a');
-         *   this.b = _.constant('b');
-         * }
-         *
-         * Foo.prototype.c = _.constant('c');
-         *
-         * _.functionsIn(new Foo);
-         * // => ['a', 'b', 'c']
-         */
-        functionsIn<T extends {}>(object: any): string[];
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.functionsIn
-         */
-        functionsIn(): LoDashImplicitWrapper<string[]>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.functionsIn
-         */
-        functionsIn(): LoDashExplicitWrapper<string[]>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/object/get.d.ts b/types/lodash/object/get.d.ts
deleted file mode 100644
index ff793192fb..0000000000
--- a/types/lodash/object/get.d.ts
+++ /dev/null
@@ -1,238 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-         * in its place.
-         *
-         * @param object The object to query.
-         * @param path The path of the property to get.
-         * @param defaultValue The value returned if the resolved value is undefined.
-         * @return Returns the resolved value.
-         */
-        get<TObject extends object, TKey extends keyof TObject>(
-            object: TObject,
-            path: TKey | [TKey]
-        ): TObject[TKey];
-
-        /**
-         * @see _.get
-         */
-        get<TObject extends object, TKey extends keyof TObject>(
-            object: TObject | null | undefined,
-            path: TKey | [TKey]
-        ): TObject[TKey] | undefined;
-
-        /**
-         * @see _.get
-         */
-        get<TObject extends object, TKey extends keyof TObject, TDefault>(
-            object: TObject | null | undefined,
-            path: TKey | [TKey],
-            defaultValue: TDefault
-        ): TObject[TKey] | TDefault;
-
-        /**
-         * @see _.get
-         */
-        get<T>(
-            object: NumericDictionary<T>,
-            path: number
-        ): T;
-
-        /**
-         * @see _.get
-         */
-        get<T>(
-            object: NumericDictionary<T> | null | undefined,
-            path: number
-        ): T | undefined;
-
-        /**
-         * @see _.get
-         */
-        get<T, TDefault>(
-            object: NumericDictionary<T> | null | undefined,
-            path: number,
-            defaultValue: TDefault
-        ): T | TDefault;
-
-        /**
-         * @see _.get
-         */
-        get<TDefault>(
-            object: null | undefined,
-            path: PropertyPath,
-            defaultValue: TDefault
-        ): TDefault;
-
-        /**
-         * @see _.get
-         */
-        get(
-            object: null | undefined,
-            path: PropertyPath
-        ): undefined;
-
-        /**
-         * @see _.get
-         */
-        get(
-            object: any,
-            path: PropertyPath,
-            defaultValue?: any
-        ): any;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.get
-         */
-        get<TKey extends keyof TValue>(
-            path: TKey | [TKey]
-        ): TValue[TKey];
-
-        /**
-         * @see _.get
-         */
-        get<TObject extends object, TKey extends keyof TObject>(
-            this: LoDashImplicitWrapper<TObject | null | undefined>,
-            path: TKey | [TKey],
-        ): TObject[TKey] | undefined;
-
-        /**
-         * @see _.get
-         */
-        get<TObject extends object, TKey extends keyof TObject, TDefault>(
-            this: LoDashImplicitWrapper<TObject | null | undefined>,
-            path: TKey | [TKey],
-            defaultValue: TDefault
-        ): TObject[TKey] | TDefault;
-
-        /**
-         * @see _.get
-         */
-        get<T>(
-            this: LoDashImplicitWrapper<NumericDictionary<T>>,
-            path: number
-        ): T;
-
-        /**
-         * @see _.get
-         */
-        get<T>(
-            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
-            path: number
-        ): T | undefined;
-
-        /**
-         * @see _.get
-         */
-        get<T, TDefault>(
-            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
-            path: number,
-            defaultValue: TDefault
-        ): T | TDefault;
-
-        /**
-         * @see _.get
-         */
-        get<TDefault>(
-            this: LoDashImplicitWrapper<null | undefined>,
-            path: PropertyPath,
-            defaultValue: TDefault
-        ): TDefault;
-
-        /**
-         * @see _.get
-         */
-        get(
-            this: LoDashImplicitWrapper<null | undefined>,
-            path: PropertyPath
-        ): undefined;
-
-        /**
-         * @see _.get
-         */
-        get<TResult>(
-            path: PropertyPath,
-            defaultValue?: any
-        ): any;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.get
-         */
-        get<TKey extends keyof TValue>(
-            path: TKey | [TKey]
-        ): LoDashExplicitWrapper<TValue[TKey]>;
-
-        /**
-         * @see _.get
-         */
-        get<TObject extends object, TKey extends keyof TObject>(
-            this: LoDashExplicitWrapper<TObject | null | undefined>,
-            path: TKey | [TKey],
-        ): LoDashExplicitWrapper<TObject[TKey] | undefined>;
-
-        /**
-         * @see _.get
-         */
-        get<TObject extends object, TKey extends keyof TObject, TDefault>(
-            this: LoDashExplicitWrapper<TObject | null | undefined>,
-            path: TKey | [TKey],
-            defaultValue: TDefault
-        ): LoDashExplicitWrapper<TObject[TKey] | TDefault>;
-
-        /**
-         * @see _.get
-         */
-        get<T>(
-            this: LoDashExplicitWrapper<NumericDictionary<T>>,
-            path: number
-        ): LoDashExplicitWrapper<T>;
-
-        /**
-         * @see _.get
-         */
-        get<T>(
-            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
-            path: number
-        ): LoDashExplicitWrapper<T | undefined>;
-
-        /**
-         * @see _.get
-         */
-        get<T, TDefault>(
-            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
-            path: number,
-            defaultValue: TDefault
-        ): LoDashExplicitWrapper<T | undefined>;
-
-        /**
-         * @see _.get
-         */
-        get<TDefault>(
-            this: LoDashExplicitWrapper<null | undefined>,
-            path: PropertyPath,
-            defaultValue: TDefault
-        ): LoDashExplicitWrapper<TDefault>;
-
-        /**
-         * @see _.get
-         */
-        get(
-            this: LoDashExplicitWrapper<null | undefined>,
-            path: PropertyPath
-        ): LoDashExplicitWrapper<undefined>;
-
-        /**
-         * @see _.get
-         */
-        get(
-            path: PropertyPath,
-            defaultValue?: any
-        ): LoDashExplicitWrapper<any>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/object/has.d.ts b/types/lodash/object/has.d.ts
deleted file mode 100644
index 53026153d1..0000000000
--- a/types/lodash/object/has.d.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Checks if `path` is a direct property of `object`.
-         *
-         * @category Object
-         * @param object The object to query.
-         * @param path The path to check.
-         * @returns Returns `true` if `path` exists, else `false`.
-         * @example
-         *
-         * var object = { 'a': { 'b': { 'c': 3 } } };
-         * var other = _.create({ 'a': _.create({ 'b': _.create({ 'c': 3 }) }) });
-         *
-         * _.has(object, 'a');
-         * // => true
-         *
-         * _.has(object, 'a.b.c');
-         * // => true
-         *
-         * _.has(object, ['a', 'b', 'c']);
-         * // => true
-         *
-         * _.has(other, 'a');
-         * // => false
-         */
-        has<T>(
-            object: T,
-            path: PropertyPath
-        ): boolean;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.has
-         */
-        has(path: PropertyPath): boolean;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.has
-         */
-        has(path: PropertyPath): LoDashExplicitWrapper<boolean>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/object/hasIn.d.ts b/types/lodash/object/hasIn.d.ts
deleted file mode 100644
index 5da20394b2..0000000000
--- a/types/lodash/object/hasIn.d.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Checks if `path` is a direct or inherited property of `object`.
-         *
-         * @category Object
-         * @param object The object to query.
-         * @param path The path to check.
-         * @returns Returns `true` if `path` exists, else `false`.
-         * @example
-         *
-         * var object = _.create({ 'a': _.create({ 'b': _.create({ 'c': 3 }) }) });
-         *
-         * _.hasIn(object, 'a');
-         * // => true
-         *
-         * _.hasIn(object, 'a.b.c');
-         * // => true
-         *
-         * _.hasIn(object, ['a', 'b', 'c']);
-         * // => true
-         *
-         * _.hasIn(object, 'b');
-         * // => false
-         */
-        hasIn<T>(
-            object: T,
-            path: PropertyPath
-        ): boolean;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.hasIn
-         */
-        hasIn(path: PropertyPath): boolean;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.hasIn
-         */
-        hasIn(path: PropertyPath): LoDashExplicitWrapper<boolean>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/object/invert.d.ts b/types/lodash/object/invert.d.ts
deleted file mode 100644
index d5c62aa9af..0000000000
--- a/types/lodash/object/invert.d.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Creates an object composed of the inverted keys and values of object. If object contains duplicate values,
-         * subsequent values overwrite property assignments of previous values unless multiValue is true.
-         *
-         * @param object The object to invert.
-         * @param multiValue Allow multiple values per key.
-         * @return Returns the new inverted object.
-         */
-        invert(
-            object: object
-        ): Dictionary<string>;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.invert
-         */
-        invert(): LoDashImplicitWrapper<Dictionary<string>>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.invert
-         */
-        invert(): LoDashExplicitWrapper<Dictionary<string>>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/object/invertBy.d.ts b/types/lodash/object/invertBy.d.ts
deleted file mode 100644
index 12b90969e1..0000000000
--- a/types/lodash/object/invertBy.d.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * This method is like _.invert except that the inverted object is generated from the results of running each
-         * element of object through iteratee. The corresponding inverted value of each inverted key is an array of
-         * keys responsible for generating the inverted value. The iteratee is invoked with one argument: (value).
-         *
-         * @param object The object to invert.
-         * @param interatee The iteratee invoked per element.
-         * @return Returns the new inverted object.
-         */
-        invertBy<T>(
-            object: List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined,
-            interatee?: ValueIteratee<T>
-        ): Dictionary<string[]>;
-
-        /**
-         * @see _.invertBy
-         */
-        invertBy<T extends object>(
-            object: T | null | undefined,
-            interatee?: ValueIteratee<T[keyof T]>
-        ): Dictionary<string[]>;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.invertBy
-         */
-        invertBy<T>(
-            this: LoDashImplicitWrapper<List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined>,
-            interatee?: ValueIteratee<T>
-        ): LoDashImplicitWrapper<Dictionary<string[]>>;
-
-        /**
-         * @see _.invertBy
-         */
-        invertBy<T extends object>(
-            this: LoDashImplicitWrapper<T | null | undefined>,
-            interatee?: ValueIteratee<T[keyof T]>
-        ): LoDashImplicitWrapper<Dictionary<string[]>>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.invertBy
-         */
-        invertBy<T>(
-            this: LoDashExplicitWrapper<List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined>,
-            interatee?: ValueIteratee<T>
-        ): LoDashExplicitWrapper<Dictionary<string[]>>;
-
-        /**
-         * @see _.invertBy
-         */
-        invertBy<T extends object>(
-            this: LoDashExplicitWrapper<T | null | undefined>,
-            interatee?: ValueIteratee<T[keyof T]>
-        ): LoDashExplicitWrapper<Dictionary<string[]>>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/object/invoke.d.ts b/types/lodash/object/invoke.d.ts
deleted file mode 100644
index 9405c4fa6c..0000000000
--- a/types/lodash/object/invoke.d.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-        * Invokes the method at path of object.
-        * @param object The object to query.
-        * @param path The path of the method to invoke.
-        * @param args The arguments to invoke the method with.
-        **/
-        invoke(
-            object: any,
-            path: PropertyPath,
-            ...args: any[]): any;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-        * @see _.invoke
-        **/
-        invoke(
-            path: PropertyPath,
-            ...args: any[]): any;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-        * @see _.invoke
-        **/
-        invoke(
-            path: PropertyPath,
-            ...args: any[]): LoDashExplicitWrapper<any>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/object/keys.d.ts b/types/lodash/object/keys.d.ts
deleted file mode 100644
index 374e64ad2c..0000000000
--- a/types/lodash/object/keys.d.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Creates an array of the own enumerable property names of object.
-         *
-         * Note: Non-object values are coerced to objects. See the ES spec for more details.
-         *
-         * @param object The object to query.
-         * @return Returns the array of property names.
-         */
-        keys(object?: any): string[];
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.keys
-         */
-        keys(): LoDashImplicitWrapper<string[]>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.keys
-         */
-        keys(): LoDashExplicitWrapper<string[]>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/object/keysIn.d.ts b/types/lodash/object/keysIn.d.ts
deleted file mode 100644
index fe05763414..0000000000
--- a/types/lodash/object/keysIn.d.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Creates an array of the own and inherited enumerable property names of object.
-         *
-         * Note: Non-object values are coerced to objects.
-         *
-         * @param object The object to query.
-         * @return An array of property names.
-         */
-        keysIn(object?: any): string[];
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.keysIn
-         */
-        keysIn(): LoDashImplicitWrapper<string[]>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.keysIn
-         */
-        keysIn(): LoDashExplicitWrapper<string[]>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/object/mapKeys.d.ts b/types/lodash/object/mapKeys.d.ts
deleted file mode 100644
index 620977cdb1..0000000000
--- a/types/lodash/object/mapKeys.d.ts
+++ /dev/null
@@ -1,86 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * The opposite of _.mapValues; this method creates an object with the same values as object and keys generated
-         * by running each own enumerable property of object through iteratee.
-         *
-         * @param object The object to iterate over.
-         * @param iteratee The function invoked per iteration.
-         * @param thisArg The this binding of iteratee.
-         * @return Returns the new mapped object.
-         */
-        mapKeys<T>(
-            object: List<T> | null | undefined,
-            iteratee?: ListIteratee<T>
-        ): Dictionary<T>;
-
-        /**
-         * @see _.mapKeys
-         */
-        mapKeys<T>(
-            object: Dictionary<T> | null | undefined,
-            iteratee?: DictionaryIteratee<T>
-        ): Dictionary<T>;
-
-        /**
-         * @see _.mapKeys
-         */
-        mapKeys(
-            object: object | null | undefined,
-            iteratee?: ObjectIteratee<any>
-        ): Dictionary<any>;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.mapKeys
-         */
-        mapKeys<T>(
-            this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            iteratee?: ListIteratee<T>
-        ): LoDashImplicitWrapper<Dictionary<T>>;
-
-        /**
-         * @see _.mapKeys
-         */
-        mapKeys<T>(
-            this: LoDashImplicitWrapper<Dictionary<T> | null | undefined>,
-            iteratee?: DictionaryIteratee<T>
-        ): LoDashImplicitWrapper<Dictionary<T>>;
-
-        /**
-         * @see _.mapKeys
-         */
-        mapKeys(
-            this: LoDashImplicitWrapper<object | null | undefined>,
-            iteratee?: ObjectIteratee<any>
-        ): LoDashImplicitWrapper<Dictionary<any>>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.mapKeys
-         */
-        mapKeys<T>(
-            this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            iteratee?: ListIteratee<T>
-        ): LoDashExplicitWrapper<Dictionary<T>>;
-
-        /**
-         * @see _.mapKeys
-         */
-        mapKeys<T>(
-            this: LoDashExplicitWrapper<Dictionary<T> | null | undefined>,
-            iteratee?: DictionaryIteratee<T>
-        ): LoDashExplicitWrapper<Dictionary<T>>;
-
-        /**
-         * @see _.mapKeys
-         */
-        mapKeys(
-            this: LoDashExplicitWrapper<object | null | undefined>,
-            iteratee?: ObjectIteratee<any>
-        ): LoDashExplicitWrapper<Dictionary<any>>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/object/mapValues.d.ts b/types/lodash/object/mapValues.d.ts
deleted file mode 100644
index e71e1c7f3e..0000000000
--- a/types/lodash/object/mapValues.d.ts
+++ /dev/null
@@ -1,189 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-        * Creates an object with the same keys as object and values generated by running each own
-        * enumerable property of object through iteratee. The iteratee function is bound to thisArg
-        * and invoked with three arguments: (value, key, object).
-        *
-        * If a property name is provided iteratee the created "_.property" style callback returns
-        * the property value of the given element.
-        *
-        * If a value is also provided for thisArg the creted "_.matchesProperty" style callback returns
-        * true for elements that have a matching property value, else false;.
-        *
-        * If an object is provided for iteratee the created "_.matches" style callback returns true
-        * for elements that have the properties of the given object, else false.
-        *
-        * @param object The object to iterate over.
-        * @param [iteratee=_.identity]  The function invoked per iteration.
-        * @param [thisArg] The `this` binding of `iteratee`.
-        * @return Returns the new mapped object.
-        */
-        mapValues<T extends object, TResult>(obj: T | null | undefined, callback: ObjectIterator<T, TResult>): { [P in keyof T]: TResult };
-
-        /**
-         * @see _.mapValues
-         */
-        mapValues<T extends object>(obj: T | null | undefined, iteratee: object): { [P in keyof T]: boolean };
-
-        /**
-         * @see _.mapValues
-         */
-        mapValues<T, TKey extends keyof T>(obj: Dictionary<T> | null | undefined, iteratee: TKey): Dictionary<T[TKey]>;
-
-        /**
-         * @see _.mapValues
-         */
-        mapValues<T extends object, TKey extends keyof T>(obj: T | null | undefined, iteratee: string): { [P in keyof T]: any };
-
-        /**
-         * @see _.mapValues
-         */
-        mapValues<TResult>(obj: string | null | undefined, callback: StringIterator<TResult>): NumericDictionary<TResult>;
-
-        /**
-         * @see _.mapValues
-         */
-        mapValues<T>(obj: Dictionary<T> | null | undefined): Dictionary<T>;
-
-        /**
-         * @see _.mapValues
-         */
-        mapValues<T extends object>(obj: T): T;
-
-        /**
-         * @see _.mapValues
-         */
-        mapValues<T extends object>(obj: T | null | undefined): T | {};
-
-        /**
-         * @see _.mapValues
-         */
-        mapValues(obj: string | null | undefined): NumericDictionary<string>;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.mapValues
-         */
-        mapValues<T extends object, TResult>(
-            this: LoDashImplicitWrapper<T | null | undefined>,
-            callback: ObjectIterator<T, TResult>
-        ): LoDashImplicitWrapper<{ [P in keyof T]: TResult }>;
-
-        /**
-         * @see _.mapValues
-         */
-        mapValues<T extends object>(
-            this: LoDashImplicitWrapper<T | null | undefined>,
-            iteratee: object
-        ): LoDashImplicitWrapper<{ [P in keyof T]: boolean }>;
-
-        /**
-         * @see _.mapValues
-         */
-        mapValues<T, TKey extends keyof T>(
-            this: LoDashImplicitWrapper<Dictionary<T> | null | undefined>,
-            iteratee: TKey
-        ): LoDashImplicitWrapper<Dictionary<T[TKey]>>;
-
-        /**
-         * @see _.mapValues
-         */
-        mapValues<T extends object, TKey extends keyof T>(
-            this: LoDashImplicitWrapper<T | null | undefined>,
-            iteratee: string
-        ): LoDashImplicitWrapper<{ [P in keyof T]: any }>;
-
-        /**
-         * @see _.mapValues
-         */
-        mapValues<TResult>(
-            this: LoDashImplicitWrapper<string | null | undefined>,
-            callback: StringIterator<TResult>
-        ): LoDashImplicitWrapper<NumericDictionary<TResult>>;
-
-        /**
-         * @see _.mapValues
-         */
-        mapValues<T>(this: LoDashImplicitWrapper<Dictionary<T> | null | undefined>): LoDashImplicitWrapper<Dictionary<T>>;
-
-        /**
-         * @see _.mapValues
-         */
-        mapValues<T extends object>(this: LoDashImplicitWrapper<T>): LoDashImplicitWrapper<T>;
-
-        /**
-         * @see _.mapValues
-         */
-        mapValues<T extends object>(this: LoDashImplicitWrapper<T | null | undefined>): LoDashImplicitWrapper<T | {}>;
-
-        /**
-         * @see _.mapValues
-         */
-        mapValues(this: LoDashImplicitWrapper<string | null | undefined>): LoDashImplicitWrapper<NumericDictionary<string>>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.mapValues
-         */
-        mapValues<T extends object, TResult>(
-            this: LoDashExplicitWrapper<T | null | undefined>,
-            callback: ObjectIterator<T, TResult>
-        ): LoDashExplicitWrapper<{ [P in keyof T]: TResult }>;
-
-        /**
-         * @see _.mapValues
-         */
-        mapValues<T extends object>(
-            this: LoDashExplicitWrapper<T | null | undefined>,
-            iteratee: object
-        ): LoDashExplicitWrapper<{ [P in keyof T]: boolean }>;
-
-        /**
-         * @see _.mapValues
-         */
-        mapValues<T, TKey extends keyof T>(
-            this: LoDashExplicitWrapper<Dictionary<T> | null | undefined>,
-            iteratee: TKey
-        ): LoDashExplicitWrapper<Dictionary<T[TKey]>>;
-
-        /**
-         * @see _.mapValues
-         */
-        mapValues<T extends object, TKey extends keyof T>(
-            this: LoDashExplicitWrapper<T | null | undefined>,
-            iteratee: string
-        ): LoDashExplicitWrapper<{ [P in keyof T]: any }>;
-
-        /**
-         * @see _.mapValues
-         */
-        mapValues<TResult>(
-            this: LoDashExplicitWrapper<string | null | undefined>,
-            callback: StringIterator<TResult>
-        ): LoDashExplicitWrapper<NumericDictionary<TResult>>;
-
-        /**
-         * @see _.mapValues
-         */
-        mapValues<T>(this: LoDashExplicitWrapper<Dictionary<T> | null | undefined>): LoDashExplicitWrapper<Dictionary<T>>;
-
-        /**
-         * @see _.mapValues
-         */
-        mapValues<T extends object>(this: LoDashExplicitWrapper<T>): LoDashExplicitWrapper<T>;
-
-        /**
-         * @see _.mapValues
-         */
-        mapValues<T extends object>(this: LoDashExplicitWrapper<T | null | undefined>): LoDashExplicitWrapper<T | {}>;
-
-        /**
-         * @see _.mapValues
-         */
-        mapValues(this: LoDashExplicitWrapper<string | null | undefined>): LoDashExplicitWrapper<NumericDictionary<string>>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/object/merge.d.ts b/types/lodash/object/merge.d.ts
deleted file mode 100644
index 0c18e6cfe5..0000000000
--- a/types/lodash/object/merge.d.ts
+++ /dev/null
@@ -1,156 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Recursively merges own and inherited enumerable properties of source
-         * objects into the destination object, skipping source properties that resolve
-         * to `undefined`. Array and plain object properties are merged recursively.
-         * Other objects and value types are overridden by assignment. Source objects
-         * are applied from left to right. Subsequent sources overwrite property
-         * assignments of previous sources.
-         *
-         * **Note:** This method mutates `object`.
-         *
-         * @category Object
-         * @param object The destination object.
-         * @param [sources] The source objects.
-         * @returns Returns `object`.
-         * @example
-         *
-         * var users = {
-         *   'data': [{ 'user': 'barney' }, { 'user': 'fred' }]
-         * };
-         *
-         * var ages = {
-         *   'data': [{ 'age': 36 }, { 'age': 40 }]
-         * };
-         *
-         * _.merge(users, ages);
-         * // => { 'data': [{ 'user': 'barney', 'age': 36 }, { 'user': 'fred', 'age': 40 }] }
-         */
-        merge<TObject, TSource>(
-            object: TObject,
-            source: TSource
-        ): TObject & TSource;
-
-        /**
-         * @see _.merge
-         */
-        merge<TObject, TSource1, TSource2>(
-            object: TObject,
-            source1: TSource1,
-            source2: TSource2
-        ): TObject & TSource1 & TSource2;
-
-        /**
-         * @see _.merge
-         */
-        merge<TObject, TSource1, TSource2, TSource3>(
-            object: TObject,
-            source1: TSource1,
-            source2: TSource2,
-            source3: TSource3
-        ): TObject & TSource1 & TSource2 & TSource3;
-
-        /**
-         * @see _.merge
-         */
-        merge<TObject, TSource1, TSource2, TSource3, TSource4>(
-            object: TObject,
-            source1: TSource1,
-            source2: TSource2,
-            source3: TSource3,
-            source4: TSource4
-        ): TObject & TSource1 & TSource2 & TSource3 & TSource4;
-
-        /**
-         * @see _.merge
-         */
-        merge(
-            object: any,
-            ...otherArgs: any[]
-        ): any;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.merge
-         */
-        merge<TSource>(
-            source: TSource
-        ): LoDashImplicitWrapper<TValue & TSource>;
-
-        /**
-         * @see _.merge
-         */
-        merge<TSource1, TSource2>(
-            source1: TSource1,
-            source2: TSource2
-        ): LoDashImplicitWrapper<TValue & TSource1 & TSource2>;
-
-        /**
-         * @see _.merge
-         */
-        merge<TSource1, TSource2, TSource3>(
-            source1: TSource1,
-            source2: TSource2,
-            source3: TSource3
-        ): LoDashImplicitWrapper<TValue & TSource1 & TSource2 & TSource3>;
-
-        /**
-         * @see _.merge
-         */
-        merge<TSource1, TSource2, TSource3, TSource4>(
-            source1: TSource1,
-            source2: TSource2,
-            source3: TSource3,
-            source4: TSource4
-        ): LoDashImplicitWrapper<TValue & TSource1 & TSource2 & TSource3 & TSource4>;
-
-        /**
-         * @see _.merge
-         */
-        merge(
-            ...otherArgs: any[]
-        ): LoDashImplicitWrapper<any>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.merge
-         */
-        merge<TSource>(
-            source: TSource
-        ): LoDashExplicitWrapper<TValue & TSource>;
-
-        /**
-         * @see _.merge
-         */
-        merge<TSource1, TSource2>(
-            source1: TSource1,
-            source2: TSource2
-        ): LoDashExplicitWrapper<TValue & TSource1 & TSource2>;
-
-        /**
-         * @see _.merge
-         */
-        merge<TSource1, TSource2, TSource3>(
-            source1: TSource1,
-            source2: TSource2,
-            source3: TSource3
-        ): LoDashExplicitWrapper<TValue & TSource1 & TSource2 & TSource3>;
-
-        /**
-         * @see _.merge
-         */
-        merge<TSource1, TSource2, TSource3, TSource4>(
-        ): LoDashExplicitWrapper<TValue & TSource1 & TSource2 & TSource3 & TSource4>;
-
-        /**
-         * @see _.merge
-         */
-        merge(
-            ...otherArgs: any[]
-        ): LoDashExplicitWrapper<any>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/object/mergeWith.d.ts b/types/lodash/object/mergeWith.d.ts
deleted file mode 100644
index 01fb9264e6..0000000000
--- a/types/lodash/object/mergeWith.d.ts
+++ /dev/null
@@ -1,133 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    type MergeWithCustomizer = { bivariantHack(value: any, srcValue: any, key: string, object: any, source: any): any; }["bivariantHack"]
-
-    interface LoDashStatic {
-        /**
-         * This method is like `_.merge` except that it accepts `customizer` which
-         * is invoked to produce the merged values of the destination and source
-         * properties. If `customizer` returns `undefined` merging is handled by the
-         * method instead. The `customizer` is invoked with seven arguments:
-         * (objValue, srcValue, key, object, source, stack).
-         *
-         * @category Object
-         * @param object The destination object.
-         * @param sources The source objects.
-         * @param customizer The function to customize assigned values.
-         * @returns Returns `object`.
-         * @example
-         *
-         * function customizer(objValue, srcValue) {
-         *   if (_.isArray(objValue)) {
-         *     return objValue.concat(srcValue);
-         *   }
-         * }
-         *
-         * var object = {
-         *   'fruits': ['apple'],
-         *   'vegetables': ['beet']
-         * };
-         *
-         * var other = {
-         *   'fruits': ['banana'],
-         *   'vegetables': ['carrot']
-         * };
-         *
-         * _.merge(object, other, customizer);
-         * // => { 'fruits': ['apple', 'banana'], 'vegetables': ['beet', 'carrot'] }
-         */
-        mergeWith<TObject, TSource>(
-            object: TObject,
-            source: TSource,
-            customizer: MergeWithCustomizer
-        ): TObject & TSource;
-
-        /**
-         * @see _.mergeWith
-         */
-        mergeWith<TObject, TSource1, TSource2>(
-            object: TObject,
-            source1: TSource1,
-            source2: TSource2,
-            customizer: MergeWithCustomizer
-        ): TObject & TSource1 & TSource2;
-
-        /**
-         * @see _.mergeWith
-         */
-        mergeWith<TObject, TSource1, TSource2, TSource3>(
-            object: TObject,
-            source1: TSource1,
-            source2: TSource2,
-            source3: TSource3,
-            customizer: MergeWithCustomizer
-        ): TObject & TSource1 & TSource2 & TSource3;
-
-        /**
-         * @see _.mergeWith
-         */
-        mergeWith<TObject, TSource1, TSource2, TSource3, TSource4>(
-            object: TObject,
-            source1: TSource1,
-            source2: TSource2,
-            source3: TSource3,
-            source4: TSource4,
-            customizer: MergeWithCustomizer
-        ): TObject & TSource1 & TSource2 & TSource3 & TSource4;
-
-        /**
-         * @see _.mergeWith
-         */
-        mergeWith(
-            object: any,
-            ...otherArgs: any[]
-        ): any;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.mergeWith
-         */
-        mergeWith<TSource>(
-            source: TSource,
-            customizer: MergeWithCustomizer
-        ): LoDashImplicitWrapper<TValue & TSource>;
-
-        /**
-         * @see _.mergeWith
-         */
-        mergeWith<TSource1, TSource2>(
-            source1: TSource1,
-            source2: TSource2,
-            customizer: MergeWithCustomizer
-        ): LoDashImplicitWrapper<TValue & TSource1 & TSource2>;
-
-        /**
-         * @see _.mergeWith
-         */
-        mergeWith<TSource1, TSource2, TSource3>(
-            source1: TSource1,
-            source2: TSource2,
-            source3: TSource3,
-            customizer: MergeWithCustomizer
-        ): LoDashImplicitWrapper<TValue & TSource1 & TSource2 & TSource3>;
-
-        /**
-         * @see _.mergeWith
-         */
-        mergeWith<TSource1, TSource2, TSource3, TSource4>(
-            source1: TSource1,
-            source2: TSource2,
-            source3: TSource3,
-            source4: TSource4,
-            customizer: MergeWithCustomizer
-        ): LoDashImplicitWrapper<TValue & TSource1 & TSource2 & TSource3 & TSource4>;
-
-        /**
-         * @see _.mergeWith
-         */
-        mergeWith(
-            ...otherArgs: any[]
-        ): LoDashImplicitWrapper<any>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/object/omit.d.ts b/types/lodash/object/omit.d.ts
deleted file mode 100644
index 8684b37b61..0000000000
--- a/types/lodash/object/omit.d.ts
+++ /dev/null
@@ -1,69 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * The opposite of `_.pick`; this method creates an object composed of the
-         * own and inherited enumerable properties of `object` that are not omitted.
-         *
-         * @category Object
-         * @param object The source object.
-         * @param [paths] The property names to omit, specified
-         *  individually or in arrays..
-         * @returns Returns the new object.
-         * @example
-         *
-         * var object = { 'a': 1, 'b': '2', 'c': 3 };
-         *
-         * _.omit(object, ['a', 'c']);
-         * // => { 'b': '2' }
-         */
-        omit<T>(
-            object: Dictionary<T>,
-            ...paths: PropertyPath[]
-        ): Dictionary<T>;
-
-        /**
-         * @see _.omit
-         */
-        omit<T extends object>(
-            object: T | null | undefined,
-            ...paths: PropertyPath[]
-        ): PartialObject<T>;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.omit
-         */
-        omit<T>(
-            this: LoDashImplicitWrapper<Dictionary<T>>,
-            ...paths: PropertyPath[]
-        ): LoDashImplicitWrapper<Dictionary<T>>;
-
-        /**
-         * @see _.omit
-         */
-        omit<T extends object>(
-            this: LoDashImplicitWrapper<T | null | undefined>,
-            ...paths: PropertyPath[]
-        ): LoDashImplicitWrapper<PartialObject<T>>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.omit
-         */
-        omit<T>(
-            this: LoDashExplicitWrapper<Dictionary<T>>,
-            ...paths: PropertyPath[]
-        ): LoDashExplicitWrapper<Dictionary<T>>;
-
-        /**
-         * @see _.omit
-         */
-        omit<T extends object>(
-            this: LoDashExplicitWrapper<T | null | undefined>,
-            ...paths: PropertyPath[]
-        ): LoDashExplicitWrapper<PartialObject<T>>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/object/omitBy.d.ts b/types/lodash/object/omitBy.d.ts
deleted file mode 100644
index d6c762e496..0000000000
--- a/types/lodash/object/omitBy.d.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * The opposite of `_.pickBy`; this method creates an object composed of the
-         * own and inherited enumerable properties of `object` that `predicate`
-         * doesn't return truthy for.
-         *
-         * @category Object
-         * @param object The source object.
-         * @param [predicate=_.identity] The function invoked per property.
-         * @returns Returns the new object.
-         * @example
-         *
-         * var object = { 'a': 1, 'b': '2', 'c': 3 };
-         *
-         * _.omitBy(object, _.isNumber);
-         * // => { 'b': '2' }
-         */
-        omitBy<T extends object>(
-            object: T | null | undefined,
-            predicate: ValueKeyIteratee<T[keyof T]>
-        ): PartialObject<T>;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.omitBy
-         */
-        omitBy<T extends object>(
-            this: LoDashImplicitWrapper<T | null | undefined>,
-            predicate: ValueKeyIteratee<T[keyof T]>
-        ): LoDashImplicitWrapper<PartialObject<T>>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.omitBy
-         */
-        omitBy<T extends object>(
-            this: LoDashExplicitWrapper<T | null | undefined>,
-            predicate: ValueKeyIteratee<T[keyof T]>
-        ): LoDashExplicitWrapper<PartialObject<T>>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/object/pick.d.ts b/types/lodash/object/pick.d.ts
deleted file mode 100644
index 0561c58630..0000000000
--- a/types/lodash/object/pick.d.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Creates an object composed of the picked `object` properties.
-         *
-         * @category Object
-         * @param object The source object.
-         * @param [props] The property names to pick, specified
-         *  individually or in arrays.
-         * @returns Returns the new object.
-         * @example
-         *
-         * var object = { 'a': 1, 'b': '2', 'c': 3 };
-         *
-         * _.pick(object, ['a', 'c']);
-         * // => { 'a': 1, 'c': 3 }
-         */
-        pick<T extends object, U extends keyof T>(
-            object: T,
-             ...props: Array<Many<U>>
-        ): Pick<T, U>;
-
-        /**
-         * @see _.pick
-         */
-        pick<T>(
-            object: T | null | undefined,
-            ...props: PropertyPath[]
-        ): PartialDeep<T>;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.pick
-         */
-        pick<T extends object, U extends keyof T>(
-            this: LoDashImplicitWrapper<T>,
-            ...props: Array<Many<U>>
-        ): LoDashImplicitWrapper<Pick<T, U>>;
-
-        /**
-         * @see _.pick
-         */
-        pick<T extends object>(
-            this: LoDashImplicitWrapper<T | null | undefined>,
-            ...props: PropertyPath[]
-        ): LoDashImplicitWrapper<PartialObject<T>>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.pick
-         */
-        pick<T extends object, U extends keyof T>(
-            this: LoDashExplicitWrapper<T>,
-            ...props: Array<Many<U>>
-        ): LoDashExplicitWrapper<Pick<T, U>>;
-
-        /**
-         * @see _.pick
-         */
-        pick<T extends object>(
-            this: LoDashExplicitWrapper<T | null | undefined>,
-            ...props: PropertyPath[]
-        ): LoDashExplicitWrapper<PartialObject<T>>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/object/pickBy.d.ts b/types/lodash/object/pickBy.d.ts
deleted file mode 100644
index 98b3c717dc..0000000000
--- a/types/lodash/object/pickBy.d.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Creates an object composed of the `object` properties `predicate` returns
-         * truthy for. The predicate is invoked with two arguments: (value, key).
-         *
-         * @category Object
-         * @param object The source object.
-         * @param [predicate=_.identity] The function invoked per property.
-         * @returns Returns the new object.
-         * @example
-         *
-         * var object = { 'a': 1, 'b': '2', 'c': 3 };
-         *
-         * _.pickBy(object, _.isNumber);
-         * // => { 'a': 1, 'c': 3 }
-         */
-        pickBy<T extends object>(
-            object: T | null | undefined,
-            predicate?: ValueKeyIteratee<T[keyof T]>
-        ): PartialObject<T>;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.pickBy
-         */
-        pickBy<T extends object>(
-            this: LoDashImplicitWrapper<T | null | undefined>,
-            predicate?: ValueKeyIteratee<T[keyof T]>
-        ): LoDashImplicitWrapper<PartialObject<T>>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.pickBy
-         */
-        pickBy<T extends object>(
-            this: LoDashExplicitWrapper<T | null | undefined>,
-            predicate?: ValueKeyIteratee<T[keyof T]>
-        ): LoDashExplicitWrapper<PartialObject<T>>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/object/result.d.ts b/types/lodash/object/result.d.ts
deleted file mode 100644
index ea06014ae5..0000000000
--- a/types/lodash/object/result.d.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * This method is like _.get except that if the resolved value is a function it’s invoked with the this binding
-         * of its parent object and its result is returned.
-         *
-         * @param object The object to query.
-         * @param path The path of the property to resolve.
-         * @param defaultValue The value returned if the resolved value is undefined.
-         * @return Returns the resolved value.
-         */
-        result<TResult>(
-            object: any,
-            path: PropertyPath,
-            defaultValue?: TResult|((...args: any[]) => TResult)
-        ): TResult;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.result
-         */
-        result<TResult>(
-            path: PropertyPath,
-            defaultValue?: TResult|((...args: any[]) => TResult)
-        ): TResult;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.result
-         */
-        result<TResult>(
-            path: PropertyPath,
-            defaultValue?: TResult|((...args: any[]) => TResult)
-        ): LoDashExplicitWrapper<TResult>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/object/set.d.ts b/types/lodash/object/set.d.ts
deleted file mode 100644
index fe406347e7..0000000000
--- a/types/lodash/object/set.d.ts
+++ /dev/null
@@ -1,65 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Sets the value at path of object. If a portion of path doesn’t exist it’s created. Arrays are created for
-         * missing index properties while objects are created for all other missing properties. Use _.setWith to
-         * customize path creation.
-         *
-         * @param object The object to modify.
-         * @param path The path of the property to set.
-         * @param value The value to set.
-         * @return Returns object.
-         */
-        set<T extends object>(
-            object: T,
-            path: PropertyPath,
-            value: any
-        ): T;
-
-        /**
-         * @see _.set
-         */
-        set<TResult>(
-            object: object,
-            path: PropertyPath,
-            value: any
-        ): TResult;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.set
-         */
-        set(
-            path: PropertyPath,
-            value: any
-        ): this;
-
-        /**
-         * @see _.set
-         */
-        set<TResult>(
-            path: PropertyPath,
-            value: any
-        ): LoDashImplicitWrapper<TResult>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.set
-         */
-        set(
-            path: PropertyPath,
-            value: any
-        ): this;
-
-        /**
-         * @see _.set
-         */
-        set<TResult>(
-            path: PropertyPath,
-            value: any
-        ): LoDashExplicitWrapper<TResult>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/object/setWith.d.ts b/types/lodash/object/setWith.d.ts
deleted file mode 100644
index 63f470180b..0000000000
--- a/types/lodash/object/setWith.d.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    type SetWithCustomizer<T> = (nsValue: any, key: string, nsObject: T) => any;
-
-    interface LoDashStatic {
-        /**
-         * This method is like _.set except that it accepts customizer which is invoked to produce the objects of
-         * path. If customizer returns undefined path creation is handled by the method instead. The customizer is
-         * invoked with three arguments: (nsValue, key, nsObject).
-         *
-         * @param object The object to modify.
-         * @param path The path of the property to set.
-         * @param value The value to set.
-         * @parem customizer The function to customize assigned values.
-         * @return Returns object.
-         */
-        setWith<T extends object>(
-            object: T,
-            path: PropertyPath,
-            value: any,
-            customizer?: SetWithCustomizer<T>
-        ): T;
-
-        setWith<T extends object, TResult>(
-            object: T,
-            path: PropertyPath,
-            value: any,
-            customizer?: SetWithCustomizer<T>
-        ): TResult;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.setWith
-         */
-        setWith(
-            path: PropertyPath,
-            value: any,
-            customizer?: SetWithCustomizer<TValue>
-        ): this;
-
-        /**
-         * @see _.setWith
-         */
-        setWith<TResult>(
-            path: PropertyPath,
-            value: any,
-            customizer?: SetWithCustomizer<TValue>
-        ): LoDashImplicitWrapper<TResult>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.setWith
-         */
-        setWith(
-            path: PropertyPath,
-            value: any,
-            customizer?: SetWithCustomizer<TValue>
-        ): this;
-
-        /**
-         * @see _.setWith
-         */
-        setWith<TResult>(
-            path: PropertyPath,
-            value: any,
-            customizer?: SetWithCustomizer<TValue>
-        ): LoDashExplicitWrapper<TResult>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/object/toPairs.d.ts b/types/lodash/object/toPairs.d.ts
deleted file mode 100644
index 42c4edab2f..0000000000
--- a/types/lodash/object/toPairs.d.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Creates an array of own enumerable key-value pairs for object.
-         *
-         * @param object The object to query.
-         * @return Returns the new array of key-value pairs.
-         */
-        toPairs<T>(object?: Dictionary<T>): Array<[string, T]>;
-
-        /**
-         * @see _.toPairs
-         */
-        toPairs(object?: object): Array<[string, any]>;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.toPairs
-         */
-        toPairs<T>(this: LoDashImplicitWrapper<Dictionary<T>>): LoDashImplicitWrapper<Array<[string, T]>>;
-
-        /**
-         * @see _.toPairs
-         */
-        toPairs(): LoDashImplicitWrapper<Array<[string, any]>>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.toPairs
-         */
-        toPairs<T>(this: LoDashExplicitWrapper<Dictionary<T>>): LoDashExplicitWrapper<Array<[string, T]>>;
-
-        /**
-         * @see _.toPairs
-         */
-        toPairs(): LoDashExplicitWrapper<Array<[string, any]>>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/object/toPairsIn.d.ts b/types/lodash/object/toPairsIn.d.ts
deleted file mode 100644
index ee6818c212..0000000000
--- a/types/lodash/object/toPairsIn.d.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Creates an array of own and inherited enumerable key-value pairs for object.
-         *
-         * @param object The object to query.
-         * @return Returns the new array of key-value pairs.
-         */
-        toPairsIn<T>(object?: Dictionary<T>): Array<[string, T]>;
-
-        /**
-         * @see _.toPairsIn
-         */
-        toPairsIn(object?: object): Array<[string, any]>;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.toPairsIn
-         */
-        toPairsIn<T>(this: LoDashImplicitWrapper<Dictionary<T>>): LoDashImplicitWrapper<Array<[string, T]>>;
-
-        /**
-         * @see _.toPairsIn
-         */
-        toPairsIn(): LoDashImplicitWrapper<Array<[string, any]>>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.toPairsIn
-         */
-        toPairsIn<T>(this: LoDashExplicitWrapper<Dictionary<T>>): LoDashExplicitWrapper<Array<[string, T]>>;
-
-        /**
-         * @see _.toPairsIn
-         */
-        toPairsIn(): LoDashExplicitWrapper<Array<[string, any]>>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/object/transform.d.ts b/types/lodash/object/transform.d.ts
deleted file mode 100644
index 817f51a4b2..0000000000
--- a/types/lodash/object/transform.d.ts
+++ /dev/null
@@ -1,163 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * An alternative to _.reduce; this method transforms object to a new accumulator object which is the result of
-         * running each of its own enumerable properties through iteratee, with each invocation potentially mutating
-         * the accumulator object. The iteratee is bound to thisArg and invoked with four arguments: (accumulator,
-         * value, key, object). Iteratee functions may exit iteration early by explicitly returning false.
-         *
-         * @param object The object to iterate over.
-         * @param iteratee The function invoked per iteration.
-         * @param accumulator The custom accumulator value.
-         * @param thisArg The this binding of iteratee.
-         * @return Returns the accumulated value.
-         */
-        transform<T, TResult>(
-            object: T[],
-            iteratee: MemoVoidArrayIterator<T, TResult[]>,
-            accumulator?: TResult[]
-        ): TResult[];
-
-        /**
-         * @see _.transform
-         */
-        transform<T, TResult>(
-            object: T[],
-            iteratee: MemoVoidArrayIterator<T, Dictionary<TResult>>,
-            accumulator: Dictionary<TResult>
-        ): Dictionary<TResult>;
-
-        /**
-         * @see _.transform
-         */
-        transform<T, TResult>(
-            object: Dictionary<T>,
-            iteratee: MemoVoidDictionaryIterator<T, Dictionary<TResult>>,
-            accumulator?: Dictionary<TResult>
-        ): Dictionary<TResult>;
-
-        /**
-         * @see _.transform
-         */
-        transform<T, TResult>(
-            object: Dictionary<T>,
-            iteratee: MemoVoidDictionaryIterator<T, TResult[]>,
-            accumulator: TResult[]
-        ): TResult[];
-
-        /**
-         * @see _.transform
-         */
-        transform(
-            object: any[],
-        ): any[];
-
-        /**
-         * @see _.transform
-         */
-        transform(
-            object: object,
-        ): Dictionary<any>;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.transform
-         */
-        transform<T, TResult>(
-            this: LoDashImplicitWrapper<T[]>,
-            iteratee: MemoVoidArrayIterator<T, TResult[]>,
-            accumulator?: TResult[]
-        ): LoDashImplicitWrapper<TResult[]>;
-
-        /**
-         * @see _.transform
-         */
-        transform<T, TResult>(
-            this: LoDashImplicitWrapper<T[]>,
-            iteratee: MemoVoidArrayIterator<T, Dictionary<TResult>>,
-            accumulator: Dictionary<TResult>
-        ): LoDashImplicitWrapper<Dictionary<TResult>>;
-
-        /**
-         * @see _.transform
-         */
-        transform<T, TResult>(
-            this: LoDashImplicitWrapper<Dictionary<T>>,
-            iteratee: MemoVoidDictionaryIterator<T, Dictionary<TResult>>,
-            accumulator?: Dictionary<TResult>
-        ): LoDashImplicitWrapper<Dictionary<TResult>>;
-
-        /**
-         * @see _.transform
-         */
-        transform<T, TResult>(
-            this: LoDashImplicitWrapper<Dictionary<T>>,
-            iteratee: MemoVoidDictionaryIterator<T, TResult[]>,
-            accumulator: TResult[]
-        ): LoDashImplicitWrapper<TResult[]>;
-
-        /**
-         * @see _.transform
-         */
-        transform(
-            this: LoDashImplicitWrapper<any[]>,
-        ): LoDashImplicitWrapper<any[]>;
-
-        /**
-         * @see _.transform
-         */
-        transform(): LoDashImplicitWrapper<Dictionary<any>>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.transform
-         */
-        transform<T, TResult>(
-            this: LoDashExplicitWrapper<T[]>,
-            iteratee: MemoVoidArrayIterator<T, TResult[]>,
-            accumulator?: TResult[]
-        ): LoDashExplicitWrapper<TResult[]>;
-
-        /**
-         * @see _.transform
-         */
-        transform<T, TResult>(
-            this: LoDashExplicitWrapper<T[]>,
-            iteratee: MemoVoidArrayIterator<T, Dictionary<TResult>>,
-            accumulator?: Dictionary<TResult>
-        ): LoDashExplicitWrapper<Dictionary<TResult>>;
-
-        /**
-         * @see _.transform
-         */
-        transform<T, TResult>(
-            this: LoDashExplicitWrapper<Dictionary<T>>,
-            iteratee: MemoVoidDictionaryIterator<T, Dictionary<TResult>>,
-            accumulator?: Dictionary<TResult>
-        ): LoDashExplicitWrapper<Dictionary<TResult>>;
-
-        /**
-         * @see _.transform
-         */
-        transform<T, TResult>(
-            this: LoDashExplicitWrapper<Dictionary<T>>,
-            iteratee: MemoVoidDictionaryIterator<T, TResult[]>,
-            accumulator?: TResult[]
-        ): LoDashExplicitWrapper<TResult[]>;
-
-        /**
-         * @see _.transform
-         */
-        transform(
-            this: LoDashExplicitWrapper<any[]>,
-        ): LoDashExplicitWrapper<any[]>;
-
-        /**
-         * @see _.transform
-         */
-        transform(): LoDashExplicitWrapper<Dictionary<any>>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/object/unset.d.ts b/types/lodash/object/unset.d.ts
deleted file mode 100644
index 0cf4b56f92..0000000000
--- a/types/lodash/object/unset.d.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Removes the property at path of object.
-         *
-         * Note: This method mutates object.
-         *
-         * @param object The object to modify.
-         * @param path The path of the property to unset.
-         * @return Returns true if the property is deleted, else false.
-         */
-        unset(
-            object: any,
-            path: PropertyPath
-        ): boolean;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.unset
-         */
-        unset(path: PropertyPath): LoDashImplicitWrapper<boolean>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.unset
-         */
-        unset(path: PropertyPath): LoDashExplicitWrapper<boolean>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/object/update.d.ts b/types/lodash/object/update.d.ts
deleted file mode 100644
index 4289efca72..0000000000
--- a/types/lodash/object/update.d.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * This method is like _.set except that accepts updater to produce the value to set. Use _.updateWith to
-         * customize path creation. The updater is invoked with one argument: (value).
-         *
-         * @param object The object to modify.
-         * @param path The path of the property to set.
-         * @param updater The function to produce the updated value.
-         * @return Returns object.
-         */
-        update(
-            object: object,
-            path: PropertyPath,
-            updater: (value: any) => any
-        ): any;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.update
-         */
-        update(
-            path: PropertyPath,
-            updater: (value: any) => any
-        ): LoDashImplicitWrapper<any>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.update
-         */
-        update(
-            path: PropertyPath,
-            updater: (value: any) => any
-        ): LoDashExplicitWrapper<any>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/object/updateWith.d.ts b/types/lodash/object/updateWith.d.ts
deleted file mode 100644
index 4da0be8ce5..0000000000
--- a/types/lodash/object/updateWith.d.ts
+++ /dev/null
@@ -1,83 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * This method is like `_.update` except that it accepts `customizer` which is
-         * invoked to produce the objects of `path`.  If `customizer` returns `undefined`
-         * path creation is handled by the method instead. The `customizer` is invoked
-         * with three arguments: (nsValue, key, nsObject).
-         *
-         * **Note:** This method mutates `object`.
-         *
-         * @since 4.6.0
-         * @category Object
-         * @param object The object to modify.
-         * @param path The path of the property to set.
-         * @param updater The function to produce the updated value.
-         * @param [customizer] The function to customize assigned values.
-         * @returns Returns `object`.
-         * @example
-         *
-         * var object = {};
-         *
-         * _.updateWith(object, '[0][1]', _.constant('a'), Object);
-         * // => { '0': { '1': 'a' } }
-         */
-        updateWith<T extends object>(
-            object: T,
-            path: PropertyPath,
-            updater: (oldValue: any) => any,
-            customizer?: SetWithCustomizer<T>
-        ): T;
-
-        /**
-         * @see _.updateWith
-         */
-        updateWith<T extends object, TResult>(
-            object: T,
-            path: PropertyPath,
-            updater: (oldValue: any) => any,
-            customizer?: SetWithCustomizer<T>
-        ): TResult;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.updateWith
-         */
-        updateWith(
-            path: PropertyPath,
-            updater: (oldValue: any) => any,
-            customizer?: SetWithCustomizer<TValue>
-        ): this;
-
-        /**
-         * @see _.updateWith
-         */
-        updateWith<TResult>(
-            path: PropertyPath,
-            updater: (oldValue: any) => any,
-            customizer?: SetWithCustomizer<TValue>
-        ): LoDashImplicitWrapper<TResult>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.updateWith
-         */
-        updateWith(
-            path: PropertyPath,
-            updater: (oldValue: any) => any,
-            customizer?: SetWithCustomizer<TValue>
-        ): this;
-
-        /**
-         * @see _.updateWith
-         */
-        updateWith<TResult>(
-            path: PropertyPath,
-            updater: (oldValue: any) => any,
-            customizer?: SetWithCustomizer<TValue>
-        ): LoDashExplicitWrapper<TResult>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/object/values.d.ts b/types/lodash/object/values.d.ts
deleted file mode 100644
index d1dfa1177b..0000000000
--- a/types/lodash/object/values.d.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Creates an array of the own enumerable property values of object.
-         *
-         * @param object The object to query.
-         * @return Returns an array of property values.
-         */
-        values<T>(object: Dictionary<T>|NumericDictionary<T>|List<T> | null | undefined): T[];
-
-        /**
-         * @see _.values
-         */
-        values<T extends object>(object: T | null | undefined): Array<T[keyof T]>;
-
-        /**
-         * @see _.values
-         */
-        values(object: any): any[];
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.values
-         */
-        values<T>(this: LoDashImplicitWrapper<Dictionary<T> | NumericDictionary<T> | List<T> | null | undefined>): LoDashImplicitWrapper<T[]>;
-
-        /**
-         * @see _.values
-         */
-        values<T extends object>(this: LoDashImplicitWrapper<T | null | undefined>): LoDashImplicitWrapper<Array<T[keyof T]>>;
-
-        /**
-         * @see _.values
-         */
-        values(): LoDashImplicitWrapper<any[]>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.values
-         */
-        values<T>(this: LoDashExplicitWrapper<Dictionary<T> | NumericDictionary<T> | List<T> | null | undefined>): LoDashExplicitWrapper<T[]>;
-
-        /**
-         * @see _.values
-         */
-        values<T extends object>(this: LoDashExplicitWrapper<T | null | undefined>): LoDashExplicitWrapper<Array<T[keyof T]>>;
-
-        /**
-         * @see _.values
-         */
-        values(): LoDashExplicitWrapper<any[]>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/object/valuesIn.d.ts b/types/lodash/object/valuesIn.d.ts
deleted file mode 100644
index 22730438f5..0000000000
--- a/types/lodash/object/valuesIn.d.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Creates an array of the own and inherited enumerable property values of object.
-         *
-         * @param object The object to query.
-         * @return Returns the array of property values.
-         */
-        valuesIn<T>(object: Dictionary<T>|NumericDictionary<T>|List<T> | null | undefined): T[];
-
-        /**
-         * @see _.valuesIn
-         */
-        valuesIn<T extends object>(object: T | null | undefined): Array<T[keyof T]>;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.valuesIn
-         */
-        valuesIn<T>(this: LoDashImplicitWrapper<Dictionary<T> | NumericDictionary<T> | List<T> | null | undefined>): LoDashImplicitWrapper<T[]>;
-
-        /**
-         * @see _.valuesIn
-         */
-        valuesIn<T extends object>(this: LoDashImplicitWrapper<T | null | undefined>): LoDashImplicitWrapper<Array<T[keyof T]>>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.valuesIn
-         */
-        valuesIn<T>(this: LoDashExplicitWrapper<Dictionary<T> | NumericDictionary<T> | List<T> | null | undefined>): LoDashExplicitWrapper<T[]>;
-
-        /**
-         * @see _.valuesIn
-         */
-        valuesIn<T extends object>(this: LoDashExplicitWrapper<T | null | undefined>): LoDashExplicitWrapper<Array<T[keyof T]>>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/seq/chain.d.ts b/types/lodash/seq/chain.d.ts
deleted file mode 100644
index 9edc42f881..0000000000
--- a/types/lodash/seq/chain.d.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Creates a lodash object that wraps value with explicit method chaining enabled.
-         *
-         * @param value The value to wrap.
-         * @return Returns the new lodash wrapper instance.
-         */
-        chain<T>(value: T): LoDashExplicitWrapper<T>;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.chain
-         */
-        chain(): LoDashExplicitWrapper<TValue>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.chain
-         */
-        chain(): this;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/seq/prototype.at.d.ts b/types/lodash/seq/prototype.at.d.ts
deleted file mode 100644
index 3a6a35d69b..0000000000
--- a/types/lodash/seq/prototype.at.d.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// import _ = require("../index");
-// declare module "../index" {
-//     interface LoDashWrapper<TValue> {
-//         /**
-//          * This method is the wrapper version of _.at.
-//          *
-//          * @
-//          * @return Returns the new lodash wrapper instance.
-//          */
-//         at(paths: string|string[]): this;
-//     }
-// }
\ No newline at end of file
diff --git a/types/lodash/seq/prototype.chain.d.ts b/types/lodash/seq/prototype.chain.d.ts
deleted file mode 100644
index 9edc42f881..0000000000
--- a/types/lodash/seq/prototype.chain.d.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Creates a lodash object that wraps value with explicit method chaining enabled.
-         *
-         * @param value The value to wrap.
-         * @return Returns the new lodash wrapper instance.
-         */
-        chain<T>(value: T): LoDashExplicitWrapper<T>;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.chain
-         */
-        chain(): LoDashExplicitWrapper<TValue>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.chain
-         */
-        chain(): this;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/seq/prototype.commit.d.ts b/types/lodash/seq/prototype.commit.d.ts
deleted file mode 100644
index f22477f2f9..0000000000
--- a/types/lodash/seq/prototype.commit.d.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashWrapper<TValue> {
-        /**
-         * Executes the chained sequence and returns the wrapped result.
-         *
-         * @return Returns the new lodash wrapper instance.
-         */
-        commit(): this;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/seq/prototype.plant.d.ts b/types/lodash/seq/prototype.plant.d.ts
deleted file mode 100644
index 6025b09381..0000000000
--- a/types/lodash/seq/prototype.plant.d.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * Creates a clone of the chained sequence planting value as the wrapped value.
-         * @param value The value to plant as the wrapped value.
-         * @return Returns the new lodash wrapper instance.
-         */
-        plant<T>(value: T): LoDashImplicitWrapper<T>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.plant
-         */
-        plant<T>(value: T): LoDashExplicitWrapper<T>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/seq/prototype.reverse.d.ts b/types/lodash/seq/prototype.reverse.d.ts
deleted file mode 100644
index 66526e729b..0000000000
--- a/types/lodash/seq/prototype.reverse.d.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashWrapper<TValue> {
-        /**
-         * Reverses the wrapped array so the first element becomes the last, the second element becomes the second to
-         * last, and so on.
-         *
-         * Note: This method mutates the wrapped array.
-         *
-         * @return Returns the new reversed lodash wrapper instance.
-         */
-        reverse(): this;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/seq/prototype.toJSON.d.ts b/types/lodash/seq/prototype.toJSON.d.ts
deleted file mode 100644
index 22da767aec..0000000000
--- a/types/lodash/seq/prototype.toJSON.d.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashWrapper<TValue> {
-        /**
-         * @see _.value
-         */
-        toJSON(): TValue;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/seq/prototype.toString.d.ts b/types/lodash/seq/prototype.toString.d.ts
deleted file mode 100644
index 4deef48ec0..0000000000
--- a/types/lodash/seq/prototype.toString.d.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashWrapper<TValue> {
-        /**
-         * Produces the result of coercing the unwrapped value to a string.
-         *
-         * @return Returns the coerced string value.
-         */
-        toString(): string;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/seq/prototype.value.d.ts b/types/lodash/seq/prototype.value.d.ts
deleted file mode 100644
index 9ba88a8250..0000000000
--- a/types/lodash/seq/prototype.value.d.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashWrapper<TValue> {
-        /**
-         * Executes the chained sequence to extract the unwrapped value.
-         *
-         * @alias _.toJSON, _.valueOf
-         *
-         * @return Returns the resolved unwrapped value.
-         */
-        value(): TValue;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/seq/prototype.valueOf.d.ts b/types/lodash/seq/prototype.valueOf.d.ts
deleted file mode 100644
index 6a69f1f202..0000000000
--- a/types/lodash/seq/prototype.valueOf.d.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashWrapper<TValue> {
-        /**
-         * @see _.value
-         */
-        valueOf(): TValue;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/seq/tap.d.ts b/types/lodash/seq/tap.d.ts
deleted file mode 100644
index dd4fc8d754..0000000000
--- a/types/lodash/seq/tap.d.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * This method invokes interceptor and returns value. The interceptor is bound to thisArg and invoked with one
-         * argument; (value). The purpose of this method is to "tap into" a method chain in order to perform operations
-         * on intermediate results within the chain.
-         *
-         * @param value The value to provide to interceptor.
-         * @param interceptor The function to invoke.
-         * @parem thisArg The this binding of interceptor.
-         * @return Returns value.
-         **/
-        tap<T>(
-            value: T,
-            interceptor: (value: T) => void
-        ): T;
-    }
-
-    interface LoDashWrapper<TValue> {
-        /**
-         * @see _.tap
-         */
-        tap(
-            interceptor: (value: TValue) => void
-        ): this;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/seq/thru.d.ts b/types/lodash/seq/thru.d.ts
deleted file mode 100644
index 295011945a..0000000000
--- a/types/lodash/seq/thru.d.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * This method is like _.tap except that it returns the result of interceptor.
-         *
-         * @param value The value to provide to interceptor.
-         * @param interceptor The function to invoke.
-         * @param thisArg The this binding of interceptor.
-         * @return Returns the result of interceptor.
-         */
-        thru<T, TResult>(
-            value: T,
-            interceptor: (value: T) => TResult
-        ): TResult;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.thru
-         */
-        thru<TResult>(interceptor: (value: TValue) => TResult): LoDashImplicitWrapper<TResult>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.thru
-         */
-        thru<TResult>(interceptor: (value: TValue) => TResult): LoDashExplicitWrapper<TResult>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/string/camelCase.d.ts b/types/lodash/string/camelCase.d.ts
deleted file mode 100644
index 8362137353..0000000000
--- a/types/lodash/string/camelCase.d.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Converts string to camel case.
-         *
-         * @param string The string to convert.
-         * @return Returns the camel cased string.
-         */
-        camelCase(string?: string): string;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.camelCase
-         */
-        camelCase(): string;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.camelCase
-         */
-        camelCase(): LoDashExplicitWrapper<string>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/string/capitalize.d.ts b/types/lodash/string/capitalize.d.ts
deleted file mode 100644
index 678f1c1de6..0000000000
--- a/types/lodash/string/capitalize.d.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Converts the first character of string to upper case and the remaining to lower case.
-         *
-         * @param string The string to capitalize.
-         * @return Returns the capitalized string.
-         */
-        capitalize(string?: string): string;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.capitalize
-         */
-        capitalize(): string;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.capitalize
-         */
-        capitalize(): LoDashExplicitWrapper<string>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/string/deburr.d.ts b/types/lodash/string/deburr.d.ts
deleted file mode 100644
index 85d3476be1..0000000000
--- a/types/lodash/string/deburr.d.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Deburrs string by converting latin-1 supplementary letters to basic latin letters and removing combining
-         * diacritical marks.
-         *
-         * @param string The string to deburr.
-         * @return Returns the deburred string.
-         */
-        deburr(string?: string): string;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.deburr
-         */
-        deburr(): string;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.deburr
-         */
-        deburr(): LoDashExplicitWrapper<string>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/string/endsWith.d.ts b/types/lodash/string/endsWith.d.ts
deleted file mode 100644
index 383c0acc41..0000000000
--- a/types/lodash/string/endsWith.d.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Checks if string ends with the given target string.
-         *
-         * @param string The string to search.
-         * @param target The string to search for.
-         * @param position The position to search from.
-         * @return Returns true if string ends with target, else false.
-         */
-        endsWith(
-            string?: string,
-            target?: string,
-            position?: number
-        ): boolean;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.endsWith
-         */
-        endsWith(
-            target?: string,
-            position?: number
-        ): boolean;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.endsWith
-         */
-        endsWith(
-            target?: string,
-            position?: number
-        ): LoDashExplicitWrapper<boolean>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/string/escape.d.ts b/types/lodash/string/escape.d.ts
deleted file mode 100644
index 21131ee05f..0000000000
--- a/types/lodash/string/escape.d.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Converts the characters "&", "<", ">", '"', "'", and "`" in string to their corresponding HTML entities.
-         *
-         * Note: No other characters are escaped. To escape additional characters use a third-party library like he.
-         *
-         * hough the ">" character is escaped for symmetry, characters like ">" and "/" don’t need escaping in HTML
-         * and have no special meaning unless they're part of a tag or unquoted attribute value. See Mathias Bynens’s
-         * article (under "semi-related fun fact") for more details.
-         *
-         * Backticks are escaped because in IE < 9, they can break out of attribute values or HTML comments. See #59,
-         * #102, #108, and #133 of the HTML5 Security Cheatsheet for more details.
-         *
-         * When working with HTML you should always quote attribute values to reduce XSS vectors.
-         *
-         * @param string The string to escape.
-         * @return Returns the escaped string.
-         */
-        escape(string?: string): string;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.escape
-         */
-        escape(): string;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.escape
-         */
-        escape(): LoDashExplicitWrapper<string>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/string/escapeRegExp.d.ts b/types/lodash/string/escapeRegExp.d.ts
deleted file mode 100644
index a05b2b80ab..0000000000
--- a/types/lodash/string/escapeRegExp.d.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Escapes the RegExp special characters "^", "$", "\", ".", "*", "+", "?", "(", ")", "[", "]",
-         * "{", "}", and "|" in string.
-         *
-         * @param string The string to escape.
-         * @return Returns the escaped string.
-         */
-        escapeRegExp(string?: string): string;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.escapeRegExp
-         */
-        escapeRegExp(): string;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.escapeRegExp
-         */
-        escapeRegExp(): LoDashExplicitWrapper<string>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/string/kebabCase.d.ts b/types/lodash/string/kebabCase.d.ts
deleted file mode 100644
index eac11176a7..0000000000
--- a/types/lodash/string/kebabCase.d.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Converts string to kebab case.
-         *
-         * @param string The string to convert.
-         * @return Returns the kebab cased string.
-         */
-        kebabCase(string?: string): string;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.kebabCase
-         */
-        kebabCase(): string;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.kebabCase
-         */
-        kebabCase(): LoDashExplicitWrapper<string>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/string/lowerCase.d.ts b/types/lodash/string/lowerCase.d.ts
deleted file mode 100644
index 5349f3af18..0000000000
--- a/types/lodash/string/lowerCase.d.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Converts `string`, as space separated words, to lower case.
-         *
-         * @param string The string to convert.
-         * @return Returns the lower cased string.
-         */
-        lowerCase(string?: string): string;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.lowerCase
-         */
-        lowerCase(): string;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.lowerCase
-         */
-        lowerCase(): LoDashExplicitWrapper<string>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/string/lowerFirst.d.ts b/types/lodash/string/lowerFirst.d.ts
deleted file mode 100644
index 54cacab3e6..0000000000
--- a/types/lodash/string/lowerFirst.d.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Converts the first character of `string` to lower case.
-         *
-         * @param string The string to convert.
-         * @return Returns the converted string.
-         */
-        lowerFirst(string?: string): string;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.lowerFirst
-         */
-        lowerFirst(): string;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.lowerFirst
-         */
-        lowerFirst(): LoDashExplicitWrapper<string>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/string/pad.d.ts b/types/lodash/string/pad.d.ts
deleted file mode 100644
index d47f48afad..0000000000
--- a/types/lodash/string/pad.d.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Pads string on the left and right sides if it’s shorter than length. Padding characters are truncated if
-         * they can’t be evenly divided by length.
-         *
-         * @param string The string to pad.
-         * @param length The padding length.
-         * @param chars The string used as padding.
-         * @return Returns the padded string.
-         */
-        pad(
-            string?: string,
-            length?: number,
-            chars?: string
-        ): string;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.pad
-         */
-        pad(
-            length?: number,
-            chars?: string
-        ): string;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.pad
-         */
-        pad(
-            length?: number,
-            chars?: string
-        ): LoDashExplicitWrapper<string>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/string/padEnd.d.ts b/types/lodash/string/padEnd.d.ts
deleted file mode 100644
index ed4c552705..0000000000
--- a/types/lodash/string/padEnd.d.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Pads string on the right side if it’s shorter than length. Padding characters are truncated if they exceed
-         * length.
-         *
-         * @param string The string to pad.
-         * @param length The padding length.
-         * @param chars The string used as padding.
-         * @return Returns the padded string.
-         */
-        padEnd(
-            string?: string,
-            length?: number,
-            chars?: string
-        ): string;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.padEnd
-         */
-        padEnd(
-            length?: number,
-            chars?: string
-        ): string;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.padEnd
-         */
-        padEnd(
-            length?: number,
-            chars?: string
-        ): LoDashExplicitWrapper<string>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/string/padStart.d.ts b/types/lodash/string/padStart.d.ts
deleted file mode 100644
index 02f2ce2752..0000000000
--- a/types/lodash/string/padStart.d.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Pads string on the left side if it’s shorter than length. Padding characters are truncated if they exceed
-         * length.
-         *
-         * @param string The string to pad.
-         * @param length The padding length.
-         * @param chars The string used as padding.
-         * @return Returns the padded string.
-         */
-        padStart(
-            string?: string,
-            length?: number,
-            chars?: string
-        ): string;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.padStart
-         */
-        padStart(
-            length?: number,
-            chars?: string
-        ): string;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.padStart
-         */
-        padStart(
-            length?: number,
-            chars?: string
-        ): LoDashExplicitWrapper<string>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/string/parseInt.d.ts b/types/lodash/string/parseInt.d.ts
deleted file mode 100644
index 082b45617d..0000000000
--- a/types/lodash/string/parseInt.d.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Converts string to an integer of the specified radix. If radix is undefined or 0, a radix of 10 is used
-         * unless value is a hexadecimal, in which case a radix of 16 is used.
-         *
-         * Note: This method aligns with the ES5 implementation of parseInt.
-         *
-         * @param string The string to convert.
-         * @param radix The radix to interpret value by.
-         * @return Returns the converted integer.
-         */
-        parseInt(
-            string: string,
-            radix?: number
-        ): number;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.parseInt
-         */
-        parseInt(radix?: number): number;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.parseInt
-         */
-        parseInt(radix?: number): LoDashExplicitWrapper<number>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/string/repeat.d.ts b/types/lodash/string/repeat.d.ts
deleted file mode 100644
index a72cda78b1..0000000000
--- a/types/lodash/string/repeat.d.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Repeats the given string n times.
-         *
-         * @param string The string to repeat.
-         * @param n The number of times to repeat the string.
-         * @return Returns the repeated string.
-         */
-        repeat(
-            string?: string,
-            n?: number
-        ): string;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.repeat
-         */
-        repeat(n?: number): string;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.repeat
-         */
-        repeat(n?: number): LoDashExplicitWrapper<string>;
-    }
-
-    type ReplaceFunction = (match: string, ...args: any[]) => string;
-}
\ No newline at end of file
diff --git a/types/lodash/string/replace.d.ts b/types/lodash/string/replace.d.ts
deleted file mode 100644
index 9245e2d712..0000000000
--- a/types/lodash/string/replace.d.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Replaces matches for pattern in string with replacement.
-         *
-         * Note: This method is based on String#replace.
-         *
-         * @return Returns the modified string.
-         */
-        replace(
-            string: string,
-            pattern: RegExp | string,
-            replacement: ReplaceFunction | string
-        ): string;
-
-        /**
-         * @see _.replace
-         */
-        replace(
-            pattern: RegExp | string,
-            replacement: ReplaceFunction | string
-        ): string;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.replace
-         */
-        replace(
-            pattern: RegExp|string,
-            replacement: ReplaceFunction | string
-        ): string;
-
-        /**
-         * @see _.replace
-         */
-        replace(
-            replacement: ReplaceFunction | string
-        ): string;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.replace
-         */
-        replace(
-            pattern: RegExp | string,
-            replacement: ReplaceFunction | string
-        ): LoDashExplicitWrapper<string>;
-
-        /**
-         * @see _.replace
-         */
-        replace(
-            replacement: ReplaceFunction | string
-        ): LoDashExplicitWrapper<string>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/string/snakeCase.d.ts b/types/lodash/string/snakeCase.d.ts
deleted file mode 100644
index efdaac05d0..0000000000
--- a/types/lodash/string/snakeCase.d.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Converts string to snake case.
-         *
-         * @param string The string to convert.
-         * @return Returns the snake cased string.
-         */
-        snakeCase(string?: string): string;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.snakeCase
-         */
-        snakeCase(): string;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.snakeCase
-         */
-        snakeCase(): LoDashExplicitWrapper<string>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/string/split.d.ts b/types/lodash/string/split.d.ts
deleted file mode 100644
index e964d851ce..0000000000
--- a/types/lodash/string/split.d.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Splits string by separator.
-         *
-         * Note: This method is based on String#split.
-         *
-         * @param string The string to trim.
-         * @param separator The separator pattern to split by.
-         * @param limit The length to truncate results to.
-         * @return Returns the new array of string segments.
-         */
-        split(
-            string: string,
-            separator?: RegExp|string,
-            limit?: number
-        ): string[];
-
-        /**
-         * Splits string by separator.
-         *
-         * Note: This method is based on String#split.
-         *
-         * @param string The string to trim.
-         * @param index Not used in this overload.
-         * @param guard Enables use as an iteratee for methods like _.map. You should not pass this parameter directly in your code.
-         * @return Returns the new array of string segments.
-         */
-        split(
-            string: string,
-            index: string | number,
-            guard: object
-        ): string[];
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.split
-         */
-        split(
-            separator?: RegExp|string,
-            limit?: number
-        ): LoDashImplicitWrapper<string[]>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.split
-         */
-        split(
-            separator?: RegExp|string,
-            limit?: number
-        ): LoDashExplicitWrapper<string[]>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/string/startCase.d.ts b/types/lodash/string/startCase.d.ts
deleted file mode 100644
index 19e0551bf6..0000000000
--- a/types/lodash/string/startCase.d.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Converts string to start case.
-         *
-         * @param string The string to convert.
-         * @return Returns the start cased string.
-         */
-        startCase(string?: string): string;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.startCase
-         */
-        startCase(): string;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.startCase
-         */
-        startCase(): LoDashExplicitWrapper<string>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/string/startsWith.d.ts b/types/lodash/string/startsWith.d.ts
deleted file mode 100644
index 6090c2ed69..0000000000
--- a/types/lodash/string/startsWith.d.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Checks if string starts with the given target string.
-         *
-         * @param string The string to search.
-         * @param target The string to search for.
-         * @param position The position to search from.
-         * @return Returns true if string starts with target, else false.
-         */
-        startsWith(
-            string?: string,
-            target?: string,
-            position?: number
-        ): boolean;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.startsWith
-         */
-        startsWith(
-            target?: string,
-            position?: number
-        ): boolean;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.startsWith
-         */
-        startsWith(
-            target?: string,
-            position?: number
-        ): LoDashExplicitWrapper<boolean>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/string/template.d.ts b/types/lodash/string/template.d.ts
deleted file mode 100644
index a876c72fd8..0000000000
--- a/types/lodash/string/template.d.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface TemplateOptions extends TemplateSettings {
-        /**
-         * The sourceURL of the template's compiled source.
-         */
-        sourceURL?: string;
-    }
-
-    interface TemplateExecutor {
-        (data?: object): string;
-        source: string;
-    }
-
-    interface LoDashStatic {
-        /**
-         * Creates a compiled template function that can interpolate data properties in "interpolate" delimiters,
-         * HTML-escape interpolated data properties in "escape" delimiters, and execute JavaScript in "evaluate"
-         * delimiters. Data properties may be accessed as free variables in the template. If a setting object is
-         * provided it takes precedence over _.templateSettings values.
-         *
-         * Note: In the development build _.template utilizes
-         * [sourceURLs](http://www.html5rocks.com/en/tutorials/developertools/sourcemaps/#toc-sourceurl) for easier
-         * debugging.
-         *
-         * For more information on precompiling templates see
-         * [lodash's custom builds documentation](https://lodash.com/custom-builds).
-         *
-         * For more information on Chrome extension sandboxes see
-         * [Chrome's extensions documentation](https://developer.chrome.com/extensions/sandboxingEval).
-         *
-         * @param string The template string.
-         * @param options The options object.
-         * @param options.escape The HTML "escape" delimiter.
-         * @param options.evaluate The "evaluate" delimiter.
-         * @param options.imports An object to import into the template as free variables.
-         * @param options.interpolate The "interpolate" delimiter.
-         * @param options.sourceURL The sourceURL of the template's compiled source.
-         * @param options.variable The data object variable name.
-         * @return Returns the compiled template function.
-         */
-        template(
-            string?: string,
-            options?: TemplateOptions
-        ): TemplateExecutor;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.template
-         */
-        template(options?: TemplateOptions): TemplateExecutor;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.template
-         */
-        template(options?: TemplateOptions): LoDashExplicitWrapper<TemplateExecutor>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/string/toLower.d.ts b/types/lodash/string/toLower.d.ts
deleted file mode 100644
index 522014d583..0000000000
--- a/types/lodash/string/toLower.d.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Converts `string`, as a whole, to lower case.
-         *
-         * @param string The string to convert.
-         * @return Returns the lower cased string.
-         */
-        toLower(string?: string): string;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.toLower
-         */
-        toLower(): string;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.toLower
-         */
-        toLower(): LoDashExplicitWrapper<string>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/string/toUpper.d.ts b/types/lodash/string/toUpper.d.ts
deleted file mode 100644
index 5b2215685b..0000000000
--- a/types/lodash/string/toUpper.d.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Converts `string`, as a whole, to upper case.
-         *
-         * @param string The string to convert.
-         * @return Returns the upper cased string.
-         */
-        toUpper(string?: string): string;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.toUpper
-         */
-        toUpper(): string;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.toUpper
-         */
-        toUpper(): LoDashExplicitWrapper<string>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/string/trim.d.ts b/types/lodash/string/trim.d.ts
deleted file mode 100644
index 47e2a81d36..0000000000
--- a/types/lodash/string/trim.d.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Removes leading and trailing whitespace or specified characters from string.
-         *
-         * @param string The string to trim.
-         * @param chars The characters to trim.
-         * @return Returns the trimmed string.
-         */
-        trim(
-            string?: string,
-            chars?: string
-        ): string;
-
-        /**
-         * Removes leading and trailing whitespace or specified characters from string.
-         *
-         * @param string The string to trim.
-         * @param index Not used in this overload.
-         * @param guard Enables use as an iteratee for methods like _.map. You should not pass this parameter directly in your code.
-         * @return Returns the trimmed string.
-         */
-        trim(
-            string: string,
-            index: string | number,
-            guard: object
-        ): string;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.trim
-         */
-        trim(chars?: string): string;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.trim
-         */
-        trim(chars?: string): LoDashExplicitWrapper<string>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/string/trimEnd.d.ts b/types/lodash/string/trimEnd.d.ts
deleted file mode 100644
index 1af345dd74..0000000000
--- a/types/lodash/string/trimEnd.d.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Removes trailing whitespace or specified characters from string.
-         *
-         * @param string The string to trim.
-         * @param chars The characters to trim.
-         * @return Returns the trimmed string.
-         */
-        trimEnd(
-            string?: string,
-            chars?: string
-        ): string;
-
-        /**
-         * Removes trailing whitespace or specified characters from string.
-         *
-         * @param string The string to trim.
-         * @param index Not used in this overload.
-         * @param guard Enables use as an iteratee for methods like _.map. You should not pass this parameter directly in your code.
-         * @return Returns the trimmed string.
-         */
-        trimEnd(
-            string: string,
-            index: string | number,
-            guard: object
-        ): string;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.trimEnd
-         */
-        trimEnd(chars?: string): string;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.trimEnd
-         */
-        trimEnd(chars?: string): LoDashExplicitWrapper<string>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/string/trimStart.d.ts b/types/lodash/string/trimStart.d.ts
deleted file mode 100644
index 1055f6b1d3..0000000000
--- a/types/lodash/string/trimStart.d.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Removes leading whitespace or specified characters from string.
-         *
-         * @param string The string to trim.
-         * @param chars The characters to trim.
-         * @return Returns the trimmed string.
-         */
-        trimStart(
-            string?: string,
-            chars?: string
-        ): string;
-
-        /**
-         * Removes leading whitespace or specified characters from string.
-         *
-         * @param string The string to trim.
-         * @param index Not used in this overload.
-         * @param guard Enables use as an iteratee for methods like _.map. You should not pass this parameter directly in your code.
-         * @return Returns the trimmed string.
-         */
-        trimStart(
-            string: string,
-            index: string | number,
-            guard: object
-        ): string;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.trimStart
-         */
-        trimStart(chars?: string): string;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.trimStart
-         */
-        trimStart(chars?: string): LoDashExplicitWrapper<string>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/string/truncate.d.ts b/types/lodash/string/truncate.d.ts
deleted file mode 100644
index 23d4039356..0000000000
--- a/types/lodash/string/truncate.d.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface TruncateOptions {
-        /** The maximum string length. */
-        length?: number;
-        /** The string to indicate text is omitted. */
-        omission?: string;
-        /** The separator pattern to truncate to. */
-        separator?: string|RegExp;
-    }
-
-    interface LoDashStatic {
-        /**
-         * Truncates string if it’s longer than the given maximum string length. The last characters of the truncated
-         * string are replaced with the omission string which defaults to "…".
-         *
-         * @param string The string to truncate.
-         * @param options The options object or maximum string length.
-         * @return Returns the truncated string.
-         */
-        truncate(
-            string?: string,
-            options?: TruncateOptions
-        ): string;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.truncate
-         */
-        truncate(options?: TruncateOptions): string;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.truncate
-         */
-        truncate(options?: TruncateOptions): LoDashExplicitWrapper<string>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/string/unescape.d.ts b/types/lodash/string/unescape.d.ts
deleted file mode 100644
index 3e2be90abb..0000000000
--- a/types/lodash/string/unescape.d.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * The inverse of _.escape; this method converts the HTML entities &amp;, &lt;, &gt;, &quot;, &#39;, and &#96;
-         * in string to their corresponding characters.
-         *
-         * Note: No other HTML entities are unescaped. To unescape additional HTML entities use a third-party library
-         * like he.
-         *
-         * @param string The string to unescape.
-         * @return Returns the unescaped string.
-         */
-        unescape(string?: string): string;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.unescape
-         */
-        unescape(): string;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.unescape
-         */
-        unescape(): LoDashExplicitWrapper<string>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/string/upperCase.d.ts b/types/lodash/string/upperCase.d.ts
deleted file mode 100644
index d33b6885b9..0000000000
--- a/types/lodash/string/upperCase.d.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Converts `string`, as space separated words, to upper case.
-         *
-         * @param string The string to convert.
-         * @return Returns the upper cased string.
-         */
-        upperCase(string?: string): string;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.upperCase
-         */
-        upperCase(): string;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.upperCase
-         */
-        upperCase(): LoDashExplicitWrapper<string>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/string/upperFirst.d.ts b/types/lodash/string/upperFirst.d.ts
deleted file mode 100644
index 692aa702cd..0000000000
--- a/types/lodash/string/upperFirst.d.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Converts the first character of `string` to upper case.
-         *
-         * @param string The string to convert.
-         * @return Returns the converted string.
-         */
-        upperFirst(string?: string): string;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.upperFirst
-         */
-        upperFirst(): string;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.upperFirst
-         */
-        upperFirst(): LoDashExplicitWrapper<string>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/string/words.d.ts b/types/lodash/string/words.d.ts
deleted file mode 100644
index 4ca4530513..0000000000
--- a/types/lodash/string/words.d.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Splits `string` into an array of its words.
-         *
-         * @param string The string to inspect.
-         * @param pattern The pattern to match words.
-         * @return Returns the words of `string`.
-         */
-        words(
-            string?: string,
-            pattern?: string|RegExp
-        ): string[];
-
-        /**
-         * Splits `string` into an array of its words.
-         *
-         * @param string The string to inspect.
-         * @param index Not used in this overload.
-         * @param guard Enables use as an iteratee for methods like _.map. You should not pass this parameter directly in your code.
-         * @return Returns the words of `string`.
-         */
-        words(
-            string: string,
-            index: string | number,
-            guard: object
-        ): string[];
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.words
-         */
-        words(pattern?: string|RegExp): string[];
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.words
-         */
-        words(pattern?: string|RegExp): LoDashExplicitWrapper<string[]>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/tsconfig.json b/types/lodash/tsconfig.json
index af6ba5e2e9..7ab3d8db99 100644
--- a/types/lodash/tsconfig.json
+++ b/types/lodash/tsconfig.json
@@ -318,4 +318,4 @@
         "zipObjectDeep.d.ts",
         "zipWith.d.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/lodash/util/attempt.d.ts b/types/lodash/util/attempt.d.ts
deleted file mode 100644
index b539421d13..0000000000
--- a/types/lodash/util/attempt.d.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Attempts to invoke func, returning either the result or the caught error object. Any additional arguments
-         * are provided to func when it’s invoked.
-         *
-         * @param func The function to attempt.
-         * @return Returns the func result or error object.
-         */
-        attempt<TResult>(func: (...args: any[]) => TResult, ...args: any[]): TResult|Error;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.attempt
-         */
-        attempt<TResult>(...args: any[]): TResult|Error;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.attempt
-         */
-        attempt<TResult>(...args: any[]): LoDashExplicitWrapper<TResult|Error>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/util/bindAll.d.ts b/types/lodash/util/bindAll.d.ts
deleted file mode 100644
index 1ebe05fe60..0000000000
--- a/types/lodash/util/bindAll.d.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Binds methods of an object to the object itself, overwriting the existing method. Method names may be
-         * specified as individual arguments or as arrays of method names. If no method names are provided all
-         * enumerable function properties, own and inherited, of object are bound.
-         *
-         * Note: This method does not set the "length" property of bound functions.
-         *
-         * @param object The object to bind and assign the bound methods to.
-         * @param methodNames The object method names to bind, specified as individual method names or arrays of
-         * method names.
-         * @return Returns object.
-         */
-        bindAll<T>(
-            object: T,
-            ...methodNames: Array<Many<string>>
-        ): T;
-    }
-
-    interface LoDashWrapper<TValue> {
-        /**
-         * @see _.bindAll
-         */
-        bindAll(...methodNames: Array<Many<string>>): this;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/util/cond.d.ts b/types/lodash/util/cond.d.ts
deleted file mode 100644
index 036f518184..0000000000
--- a/types/lodash/util/cond.d.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Creates a function that iterates over `pairs` and invokes the corresponding
-         * function of the first predicate to return truthy. The predicate-function
-         * pairs are invoked with the `this` binding and arguments of the created
-         * function.
-         *
-         * @since 4.0.0
-         * @category Util
-         * @param pairs The predicate-function pairs.
-         * @returns Returns the new composite function.
-         * @example
-         *
-         * var func = _.cond([
-         *   [_.matches({ 'a': 1 }),           _.constant('matches A')],
-         *   [_.conforms({ 'b': _.isNumber }), _.constant('matches B')],
-         *   [_.stubTrue,                      _.constant('no match')]
-         * ]);
-         *
-         * func({ 'a': 1, 'b': 2 });
-         * // => 'matches A'
-         *
-         * func({ 'a': 0, 'b': 1 });
-         * // => 'matches B'
-         *
-         * func({ 'a': '1', 'b': '2' });
-         * // => 'no match'
-         */
-        cond<T, R>(pairs: Array<CondPair<T, R>>): (Target: T) => R;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/util/conforms.d.ts b/types/lodash/util/conforms.d.ts
deleted file mode 100644
index 9da61cedd1..0000000000
--- a/types/lodash/util/conforms.d.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    type ConformsPredicateObject<T> = {
-        [P in keyof T]?: (val: T[P]) => boolean;
-    };
-
-    interface LoDashStatic {
-        /**
-         * Creates a function that invokes the predicate properties of `source` with the corresponding
-         * property values of a given object, returning true if all predicates return truthy, else false.
-         */
-        conforms<T>(source: ConformsPredicateObject<T>): (value: T) => boolean;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.conforms
-         */
-        conforms<T>(this: LoDashImplicitWrapper<ConformsPredicateObject<T>>): LoDashImplicitWrapper<(value: T) => boolean>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.conforms
-         */
-        conforms<T>(this: LoDashExplicitWrapper<ConformsPredicateObject<T>>): LoDashExplicitWrapper<(value: T) => boolean>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/util/constant.d.ts b/types/lodash/util/constant.d.ts
deleted file mode 100644
index 9255171af1..0000000000
--- a/types/lodash/util/constant.d.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Creates a function that returns value.
-         *
-         * @param value The value to return from the new function.
-         * @return Returns the new function.
-         */
-        constant<T>(value: T): () => T;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.constant
-         */
-        constant(): LoDashImplicitWrapper<() => TValue>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.constant
-         */
-        constant(): LoDashExplicitWrapper<() => TValue>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/util/defaultTo.d.ts b/types/lodash/util/defaultTo.d.ts
deleted file mode 100644
index ced0e976c5..0000000000
--- a/types/lodash/util/defaultTo.d.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Checks `value` to determine whether a default value should be returned in
-         * its place. The `defaultValue` is returned if `value` is `NaN`, `null`,
-         * or `undefined`.
-         *
-         * @param value The value to check.
-         * @param defaultValue The default value.
-         * @returns Returns the resolved value.
-         */
-        defaultTo<T>(value: T | null | undefined, defaultValue: T): T;
-
-        /**
-         * @see _.defaultTo
-         */
-        defaultTo<T, TDefault>(
-            value: T | null | undefined,
-            defaultValue: TDefault
-        ): T | TDefault;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.defaultTo
-         */
-        defaultTo<T>(this: LoDashImplicitWrapper<T | null | undefined>, defaultValue: T): T;
-
-        /**
-         * @see _.defaultTo
-         */
-        defaultTo<T, TDefault>(
-            this: LoDashImplicitWrapper<T | null | undefined>,
-            defaultValue: TDefault
-        ): T | TDefault;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.defaultTo
-         */
-        defaultTo<T>(this: LoDashExplicitWrapper<T | null | undefined>, defaultValue: T): LoDashExplicitWrapper<T>;
-
-        /**
-         * @see _.defaultTo
-         */
-        defaultTo<T, TDefault>(
-            this: LoDashExplicitWrapper<T | null | undefined>,
-            defaultValue: TDefault
-        ): LoDashExplicitWrapper<T | TDefault>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/util/flow.d.ts b/types/lodash/util/flow.d.ts
deleted file mode 100644
index 90736c5da4..0000000000
--- a/types/lodash/util/flow.d.ts
+++ /dev/null
@@ -1,171 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Creates a function that returns the result of invoking the provided functions with the this binding of the
-         * created function, where each successive invocation is supplied the return value of the previous.
-         *
-         * @param funcs Functions to invoke.
-         * @return Returns the new function.
-         */
-        // 0-argument first function
-        flow<R1, R2>(f1: () => R1, f2: (a: R1) => R2): () => R2;
-        flow<R1, R2, R3>(f1: () => R1, f2: (a: R1) => R2, f3: (a: R2) => R3): () => R3;
-        flow<R1, R2, R3, R4>(f1: () => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4): () => R4;
-        flow<R1, R2, R3, R4, R5>(f1: () => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5): () => R5;
-        flow<R1, R2, R3, R4, R5, R6>(f1: () => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6): () => R6;
-        flow<R1, R2, R3, R4, R5, R6, R7>(f1: () => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7): () => R7;
-        flow<R1, R2, R3, R4, R5, R6, R7>(f1: () => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7, ...funcs: Array<Many<(a: any) => any>>): () => any;
-        // 1-argument first function
-        flow<A1, R1, R2>(f1: (a1: A1) => R1, f2: (a: R1) => R2): (a1: A1) => R2;
-        flow<A1, R1, R2, R3>(f1: (a1: A1) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3): (a1: A1) => R3;
-        flow<A1, R1, R2, R3, R4>(f1: (a1: A1) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4): (a1: A1) => R4;
-        flow<A1, R1, R2, R3, R4, R5>(f1: (a1: A1) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5): (a1: A1) => R5;
-        flow<A1, R1, R2, R3, R4, R5, R6>(f1: (a1: A1) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6): (a1: A1) => R6;
-        flow<A1, R1, R2, R3, R4, R5, R6, R7>(f1: (a1: A1) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7): (a1: A1) => R7;
-        flow<A1, R1, R2, R3, R4, R5, R6, R7>(f1: (a1: A1) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7, ...funcs: Array<Many<(a: any) => any>>): (a1: A1) => any;
-        // 2-argument first function
-        flow<A1, A2, R1, R2>(f1: (a1: A1, a2: A2) => R1, f2: (a: R1) => R2): (a1: A1, a2: A2) => R2;
-        flow<A1, A2, R1, R2, R3>(f1: (a1: A1, a2: A2) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3): (a1: A1, a2: A2) => R3;
-        flow<A1, A2, R1, R2, R3, R4>(f1: (a1: A1, a2: A2) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4): (a1: A1, a2: A2) => R4;
-        flow<A1, A2, R1, R2, R3, R4, R5>(f1: (a1: A1, a2: A2) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5): (a1: A1, a2: A2) => R5;
-        flow<A1, A2, R1, R2, R3, R4, R5, R6>(f1: (a1: A1, a2: A2) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6): (a1: A1, a2: A2) => R6;
-        flow<A1, A2, R1, R2, R3, R4, R5, R6, R7>(f1: (a1: A1, a2: A2) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7): (a1: A1, a2: A2) => R7;
-        flow<A1, A2, R1, R2, R3, R4, R5, R6, R7>(f1: (a1: A1, a2: A2) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7, ...funcs: Array<Many<(a: any) => any>>): (a1: A1, a2: A2) => any;
-        // 3-argument first function
-        flow<A1, A2, A3, R1, R2>(f1: (a1: A1, a2: A2, a3: A3) => R1, f2: (a: R1) => R2): (a1: A1, a2: A2, a3: A3) => R2;
-        flow<A1, A2, A3, R1, R2, R3>(f1: (a1: A1, a2: A2, a3: A3) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3): (a1: A1, a2: A2, a3: A3) => R3;
-        flow<A1, A2, A3, R1, R2, R3, R4>(f1: (a1: A1, a2: A2, a3: A3) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4): (a1: A1, a2: A2, a3: A3) => R4;
-        flow<A1, A2, A3, R1, R2, R3, R4, R5>(f1: (a1: A1, a2: A2, a3: A3) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5): (a1: A1, a2: A2, a3: A3) => R5;
-        flow<A1, A2, A3, R1, R2, R3, R4, R5, R6>(f1: (a1: A1, a2: A2, a3: A3) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6): (a1: A1, a2: A2, a3: A3) => R6;
-        flow<A1, A2, A3, R1, R2, R3, R4, R5, R6, R7>(f1: (a1: A1, a2: A2, a3: A3) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7): (a1: A1, a2: A2, a3: A3) => R7;
-        flow<A1, A2, A3, R1, R2, R3, R4, R5, R6, R7>(f1: (a1: A1, a2: A2, a3: A3) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7, ...funcs: Array<Many<(a: any) => any>>): (a1: A1, a2: A2, a3: A3) => any;
-        // 4-argument first function
-        flow<A1, A2, A3, A4, R1, R2>(f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1, f2: (a: R1) => R2): (a1: A1, a2: A2, a3: A3, a4: A4) => R2;
-        flow<A1, A2, A3, A4, R1, R2, R3>(f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3): (a1: A1, a2: A2, a3: A3, a4: A4) => R3;
-        flow<A1, A2, A3, A4, R1, R2, R3, R4>(f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4): (a1: A1, a2: A2, a3: A3, a4: A4) => R4;
-        flow<A1, A2, A3, A4, R1, R2, R3, R4, R5>(f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5): (a1: A1, a2: A2, a3: A3, a4: A4) => R5;
-        flow<A1, A2, A3, A4, R1, R2, R3, R4, R5, R6>(f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6): (a1: A1, a2: A2, a3: A3, a4: A4) => R6;
-        flow<A1, A2, A3, A4, R1, R2, R3, R4, R5, R6, R7>(f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7): (a1: A1, a2: A2, a3: A3, a4: A4) => R7;
-        flow<A1, A2, A3, A4, R1, R2, R3, R4, R5, R6, R7>(f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7, ...funcs: Array<Many<(a: any) => any>>): (a1: A1, a2: A2, a3: A3, a4: A4) => any;
-        // any-argument first function
-        flow<A1, A2, A3, A4, R1, R2>(f1: (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1, f2: (a: R1) => R2): (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R2;
-        flow<A1, A2, A3, A4, R1, R2, R3>(f1: (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3): (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R3;
-        flow<A1, A2, A3, A4, R1, R2, R3, R4>(f1: (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4): (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R4;
-        flow<A1, A2, A3, A4, R1, R2, R3, R4, R5>(f1: (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5): (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R5;
-        flow<A1, A2, A3, A4, R1, R2, R3, R4, R5, R6>(f1: (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6): (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R6;
-        flow<A1, A2, A3, A4, R1, R2, R3, R4, R5, R6, R7>(f1: (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7): (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R7;
-        flow<A1, A2, A3, A4, R1, R2, R3, R4, R5, R6, R7>(f1: (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7, ...funcs: Array<Many<(a: any) => any>>): (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => any;
-        flow(funcs: Array<Many<(...args: any[]) => any>>): (...args: any[]) => any;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.flow
-         */
-        // 0-argument first function
-        flow<R1, R2>(this: LoDashImplicitWrapper<() => R1>, f2: (a: R1) => R2): LoDashImplicitWrapper<() => R2>;
-        flow<R1, R2, R3>(this: LoDashImplicitWrapper<() => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3): LoDashImplicitWrapper<() => R3>;
-        flow<R1, R2, R3, R4>(this: LoDashImplicitWrapper<() => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4): LoDashImplicitWrapper<() => R4>;
-        flow<R1, R2, R3, R4, R5>(this: LoDashImplicitWrapper<() => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5): LoDashImplicitWrapper<() => R5>;
-        flow<R1, R2, R3, R4, R5, R6>(this: LoDashImplicitWrapper<() => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6): LoDashImplicitWrapper<() => R6>;
-        flow<R1, R2, R3, R4, R5, R6, R7>(this: LoDashImplicitWrapper<() => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7): LoDashImplicitWrapper<() => R7>;
-        flow<R1, R2, R3, R4, R5, R6, R7>(this: LoDashImplicitWrapper<() => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7, ...funcs: Array<Many<(a: any) => any>>): LoDashImplicitWrapper<() => any>;
-        // 1-argument first function
-        flow<A1, R1, R2>(this: LoDashImplicitWrapper<(a1: A1) => R1>, f2: (a: R1) => R2): LoDashImplicitWrapper<(a1: A1) => R2>;
-        flow<A1, R1, R2, R3>(this: LoDashImplicitWrapper<(a1: A1) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3): LoDashImplicitWrapper<(a1: A1) => R3>;
-        flow<A1, R1, R2, R3, R4>(this: LoDashImplicitWrapper<(a1: A1) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4): LoDashImplicitWrapper<(a1: A1) => R4>;
-        flow<A1, R1, R2, R3, R4, R5>(this: LoDashImplicitWrapper<(a1: A1) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5): LoDashImplicitWrapper<(a1: A1) => R5>;
-        flow<A1, R1, R2, R3, R4, R5, R6>(this: LoDashImplicitWrapper<(a1: A1) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6): LoDashImplicitWrapper<(a1: A1) => R6>;
-        flow<A1, R1, R2, R3, R4, R5, R6, R7>(this: LoDashImplicitWrapper<(a1: A1) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7): LoDashImplicitWrapper<(a1: A1) => R7>;
-        flow<A1, R1, R2, R3, R4, R5, R6, R7>(this: LoDashImplicitWrapper<(a1: A1) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7, ...funcs: Array<Many<(a: any) => any>>): LoDashImplicitWrapper<(a1: A1) => any>;
-        // 2-argument first function
-        flow<A1, A2, R1, R2>(this: LoDashImplicitWrapper<(a1: A1, a2: A2) => R1>, f2: (a: R1) => R2): LoDashImplicitWrapper<(a1: A1, a2: A2) => R2>;
-        flow<A1, A2, R1, R2, R3>(this: LoDashImplicitWrapper<(a1: A1, a2: A2) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3): LoDashImplicitWrapper<(a1: A1, a2: A2) => R3>;
-        flow<A1, A2, R1, R2, R3, R4>(this: LoDashImplicitWrapper<(a1: A1, a2: A2) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4): LoDashImplicitWrapper<(a1: A1, a2: A2) => R4>;
-        flow<A1, A2, R1, R2, R3, R4, R5>(this: LoDashImplicitWrapper<(a1: A1, a2: A2) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5): LoDashImplicitWrapper<(a1: A1, a2: A2) => R5>;
-        flow<A1, A2, R1, R2, R3, R4, R5, R6>(this: LoDashImplicitWrapper<(a1: A1, a2: A2) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6): LoDashImplicitWrapper<(a1: A1, a2: A2) => R6>;
-        flow<A1, A2, R1, R2, R3, R4, R5, R6, R7>(this: LoDashImplicitWrapper<(a1: A1, a2: A2) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7): LoDashImplicitWrapper<(a1: A1, a2: A2) => R7>;
-        flow<A1, A2, R1, R2, R3, R4, R5, R6, R7>(this: LoDashImplicitWrapper<(a1: A1, a2: A2) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7, ...funcs: Array<Many<(a: any) => any>>): LoDashImplicitWrapper<(a1: A1, a2: A2) => any>;
-        // 3-argument first function
-        flow<A1, A2, A3, R1, R2>(this: LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3) => R1>, f2: (a: R1) => R2): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3) => R2>;
-        flow<A1, A2, A3, R1, R2, R3>(this: LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3) => R3>;
-        flow<A1, A2, A3, R1, R2, R3, R4>(this: LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3) => R4>;
-        flow<A1, A2, A3, R1, R2, R3, R4, R5>(this: LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3) => R5>;
-        flow<A1, A2, A3, R1, R2, R3, R4, R5, R6>(this: LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3) => R6>;
-        flow<A1, A2, A3, R1, R2, R3, R4, R5, R6, R7>(this: LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3) => R7>;
-        flow<A1, A2, A3, R1, R2, R3, R4, R5, R6, R7>(this: LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7, ...funcs: Array<Many<(a: any) => any>>): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3) => any>;
-        // 4-argument first function
-        flow<A1, A2, A3, A4, R1, R2>(this: LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R1>, f2: (a: R1) => R2): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R2>;
-        flow<A1, A2, A3, A4, R1, R2, R3>(this: LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R3>;
-        flow<A1, A2, A3, A4, R1, R2, R3, R4>(this: LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R4>;
-        flow<A1, A2, A3, A4, R1, R2, R3, R4, R5>(this: LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R5>;
-        flow<A1, A2, A3, A4, R1, R2, R3, R4, R5, R6>(this: LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R6>;
-        flow<A1, A2, A3, A4, R1, R2, R3, R4, R5, R6, R7>(this: LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R7>;
-        flow<A1, A2, A3, A4, R1, R2, R3, R4, R5, R6, R7>(this: LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7, ...funcs: Array<Many<(a: any) => any>>): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => any>;
-        // any-argument first function
-        flow<A1, A2, A3, A4, R1, R2>(this: LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1>, f2: (a: R1) => R2): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R2>;
-        flow<A1, A2, A3, A4, R1, R2, R3>(this: LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R3>;
-        flow<A1, A2, A3, A4, R1, R2, R3, R4>(this: LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R4>;
-        flow<A1, A2, A3, A4, R1, R2, R3, R4, R5>(this: LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R5>;
-        flow<A1, A2, A3, A4, R1, R2, R3, R4, R5, R6>(this: LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R6>;
-        flow<A1, A2, A3, A4, R1, R2, R3, R4, R5, R6, R7>(this: LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R7>;
-        flow<A1, A2, A3, A4, R1, R2, R3, R4, R5, R6, R7>(this: LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7, ...funcs: Array<Many<(a: any) => any>>): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => any>;
-        flow(this: LoDashImplicitWrapper<(...args: any[]) => any>, funcs: Array<Many<(a: any) => any>>): LoDashImplicitWrapper<(...args: any[]) => any>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.flow
-         */
-        // 0-argument first function
-        flow<R1, R2>(this: LoDashExplicitWrapper<() => R1>, f2: (a: R1) => R2): LoDashExplicitWrapper<() => R2>;
-        flow<R1, R2, R3>(this: LoDashExplicitWrapper<() => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3): LoDashExplicitWrapper<() => R3>;
-        flow<R1, R2, R3, R4>(this: LoDashExplicitWrapper<() => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4): LoDashExplicitWrapper<() => R4>;
-        flow<R1, R2, R3, R4, R5>(this: LoDashExplicitWrapper<() => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5): LoDashExplicitWrapper<() => R5>;
-        flow<R1, R2, R3, R4, R5, R6>(this: LoDashExplicitWrapper<() => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6): LoDashExplicitWrapper<() => R6>;
-        flow<R1, R2, R3, R4, R5, R6, R7>(this: LoDashExplicitWrapper<() => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7): LoDashExplicitWrapper<() => R7>;
-        flow<R1, R2, R3, R4, R5, R6, R7>(this: LoDashExplicitWrapper<() => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7, ...funcs: Array<Many<(a: any) => any>>): LoDashExplicitWrapper<() => any>;
-        // 1-argument first function
-        flow<A1, R1, R2>(this: LoDashExplicitWrapper<(a1: A1) => R1>, f2: (a: R1) => R2): LoDashExplicitWrapper<(a1: A1) => R2>;
-        flow<A1, R1, R2, R3>(this: LoDashExplicitWrapper<(a1: A1) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3): LoDashExplicitWrapper<(a1: A1) => R3>;
-        flow<A1, R1, R2, R3, R4>(this: LoDashExplicitWrapper<(a1: A1) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4): LoDashExplicitWrapper<(a1: A1) => R4>;
-        flow<A1, R1, R2, R3, R4, R5>(this: LoDashExplicitWrapper<(a1: A1) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5): LoDashExplicitWrapper<(a1: A1) => R5>;
-        flow<A1, R1, R2, R3, R4, R5, R6>(this: LoDashExplicitWrapper<(a1: A1) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6): LoDashExplicitWrapper<(a1: A1) => R6>;
-        flow<A1, R1, R2, R3, R4, R5, R6, R7>(this: LoDashExplicitWrapper<(a1: A1) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7): LoDashExplicitWrapper<(a1: A1) => R7>;
-        flow<A1, R1, R2, R3, R4, R5, R6, R7>(this: LoDashExplicitWrapper<(a1: A1) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7, ...funcs: Array<Many<(a: any) => any>>): LoDashExplicitWrapper<(a1: A1) => any>;
-        // 2-argument first function
-        flow<A1, A2, R1, R2>(this: LoDashExplicitWrapper<(a1: A1, a2: A2) => R1>, f2: (a: R1) => R2): LoDashExplicitWrapper<(a1: A1, a2: A2) => R2>;
-        flow<A1, A2, R1, R2, R3>(this: LoDashExplicitWrapper<(a1: A1, a2: A2) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3): LoDashExplicitWrapper<(a1: A1, a2: A2) => R3>;
-        flow<A1, A2, R1, R2, R3, R4>(this: LoDashExplicitWrapper<(a1: A1, a2: A2) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4): LoDashExplicitWrapper<(a1: A1, a2: A2) => R4>;
-        flow<A1, A2, R1, R2, R3, R4, R5>(this: LoDashExplicitWrapper<(a1: A1, a2: A2) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5): LoDashExplicitWrapper<(a1: A1, a2: A2) => R5>;
-        flow<A1, A2, R1, R2, R3, R4, R5, R6>(this: LoDashExplicitWrapper<(a1: A1, a2: A2) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6): LoDashExplicitWrapper<(a1: A1, a2: A2) => R6>;
-        flow<A1, A2, R1, R2, R3, R4, R5, R6, R7>(this: LoDashExplicitWrapper<(a1: A1, a2: A2) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7): LoDashExplicitWrapper<(a1: A1, a2: A2) => R7>;
-        flow<A1, A2, R1, R2, R3, R4, R5, R6, R7>(this: LoDashExplicitWrapper<(a1: A1, a2: A2) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7, ...funcs: Array<Many<(a: any) => any>>): LoDashExplicitWrapper<(a1: A1, a2: A2) => any>;
-        // 3-argument first function
-        flow<A1, A2, A3, R1, R2>(this: LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3) => R1>, f2: (a: R1) => R2): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3) => R2>;
-        flow<A1, A2, A3, R1, R2, R3>(this: LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3) => R3>;
-        flow<A1, A2, A3, R1, R2, R3, R4>(this: LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3) => R4>;
-        flow<A1, A2, A3, R1, R2, R3, R4, R5>(this: LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3) => R5>;
-        flow<A1, A2, A3, R1, R2, R3, R4, R5, R6>(this: LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3) => R6>;
-        flow<A1, A2, A3, R1, R2, R3, R4, R5, R6, R7>(this: LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3) => R7>;
-        flow<A1, A2, A3, R1, R2, R3, R4, R5, R6, R7>(this: LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7, ...funcs: Array<Many<(a: any) => any>>): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3) => any>;
-        // 4-argument first function
-        flow<A1, A2, A3, A4, R1, R2>(this: LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R1>, f2: (a: R1) => R2): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R2>;
-        flow<A1, A2, A3, A4, R1, R2, R3>(this: LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R3>;
-        flow<A1, A2, A3, A4, R1, R2, R3, R4>(this: LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R4>;
-        flow<A1, A2, A3, A4, R1, R2, R3, R4, R5>(this: LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R5>;
-        flow<A1, A2, A3, A4, R1, R2, R3, R4, R5, R6>(this: LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R6>;
-        flow<A1, A2, A3, A4, R1, R2, R3, R4, R5, R6, R7>(this: LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R7>;
-        flow<A1, A2, A3, A4, R1, R2, R3, R4, R5, R6, R7>(this: LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7, ...funcs: Array<Many<(a: any) => any>>): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => any>;
-        // any-argument first function
-        flow<A1, A2, A3, A4, R1, R2>(this: LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1>, f2: (a: R1) => R2): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R2>;
-        flow<A1, A2, A3, A4, R1, R2, R3>(this: LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R3>;
-        flow<A1, A2, A3, A4, R1, R2, R3, R4>(this: LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R4>;
-        flow<A1, A2, A3, A4, R1, R2, R3, R4, R5>(this: LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R5>;
-        flow<A1, A2, A3, A4, R1, R2, R3, R4, R5, R6>(this: LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R6>;
-        flow<A1, A2, A3, A4, R1, R2, R3, R4, R5, R6, R7>(this: LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R7>;
-        flow<A1, A2, A3, A4, R1, R2, R3, R4, R5, R6, R7>(this: LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1>, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7, ...funcs: Array<Many<(a: any) => any>>): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => any>;
-        flow(this: LoDashExplicitWrapper<(...args: any[]) => any>, funcs: Array<Many<(a: any) => any>>): LoDashExplicitWrapper<(...args: any[]) => any>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/util/flowRight.d.ts b/types/lodash/util/flowRight.d.ts
deleted file mode 100644
index e61f162ce3..0000000000
--- a/types/lodash/util/flowRight.d.ts
+++ /dev/null
@@ -1,156 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * This method is like _.flow except that it creates a function that invokes the provided functions from right
-         * to left.
-         *
-         * @param funcs Functions to invoke.
-         * @return Returns the new function.
-         */
-        // 0-argument first function
-        flowRight<R2, R1>(f2: (a: R1) => R2, f1: () => R1): () => R2;
-        flowRight<R3, R2, R1>(f3: (a: R2) => R3, f2: (a: R1) => R2, f1: () => R1): () => R3;
-        flowRight<R4, R3, R2, R1>(f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: () => R1): () => R4;
-        flowRight<R5, R4, R3, R2, R1>(f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: () => R1): () => R5;
-        flowRight<R6, R5, R4, R3, R2, R1>(f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: () => R1): () => R6;
-        flowRight<R7, R6, R5, R4, R3, R2, R1>(f7: (a: R6) => R7, f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: () => R1): () => R7;
-        // 1-argument first function
-        flowRight<A1, R2, R1>(f2: (a: R1) => R2, f1: (a1: A1) => R1): (a1: A1) => R2;
-        flowRight<A1, R3, R2, R1>(f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1) => R1): (a1: A1) => R3;
-        flowRight<A1, R4, R3, R2, R1>(f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1) => R1): (a1: A1) => R4;
-        flowRight<A1, R5, R4, R3, R2, R1>(f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1) => R1): (a1: A1) => R5;
-        flowRight<A1, R6, R5, R4, R3, R2, R1>(f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1) => R1): (a1: A1) => R6;
-        flowRight<A1, R7, R6, R5, R4, R3, R2, R1>(f7: (a: R6) => R7, f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1) => R1): (a1: A1) => R7;
-        // 2-argument first function
-        flowRight<A1, A2, R2, R1>(f2: (a: R1) => R2, f1: (a1: A1, a2: A2) => R1): (a1: A1, a2: A2) => R2;
-        flowRight<A1, A2, R3, R2, R1>(f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2) => R1): (a1: A1, a2: A2) => R3;
-        flowRight<A1, A2, R4, R3, R2, R1>(f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2) => R1): (a1: A1, a2: A2) => R4;
-        flowRight<A1, A2, R5, R4, R3, R2, R1>(f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2) => R1): (a1: A1, a2: A2) => R5;
-        flowRight<A1, A2, R6, R5, R4, R3, R2, R1>(f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2) => R1): (a1: A1, a2: A2) => R6;
-        flowRight<A1, A2, R7, R6, R5, R4, R3, R2, R1>(f7: (a: R6) => R7, f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2) => R1): (a1: A1, a2: A2) => R7;
-        // 3-argument first function
-        flowRight<A1, A2, A3, R2, R1>(f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3) => R1): (a1: A1, a2: A2, a3: A3) => R2;
-        flowRight<A1, A2, A3, R3, R2, R1>(f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3) => R1): (a1: A1, a2: A2, a3: A3) => R3;
-        flowRight<A1, A2, A3, R4, R3, R2, R1>(f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3) => R1): (a1: A1, a2: A2, a3: A3) => R4;
-        flowRight<A1, A2, A3, R5, R4, R3, R2, R1>(f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3) => R1): (a1: A1, a2: A2, a3: A3) => R5;
-        flowRight<A1, A2, A3, R6, R5, R4, R3, R2, R1>(f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3) => R1): (a1: A1, a2: A2, a3: A3) => R6;
-        flowRight<A1, A2, A3, R7, R6, R5, R4, R3, R2, R1>(f7: (a: R6) => R7, f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3) => R1): (a1: A1, a2: A2, a3: A3) => R7;
-        // 4-argument first function
-        flowRight<A1, A2, A3, A4, R2, R1>(f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1): (a1: A1, a2: A2, a3: A3, a4: A4) => R2;
-        flowRight<A1, A2, A3, A4, R3, R2, R1>(f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1): (a1: A1, a2: A2, a3: A3, a4: A4) => R3;
-        flowRight<A1, A2, A3, A4, R4, R3, R2, R1>(f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1): (a1: A1, a2: A2, a3: A3, a4: A4) => R4;
-        flowRight<A1, A2, A3, A4, R5, R4, R3, R2, R1>(f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1): (a1: A1, a2: A2, a3: A3, a4: A4) => R5;
-        flowRight<A1, A2, A3, A4, R6, R5, R4, R3, R2, R1>(f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1): (a1: A1, a2: A2, a3: A3, a4: A4) => R6;
-        flowRight<A1, A2, A3, A4, R7, R6, R5, R4, R3, R2, R1>(f7: (a: R6) => R7, f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1): (a1: A1, a2: A2, a3: A3, a4: A4) => R7;
-        // any-argument first function
-        flowRight<R2, R1>(f2: (a: R1) => R2, f1: (...args: any[]) => R1): (...args: any[]) => R2;
-        flowRight<R3, R2, R1>(f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (...args: any[]) => R1): (...args: any[]) => R3;
-        flowRight<R4, R3, R2, R1>(f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (...args: any[]) => R1): (...args: any[]) => R4;
-        flowRight<R5, R4, R3, R2, R1>(f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (...args: any[]) => R1): (...args: any[]) => R5;
-        flowRight<R6, R5, R4, R3, R2, R1>(f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (...args: any[]) => R1): (...args: any[]) => R6;
-        flowRight<R7, R6, R5, R4, R3, R2, R1>(f7: (a: R6) => R7, f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (...args: any[]) => R1): (...args: any[]) => R7;
-        flowRight(f7: (a: any) => any, f6: (a: any) => any, f5: (a: any) => any, f4: (a: any) => any, f3: (a: any) => any, f2: (a: any) => any, f1: () => any, ...funcs: Array<Many<(...args: any[]) => any>>): (...args: any[]) => any;
-        flowRight(funcs: Array<Many<(...args: any[]) => any>>): (...args: any[]) => any;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.flowRight
-         */
-        // 0-argument first function
-        flowRight<R2, R1>(this: LoDashImplicitWrapper<(a: R1) => R2>, f1: () => R1): LoDashImplicitWrapper<() => R2>;
-        flowRight<R3, R2, R1>(this: LoDashImplicitWrapper<(a: R2) => R3>, f2: (a: R1) => R2, f1: () => R1): LoDashImplicitWrapper<() => R3>;
-        flowRight<R4, R3, R2, R1>(this: LoDashImplicitWrapper<(a: R3) => R4>, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: () => R1): LoDashImplicitWrapper<() => R4>;
-        flowRight<R5, R4, R3, R2, R1>(this: LoDashImplicitWrapper<(a: R4) => R5>, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: () => R1): LoDashImplicitWrapper<() => R5>;
-        flowRight<R6, R5, R4, R3, R2, R1>(this: LoDashImplicitWrapper<(a: R5) => R6>, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: () => R1): LoDashImplicitWrapper<() => R6>;
-        flowRight<R7, R6, R5, R4, R3, R2, R1>(this: LoDashImplicitWrapper<(a: R6) => R7>, f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: () => R1): LoDashImplicitWrapper<() => R7>;
-        // 1-argument first function
-        flowRight<A1, R2, R1>(this: LoDashImplicitWrapper<(a: R1) => R2>, f1: (a1: A1) => R1): LoDashImplicitWrapper<(a1: A1) => R2>;
-        flowRight<A1, R3, R2, R1>(this: LoDashImplicitWrapper<(a: R2) => R3>, f2: (a: R1) => R2, f1: (a1: A1) => R1): LoDashImplicitWrapper<(a1: A1) => R3>;
-        flowRight<A1, R4, R3, R2, R1>(this: LoDashImplicitWrapper<(a: R3) => R4>, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1) => R1): LoDashImplicitWrapper<(a1: A1) => R4>;
-        flowRight<A1, R5, R4, R3, R2, R1>(this: LoDashImplicitWrapper<(a: R4) => R5>, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1) => R1): LoDashImplicitWrapper<(a1: A1) => R5>;
-        flowRight<A1, R6, R5, R4, R3, R2, R1>(this: LoDashImplicitWrapper<(a: R5) => R6>, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1) => R1): LoDashImplicitWrapper<(a1: A1) => R6>;
-        flowRight<A1, R7, R6, R5, R4, R3, R2, R1>(this: LoDashImplicitWrapper<(a: R6) => R7>, f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1) => R1): LoDashImplicitWrapper<(a1: A1) => R7>;
-        // 2-argument first function
-        flowRight<A1, A2, R2, R1>(this: LoDashImplicitWrapper<(a: R1) => R2>, f1: (a1: A1, a2: A2) => R1): LoDashImplicitWrapper<(a1: A1, a2: A2) => R2>;
-        flowRight<A1, A2, R3, R2, R1>(this: LoDashImplicitWrapper<(a: R2) => R3>, f2: (a: R1) => R2, f1: (a1: A1, a2: A2) => R1): LoDashImplicitWrapper<(a1: A1, a2: A2) => R3>;
-        flowRight<A1, A2, R4, R3, R2, R1>(this: LoDashImplicitWrapper<(a: R3) => R4>, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2) => R1): LoDashImplicitWrapper<(a1: A1, a2: A2) => R4>;
-        flowRight<A1, A2, R5, R4, R3, R2, R1>(this: LoDashImplicitWrapper<(a: R4) => R5>, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2) => R1): LoDashImplicitWrapper<(a1: A1, a2: A2) => R5>;
-        flowRight<A1, A2, R6, R5, R4, R3, R2, R1>(this: LoDashImplicitWrapper<(a: R5) => R6>, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2) => R1): LoDashImplicitWrapper<(a1: A1, a2: A2) => R6>;
-        flowRight<A1, A2, R7, R6, R5, R4, R3, R2, R1>(this: LoDashImplicitWrapper<(a: R6) => R7>, f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2) => R1): LoDashImplicitWrapper<(a1: A1, a2: A2) => R7>;
-        // 3-argument first function
-        flowRight<A1, A2, A3, R2, R1>(this: LoDashImplicitWrapper<(a: R1) => R2>, f1: (a1: A1, a2: A2, a3: A3) => R1): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3) => R2>;
-        flowRight<A1, A2, A3, R3, R2, R1>(this: LoDashImplicitWrapper<(a: R2) => R3>, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3) => R1): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3) => R3>;
-        flowRight<A1, A2, A3, R4, R3, R2, R1>(this: LoDashImplicitWrapper<(a: R3) => R4>, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3) => R1): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3) => R4>;
-        flowRight<A1, A2, A3, R5, R4, R3, R2, R1>(this: LoDashImplicitWrapper<(a: R4) => R5>, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3) => R1): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3) => R5>;
-        flowRight<A1, A2, A3, R6, R5, R4, R3, R2, R1>(this: LoDashImplicitWrapper<(a: R5) => R6>, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3) => R1): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3) => R6>;
-        flowRight<A1, A2, A3, R7, R6, R5, R4, R3, R2, R1>(this: LoDashImplicitWrapper<(a: R6) => R7>, f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3) => R1): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3) => R7>;
-        // 4-argument first function
-        flowRight<A1, A2, A3, A4, R2, R1>(this: LoDashImplicitWrapper<(a: R1) => R2>, f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R2>;
-        flowRight<A1, A2, A3, A4, R3, R2, R1>(this: LoDashImplicitWrapper<(a: R2) => R3>, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R3>;
-        flowRight<A1, A2, A3, A4, R4, R3, R2, R1>(this: LoDashImplicitWrapper<(a: R3) => R4>, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R4>;
-        flowRight<A1, A2, A3, A4, R5, R4, R3, R2, R1>(this: LoDashImplicitWrapper<(a: R4) => R5>, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R5>;
-        flowRight<A1, A2, A3, A4, R6, R5, R4, R3, R2, R1>(this: LoDashImplicitWrapper<(a: R5) => R6>, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R6>;
-        flowRight<A1, A2, A3, A4, R7, R6, R5, R4, R3, R2, R1>(this: LoDashImplicitWrapper<(a: R6) => R7>, f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1): LoDashImplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R7>;
-        // any-argument first function
-        flowRight<R2, R1>(this: LoDashImplicitWrapper<(a: R1) => R2>, f1: (...args: any[]) => R1): LoDashImplicitWrapper<(...args: any[]) => R2>;
-        flowRight<R3, R2, R1>(this: LoDashImplicitWrapper<(a: R1) => R2>, f2: (a: R1) => R2, f1: (...args: any[]) => R1): LoDashImplicitWrapper<(...args: any[]) => R3>;
-        flowRight<R4, R3, R2, R1>(this: LoDashImplicitWrapper<(a: R1) => R2>, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (...args: any[]) => R1): LoDashImplicitWrapper<(...args: any[]) => R4>;
-        flowRight<R5, R4, R3, R2, R1>(this: LoDashImplicitWrapper<(a: R1) => R2>, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (...args: any[]) => R1): LoDashImplicitWrapper<(...args: any[]) => R5>;
-        flowRight<R6, R5, R4, R3, R2, R1>(this: LoDashImplicitWrapper<(a: R1) => R2>, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (...args: any[]) => R1): LoDashImplicitWrapper<(...args: any[]) => R6>;
-        flowRight<R7, R6, R5, R4, R3, R2, R1>(this: LoDashImplicitWrapper<(a: R1) => R2>, f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (...args: any[]) => R1): LoDashImplicitWrapper<(...args: any[]) => R7>;
-        flowRight(this: LoDashImplicitWrapper<(a: any) => any>, f6: (a: any) => any, f5: (a: any) => any, f4: (a: any) => any, f3: (a: any) => any, f2: (a: any) => any, f1: () => any, ...funcs: Array<Many<(...args: any[]) => any>>): LoDashImplicitWrapper<(...args: any[]) => any>;
-        flowRight(this: LoDashImplicitWrapper<(a: any) => any>, funcs: Array<Many<(...args: any[]) => any>>): LoDashImplicitWrapper<(...args: any[]) => any>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.flowRight
-         */
-        // 0-argument first function
-        flowRight<R2, R1>(this: LoDashExplicitWrapper<(a: R1) => R2>, f1: () => R1): LoDashExplicitWrapper<() => R2>;
-        flowRight<R3, R2, R1>(this: LoDashExplicitWrapper<(a: R2) => R3>, f2: (a: R1) => R2, f1: () => R1): LoDashExplicitWrapper<() => R3>;
-        flowRight<R4, R3, R2, R1>(this: LoDashExplicitWrapper<(a: R3) => R4>, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: () => R1): LoDashExplicitWrapper<() => R4>;
-        flowRight<R5, R4, R3, R2, R1>(this: LoDashExplicitWrapper<(a: R4) => R5>, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: () => R1): LoDashExplicitWrapper<() => R5>;
-        flowRight<R6, R5, R4, R3, R2, R1>(this: LoDashExplicitWrapper<(a: R5) => R6>, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: () => R1): LoDashExplicitWrapper<() => R6>;
-        flowRight<R7, R6, R5, R4, R3, R2, R1>(this: LoDashExplicitWrapper<(a: R6) => R7>, f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: () => R1): LoDashExplicitWrapper<() => R7>;
-        // 1-argument first function
-        flowRight<A1, R2, R1>(this: LoDashExplicitWrapper<(a: R1) => R2>, f1: (a1: A1) => R1): LoDashExplicitWrapper<(a1: A1) => R2>;
-        flowRight<A1, R3, R2, R1>(this: LoDashExplicitWrapper<(a: R2) => R3>, f2: (a: R1) => R2, f1: (a1: A1) => R1): LoDashExplicitWrapper<(a1: A1) => R3>;
-        flowRight<A1, R4, R3, R2, R1>(this: LoDashExplicitWrapper<(a: R3) => R4>, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1) => R1): LoDashExplicitWrapper<(a1: A1) => R4>;
-        flowRight<A1, R5, R4, R3, R2, R1>(this: LoDashExplicitWrapper<(a: R4) => R5>, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1) => R1): LoDashExplicitWrapper<(a1: A1) => R5>;
-        flowRight<A1, R6, R5, R4, R3, R2, R1>(this: LoDashExplicitWrapper<(a: R5) => R6>, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1) => R1): LoDashExplicitWrapper<(a1: A1) => R6>;
-        flowRight<A1, R7, R6, R5, R4, R3, R2, R1>(this: LoDashExplicitWrapper<(a: R6) => R7>, f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1) => R1): LoDashExplicitWrapper<(a1: A1) => R7>;
-        // 2-argument first function
-        flowRight<A1, A2, R2, R1>(this: LoDashExplicitWrapper<(a: R1) => R2>, f1: (a1: A1, a2: A2) => R1): LoDashExplicitWrapper<(a1: A1, a2: A2) => R2>;
-        flowRight<A1, A2, R3, R2, R1>(this: LoDashExplicitWrapper<(a: R2) => R3>, f2: (a: R1) => R2, f1: (a1: A1, a2: A2) => R1): LoDashExplicitWrapper<(a1: A1, a2: A2) => R3>;
-        flowRight<A1, A2, R4, R3, R2, R1>(this: LoDashExplicitWrapper<(a: R3) => R4>, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2) => R1): LoDashExplicitWrapper<(a1: A1, a2: A2) => R4>;
-        flowRight<A1, A2, R5, R4, R3, R2, R1>(this: LoDashExplicitWrapper<(a: R4) => R5>, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2) => R1): LoDashExplicitWrapper<(a1: A1, a2: A2) => R5>;
-        flowRight<A1, A2, R6, R5, R4, R3, R2, R1>(this: LoDashExplicitWrapper<(a: R5) => R6>, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2) => R1): LoDashExplicitWrapper<(a1: A1, a2: A2) => R6>;
-        flowRight<A1, A2, R7, R6, R5, R4, R3, R2, R1>(this: LoDashExplicitWrapper<(a: R6) => R7>, f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2) => R1): LoDashExplicitWrapper<(a1: A1, a2: A2) => R7>;
-        // 3-argument first function
-        flowRight<A1, A2, A3, R2, R1>(this: LoDashExplicitWrapper<(a: R1) => R2>, f1: (a1: A1, a2: A2, a3: A3) => R1): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3) => R2>;
-        flowRight<A1, A2, A3, R3, R2, R1>(this: LoDashExplicitWrapper<(a: R2) => R3>, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3) => R1): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3) => R3>;
-        flowRight<A1, A2, A3, R4, R3, R2, R1>(this: LoDashExplicitWrapper<(a: R3) => R4>, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3) => R1): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3) => R4>;
-        flowRight<A1, A2, A3, R5, R4, R3, R2, R1>(this: LoDashExplicitWrapper<(a: R4) => R5>, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3) => R1): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3) => R5>;
-        flowRight<A1, A2, A3, R6, R5, R4, R3, R2, R1>(this: LoDashExplicitWrapper<(a: R5) => R6>, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3) => R1): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3) => R6>;
-        flowRight<A1, A2, A3, R7, R6, R5, R4, R3, R2, R1>(this: LoDashExplicitWrapper<(a: R6) => R7>, f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3) => R1): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3) => R7>;
-        // 4-argument first function
-        flowRight<A1, A2, A3, A4, R2, R1>(this: LoDashExplicitWrapper<(a: R1) => R2>, f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R2>;
-        flowRight<A1, A2, A3, A4, R3, R2, R1>(this: LoDashExplicitWrapper<(a: R2) => R3>, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R3>;
-        flowRight<A1, A2, A3, A4, R4, R3, R2, R1>(this: LoDashExplicitWrapper<(a: R3) => R4>, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R4>;
-        flowRight<A1, A2, A3, A4, R5, R4, R3, R2, R1>(this: LoDashExplicitWrapper<(a: R4) => R5>, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R5>;
-        flowRight<A1, A2, A3, A4, R6, R5, R4, R3, R2, R1>(this: LoDashExplicitWrapper<(a: R5) => R6>, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R6>;
-        flowRight<A1, A2, A3, A4, R7, R6, R5, R4, R3, R2, R1>(this: LoDashExplicitWrapper<(a: R6) => R7>, f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1): LoDashExplicitWrapper<(a1: A1, a2: A2, a3: A3, a4: A4) => R7>;
-        // any-argument first function
-        flowRight<R2, R1>(this: LoDashExplicitWrapper<(a: R1) => R2>, f1: (...args: any[]) => R1): LoDashExplicitWrapper<(...args: any[]) => R2>;
-        flowRight<R3, R2, R1>(this: LoDashExplicitWrapper<(a: R1) => R2>, f2: (a: R1) => R2, f1: (...args: any[]) => R1): LoDashExplicitWrapper<(...args: any[]) => R3>;
-        flowRight<R4, R3, R2, R1>(this: LoDashExplicitWrapper<(a: R1) => R2>, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (...args: any[]) => R1): LoDashExplicitWrapper<(...args: any[]) => R4>;
-        flowRight<R5, R4, R3, R2, R1>(this: LoDashExplicitWrapper<(a: R1) => R2>, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (...args: any[]) => R1): LoDashExplicitWrapper<(...args: any[]) => R5>;
-        flowRight<R6, R5, R4, R3, R2, R1>(this: LoDashExplicitWrapper<(a: R1) => R2>, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (...args: any[]) => R1): LoDashExplicitWrapper<(...args: any[]) => R6>;
-        flowRight<R7, R6, R5, R4, R3, R2, R1>(this: LoDashExplicitWrapper<(a: R1) => R2>, f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (...args: any[]) => R1): LoDashExplicitWrapper<(...args: any[]) => R7>;
-        flowRight(this: LoDashExplicitWrapper<(a: any) => any>, f6: (a: any) => any, f5: (a: any) => any, f4: (a: any) => any, f3: (a: any) => any, f2: (a: any) => any, f1: () => any, ...funcs: Array<Many<(...args: any[]) => any>>): LoDashExplicitWrapper<(...args: any[]) => any>;
-        flowRight(this: LoDashExplicitWrapper<(a: any) => any>, funcs: Array<Many<(...args: any[]) => any>>): LoDashExplicitWrapper<(...args: any[]) => any>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/util/identity.d.ts b/types/lodash/util/identity.d.ts
deleted file mode 100644
index 6fff4525ad..0000000000
--- a/types/lodash/util/identity.d.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * This method returns the first argument provided to it.
-         *
-         * @param value Any value.
-         * @return Returns value.
-         */
-        identity<T>(value: T): T;
-
-        /**
-         * @see _.identity
-         */
-        identity(): undefined;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.identity
-         */
-        identity(): TValue;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.identity
-         */
-        identity(): this;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/util/iteratee.d.ts b/types/lodash/util/iteratee.d.ts
deleted file mode 100644
index b41c6d3cf2..0000000000
--- a/types/lodash/util/iteratee.d.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Creates a function that invokes `func` with the arguments of the created
-         * function. If `func` is a property name the created callback returns the
-         * property value for a given element. If `func` is an object the created
-         * callback returns `true` for elements that contain the equivalent object properties, otherwise it returns `false`.
-         *
-         * @category Util
-         * @param [func=_.identity] The value to convert to a callback.
-         * @returns Returns the callback.
-         * @example
-         *
-         * var users = [
-         *   { 'user': 'barney', 'age': 36 },
-         *   { 'user': 'fred',   'age': 40 }
-         * ];
-         *
-         * // create custom iteratee shorthands
-         * _.iteratee = _.wrap(_.iteratee, function(callback, func) {
-         *   var p = /^(\S+)\s*([<>])\s*(\S+)$/.exec(func);
-         *   return !p ? callback(func) : function(object) {
-         *     return (p[2] == '>' ? object[p[1]] > p[3] : object[p[1]] < p[3]);
-         *   };
-         * });
-         *
-         * _.filter(users, 'age > 36');
-         * // => [{ 'user': 'fred', 'age': 40 }]
-         */
-        iteratee<TFunction extends (...args: any[]) => any>(
-            func: TFunction | string | object
-        ): TFunction;
-
-        /**
-         * @see _.iteratee
-         */
-        iteratee(): typeof _.identity; // tslint:disable-line:no-unnecessary-qualifier
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.iteratee
-         */
-        iteratee<TFunction extends (...args: any[]) => any>(
-            this: LoDashImplicitWrapper<TFunction | string | object>
-        ): LoDashImplicitWrapper<TFunction>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.iteratee
-         */
-        iteratee<TFunction extends (...args: any[]) => any>(
-            this: LoDashExplicitWrapper<TFunction | string | object>
-        ): LoDashExplicitWrapper<TFunction>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/util/matches.d.ts b/types/lodash/util/matches.d.ts
deleted file mode 100644
index b919ffbbcc..0000000000
--- a/types/lodash/util/matches.d.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Creates a function that performs a deep comparison between a given object and source, returning true if the
-         * given object has equivalent property values, else false.
-         *
-         * Note: This method supports comparing arrays, booleans, Date objects, numbers, Object objects, regexes, and
-         * strings. Objects are compared by their own, not inherited, enumerable properties. For comparing a single own
-         * or inherited property value see _.matchesProperty.
-         *
-         * @param source The object of property values to match.
-         * @return Returns the new function.
-         */
-        matches<T>(source: T): (value: any) => boolean;
-
-        /**
-         * @see _.matches
-         */
-        matches<T, V>(source: T): (value: V) => boolean;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.matches
-         */
-        matches<V>(): LoDashImplicitWrapper<(value: V) => boolean>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.matches
-         */
-        matches<V>(): LoDashExplicitWrapper<(value: V) => boolean>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/util/matchesProperty.d.ts b/types/lodash/util/matchesProperty.d.ts
deleted file mode 100644
index fc574be4f9..0000000000
--- a/types/lodash/util/matchesProperty.d.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Creates a function that compares the property value of path on a given object to value.
-         *
-         * Note: This method supports comparing arrays, booleans, Date objects, numbers, Object objects, regexes, and
-         * strings. Objects are compared by their own, not inherited, enumerable properties.
-         *
-         * @param path The path of the property to get.
-         * @param srcValue The value to match.
-         * @return Returns the new function.
-         */
-        matchesProperty<T>(
-            path: PropertyPath,
-            srcValue: T
-        ): (value: any) => boolean;
-
-        /**
-         * @see _.matchesProperty
-         */
-        matchesProperty<T, V>(
-            path: PropertyPath,
-            srcValue: T
-        ): (value: V) => boolean;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.matchesProperty
-         */
-        matchesProperty<SrcValue>(
-            srcValue: SrcValue
-        ): LoDashImplicitWrapper<(value: any) => boolean>;
-
-        /**
-         * @see _.matchesProperty
-         */
-        matchesProperty<SrcValue, Value>(
-            srcValue: SrcValue
-        ): LoDashImplicitWrapper<(value: Value) => boolean>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.matchesProperty
-         */
-        matchesProperty<SrcValue>(
-            srcValue: SrcValue
-        ): LoDashExplicitWrapper<(value: any) => boolean>;
-
-        /**
-         * @see _.matchesProperty
-         */
-        matchesProperty<SrcValue, Value>(
-            srcValue: SrcValue
-        ): LoDashExplicitWrapper<(value: Value) => boolean>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/util/method.d.ts b/types/lodash/util/method.d.ts
deleted file mode 100644
index 09c508caef..0000000000
--- a/types/lodash/util/method.d.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Creates a function that invokes the method at path on a given object. Any additional arguments are provided
-         * to the invoked method.
-         *
-         * @param path The path of the method to invoke.
-         * @param args The arguments to invoke the method with.
-         * @return Returns the new function.
-         */
-        method(
-            path: PropertyPath,
-            ...args: any[]
-        ): (object: any) => any;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.method
-         */
-        method(...args: any[]): LoDashImplicitWrapper<(object: any) => any>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.method
-         */
-        method(...args: any[]): LoDashExplicitWrapper<(object: any) => any>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/util/methodOf.d.ts b/types/lodash/util/methodOf.d.ts
deleted file mode 100644
index 4ec4d15515..0000000000
--- a/types/lodash/util/methodOf.d.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * The opposite of _.method; this method creates a function that invokes the method at a given path on object.
-         * Any additional arguments are provided to the invoked method.
-         *
-         * @param object The object to query.
-         * @param args The arguments to invoke the method with.
-         * @return Returns the new function.
-         */
-        methodOf(
-            object: object,
-            ...args: any[]
-        ): (path: PropertyPath) => any;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.methodOf
-         */
-        methodOf(
-            ...args: any[]
-        ): LoDashImplicitWrapper<(path: PropertyPath) => any>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.methodOf
-         */
-        methodOf(
-            ...args: any[]
-        ): LoDashExplicitWrapper<(path: PropertyPath) => any>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/util/mixin.d.ts b/types/lodash/util/mixin.d.ts
deleted file mode 100644
index 02237ae751..0000000000
--- a/types/lodash/util/mixin.d.ts
+++ /dev/null
@@ -1,69 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface MixinOptions {
-        chain?: boolean;
-    }
-
-    interface LoDashStatic {
-        /**
-         * Adds all own enumerable function properties of a source object to the destination object. If object is a
-         * function then methods are added to its prototype as well.
-         *
-         * Note: Use _.runInContext to create a pristine lodash function to avoid conflicts caused by modifying
-         * the original.
-         *
-         * @param object The destination object.
-         * @param source The object of functions to add.
-         * @param options The options object.
-         * @param options.chain Specify whether the functions added are chainable.
-         * @return Returns object.
-         */
-        mixin<TObject>(
-            object: TObject,
-            source: Dictionary<(...args: any[]) => any>,
-            options?: MixinOptions
-        ): TObject;
-
-        /**
-         * @see _.mixin
-         */
-        mixin<TResult>(
-            source: Dictionary<(...args: any[]) => any>,
-            options?: MixinOptions
-        ): LoDashStatic;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.mixin
-         */
-        mixin(
-            source: Dictionary<(...args: any[]) => any>,
-            options?: MixinOptions
-        ): this;
-
-        /**
-         * @see _.mixin
-         */
-        mixin(
-            options?: MixinOptions
-        ): LoDashImplicitWrapper<LoDashStatic>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.mixin
-         */
-        mixin(
-            source: Dictionary<(...args: any[]) => any>,
-            options?: MixinOptions
-        ): this;
-
-        /**
-         * @see _.mixin
-         */
-        mixin(
-            options?: MixinOptions
-        ): LoDashExplicitWrapper<LoDashStatic>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/util/noConflict.d.ts b/types/lodash/util/noConflict.d.ts
deleted file mode 100644
index 80ecca9f10..0000000000
--- a/types/lodash/util/noConflict.d.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Reverts the _ variable to its previous value and returns a reference to the lodash function.
-         *
-         * @return Returns the lodash function.
-         */
-        noConflict(): typeof _;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.noConflict
-         */
-        noConflict(): typeof _;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.noConflict
-         */
-        noConflict(): LoDashExplicitWrapper<typeof _>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/util/noop.d.ts b/types/lodash/util/noop.d.ts
deleted file mode 100644
index ca66677e57..0000000000
--- a/types/lodash/util/noop.d.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * A no-operation function that returns undefined regardless of the arguments it receives.
-         *
-         * @return undefined
-         */
-        noop(...args: any[]): void;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.noop
-         */
-        noop(...args: any[]): void;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.noop
-         */
-        noop(...args: any[]): LoDashExplicitWrapper<undefined>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/util/nthArg.d.ts b/types/lodash/util/nthArg.d.ts
deleted file mode 100644
index c5b6b0d5db..0000000000
--- a/types/lodash/util/nthArg.d.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Creates a function that returns its nth argument.
-         *
-         * @param n The index of the argument to return.
-         * @return Returns the new function.
-         */
-        nthArg(n?: number): (...args: any[]) => any;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.nthArg
-         */
-        nthArg(): LoDashImplicitWrapper<(...args: any[]) => any>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.nthArg
-         */
-        nthArg(): LoDashExplicitWrapper<(...args: any[]) => any>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/util/over.d.ts b/types/lodash/util/over.d.ts
deleted file mode 100644
index 2b4b49f573..0000000000
--- a/types/lodash/util/over.d.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Creates a function that invokes iteratees with the arguments provided to the created function and returns
-         * their results.
-         *
-         * @param iteratees The iteratees to invoke.
-         * @return Returns the new function.
-         */
-        over<TResult>(...iteratees: Array<Many<(...args: any[]) => TResult>>): (...args: any[]) => TResult[];
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.over
-         */
-        over<TResult>(
-            this: LoDashImplicitWrapper<Many<(...args: any[]) => TResult>>,
-            ...iteratees: Array<Many<(...args: any[]) => TResult>>
-        ): LoDashImplicitWrapper<(...args: any[]) => TResult[]>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.over
-         */
-        over<TResult>(
-            this: LoDashExplicitWrapper<Many<(...args: any[]) => TResult>>,
-            ...iteratees: Array<Many<(...args: any[]) => TResult>>
-        ): LoDashExplicitWrapper<(...args: any[]) => TResult[]>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/util/overEvery.d.ts b/types/lodash/util/overEvery.d.ts
deleted file mode 100644
index d061d3ec72..0000000000
--- a/types/lodash/util/overEvery.d.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Creates a function that checks if all of the predicates return truthy when invoked with the arguments
-         * provided to the created function.
-         *
-         * @param predicates The predicates to check.
-         * @return Returns the new function.
-         */
-        overEvery<T>(...predicates: Array<Many<(...args: T[]) => boolean>>): (...args: T[]) => boolean;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.overEvery
-         */
-        overEvery<T>(...predicates: Array<Many<(...args: T[]) => boolean>>): LoDashImplicitWrapper<(...args: T[]) => boolean>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.overEvery
-         */
-        overEvery<T>(...predicates: Array<Many<(...args: T[]) => boolean>>): LoDashExplicitWrapper<(...args: T[]) => boolean>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/util/overSome.d.ts b/types/lodash/util/overSome.d.ts
deleted file mode 100644
index 1ff92f8d42..0000000000
--- a/types/lodash/util/overSome.d.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Creates a function that checks if any of the predicates return truthy when invoked with the arguments
-         * provided to the created function.
-         *
-         * @param predicates The predicates to check.
-         * @return Returns the new function.
-         */
-        overSome<T>(...predicates: Array<Many<(...args: T[]) => boolean>>): (...args: T[]) => boolean;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.overSome
-         */
-        overSome<T>(...predicates: Array<Many<(...args: T[]) => boolean>>): LoDashImplicitWrapper<(...args: T[]) => boolean>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.overSome
-         */
-        overSome<T>(...predicates: Array<Many<(...args: T[]) => boolean>>): LoDashExplicitWrapper<(...args: T[]) => boolean>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/util/property.d.ts b/types/lodash/util/property.d.ts
deleted file mode 100644
index 8edab90248..0000000000
--- a/types/lodash/util/property.d.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Creates a function that returns the property value at path on a given object.
-         *
-         * @param path The path of the property to get.
-         * @return Returns the new function.
-         */
-        property<TObj, TResult>(path: PropertyPath): (obj: TObj) => TResult;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.property
-         */
-        property<TObj, TResult>(): LoDashImplicitWrapper<(obj: TObj) => TResult>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.property
-         */
-        property<TObj, TResult>(): LoDashExplicitWrapper<(obj: TObj) => TResult>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/util/propertyOf.d.ts b/types/lodash/util/propertyOf.d.ts
deleted file mode 100644
index cc272ec7bf..0000000000
--- a/types/lodash/util/propertyOf.d.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * The opposite of _.property; this method creates a function that returns the property value at a given path
-         * on object.
-         *
-         * @param object The object to query.
-         * @return Returns the new function.
-         */
-        propertyOf<T extends {}>(object: T): (path: PropertyPath) => any;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.propertyOf
-         */
-        propertyOf(): LoDashImplicitWrapper<(path: PropertyPath) => any>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.propertyOf
-         */
-        propertyOf(): LoDashExplicitWrapper<(path: PropertyPath) => any>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/util/range.d.ts b/types/lodash/util/range.d.ts
deleted file mode 100644
index 35bf7e3d2e..0000000000
--- a/types/lodash/util/range.d.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Creates an array of numbers (positive and/or negative) progressing from start up to, but not including, end.
-         * If end is not specified it’s set to start with start then set to 0. If end is less than start a zero-length
-         * range is created unless a negative step is specified.
-         *
-         * @param start The start of the range.
-         * @param end The end of the range.
-         * @param step The value to increment or decrement by.
-         * @return Returns a new range array.
-         */
-        range(
-            start: number,
-            end?: number,
-            step?: number
-        ): number[];
-
-        /**
-         * Creates an array of numbers (positive and/or negative) progressing from start up to, but not including, end.
-         * If end is not specified it’s set to start with start then set to 0. If end is less than start a zero-length
-         * range is created unless a negative step is specified.
-         *
-         * @param start The start of the range.
-         * @param index Not used in this overload.
-         * @param guard Enables use as an iteratee for methods like _.map. You should not pass this parameter directly in your code.
-         * @return Returns a new range array.
-         */
-        range(
-            end: number,
-            index: string | number,
-            guard: object
-        ): number[];
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.range
-         */
-        range(
-            end?: number,
-            step?: number
-        ): LoDashImplicitWrapper<number[]>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.range
-         */
-        range(
-            end?: number,
-            step?: number
-        ): LoDashExplicitWrapper<number[]>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/util/rangeRight.d.ts b/types/lodash/util/rangeRight.d.ts
deleted file mode 100644
index ced80d5968..0000000000
--- a/types/lodash/util/rangeRight.d.ts
+++ /dev/null
@@ -1,77 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * This method is like `_.range` except that it populates values in
-         * descending order.
-         *
-         * @category Util
-         * @param start The start of the range.
-         * @param end The end of the range.
-         * @param step The value to increment or decrement by.
-         * @returns Returns the new array of numbers.
-         * @example
-         *
-         * _.rangeRight(4);
-         * // => [3, 2, 1, 0]
-         *
-         * _.rangeRight(-4);
-         * // => [-3, -2, -1, 0]
-         *
-         * _.rangeRight(1, 5);
-         * // => [4, 3, 2, 1]
-         *
-         * _.rangeRight(0, 20, 5);
-         * // => [15, 10, 5, 0]
-         *
-         * _.rangeRight(0, -4, -1);
-         * // => [-3, -2, -1, 0]
-         *
-         * _.rangeRight(1, 4, 0);
-         * // => [1, 1, 1]
-         *
-         * _.rangeRight(0);
-         * // => []
-         */
-        rangeRight(
-            start: number,
-            end?: number,
-            step?: number
-        ): number[];
-
-        /**
-         * This method is like _.range except that it populates values in
-         * descending order.
-         *
-         * @param start The start of the range.
-         * @param index Not used in this overload.
-         * @param guard Enables use as an iteratee for methods like _.map. You should not pass this parameter directly in your code.
-         * @return Returns a new range array.
-         */
-        rangeRight(
-            end: number,
-            index: string | number,
-            guard: object
-        ): number[];
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.rangeRight
-         */
-        rangeRight(
-            end?: number,
-            step?: number
-        ): LoDashImplicitWrapper<number[]>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.rangeRight
-         */
-        rangeRight(
-            end?: number,
-            step?: number
-        ): LoDashExplicitWrapper<number[]>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/util/runInContext.d.ts b/types/lodash/util/runInContext.d.ts
deleted file mode 100644
index 38fb1ff6b1..0000000000
--- a/types/lodash/util/runInContext.d.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Create a new pristine lodash function using the given context object.
-         *
-         * @param context The context object.
-         * @return Returns a new lodash function.
-         */
-        runInContext(context?: object): typeof _;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.runInContext
-         */
-        runInContext(): typeof _;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/util/stubArray.d.ts b/types/lodash/util/stubArray.d.ts
deleted file mode 100644
index b8440b7f25..0000000000
--- a/types/lodash/util/stubArray.d.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * This method returns a new empty array.
-         *
-         * @returns Returns the new empty array.
-         */
-        stubArray(): any[];
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.stubArray
-         */
-        stubArray(): any[];
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.stubArray
-         */
-        stubArray(): LoDashExplicitWrapper<any[]>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/util/stubFalse.d.ts b/types/lodash/util/stubFalse.d.ts
deleted file mode 100644
index 394bdc5cce..0000000000
--- a/types/lodash/util/stubFalse.d.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * This method returns `false`.
-         *
-         * @returns Returns `false`.
-         */
-        stubFalse(): boolean;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.stubFalse
-         */
-        stubFalse(): boolean;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.stubFalse
-         */
-        stubFalse(): LoDashExplicitWrapper<boolean>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/util/stubObject.d.ts b/types/lodash/util/stubObject.d.ts
deleted file mode 100644
index 877decfcf0..0000000000
--- a/types/lodash/util/stubObject.d.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * This method returns a new empty object.
-         *
-         * @returns Returns the new empty object.
-         */
-        stubObject(): any;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.stubObject
-         */
-        stubObject(): any;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.stubObject
-         */
-        stubObject(): LoDashExplicitWrapper<any>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/util/stubString.d.ts b/types/lodash/util/stubString.d.ts
deleted file mode 100644
index 6967aafc14..0000000000
--- a/types/lodash/util/stubString.d.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * This method returns an empty string.
-         *
-         * @returns Returns the empty string.
-         */
-        stubString(): string;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.stubString
-         */
-        stubString(): string;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.stubString
-         */
-        stubString(): LoDashExplicitWrapper<string>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/util/stubTrue.d.ts b/types/lodash/util/stubTrue.d.ts
deleted file mode 100644
index 2a18d82e88..0000000000
--- a/types/lodash/util/stubTrue.d.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * This method returns `true`.
-         *
-         * @returns Returns `true`.
-         */
-        stubTrue(): boolean;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.stubTrue
-         */
-        stubTrue(): boolean;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.stubTrue
-         */
-        stubTrue(): LoDashExplicitWrapper<boolean>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/util/times.d.ts b/types/lodash/util/times.d.ts
deleted file mode 100644
index 1056080ebf..0000000000
--- a/types/lodash/util/times.d.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Invokes the iteratee function n times, returning an array of the results of each invocation. The iteratee
-         * is invoked with one argument; (index).
-         *
-         * @param n The number of times to invoke iteratee.
-         * @param iteratee The function invoked per iteration.
-         * @return Returns the array of results.
-         */
-        times<TResult>(
-            n: number,
-            iteratee: (num: number) => TResult
-        ): TResult[];
-
-        /**
-         * @see _.times
-         */
-        times(n: number): number[];
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.times
-         */
-        times<TResult>(
-            iteratee: (num: number) => TResult
-        ): TResult[];
-
-        /**
-         * @see _.times
-         */
-        times(): number[];
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.times
-         */
-        times<TResult>(
-            iteratee: (num: number) => TResult
-        ): LoDashExplicitWrapper<TResult[]>;
-
-        /**
-         * @see _.times
-         */
-        times(): LoDashExplicitWrapper<number[]>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/util/toPath.d.ts b/types/lodash/util/toPath.d.ts
deleted file mode 100644
index e98a9eb30f..0000000000
--- a/types/lodash/util/toPath.d.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Converts `value` to a property path array.
-         *
-         * @category Util
-         * @param value The value to convert.
-         * @returns Returns the new property path array.
-         * @example
-         *
-         * _.toPath('a.b.c');
-         * // => ['a', 'b', 'c']
-         *
-         * _.toPath('a[0].b.c');
-         * // => ['a', '0', 'b', 'c']
-         *
-         * var path = ['a', 'b', 'c'],
-         *     newPath = _.toPath(path);
-         *
-         * console.log(newPath);
-         * // => ['a', 'b', 'c']
-         *
-         * console.log(path === newPath);
-         * // => false
-         */
-        toPath(value: any): string[];
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.toPath
-         */
-        toPath(): LoDashImplicitWrapper<string[]>;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.toPath
-         */
-        toPath(): LoDashExplicitWrapper<string[]>;
-    }
-}
\ No newline at end of file
diff --git a/types/lodash/util/uniqueId.d.ts b/types/lodash/util/uniqueId.d.ts
deleted file mode 100644
index 75bedcaa94..0000000000
--- a/types/lodash/util/uniqueId.d.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import _ = require("../index");
-declare module "../index" {
-    interface LoDashStatic {
-        /**
-         * Generates a unique ID. If prefix is provided the ID is appended to it.
-         *
-         * @param prefix The value to prefix the ID with.
-         * @return Returns the unique ID.
-         */
-        uniqueId(prefix?: string): string;
-    }
-
-    interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.uniqueId
-         */
-        uniqueId(): string;
-    }
-
-    interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.uniqueId
-         */
-        uniqueId(): LoDashExplicitWrapper<string>;
-    }
-}
\ No newline at end of file
diff --git a/types/logform/tsconfig.json b/types/logform/tsconfig.json
index 5b68ac3c28..e583eef148 100644
--- a/types/logform/tsconfig.json
+++ b/types/logform/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "logform-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/loglevel/tsconfig.json b/types/loglevel/tsconfig.json
index 4d370f7a24..efcc4efad8 100644
--- a/types/loglevel/tsconfig.json
+++ b/types/loglevel/tsconfig.json
@@ -21,4 +21,4 @@
         "test/loglevel-tests.ts",
         "test/loglevel-umd-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/loopback-boot/loopback-boot-tests.ts b/types/loopback-boot/loopback-boot-tests.ts
index 5de95d00c6..8fa409c768 100644
--- a/types/loopback-boot/loopback-boot-tests.ts
+++ b/types/loopback-boot/loopback-boot-tests.ts
@@ -1,6 +1,6 @@
-import * as loopback from 'loopback';
-import * as boot from 'loopback-boot';
-import * as cookieParser from 'cookie-parser';
+import loopback = require('loopback');
+import boot = require('loopback-boot');
+import cookieParser = require('cookie-parser');
 
 class Server {
   app: loopback.LoopBackApplication;
diff --git a/types/loopback/loopback-tests.ts b/types/loopback/loopback-tests.ts
index ed37bf5804..359e6977b6 100644
--- a/types/loopback/loopback-tests.ts
+++ b/types/loopback/loopback-tests.ts
@@ -1,5 +1,5 @@
-import * as loopback from 'loopback';
-import * as cookieParser from 'cookie-parser';
+import loopback = require('loopback');
+import cookieParser = require('cookie-parser');
 
 class TestModel {
     id: number;
diff --git a/types/lowdb/tsconfig.json b/types/lowdb/tsconfig.json
index 7897564789..ba8db2cede 100644
--- a/types/lowdb/tsconfig.json
+++ b/types/lowdb/tsconfig.json
@@ -28,4 +28,4 @@
         "lib/main.d.ts",
         "lowdb-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/lusca/tsconfig.json b/types/lusca/tsconfig.json
index ede7926c1c..5aa370882f 100644
--- a/types/lusca/tsconfig.json
+++ b/types/lusca/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "lusca-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/luxon/index.d.ts b/types/luxon/index.d.ts
index 7229e45dc4..fac0b90fe6 100644
--- a/types/luxon/index.d.ts
+++ b/types/luxon/index.d.ts
@@ -287,7 +287,7 @@ declare module 'luxon' {
         type Features = {
             intl: boolean;
             intlTokens: boolean;
-            timezones: boolean;
+            zones: boolean;
         };
 
         namespace Info {
diff --git a/types/luxon/luxon-tests.ts b/types/luxon/luxon-tests.ts
index 6310342899..11ef254ae9 100644
--- a/types/luxon/luxon-tests.ts
+++ b/types/luxon/luxon-tests.ts
@@ -78,6 +78,9 @@ i.toString();
 /* Info */
 Info.months();
 Info.weekdays('long');
+Info.features().intl;
+Info.features().intlTokens;
+Info.features().zones;
 
 /* Settings */
 Settings.defaultLocale;
diff --git a/types/luxon/tsconfig.json b/types/luxon/tsconfig.json
index e1b0e7864c..a425d6f79f 100644
--- a/types/luxon/tsconfig.json
+++ b/types/luxon/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "luxon-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/mapbox-gl/index.d.ts b/types/mapbox-gl/index.d.ts
index 47f62556c3..3cd759b2d0 100644
--- a/types/mapbox-gl/index.d.ts
+++ b/types/mapbox-gl/index.d.ts
@@ -1031,7 +1031,7 @@ declare namespace mapboxgl {
         'icon-size'?: number | StyleFunction | Expression;
         'icon-text-fit'?: 'none' | 'both' | 'width' | 'height';
         'icon-text-fit-padding'?: number[] | Expression;
-        'icon-image'?: string | StyleFunction;
+        'icon-image'?: string | StyleFunction | Expression;
         'icon-rotate'?: number | StyleFunction | Expression;
         'icon-padding'?: number | Expression;
         'icon-keep-upright'?: boolean;
diff --git a/types/mapbox-gl/tsconfig.json b/types/mapbox-gl/tsconfig.json
index 4c4228132e..efdc02c245 100644
--- a/types/mapbox-gl/tsconfig.json
+++ b/types/mapbox-gl/tsconfig.json
@@ -21,4 +21,4 @@
         "index.d.ts",
         "mapbox-gl-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/mapnik/tsconfig.json b/types/mapnik/tsconfig.json
index 81f111a37e..17f20bab52 100644
--- a/types/mapnik/tsconfig.json
+++ b/types/mapnik/tsconfig.json
@@ -1,23 +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",
-    "mapnik-tests.ts"
-  ]
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "mapnik-tests.ts"
+    ]
 }
\ No newline at end of file
diff --git a/types/mark.js/tsconfig.json b/types/mark.js/tsconfig.json
index 381f150954..2e55bd5541 100644
--- a/types/mark.js/tsconfig.json
+++ b/types/mark.js/tsconfig.json
@@ -21,4 +21,4 @@
         "index.d.ts",
         "mark.js-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/markdownlint/tsconfig.json b/types/markdownlint/tsconfig.json
index 53b9ae46aa..d5d0f1b043 100644
--- a/types/markdownlint/tsconfig.json
+++ b/types/markdownlint/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "markdownlint-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/massive/v3/tsconfig.json b/types/massive/v3/tsconfig.json
index ddfdc175d3..8cfaa77662 100644
--- a/types/massive/v3/tsconfig.json
+++ b/types/massive/v3/tsconfig.json
@@ -12,7 +12,9 @@
             "../../"
         ],
         "paths": {
-          "massive": [ "massive/v3" ]
+            "massive": [
+                "massive/v3"
+            ]
         },
         "types": [],
         "noEmit": true,
@@ -23,4 +25,4 @@
         "index.d.ts",
         "massive-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/material-components-web/tsconfig.json b/types/material-components-web/tsconfig.json
index 72ab99ccfc..6960b5a465 100644
--- a/types/material-components-web/tsconfig.json
+++ b/types/material-components-web/tsconfig.json
@@ -20,4 +20,4 @@
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     }
-}
+}
\ No newline at end of file
diff --git a/types/material-ui-datatables/index.d.ts b/types/material-ui-datatables/index.d.ts
index 3a8eab86f1..e456f84e7d 100644
--- a/types/material-ui-datatables/index.d.ts
+++ b/types/material-ui-datatables/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/hyojin/material-ui-datatables#readme
 // Definitions by: Ravi L. <https://github.com/coding2012>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from 'react';
 
diff --git a/types/material-ui-pagination/index.d.ts b/types/material-ui-pagination/index.d.ts
index 2e8ec8f1df..3e76401f43 100644
--- a/types/material-ui-pagination/index.d.ts
+++ b/types/material-ui-pagination/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/lo-tp/material-ui-pagination
 // Definitions by: m0a <https://m0a.github.io>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 import * as React from 'react';
 export interface PaginationProps {
 	total: number;
diff --git a/types/material-ui-pagination/material-ui-pagination-tests.tsx b/types/material-ui-pagination/material-ui-pagination-tests.tsx
index a7f85d8184..d680f95e1f 100644
--- a/types/material-ui-pagination/material-ui-pagination-tests.tsx
+++ b/types/material-ui-pagination/material-ui-pagination-tests.tsx
@@ -5,7 +5,7 @@ import * as ReactDOM from 'react-dom';
 import Pagination from 'material-ui-pagination';
 import * as ui from 'material-ui';
 import { MuiThemeProvider } from 'material-ui/styles';
-import * as injectTapEventPlugin from 'react-tap-event-plugin';
+import injectTapEventPlugin = require('react-tap-event-plugin');
 
 // Needed for onTouchTap
 // Check this repo:
diff --git a/types/material-ui/index.d.ts b/types/material-ui/index.d.ts
index 9624e6d4a2..c35eb31cba 100644
--- a/types/material-ui/index.d.ts
+++ b/types/material-ui/index.d.ts
@@ -12,7 +12,7 @@
 //                 Dan Jones <https://github.com/dan-j>
 //                 Daisuke Mino <https://github.com/minodisk>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 /// <reference types="react" />
 /// <reference types="react-addons-linked-state-mixin" />
@@ -1262,7 +1262,6 @@ declare namespace __MaterialUI {
 
             // Other properties from <Menu/>
             autoWidth?: boolean;
-            children?: React.ReactElement<MenuItemProps> | Array<React.ReactElement<MenuItemProps>>;
             desktop?: boolean;
             disableAutoFocus?: boolean;
             initiallyKeyboardFocused?: boolean;
diff --git a/types/material-ui/material-ui-tests.tsx b/types/material-ui/material-ui-tests.tsx
index 51b22c936c..a997ca7512 100644
--- a/types/material-ui/material-ui-tests.tsx
+++ b/types/material-ui/material-ui-tests.tsx
@@ -4503,6 +4503,15 @@ const IconMenuExampleSimple = () => (
     >
             <MenuItem primaryText="Sign out"/>
     </IconMenu>
+    <IconMenu
+      iconButtonElement={<IconButton><NavigationMoreVert /></IconButton>}
+    >
+            {false}
+            {undefined}
+            {null}
+            {true}
+            <MenuItem primaryText="Sign out"/>
+    </IconMenu>
   </div>
 );
 
diff --git a/types/material__animation/tsconfig.json b/types/material__animation/tsconfig.json
index d25bb531d1..6b0aa4b945 100644
--- a/types/material__animation/tsconfig.json
+++ b/types/material__animation/tsconfig.json
@@ -21,4 +21,4 @@
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     }
-}
+}
\ No newline at end of file
diff --git a/types/material__auto-init/tsconfig.json b/types/material__auto-init/tsconfig.json
index d25bb531d1..6b0aa4b945 100644
--- a/types/material__auto-init/tsconfig.json
+++ b/types/material__auto-init/tsconfig.json
@@ -21,4 +21,4 @@
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     }
-}
+}
\ No newline at end of file
diff --git a/types/material__base/tsconfig.json b/types/material__base/tsconfig.json
index 4f144a4c20..8d115d4eb3 100644
--- a/types/material__base/tsconfig.json
+++ b/types/material__base/tsconfig.json
@@ -23,4 +23,4 @@
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     }
-}
+}
\ No newline at end of file
diff --git a/types/material__checkbox/tsconfig.json b/types/material__checkbox/tsconfig.json
index 741c98e44a..2af99c6e5e 100644
--- a/types/material__checkbox/tsconfig.json
+++ b/types/material__checkbox/tsconfig.json
@@ -24,4 +24,4 @@
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     }
-}
+}
\ No newline at end of file
diff --git a/types/material__dialog/tsconfig.json b/types/material__dialog/tsconfig.json
index 3feaa72ba5..826161ca25 100644
--- a/types/material__dialog/tsconfig.json
+++ b/types/material__dialog/tsconfig.json
@@ -25,4 +25,4 @@
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     }
-}
+}
\ No newline at end of file
diff --git a/types/material__drawer/tsconfig.json b/types/material__drawer/tsconfig.json
index ab4f18b399..3e2a955de5 100644
--- a/types/material__drawer/tsconfig.json
+++ b/types/material__drawer/tsconfig.json
@@ -32,4 +32,4 @@
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     }
-}
+}
\ No newline at end of file
diff --git a/types/material__form-field/tsconfig.json b/types/material__form-field/tsconfig.json
index 741c98e44a..2af99c6e5e 100644
--- a/types/material__form-field/tsconfig.json
+++ b/types/material__form-field/tsconfig.json
@@ -24,4 +24,4 @@
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     }
-}
+}
\ No newline at end of file
diff --git a/types/material__grid-list/tsconfig.json b/types/material__grid-list/tsconfig.json
index 741c98e44a..2af99c6e5e 100644
--- a/types/material__grid-list/tsconfig.json
+++ b/types/material__grid-list/tsconfig.json
@@ -24,4 +24,4 @@
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     }
-}
+}
\ No newline at end of file
diff --git a/types/material__icon-toggle/tsconfig.json b/types/material__icon-toggle/tsconfig.json
index 741c98e44a..2af99c6e5e 100644
--- a/types/material__icon-toggle/tsconfig.json
+++ b/types/material__icon-toggle/tsconfig.json
@@ -24,4 +24,4 @@
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     }
-}
+}
\ No newline at end of file
diff --git a/types/material__linear-progress/tsconfig.json b/types/material__linear-progress/tsconfig.json
index 741c98e44a..2af99c6e5e 100644
--- a/types/material__linear-progress/tsconfig.json
+++ b/types/material__linear-progress/tsconfig.json
@@ -24,4 +24,4 @@
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     }
-}
+}
\ No newline at end of file
diff --git a/types/material__menu/tsconfig.json b/types/material__menu/tsconfig.json
index 7903a23031..74016e9380 100644
--- a/types/material__menu/tsconfig.json
+++ b/types/material__menu/tsconfig.json
@@ -26,4 +26,4 @@
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     }
-}
+}
\ No newline at end of file
diff --git a/types/material__radio/tsconfig.json b/types/material__radio/tsconfig.json
index 741c98e44a..2af99c6e5e 100644
--- a/types/material__radio/tsconfig.json
+++ b/types/material__radio/tsconfig.json
@@ -24,4 +24,4 @@
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     }
-}
+}
\ No newline at end of file
diff --git a/types/material__ripple/tsconfig.json b/types/material__ripple/tsconfig.json
index 3feaa72ba5..826161ca25 100644
--- a/types/material__ripple/tsconfig.json
+++ b/types/material__ripple/tsconfig.json
@@ -25,4 +25,4 @@
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     }
-}
+}
\ No newline at end of file
diff --git a/types/material__select/tsconfig.json b/types/material__select/tsconfig.json
index 741c98e44a..2af99c6e5e 100644
--- a/types/material__select/tsconfig.json
+++ b/types/material__select/tsconfig.json
@@ -24,4 +24,4 @@
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     }
-}
+}
\ No newline at end of file
diff --git a/types/material__selection-control/tsconfig.json b/types/material__selection-control/tsconfig.json
index d25bb531d1..6b0aa4b945 100644
--- a/types/material__selection-control/tsconfig.json
+++ b/types/material__selection-control/tsconfig.json
@@ -21,4 +21,4 @@
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     }
-}
+}
\ No newline at end of file
diff --git a/types/material__slider/tsconfig.json b/types/material__slider/tsconfig.json
index 741c98e44a..2af99c6e5e 100644
--- a/types/material__slider/tsconfig.json
+++ b/types/material__slider/tsconfig.json
@@ -24,4 +24,4 @@
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     }
-}
+}
\ No newline at end of file
diff --git a/types/material__snackbar/tsconfig.json b/types/material__snackbar/tsconfig.json
index 741c98e44a..2af99c6e5e 100644
--- a/types/material__snackbar/tsconfig.json
+++ b/types/material__snackbar/tsconfig.json
@@ -24,4 +24,4 @@
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     }
-}
+}
\ No newline at end of file
diff --git a/types/material__tabs/tsconfig.json b/types/material__tabs/tsconfig.json
index 0eb3952185..6cf952642a 100644
--- a/types/material__tabs/tsconfig.json
+++ b/types/material__tabs/tsconfig.json
@@ -33,4 +33,4 @@
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     }
-}
+}
\ No newline at end of file
diff --git a/types/material__textfield/tsconfig.json b/types/material__textfield/tsconfig.json
index a483098ccd..d70d268d9a 100644
--- a/types/material__textfield/tsconfig.json
+++ b/types/material__textfield/tsconfig.json
@@ -32,4 +32,4 @@
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     }
-}
+}
\ No newline at end of file
diff --git a/types/material__toolbar/tsconfig.json b/types/material__toolbar/tsconfig.json
index 3feaa72ba5..826161ca25 100644
--- a/types/material__toolbar/tsconfig.json
+++ b/types/material__toolbar/tsconfig.json
@@ -25,4 +25,4 @@
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     }
-}
+}
\ No newline at end of file
diff --git a/types/materialize-css/tsconfig.json b/types/materialize-css/tsconfig.json
index 316e2f8361..617d1b925a 100644
--- a/types/materialize-css/tsconfig.json
+++ b/types/materialize-css/tsconfig.json
@@ -23,4 +23,4 @@
         "test/materialize-css-module.test.ts",
         "test/materialize-css-jquery.test.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/materialize-css/v0/tsconfig.json b/types/materialize-css/v0/tsconfig.json
index 4f000774ea..3d26746416 100644
--- a/types/materialize-css/v0/tsconfig.json
+++ b/types/materialize-css/v0/tsconfig.json
@@ -26,4 +26,4 @@
         "index.d.ts",
         "materialize-css-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/matter-js/index.d.ts b/types/matter-js/index.d.ts
index 51a367df6c..ffca8627d0 100644
--- a/types/matter-js/index.d.ts
+++ b/types/matter-js/index.d.ts
@@ -1,13 +1,24 @@
-// Type definitions for Matter.js - 0.9.1
+// Type definitions for Matter.js - 0.10.0
 // Project: https://github.com/liabru/matter-js
 // Definitions by: Ivane Gegia <https://twitter.com/ivanegegia>,
-//                 David Asmuth <https://github.com/piranha771>
+//                 David Asmuth <https://github.com/piranha771>,
+//                 Piotr Pietrzak <https://github.com/hasparus> 
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 export = Matter;
 export as namespace Matter;
 
 declare namespace Matter {
+    /**
+     * Installs the given plugins on the `Matter` namespace.
+     * This is a short-hand for `Plugin.use`, see it for more information.
+     * Call this function once at the start of your code, with all of the plugins you wish to install as arguments.
+     * Avoid calling this function multiple times unless you intend to manually control installation order.
+     * @method use
+     * @param ...plugin {Function} The plugin(s) to install on `base` (multi-argument).
+     */
+    export function use(...plugins: (Plugin | string)[]): void;
+
     /**
     * The `Matter.Axes` module contains methods for creating and manipulating sets of axes.
     *
@@ -3315,4 +3326,142 @@ declare namespace Matter {
         static trigger(object: any, eventNames: string, event?: (e: any) => void): void;
 
     }
+    
+    type Dependency = {name: string, range: string}
+                    | {name: string, version: string}
+                    | string;
+
+    export class Plugin {
+        name: string;
+        version: string;
+        install: () => void;
+        for?: string;
+        
+        /**
+         * Registers a plugin object so it can be resolved later by name.
+         * @method register
+         * @param plugin {} The plugin to register.
+         * @return {object} The plugin.
+         */
+        static register(plugin: Plugin): Plugin;
+      
+        /**
+         * Resolves a dependency to a plugin object from the registry if it exists. 
+         * The `dependency` may contain a version, but only the name matters when resolving.
+         * @method resolve
+         * @param dependency {string} The dependency.
+         * @return {object} The plugin if resolved, otherwise `undefined`.
+         */
+        static resolve(dependency: string): Plugin | undefined;
+        
+        /**
+         * Returns `true` if the object meets the minimum standard to be considered a plugin.
+         * This means it must define the following properties:
+         * - `name`
+         * - `version`
+         * - `install`
+         * @method isPlugin
+         * @param obj {} The obj to test.
+         * @return {boolean} `true` if the object can be considered a plugin otherwise `false`.
+         */
+        static isPlugin(obj: {}): boolean;
+
+        /**
+         * Returns a pretty printed plugin name and version.
+         * @method toString
+         * @param plugin {} The plugin.
+         * @return {string} Pretty printed plugin name and version.
+         */
+        static toString(plugin: string | Plugin): string;
+
+        /**
+         * Returns `true` if `plugin.for` is applicable to `module` by comparing against `module.name` and `module.version`.
+         * If `plugin.for` is not specified then it is assumed to be applicable.
+         * The value of `plugin.for` is a string of the format `'module-name'` or `'module-name@version'`.
+         * @method isFor
+         * @param plugin {} The plugin.
+         * @param module {} The module.
+         * @return {boolean} `true` if `plugin.for` is applicable to `module`, otherwise `false`.
+         */
+        static isFor(plugin: Plugin, module: {name?: string, [_: string]: any}): boolean;
+
+        /**
+         * Installs the plugins by calling `plugin.install` on each plugin specified in `plugins` if passed, otherwise `module.uses`.
+         * For installing plugins on `Matter` see the convenience function `Matter.use`.
+         * Plugins may be specified either by their name or a reference to the plugin object.
+         * Plugins themselves may specify further dependencies, but each plugin is installed only once.
+         * Order is important, a topological sort is performed to find the best resulting order of installation.
+         * This sorting attempts to satisfy every dependency's requested ordering, but may not be exact in all cases.
+         * This function logs the resulting status of each dependency in the console, along with any warnings.
+         * - A green tick ✅ indicates a dependency was resolved and installed.
+         * - An orange diamond 🔶 indicates a dependency was resolved but a warning was thrown for it or one if its dependencies.
+         * - A red cross ❌ indicates a dependency could not be resolved.
+         * Avoid calling this function multiple times on the same module unless you intend to manually control installation order.
+         * @method use
+         * @param module {} The module install plugins on.
+         * @param [plugins=module.uses] {} The plugins to install on module (optional, defaults to `module.uses`).
+         */
+        static use(
+            module: {uses?: (Plugin | string)[]; [_: string]: any},
+            plugins: (Plugin | string)[]
+        ): void;
+
+        /**
+         * Recursively finds all of a module's dependencies and returns a flat dependency graph.
+         * @method dependencies
+         * @param module {} The module.
+         * @return {object} A dependency graph.
+         */
+        static dependencies(
+            module: Dependency,
+            tracked?: {[_: string]: string[]}
+        ): {[_: string]: string[]} | string | undefined
+
+        /**
+         * Parses a dependency string into its components.
+         * The `dependency` is a string of the format `'module-name'` or `'module-name@version'`.
+         * See documentation for `Plugin.versionParse` for a description of the format.
+         * This function can also handle dependencies that are already resolved (e.g. a module object).
+         * @method dependencyParse
+         * @param dependency {string} The dependency of the format `'module-name'` or `'module-name@version'`.
+         * @return {object} The dependency parsed into its components.
+         */
+        static dependencyParse(dependency: Dependency) : {name: string, range: string};
+        
+        /**
+         * Parses a version string into its components.
+         * Versions are strictly of the format `x.y.z` (as in [semver](http://semver.org/)).
+         * Versions may optionally have a prerelease tag in the format `x.y.z-alpha`.
+         * Ranges are a strict subset of [npm ranges](https://docs.npmjs.com/misc/semver#advanced-range-syntax).
+         * Only the following range types are supported:
+         * - Tilde ranges e.g. `~1.2.3`
+         * - Caret ranges e.g. `^1.2.3`
+         * - Exact version e.g. `1.2.3`
+         * - Any version `*`
+         * @method versionParse
+         * @param range {string} The version string.
+         * @return {object} The version range parsed into its components.
+         */
+        static versionParse(range: string) : {
+            isRange: boolean,
+            version: string,
+            range: string,
+            operator: string
+            parts: number[],
+            prerelease: string,
+            number: number
+        };
+
+        /**
+         * Returns `true` if `version` satisfies the given `range`.
+         * See documentation for `Plugin.versionParse` for a description of the format.
+         * If a version or range is not specified, then any version (`*`) is assumed to satisfy.
+         * @method versionSatisfies
+         * @param version {string} The version string.
+         * @param range {string} The range string.
+         * @return {boolean} `true` if `version` satisfies `range`, otherwise `false`.
+         */
+        static versionSatisfies(version: string, range: string): boolean;
+
+    }
 }
diff --git a/types/matter-js/matter-js-tests.ts b/types/matter-js/matter-js-tests.ts
index d94a1b6bed..3c34f91ecc 100644
--- a/types/matter-js/matter-js-tests.ts
+++ b/types/matter-js/matter-js-tests.ts
@@ -6,9 +6,13 @@ var Engine = Matter.Engine,
 	Composites = Matter.Composites,
 	Constraint = Matter.Constraint,
 	Events = Matter.Events,
-	Query = Matter.Query;
-	
-	
+	Query = Matter.Query,
+    Plugin = Matter.Plugin;
+    
+
+Matter.use('matter-attractors');
+Plugin.use(Matter, ["matter-wrap"]);
+
 var engine = Engine.create();
 
 //Bodies
diff --git a/types/mdurl/tsconfig.json b/types/mdurl/tsconfig.json
index c00c56ef07..cae963a9b0 100644
--- a/types/mdurl/tsconfig.json
+++ b/types/mdurl/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "mdurl-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/menubar/menubar-tests.ts b/types/menubar/menubar-tests.ts
index 7fd1a9dbe4..9501574164 100644
--- a/types/menubar/menubar-tests.ts
+++ b/types/menubar/menubar-tests.ts
@@ -1,4 +1,4 @@
-import * as menubar from "menubar";
+import menubar = require("menubar");
 
 var mb1 = menubar();
 
diff --git a/types/merge2/merge2-tests.ts b/types/merge2/merge2-tests.ts
index ba11597dfa..c96747973d 100644
--- a/types/merge2/merge2-tests.ts
+++ b/types/merge2/merge2-tests.ts
@@ -1,5 +1,5 @@
 import * as gulp from 'gulp';
-import * as merge2 from 'merge2';
+import merge2 = require('merge2');
 
 gulp.task('app-js', () =>
   merge2(
diff --git a/types/meteor/tsconfig.json b/types/meteor/tsconfig.json
index 6185ff9c61..b6cfc721f1 100644
--- a/types/meteor/tsconfig.json
+++ b/types/meteor/tsconfig.json
@@ -41,4 +41,4 @@
         "index.d.ts",
         "meteor-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/micro/micro-tests.ts b/types/micro/micro-tests.ts
index 010fe012cb..e47645deb9 100644
--- a/types/micro/micro-tests.ts
+++ b/types/micro/micro-tests.ts
@@ -1,5 +1,5 @@
 import micro, { json, RequestHandler, buffer, text, send, createError } from 'micro';
-import * as socketIO from 'socket.io';
+import socketIO = require('socket.io');
 
 // Json sample
 
diff --git a/types/milliseconds/index.d.ts b/types/milliseconds/index.d.ts
index 144886e457..937b281bde 100644
--- a/types/milliseconds/index.d.ts
+++ b/types/milliseconds/index.d.ts
@@ -9,7 +9,7 @@ interface Milliseconds {
 	hours(hours: number): number
 	days(days: number): number
 	weeks(weeks: number): number
-	month(month: number): number
+	months(months: number): number
 	years(years: number): number
 }
 
diff --git a/types/milliseconds/milliseconds-tests.ts b/types/milliseconds/milliseconds-tests.ts
index ea3b7c23ef..adb9efe7f3 100644
--- a/types/milliseconds/milliseconds-tests.ts
+++ b/types/milliseconds/milliseconds-tests.ts
@@ -5,5 +5,5 @@ milliseconds.minutes(2)
 milliseconds.hours(3)
 milliseconds.days(4)
 milliseconds.weeks(5)
-milliseconds.month(6)
+milliseconds.months(6)
 milliseconds.years(7)
diff --git a/types/minimist-options/tsconfig.json b/types/minimist-options/tsconfig.json
index b43c584555..97ee51708b 100644
--- a/types/minimist-options/tsconfig.json
+++ b/types/minimist-options/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "minimist-options-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/minio/index.d.ts b/types/minio/index.d.ts
new file mode 100644
index 0000000000..e4f2a0613c
--- /dev/null
+++ b/types/minio/index.d.ts
@@ -0,0 +1,230 @@
+// Type definitions for minio 4.0
+// Project: https://github.com/minio/minio-js#readme
+// Definitions by: Barin Britva <https://github.com/barinbritva>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+// Import from dependencies
+import { Stream } from 'stream';
+import EventEmitter = NodeJS.EventEmitter;
+
+// Exports only from typings
+export type Region = 'us-east-1'|'us-west-1'|'us-west-2'|'eu-west-1'|'eu-central-1'|'ap-southeast-1'|'ap-northeast-1'|'ap-southeast-2'|'sa-east-1'|'cn-north-1';
+export type PolicyValue = 'none'|'readonly'|'writeonly'|'readwrite';
+export type NoResultCallback = (error: Error|null) => void;
+export type ResultCallback<T> = (error: Error|null, result: T) => void;
+
+export interface ClientOptions {
+    endPoint: string;
+    accessKey: string;
+    secretKey: string;
+    secure?: boolean;
+    port?: number;
+    region?: Region;
+}
+
+export interface BucketItemFromList {
+    name: string;
+    creationDate: Date;
+}
+
+export interface BucketItemCopy {
+    etag: string;
+    lastModified: Date;
+}
+
+export interface BucketItem {
+    name: string;
+    prefix: string;
+    size: number;
+    etag: string;
+    lastModified: Date;
+}
+
+export interface BucketItemStat {
+    size: number;
+    contentType: string;
+    etag: string;
+    // In documentation in this case string. Is it doc error?
+    lastModified: Date|string;
+}
+
+export interface IncompleteUploadedBucketItem {
+    key: string;
+    uploadId: string;
+    size: number;
+}
+
+export interface BucketStream<T> extends Stream {
+    on(event: 'data', listener: (item: T) => void): this;
+}
+
+export interface PostPolicyResult {
+    postURL: string;
+    formData: {
+        [key: string]: any;
+    };
+}
+
+// No need to export this. But without it - linter error.
+export class TargetConfig {
+    setId(id: any): void;
+    addEvent(newEvent: any): void;
+    addFilterSuffix(suffix: any): void;
+    addFilterPrefix(prefix: any): void;
+}
+
+// Exports from library
+export class Client {
+    constructor(options: ClientOptions);
+
+    // Bucket operations
+    makeBucket(bucketName: string, callback: NoResultCallback): void;
+    makeBucket(bucketName: string, region: Region, callback: NoResultCallback): void;
+    makeBucket(bucketName: string, region?: Region): Promise<void>;
+
+    listBuckets(callback: ResultCallback<BucketItemFromList[]>): void;
+    listBuckets(): Promise<BucketItemFromList>;
+
+    // Doc contains error - no boolean value in result
+    bucketExists(bucketName: string, callback: NoResultCallback): void;
+    bucketExists(bucketName: string): Promise<void>;
+
+    removeBucket(bucketName: string, callback: NoResultCallback): void;
+    removeBucket(bucketName: string): Promise<void>;
+
+    listObjects(bucketName: string, prefix?: string, recursive?: boolean): BucketStream<BucketItem>;
+
+    listObjectsV2(bucketName: string, prefix?: string, recursive?: boolean): BucketStream<BucketItem>;
+
+    listIncompleteUploads(bucketName: string, prefix?: string, recursive?: boolean): BucketStream<IncompleteUploadedBucketItem>;
+
+    // Object operations
+    getObject(bucketName: string, objectName: string, callback: ResultCallback<Stream>): void;
+    getObject(bucketName: string, objectName: string): Promise<Stream>;
+
+    getPartialObject(bucketName: string, objectName: string, offset: number, callback: ResultCallback<Stream>): void;
+    getPartialObject(bucketName: string, objectName: string, offset: number, length: number, callback: ResultCallback<Stream>): void;
+    getPartialObject(bucketName: string, objectName: string, offset: number, length?: number): Promise<Stream>;
+
+    fGetObject(bucketName: string, objectName: string, filePath: string, callback: NoResultCallback): void;
+    fGetObject(bucketName: string, objectName: string, filePath: string): Promise<void>;
+
+    putObject(bucketName: string, objectName: string, stream: Stream|Buffer|string, callback: ResultCallback<string>): void;
+    putObject(bucketName: string, objectName: string, stream: Stream|Buffer|string, size: number, callback: ResultCallback<string>): void;
+    putObject(bucketName: string, objectName: string, stream: Stream|Buffer|string, size: number, cotentType: string, callback: ResultCallback<string>): void;
+    putObject(bucketName: string, objectName: string, stream: Stream|Buffer|string, size?: number, cotentType?: string): Promise<string>;
+
+    fPutObject(bucketName: string, objectName: string, filePath: string, contentType: string, callback: ResultCallback<string>): void;
+    fPutObject(bucketName: string, objectName: string, filePath: string, contentType: string): Promise<string>;
+
+    copyObject(bucketName: string, objectName: string, sourceObject: string, conditions: CopyConditions, callback: ResultCallback<BucketItemCopy>): void;
+    copyObject(bucketName: string, objectName: string, sourceObject: string, conditions: CopyConditions): Promise<BucketItemCopy>;
+
+    statObject(bucketName: string, objectName: string, callback: ResultCallback<BucketItemStat>): void;
+    statObject(bucketName: string, objectName: string): Promise<BucketItemStat>;
+
+    removeObject(bucketName: string, objectName: string, callback: NoResultCallback): void;
+    removeObject(bucketName: string, objectName: string): Promise<void>;
+
+    removeIncompleteUpload(bucketName: string, objectName: string, callback: NoResultCallback): void;
+    removeIncompleteUpload(bucketName: string, objectName: string): Promise<void>;
+
+    // Presigned operations
+    presignedUrl(httpMethod: string, bucketName: string, objectName: string, callback: ResultCallback<string>): void;
+    presignedUrl(httpMethod: string, bucketName: string, objectName: string, expiry: number, callback: ResultCallback<string>): void;
+    presignedUrl(httpMethod: string, bucketName: string, objectName: string, expiry: number, reqParams: { [key: string]: any; }, callback: ResultCallback<string>): void;
+    presignedUrl(httpMethod: string, bucketName: string, objectName: string, expiry?: number, reqParams?: { [key: string]: any; }): Promise<string>;
+
+    presignedGetObject(bucketName: string, objectName: string, callback: ResultCallback<string>): void;
+    presignedGetObject(bucketName: string, objectName: string, expiry: number, callback: ResultCallback<string>): void;
+    presignedGetObject(bucketName: string, objectName: string, expiry?: number): Promise<string>;
+
+    presignedPutObject(bucketName: string, objectName: string, callback: ResultCallback<string>): void;
+    presignedPutObject(bucketName: string, objectName: string, expiry: number, callback: ResultCallback<string>): void;
+    presignedPutObject(bucketName: string, objectName: string, expiry?: number): Promise<string>;
+
+    presignedPostPolicy(policy: PostPolicy, callback: ResultCallback<PostPolicyResult>): void;
+    presignedPostPolicy(policy: PostPolicy): Promise<PostPolicyResult>;
+
+    // Bucket Policy & Notification operations
+    getBucketNotification(bucketName: string, callback: ResultCallback<NotificationConfig>): void;
+    getBucketNotification(bucketName: string): Promise<NotificationConfig>;
+
+    setBucketNotification(bucketName: string, bucketNotificationConfig: NotificationConfig, callback: NoResultCallback): void;
+    setBucketNotification(bucketName: string, bucketNotificationConfig: NotificationConfig): Promise<void>;
+
+    removeAllBucketNotification(bucketName: string, callback: NoResultCallback): void;
+    removeAllBucketNotification(bucketName: string): Promise<void>;
+
+    // todo #low Specify events
+    listenBucketNotification(bucketName: string, prefix: string, suffix: string, events: string[]): EventEmitter;
+
+    getBucketPolicy(bucketName: string, objectPrefix: string, callback: ResultCallback<PolicyValue>): void;
+    getBucketPolicy(bucketName: string, objectPrefix: string): Promise<PolicyValue>;
+
+    setBucketPolicy(bucketName: string, objectPrefix: string, bucketPolice: PolicyValue, callback: NoResultCallback): void;
+    setBucketPolicy(bucketName: string, objectPrefix: string, bucketPolice: PolicyValue): Promise<void>;
+
+    // Other
+    newPostPolicy(): PostPolicy;
+}
+
+export namespace Policy {
+    const NONE: 'none';
+    const READONLY: 'readonly';
+    const WRITEONLY: 'writeonly';
+    const READWRITE: 'readwrite';
+}
+
+export class CopyConditions {
+    setModified(date: Date): void;
+    setUnmodified(date: Date): void;
+    setMatchETag(etag: string): void;
+    setMatchETagExcept(etag: string): void;
+}
+
+export class PostPolicy {
+    setExpires(date: Date): void;
+    setKey(objectName: string): void;
+    setKeyStartsWith(prefix: string): void;
+    setBucket(bucketName: string): void;
+    setContentType(type: string): void;
+    setContentLengthRange(min: number, max: number): void;
+}
+
+export class NotificationPoller extends EventEmitter {
+    stop(): void;
+    start(): void;
+    // must to be public?
+    checkForChanges(): void;
+}
+
+export class NotificationConfig {
+    add(target: TopicConfig|QueueConfig|CloudFunctionConfig): void;
+}
+
+export class TopicConfig extends TargetConfig {
+    constructor(arn: string);
+}
+
+export class QueueConfig extends TargetConfig {
+    constructor(arn: string);
+}
+
+export class CloudFunctionConfig extends TargetConfig {
+    constructor(arn: string);
+}
+
+export function buildARN(partition: string, service: string, region: string, accountId: string, resource: string): string;
+
+export const ObjectCreatedAll: string; // s3:ObjectCreated:*'
+export const ObjectCreatedPut: string; // s3:ObjectCreated:Put
+export const ObjectCreatedPost: string; // s3:ObjectCreated:Post
+export const ObjectCreatedCopy: string; // s3:ObjectCreated:Copy
+export const ObjectCreatedCompleteMultipartUpload: string; // sh:ObjectCreated:CompleteMultipartUpload
+export const ObjectRemovedAll: string; // s3:ObjectRemoved:*
+export const ObjectRemovedDelete: string; // s3:ObjectRemoved:Delete
+export const ObjectRemovedDeleteMarkerCreated: string; // s3:ObjectRemoved:DeleteMarkerCreated
+export const ObjectReducedRedundancyLostObject: string; // s3:ReducedRedundancyLostObject
diff --git a/types/minio/minio-tests.ts b/types/minio/minio-tests.ts
new file mode 100644
index 0000000000..56e81762ce
--- /dev/null
+++ b/types/minio/minio-tests.ts
@@ -0,0 +1,114 @@
+import { Stream } from 'stream';
+import Minio = require('minio');
+
+const minio = new Minio.Client({
+    endPoint: 'localhost',
+    port: 9000,
+    secure: false,
+    accessKey: 'iV7RAFOtxF',
+    secretKey: 'Go1hhOkXnl',
+});
+
+minio.makeBucket('testBucket', (error: Error|null) => { console.log(error); });
+minio.makeBucket('testBucket', 'ap-southeast-2', (error: Error|null) => { console.log(error); });
+minio.makeBucket('testBucket');
+minio.makeBucket('testBucket', 'eu-west-1');
+
+minio.listBuckets((error: Error|null, bucketList: Minio.BucketItemFromList[]) => { console.log(error, bucketList); });
+minio.listBuckets();
+
+minio.bucketExists('testBucket', (error: Error|null) => { console.log(error); });
+minio.bucketExists('testBucket');
+
+minio.removeBucket('testBucket', (error: Error|null) => { console.log(error); });
+minio.removeBucket('testBucket');
+
+minio.listObjects('testBucket');
+minio.listObjects('testBucket', 'image_');
+minio.listObjects('testBucket', 'audio_', true);
+minio.listObjectsV2('testBucket');
+minio.listObjectsV2('testBucket', 'image_');
+minio.listObjectsV2('testBucket', 'audio_', true);
+
+minio.listIncompleteUploads('testBucket');
+minio.listIncompleteUploads('testBucket', 'image_');
+minio.listIncompleteUploads('testBucket', 'audio_', true);
+
+minio.getObject('testBucket', 'hello.jpg', (error: Error|null, objectStream: Stream) => { console.log(error, objectStream); });
+minio.getObject('testBucket', 'hello.jpg');
+
+minio.getPartialObject('testBucket', 'hello.jpg', 10, (error: Error|null, objectStream: Stream) => { console.log(error, objectStream); });
+minio.getPartialObject('testBucket', 'hello.jpg', 10, 20, (error: Error|null, objectStream: Stream) => { console.log(error, objectStream); });
+minio.getPartialObject('testBucket', 'hello.jpg', 10);
+minio.getPartialObject('testBucket', 'hello.jpg', 10, 20);
+
+minio.fGetObject('testBucket', 'hello.jpg', 'file/path', (error: Error|null) => { console.log(error); });
+minio.fGetObject('testBucket', 'hello.jpg', 'file/path');
+
+minio.putObject('testBucket', 'hello.jpg', new Stream(), (error: Error|null, etag: string) => { console.log(error, etag); });
+minio.putObject('testBucket', 'hello.jpg', new Buffer('string'), 100, (error: Error|null, etag: string) => { console.log(error, etag); });
+minio.putObject('testBucket', 'hello.txt', 'hello.txt content', 100, 'text/plain', (error: Error|null, etag: string) => { console.log(error, etag); });
+minio.putObject('testBucket', 'hello.jpg', new Stream());
+minio.putObject('testBucket', 'hello.jpg', new Buffer('string'), 100);
+minio.putObject('testBucket', 'hello.txt', 'hello.txt content', 100, 'text/plain');
+
+minio.fPutObject('testBucket', 'hello.jpg', 'file/path', 'image/jpg', (error: Error|null, etag: string) => { console.log(error, etag); });
+minio.fPutObject('testBucket', 'hello.jpg', 'file/path', 'image/jpg');
+
+const conditions = new Minio.CopyConditions();
+conditions.setMatchETag('bd891862ea3e22c93ed53a098218791d');
+minio.copyObject('testBucket', 'copy-of-hello.jpg', 'hello.jpg', conditions, (error: Error|null, item: Minio.BucketItemCopy) => { console.log(error, item); });
+minio.copyObject('testBucket', 'copy-of-hello.jpg', 'hello.jpg', conditions);
+
+minio.statObject('testBucket', 'hello.jpg', (error: Error|null, stat: Minio.BucketItemStat) => { console.log(error, stat); });
+minio.statObject('testBucket', 'hello.jpg');
+
+minio.removeObject('testBucket', 'hello.jpg', (error: Error|null) => { console.log(error); });
+minio.removeObject('testBucket', 'hello.jpg');
+
+minio.removeIncompleteUpload('testBucket', 'hello.jpg', (error: Error|null) => { console.log(error); });
+minio.removeIncompleteUpload('testBucket', 'hello.jpg');
+
+minio.presignedUrl('GET', 'testBucket', 'hello.jpg', (error: Error|null, url: string) => { console.log(error, url); });
+minio.presignedUrl('GET', 'testBucket', 'hello.jpg', 84600, (error: Error|null, url: string) => { console.log(error, url); });
+minio.presignedUrl('GET', 'testBucket', 'hello.jpg', 84600, { prefix: 'data', 'max-keys': 1000 }, (error: Error|null, url: string) => { console.log(error, url); });
+minio.presignedUrl('GET', 'testBucket', 'hello.jpg');
+minio.presignedUrl('GET', 'testBucket', 'hello.jpg', 84600);
+minio.presignedUrl('GET', 'testBucket', 'hello.jpg', 84600, { prefix: 'data', 'max-keys': 1000 });
+
+minio.presignedGetObject('testBucket', 'hello.jpg', (error: Error|null, url: string) => { console.log(error, url); });
+minio.presignedGetObject('testBucket', 'hello.jpg', 84600, (error: Error|null, url: string) => { console.log(error, url); });
+minio.presignedGetObject('testBucket', 'hello.jpg');
+minio.presignedGetObject('testBucket', 'hello.jpg', 84600);
+
+minio.presignedPutObject('testBucket', 'hello.jpg', (error: Error|null, url: string) => { console.log(error, url); });
+minio.presignedPutObject('testBucket', 'hello.jpg', 84600, (error: Error|null, url: string) => { console.log(error, url); });
+minio.presignedPutObject('testBucket', 'hello.jpg');
+minio.presignedPutObject('testBucket', 'hello.jpg', 84600);
+
+const policy = minio.newPostPolicy();
+policy.setBucket('testBucket');
+policy.setKey('hello.jpg');
+minio.presignedPostPolicy(policy, (error: Error|null, data: Minio.PostPolicyResult) => { console.log(error, data); });
+minio.presignedPostPolicy(policy);
+
+minio.getBucketNotification('testBucket', (error: Error|null, config: Minio.NotificationConfig) => { console.log(error, config); });
+minio.getBucketNotification('testBucket');
+
+const notificationConfig = new Minio.NotificationConfig();
+const arn: string = Minio.buildARN('aws', 'sns', 'us-west-2', '408065449417', 'resource');
+const topic = new Minio.TopicConfig(arn);
+notificationConfig.add(topic);
+minio.setBucketNotification('testBucket', notificationConfig, (error: Error|null) => { console.log(error); });
+minio.setBucketNotification('testBucket', notificationConfig);
+
+minio.removeAllBucketNotification('testBucket', (error: Error|null) => { console.log(error); });
+minio.removeAllBucketNotification('testBucket');
+
+minio.listenBucketNotification('testBucket', 'pref_', '_suf', [ Minio.ObjectCreatedAll ]);
+
+minio.getBucketPolicy('testBucket', 'pref_', (error: Error|null, policy: Minio.PolicyValue) => { console.log(error, policy); });
+minio.getBucketPolicy('testBucket', '');
+
+minio.setBucketPolicy('testBucket', '', Minio.Policy.READWRITE, (error: Error|null) => { console.log(error); });
+minio.setBucketPolicy('testBucket', 'pref_', Minio.Policy.WRITEONLY);
diff --git a/types/minio/tsconfig.json b/types/minio/tsconfig.json
new file mode 100644
index 0000000000..1cf34ed33d
--- /dev/null
+++ b/types/minio/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "esModuleInterop": true,
+        "strictFunctionTypes": true
+    },
+    "files": [
+        "index.d.ts",
+        "minio-tests.ts"
+    ]
+}
diff --git a/types/minio/tslint.json b/types/minio/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/minio/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/mirrorx/index.d.ts b/types/mirrorx/index.d.ts
index 66f85e14e7..b4bebc9cea 100644
--- a/types/mirrorx/index.d.ts
+++ b/types/mirrorx/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/mirrorjs/mirror
 // Definitions by: Aaronphy <https://github.com/aaronphy>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.4
+// TypeScript Version: 2.6
 
 import * as H from 'history';
 
diff --git a/types/mirrorx/tsconfig.json b/types/mirrorx/tsconfig.json
index 561f5cdab4..e0b4babda6 100644
--- a/types/mirrorx/tsconfig.json
+++ b/types/mirrorx/tsconfig.json
@@ -1,5 +1,5 @@
 {
-	"files": [
+    "files": [
         "index.d.ts",
         "mirrorx-tests.ts"
     ],
diff --git a/types/mithril/test/test-api.ts b/types/mithril/test/test-api.ts
index 69f86c5ee4..73e03edeae 100644
--- a/types/mithril/test/test-api.ts
+++ b/types/mithril/test/test-api.ts
@@ -1,8 +1,8 @@
 // Typescript adaptation of mithril's test suite.
 // Not intended to be run; only to compile & check types.
 
-import * as m from 'mithril';
-import * as stream from 'mithril/stream';
+import m = require('mithril');
+import stream = require('mithril/stream');
 
 const FRAME_BUDGET = 100;
 
diff --git a/types/mithril/test/test-class-component.ts b/types/mithril/test/test-class-component.ts
index ceaf9d08d3..0b70773c9e 100644
--- a/types/mithril/test/test-class-component.ts
+++ b/types/mithril/test/test-class-component.ts
@@ -1,4 +1,4 @@
-import * as m from 'mithril';
+import m = require('mithril');
 import { ClassComponent, Vnode, CVnode, CVnodeDOM } from 'mithril';
 
 ///////////////////////////////////////////////////////////
diff --git a/types/mithril/test/test-component.ts b/types/mithril/test/test-component.ts
index 781cdedbe3..7e16dcd3d7 100644
--- a/types/mithril/test/test-component.ts
+++ b/types/mithril/test/test-component.ts
@@ -1,4 +1,4 @@
-import * as m from 'mithril';
+import m = require('mithril');
 
 import { Comp, Component } from 'mithril';
 
diff --git a/types/mithril/test/test-factory-component.ts b/types/mithril/test/test-factory-component.ts
index ba438a3789..6d0102fe38 100644
--- a/types/mithril/test/test-factory-component.ts
+++ b/types/mithril/test/test-factory-component.ts
@@ -1,4 +1,4 @@
-import * as m from 'mithril';
+import m = require('mithril');
 import { Component, FactoryComponent, Vnode } from 'mithril';
 
 ///////////////////////////////////////////////////////////
diff --git a/types/mithril/test/test-fragment.ts b/types/mithril/test/test-fragment.ts
index 5e60952741..814d787c7d 100644
--- a/types/mithril/test/test-fragment.ts
+++ b/types/mithril/test/test-fragment.ts
@@ -1,6 +1,6 @@
 import * as m from 'mithril';
 import { Vnode } from 'mithril';
-import * as h from 'mithril/hyperscript';
+import h = require('mithril/hyperscript');
 
 const vnode = m.fragment({id: 'abc'}, ['test']);
 
diff --git a/types/mithril/test/test-misc.ts b/types/mithril/test/test-misc.ts
index fbb7e83d36..3f377fec60 100644
--- a/types/mithril/test/test-misc.ts
+++ b/types/mithril/test/test-misc.ts
@@ -1,8 +1,8 @@
 import { trust, parseQueryString, buildQueryString } from 'mithril';
-import * as h from 'mithril/hyperscript';
+import h = require('mithril/hyperscript');
 import { render } from 'mithril/render';
 import { redraw } from 'mithril/redraw';
-import * as withAttr from 'mithril/withAttr';
+import withAttr = require('mithril/withAttr');
 
 const vnode = trust('Some <strong>bold</strong> text.');
 
diff --git a/types/mithril/test/test-route.ts b/types/mithril/test/test-route.ts
index 523780261d..7f82c9fa40 100644
--- a/types/mithril/test/test-route.ts
+++ b/types/mithril/test/test-route.ts
@@ -1,6 +1,6 @@
 import { Vnode, Component, Comp, ClassComponent, FactoryComponent, RouteResolver } from 'mithril';
-import * as h from 'mithril/hyperscript';
-import * as route from 'mithril/route';
+import h = require('mithril/hyperscript');
+import route = require('mithril/route');
 
 const component1 = {
 	view() {
diff --git a/types/mithril/test/test-stream.ts b/types/mithril/test/test-stream.ts
index 559f339634..ff86d62211 100644
--- a/types/mithril/test/test-stream.ts
+++ b/types/mithril/test/test-stream.ts
@@ -1,4 +1,4 @@
-import * as stream from 'mithril/stream';
+import stream = require('mithril/stream');
 import { Stream } from 'mithril/stream';
 
 {
diff --git a/types/mobx-apollo/tsconfig.json b/types/mobx-apollo/tsconfig.json
index c4c2acace4..cff69dc655 100644
--- a/types/mobx-apollo/tsconfig.json
+++ b/types/mobx-apollo/tsconfig.json
@@ -1,17 +1,24 @@
 {
     "compilerOptions": {
         "module": "commonjs",
-        "lib": ["es6"],
+        "lib": [
+            "es6"
+        ],
         "target": "es5",
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
-        "typeRoots": ["../"],
+        "typeRoots": [
+            "../"
+        ],
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     },
-    "files": ["index.d.ts", "mobx-apollo-tests.ts"]
-}
+    "files": [
+        "index.d.ts",
+        "mobx-apollo-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/mocha-steps/tsconfig.json b/types/mocha-steps/tsconfig.json
index 0a75385b3a..d8d2da980b 100644
--- a/types/mocha-steps/tsconfig.json
+++ b/types/mocha-steps/tsconfig.json
@@ -21,4 +21,4 @@
         "index.d.ts",
         "mocha-steps-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/mochaccino/tsconfig.json b/types/mochaccino/tsconfig.json
index 166b3f4203..3018a827ec 100644
--- a/types/mochaccino/tsconfig.json
+++ b/types/mochaccino/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "mochaccino-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/mock-aws-s3/tsconfig.json b/types/mock-aws-s3/tsconfig.json
index 9b5aeeacaa..052dbc9fcf 100644
--- a/types/mock-aws-s3/tsconfig.json
+++ b/types/mock-aws-s3/tsconfig.json
@@ -1,16 +1,23 @@
 {
     "compilerOptions": {
         "module": "commonjs",
-        "lib": ["es6"],
+        "lib": [
+            "es6"
+        ],
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
-        "typeRoots": ["../"],
+        "typeRoots": [
+            "../"
+        ],
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     },
-    "files": ["index.d.ts", "mock-aws-s3-tests.ts"]
-}
+    "files": [
+        "index.d.ts",
+        "mock-aws-s3-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/mock-knex/mock-knex-tests.ts b/types/mock-knex/mock-knex-tests.ts
index ec4ef0024e..f9fa69aea1 100644
--- a/types/mock-knex/mock-knex-tests.ts
+++ b/types/mock-knex/mock-knex-tests.ts
@@ -1,4 +1,4 @@
-import * as knex from "knex";
+import knex = require("knex");
 import * as mockDb from "mock-knex";
 
 const db = knex({
diff --git a/types/mock-knex/tsconfig.json b/types/mock-knex/tsconfig.json
index 427ad9f843..73c75d8d0e 100644
--- a/types/mock-knex/tsconfig.json
+++ b/types/mock-knex/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "mock-knex-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/mock-raf/mock-raf-tests.ts b/types/mock-raf/mock-raf-tests.ts
index d773d1c760..f277570cbd 100644
--- a/types/mock-raf/mock-raf-tests.ts
+++ b/types/mock-raf/mock-raf-tests.ts
@@ -1,4 +1,4 @@
-import * as createMockRaf from 'mock-raf';
+import createMockRaf = require('mock-raf');
 
 const mockRaf = createMockRaf();
 const id = mockRaf.raf(() => {
diff --git a/types/moji/tsconfig.json b/types/moji/tsconfig.json
index a6b2e51f26..f3cddeb969 100644
--- a/types/moji/tsconfig.json
+++ b/types/moji/tsconfig.json
@@ -1,24 +1,24 @@
 {
     "compilerOptions": {
-      "module": "commonjs",
-      "target": "es6",
-      "lib": [
-        "es6"
-      ],
-      "noImplicitAny": true,
-      "noImplicitThis": true,
-      "strictNullChecks": true,
-      "strictFunctionTypes": true,
-      "baseUrl": "../",
-      "typeRoots": [
-        "../"
-      ],
-      "types": [],
-      "noEmit": true,
-      "forceConsistentCasingInFileNames": true
+        "module": "commonjs",
+        "target": "es6",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
     },
     "files": [
-      "index.d.ts",
-      "moji-tests.ts"
+        "index.d.ts",
+        "moji-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/moment-business-time/moment-business-time-tests.ts b/types/moment-business-time/moment-business-time-tests.ts
index 79f25a720a..6fccc96580 100644
--- a/types/moment-business-time/moment-business-time-tests.ts
+++ b/types/moment-business-time/moment-business-time-tests.ts
@@ -1,4 +1,4 @@
-import * as moment from 'moment';
+import moment = require('moment');
 import 'moment-business-time';
 
 moment('2015-02-28T10:00:00Z').nextWorkingDay();
diff --git a/types/moment-business-time/tsconfig.json b/types/moment-business-time/tsconfig.json
index c1212caa2f..b993b8adc0 100644
--- a/types/moment-business-time/tsconfig.json
+++ b/types/moment-business-time/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "moment-business-time-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/moment-business/moment-business-tests.ts b/types/moment-business/moment-business-tests.ts
index 4f8ae296df..db79dc7d84 100644
--- a/types/moment-business/moment-business-tests.ts
+++ b/types/moment-business/moment-business-tests.ts
@@ -1,4 +1,4 @@
-import * as moment from "moment";
+import moment = require("moment");
 import * as mb from "moment-business";
 
 mb.isWeekDay(moment());
diff --git a/types/moment-holiday/tsconfig.json b/types/moment-holiday/tsconfig.json
index d03f37e12c..aebc8f8619 100644
--- a/types/moment-holiday/tsconfig.json
+++ b/types/moment-holiday/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "moment-holiday-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/moment-jalaali/index.d.ts b/types/moment-jalaali/index.d.ts
index e6fc2a6488..02580d8774 100644
--- a/types/moment-jalaali/index.d.ts
+++ b/types/moment-jalaali/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Ali Taheri Moghaddar <https://github.com/alitaheri>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-import * as moment from 'moment';
+import moment = require('moment');
 
 export = moment;
 
diff --git a/types/moment-jalaali/moment-jalaali-tests.ts b/types/moment-jalaali/moment-jalaali-tests.ts
index 40c31963cb..ce183f635d 100644
--- a/types/moment-jalaali/moment-jalaali-tests.ts
+++ b/types/moment-jalaali/moment-jalaali-tests.ts
@@ -1,4 +1,4 @@
-import * as moment from 'moment-jalaali';
+import moment = require('moment-jalaali');
 
 moment.loadPersian();
 
diff --git a/types/moment-range/index.d.ts b/types/moment-range/index.d.ts
index eb9bb30910..e0298abd8e 100644
--- a/types/moment-range/index.d.ts
+++ b/types/moment-range/index.d.ts
@@ -6,7 +6,7 @@
 //                 MartynasZilinskas <https://github.com/MartynasZilinskas>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-import * as moment from 'moment';
+import moment = require('moment');
 
 export class DateRange {
     start: moment.Moment;
diff --git a/types/moment-range/moment-range-tests.ts b/types/moment-range/moment-range-tests.ts
index 6043d3b203..fc9a8b6e12 100644
--- a/types/moment-range/moment-range-tests.ts
+++ b/types/moment-range/moment-range-tests.ts
@@ -1,4 +1,4 @@
-import * as moment from "moment";
+import moment = require("moment");
 import * as momentRange from "moment-range";
 
 const range: momentRange.DateRange = new momentRange.DateRange(new Date(2012, 0, 15), new Date(2012, 4, 23));
diff --git a/types/moment-round/moment-round-tests.ts b/types/moment-round/moment-round-tests.ts
index 4e3829671a..7400e63cc6 100644
--- a/types/moment-round/moment-round-tests.ts
+++ b/types/moment-round/moment-round-tests.ts
@@ -1,4 +1,4 @@
-import * as moment from 'moment';
+import moment = require('moment');
 
 const m = moment();
 m.round(5, 'seconds');
diff --git a/types/moment-strftime2/tsconfig.json b/types/moment-strftime2/tsconfig.json
index cd5862e99f..780f518cfa 100644
--- a/types/moment-strftime2/tsconfig.json
+++ b/types/moment-strftime2/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "moment-strftime2-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/mongoose-geojson-schema/tsconfig.json b/types/mongoose-geojson-schema/tsconfig.json
index 9d3afc8952..e2340e44a8 100644
--- a/types/mongoose-geojson-schema/tsconfig.json
+++ b/types/mongoose-geojson-schema/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "mongoose-geojson-schema-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/mongoose-paginate/mongoose-paginate-tests.ts b/types/mongoose-paginate/mongoose-paginate-tests.ts
index d541c44da8..320077bc3a 100644
--- a/types/mongoose-paginate/mongoose-paginate-tests.ts
+++ b/types/mongoose-paginate/mongoose-paginate-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="express" />
-
 /**
  * Created by Linus Brolin <https://github.com/linusbrolin/>.
  */
@@ -12,7 +10,7 @@ import {
     PaginateResult,
     Document
 } from 'mongoose';
-import * as mongoosePaginate from 'mongoose-paginate';
+import mongoosePaginate = require('mongoose-paginate');
 import { Router, Request, Response } from 'express';
 
 
diff --git a/types/mongoose-sequence/mongoose-sequence-tests.ts b/types/mongoose-sequence/mongoose-sequence-tests.ts
index b4173e0002..85c46633e0 100644
--- a/types/mongoose-sequence/mongoose-sequence-tests.ts
+++ b/types/mongoose-sequence/mongoose-sequence-tests.ts
@@ -1,12 +1,10 @@
-/// <reference types="express" />
-
 /**
  * Based on the examples on: https://github.com/ramiel/mongoose-sequence
  * Created by Linus Brolin <https://github.com/linusbrolin/>.
  */
 
 import { SequenceDocument, SequenceOptions, SequenceSchema, Document, Schema, Model, model } from 'mongoose';
-import * as mongooseSequence from 'mongoose-sequence';
+import mongooseSequence = require('mongoose-sequence');
 
 //#region Test Models
 interface User extends SequenceDocument {
diff --git a/types/mongoose-simple-random/mongoose-simple-random-tests.ts b/types/mongoose-simple-random/mongoose-simple-random-tests.ts
index f5b26dbebb..1ed3051652 100644
--- a/types/mongoose-simple-random/mongoose-simple-random-tests.ts
+++ b/types/mongoose-simple-random/mongoose-simple-random-tests.ts
@@ -1,5 +1,5 @@
 import * as mongoose from 'mongoose';
-import * as mongoose_simple_random from "mongoose-simple-random";
+import mongoose_simple_random = require("mongoose-simple-random");
 
 // test compatibility with other libraries - from @types/mongoose
 import * as _ from 'lodash';
diff --git a/types/mongoose-unique-validator/mongoose-unique-validator-tests.ts b/types/mongoose-unique-validator/mongoose-unique-validator-tests.ts
index 59ada92a3c..ded6f76ae4 100644
--- a/types/mongoose-unique-validator/mongoose-unique-validator-tests.ts
+++ b/types/mongoose-unique-validator/mongoose-unique-validator-tests.ts
@@ -1,5 +1,5 @@
 import { Schema } from "mongoose";
-import * as uniqueValidator from "mongoose-unique-validator";
+import uniqueValidator = require("mongoose-unique-validator");
 
 const schema = new Schema({
     test: { type: String }
diff --git a/types/mongoose/index.d.ts b/types/mongoose/index.d.ts
index 3cf4e4ca2a..cb8ca38408 100644
--- a/types/mongoose/index.d.ts
+++ b/types/mongoose/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for Mongoose 5.0.1
 // Project: http://mongoosejs.com/
-// Definitions by: simonxca <https://github.com/simonxca>, horiuchi <https://github.com/horiuchi>, sindrenm <https://github.com/sindrenm>, lukasz-zak <https://github.com/lukasz-zak>, Alorel <https://github.com/Alorel>
+// Definitions by: simonxca <https://github.com/simonxca>, horiuchi <https://github.com/horiuchi>, sindrenm <https://github.com/sindrenm>, lukasz-zak <https://github.com/lukasz-zak>, Alorel <https://github.com/Alorel>, jendrikw <https://github.com/jendrikw>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -722,7 +722,7 @@ declare module "mongoose" {
     /** defaults to null */
     shardKey?: boolean;
     /** defaults to true */
-    strict?: boolean;
+    strict?: boolean | 'throw';
     /** no default */
     toJSON?: DocumentToObjectOptions;
     /** no default */
diff --git a/types/mongoose/mongoose-tests.ts b/types/mongoose/mongoose-tests.ts
index e63a0e612d..80050dad33 100644
--- a/types/mongoose/mongoose-tests.ts
+++ b/types/mongoose/mongoose-tests.ts
@@ -432,6 +432,8 @@ new mongoose.Schema({
   }
 });
 
+new mongoose.Schema({foo: String}, {strict: 'throw'});
+
 export default function(schema: mongoose.Schema) {
   schema.pre('init', function(this: mongoose.Document, next: (err?: Error) => void): void {
      console.log('success!');
diff --git a/types/move-concurrently/move-concurrently-tests.ts b/types/move-concurrently/move-concurrently-tests.ts
index 58394efcfa..6e62ced8ad 100644
--- a/types/move-concurrently/move-concurrently-tests.ts
+++ b/types/move-concurrently/move-concurrently-tests.ts
@@ -1,4 +1,4 @@
-import * as move from 'move-concurrently';
+import move = require('move-concurrently');
 
 move('/path/to/thing', '/new/path/thing').then(() => {
   // thing is now moved!
@@ -6,7 +6,7 @@ move('/path/to/thing', '/new/path/thing').then(() => {
   // oh no!
 });
 
-import * as Bluebird from 'bluebird';
+import Bluebird = require('bluebird');
 
 // tsc version: 2.7.0-dev.20171024
 // required type arguments!
diff --git a/types/mozilla-readability/mozilla-readability-tests.ts b/types/mozilla-readability/mozilla-readability-tests.ts
index bcb17f4bf5..e5431dd14e 100644
--- a/types/mozilla-readability/mozilla-readability-tests.ts
+++ b/types/mozilla-readability/mozilla-readability-tests.ts
@@ -1,4 +1,4 @@
-import * as Readability from 'mozilla-readability';
+import Readability = require('mozilla-readability');
 import { JSDOM } from 'jsdom';
 
 // Compiling requires `--noImplicitUseStrict`
diff --git a/types/mozilla-readability/tsconfig.json b/types/mozilla-readability/tsconfig.json
index 007aac8b63..6ec688cf2f 100644
--- a/types/mozilla-readability/tsconfig.json
+++ b/types/mozilla-readability/tsconfig.json
@@ -21,4 +21,4 @@
         "index.d.ts",
         "mozilla-readability-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/mri/mri-tests.ts b/types/mri/mri-tests.ts
index c766587db1..07911ca7f7 100644
--- a/types/mri/mri-tests.ts
+++ b/types/mri/mri-tests.ts
@@ -1,4 +1,4 @@
-import * as mri from 'mri';
+import mri = require('mri');
 
 const first = mri(['--foo', 'bar']);
 
diff --git a/types/msgpack5/msgpack5-tests.ts b/types/msgpack5/msgpack5-tests.ts
index 6cd9854992..d8a2829302 100644
--- a/types/msgpack5/msgpack5-tests.ts
+++ b/types/msgpack5/msgpack5-tests.ts
@@ -1,9 +1,9 @@
-import * as msgpack from 'msgpack5';
+import msgpack = require('msgpack5');
 
 // msgpack()
 let packer = msgpack();
 packer = msgpack({ forceFloat64: true });
-packer = msgpack({ compatibilityMode: true }); 
+packer = msgpack({ compatibilityMode: true });
 
 class InputType {
   number: number;
diff --git a/types/multer-gridfs-storage/multer-gridfs-storage-tests.ts b/types/multer-gridfs-storage/multer-gridfs-storage-tests.ts
index 61114fa349..d34eaeeae6 100644
--- a/types/multer-gridfs-storage/multer-gridfs-storage-tests.ts
+++ b/types/multer-gridfs-storage/multer-gridfs-storage-tests.ts
@@ -1,4 +1,4 @@
-import * as MulterGridfsStorage from 'multer-gridfs-storage';
+import MulterGridfsStorage = require('multer-gridfs-storage');
 import { Db, MongoClient, Server } from "mongodb";
 
 // Exported interfaces
diff --git a/types/multer-gridfs-storage/v1/multer-gridfs-storage-tests.ts b/types/multer-gridfs-storage/v1/multer-gridfs-storage-tests.ts
index 73522eebca..3578089b92 100644
--- a/types/multer-gridfs-storage/v1/multer-gridfs-storage-tests.ts
+++ b/types/multer-gridfs-storage/v1/multer-gridfs-storage-tests.ts
@@ -1,4 +1,4 @@
-import * as MulterGridfsStorage from 'multer-gridfs-storage';
+import MulterGridfsStorage = require('multer-gridfs-storage');
 import { Grid } from "gridfs-stream";
 
 // Exported interfaces
diff --git a/types/multer/multer-tests.ts b/types/multer/multer-tests.ts
index 029f5fa0f4..6346b5f7dc 100644
--- a/types/multer/multer-tests.ts
+++ b/types/multer/multer-tests.ts
@@ -1,5 +1,5 @@
-import * as express from 'express';
-import * as multer from 'multer';
+import express = require('express');
+import multer = require('multer');
 
 const upload = multer({
     dest: 'uploads/',
diff --git a/types/multimatch/multimatch-tests.ts b/types/multimatch/multimatch-tests.ts
index b8c9cac658..6e687a2cdc 100644
--- a/types/multimatch/multimatch-tests.ts
+++ b/types/multimatch/multimatch-tests.ts
@@ -1,4 +1,4 @@
-import * as multimatch from "multimatch";
+import multimatch = require("multimatch");
 
 const options: multimatch.MultimatchOptions = {
 	debug: true
diff --git a/types/multisort/multisort-tests.ts b/types/multisort/multisort-tests.ts
index 6fadab16ef..bdec580a46 100644
--- a/types/multisort/multisort-tests.ts
+++ b/types/multisort/multisort-tests.ts
@@ -1,4 +1,4 @@
-import * as multisort from 'multisort';
+import multisort = require('multisort');
 
 const gameShowHosts = [
     {
diff --git a/types/multisort/tsconfig.json b/types/multisort/tsconfig.json
index d2d76512ef..c7e40754ad 100644
--- a/types/multisort/tsconfig.json
+++ b/types/multisort/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "multisort-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/multistream/tsconfig.json b/types/multistream/tsconfig.json
index 3fa5cc7c47..7606de5fc8 100644
--- a/types/multistream/tsconfig.json
+++ b/types/multistream/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "multistream-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/murmurhash-js/index.d.ts b/types/murmurhash-js/index.d.ts
index 360850b7ec..31f2785353 100644
--- a/types/murmurhash-js/index.d.ts
+++ b/types/murmurhash-js/index.d.ts
@@ -3,8 +3,8 @@
 // Definitions by: Chi Vinh Le <https://github.com/cvle>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-import * as murmur2 from "./murmurhash2_gc";
-import * as murmur3 from "./murmurhash3_gc";
+import murmur2 = require("./murmurhash2_gc");
+import murmur3 = require("./murmurhash3_gc");
 
 declare const murmur: typeof murmur3 & {
     murmur3: typeof murmur3;
diff --git a/types/murmurhash-js/murmurhash-js-tests.ts b/types/murmurhash-js/murmurhash-js-tests.ts
index 3f300d24d1..fed401a91c 100644
--- a/types/murmurhash-js/murmurhash-js-tests.ts
+++ b/types/murmurhash-js/murmurhash-js-tests.ts
@@ -1,6 +1,6 @@
-import * as murmur from 'murmurhash-js';
-import * as murmur2 from 'murmurhash-js/murmurhash2_gc';
-import * as murmur3 from 'murmurhash-js/murmurhash3_gc';
+import murmur = require('murmurhash-js');
+import murmur2 = require('murmurhash-js/murmurhash2_gc');
+import murmur3 = require('murmurhash-js/murmurhash3_gc');
 
 let hash: number;
 
diff --git a/types/musicmetadata/musicmetadata-tests.ts b/types/musicmetadata/musicmetadata-tests.ts
index 421aec3bc5..c2e70116fb 100644
--- a/types/musicmetadata/musicmetadata-tests.ts
+++ b/types/musicmetadata/musicmetadata-tests.ts
@@ -1,5 +1,5 @@
 import * as fs from "fs";
-import * as mm from "musicmetadata";
+import mm = require("musicmetadata");
 
 mm(fs.createReadStream("hype-train.mp3"), (err: Error, metadata: MM.Metadata) => {
     if (err) throw err;
diff --git a/types/mv/mv-tests.ts b/types/mv/mv-tests.ts
index 079fd0efec..257290506a 100644
--- a/types/mv/mv-tests.ts
+++ b/types/mv/mv-tests.ts
@@ -1,4 +1,4 @@
-import * as mv from 'mv';
+import mv = require('mv');
 
 () => {
     mv('/tmp/f1.txt', '/tmp/f2.txt', error => {
diff --git a/types/mysql/tsconfig.json b/types/mysql/tsconfig.json
index 1249bcd757..010904ef8b 100644
--- a/types/mysql/tsconfig.json
+++ b/types/mysql/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "mysql-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/nano/nano-tests.ts b/types/nano/nano-tests.ts
index 4f13e90f43..0556f2b8fe 100644
--- a/types/nano/nano-tests.ts
+++ b/types/nano/nano-tests.ts
@@ -1,5 +1,5 @@
 import * as fs from "fs";
-import * as nano from "nano";
+import nano = require("nano");
 
 /*
  * Instantiate with configuration object
diff --git a/types/nanoid/tsconfig.json b/types/nanoid/tsconfig.json
index 0df191829d..cab6900700 100644
--- a/types/nanoid/tsconfig.json
+++ b/types/nanoid/tsconfig.json
@@ -25,4 +25,4 @@
         "random.d.ts",
         "url.d.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/nats-hemera/nats-hemera-tests.ts b/types/nats-hemera/nats-hemera-tests.ts
index 28c0c724c9..0e4fa69b93 100644
--- a/types/nats-hemera/nats-hemera-tests.ts
+++ b/types/nats-hemera/nats-hemera-tests.ts
@@ -1,4 +1,4 @@
-import * as Hemera from 'nats-hemera';
+import Hemera = require('nats-hemera');
 
 const nats = {};
 const hemera: any = new Hemera(nats, {});
diff --git a/types/natsort/natsort-tests.ts b/types/natsort/natsort-tests.ts
index 4e9d0c0fcb..73976647d6 100644
--- a/types/natsort/natsort-tests.ts
+++ b/types/natsort/natsort-tests.ts
@@ -1,4 +1,4 @@
-import * as natsort from "natsort";
+import natsort = require("natsort");
 
 const someArr = [2, 5, 3, 4, 1, 'a', 'B'];
 
diff --git a/types/navigation-react/index.d.ts b/types/navigation-react/index.d.ts
index 0c85dac138..3d98c0d5a5 100644
--- a/types/navigation-react/index.d.ts
+++ b/types/navigation-react/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://grahammendick.github.io/navigation/
 // Definitions by: Graham Mendick <https://github.com/grahammendick>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import { StateNavigator } from 'navigation';
 import { Component, HTMLProps } from 'react';
diff --git a/types/ndarray/ndarray-tests.ts b/types/ndarray/ndarray-tests.ts
index 899f43efd5..aa4f4fcefb 100644
--- a/types/ndarray/ndarray-tests.ts
+++ b/types/ndarray/ndarray-tests.ts
@@ -1,4 +1,4 @@
-import * as ndarray from 'ndarray';
+import ndarray = require('ndarray');
 
 const data = new Int32Array(2 * 2 * 2 + 10);
 const a = ndarray(data, [2, 2, 2], [1, 2, 4], 5);
diff --git a/types/needle/needle-tests.ts b/types/needle/needle-tests.ts
index e8f2efee20..a216b1f686 100644
--- a/types/needle/needle-tests.ts
+++ b/types/needle/needle-tests.ts
@@ -1,4 +1,4 @@
-import * as needle from "needle";
+import needle = require("needle");
 import * as fs from "fs";
 
 function Usage() {
diff --git a/types/nes/tsconfig.json b/types/nes/tsconfig.json
index 374b67b515..dc39b99fed 100644
--- a/types/nes/tsconfig.json
+++ b/types/nes/tsconfig.json
@@ -14,7 +14,12 @@
         ],
         "types": [],
         "paths": {
-            "boom": ["boom/v4"]
+            "boom": [
+                "boom/v4"
+            ],
+            "hapi": [
+                "hapi/v16"
+            ]
         },
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
@@ -36,4 +41,4 @@
         "test/subscriptions-client.ts",
         "test/subscriptions-server.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/net-keepalive/tsconfig.json b/types/net-keepalive/tsconfig.json
index 38736fd181..7a0277396e 100644
--- a/types/net-keepalive/tsconfig.json
+++ b/types/net-keepalive/tsconfig.json
@@ -1,21 +1,23 @@
 {
-  "compilerOptions": {
-    "module": "commonjs",
-    "lib": [
-      "es5"
-    ],
-    "baseUrl": "../",
-    "typeRoots": ["../"],
-    "types": [],
-    "forceConsistentCasingInFileNames": true,
-    "noImplicitAny": true,
-    "noImplicitThis": true,
-    "strictNullChecks": true,
-    "strictFunctionTypes": true,
-    "noEmit": true
-  },
-  "files": [
-    "index.d.ts",
-    "net-keepalive-tests.ts"
-  ]
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es5"
+        ],
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "forceConsistentCasingInFileNames": true,
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "net-keepalive-tests.ts"
+    ]
 }
\ No newline at end of file
diff --git a/types/new-relic-browser/tsconfig.json b/types/new-relic-browser/tsconfig.json
index 61ee6742c7..bf58b9de75 100644
--- a/types/new-relic-browser/tsconfig.json
+++ b/types/new-relic-browser/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "new-relic-browser-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/newline-remove/index.d.ts b/types/newline-remove/index.d.ts
new file mode 100644
index 0000000000..23bb087225
--- /dev/null
+++ b/types/newline-remove/index.d.ts
@@ -0,0 +1,11 @@
+// Type definitions for newline-remove 1.0
+// Project: https://github.com/yoshuawuyts/newline-remove
+// Definitions by: OpenByteDev <https://github.com/OpenByteDev>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/**
+ * Strip all newlines from the given value
+ */
+declare function removeNewlines(val: string): string;
+
+export = removeNewlines;
diff --git a/types/newline-remove/newline-remove-tests.ts b/types/newline-remove/newline-remove-tests.ts
new file mode 100644
index 0000000000..343f3e1879
--- /dev/null
+++ b/types/newline-remove/newline-remove-tests.ts
@@ -0,0 +1,4 @@
+import removeNewline = require('newline-remove');
+
+removeNewline('foo\n bar\n');
+// => 'foo bar'
diff --git a/types/newline-remove/tsconfig.json b/types/newline-remove/tsconfig.json
new file mode 100644
index 0000000000..f0059d329e
--- /dev/null
+++ b/types/newline-remove/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "esModuleInterop": true
+    },
+    "files": [
+        "index.d.ts",
+        "newline-remove-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/newline-remove/tslint.json b/types/newline-remove/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/newline-remove/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/newrelic/index.d.ts b/types/newrelic/index.d.ts
new file mode 100644
index 0000000000..83b6e409dc
--- /dev/null
+++ b/types/newrelic/index.d.ts
@@ -0,0 +1,331 @@
+// Type definitions for newrelic 2.7
+// Project: http://github.com/newrelic/node-newrelic
+// Definitions by: Matt R. Wilson <https://github.com/mastermatt>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// https://docs.newrelic.com/docs/agents/nodejs-agent/api-guides/nodejs-agent-api
+declare namespace newrelic {
+    interface NewRelicAPI {
+        /**
+         * Give the current transaction a custom name.
+         *
+         * Overrides any New Relic naming rules set in configuration or from New Relic's servers.
+         *
+         * IMPORTANT: this function must be called when a transaction is active. New
+         * Relic transactions are tied to web requests, so this method may be called
+         * from within HTTP or HTTPS listener functions, Express routes, or other
+         * contexts where a web request or response object are in scope.
+         *
+         * The `name` will be prefixed with 'Custom/' when sent.
+         */
+        setTransactionName(name: string): void;
+
+        /**
+         * Returns a handle on the currently executing transaction.
+         *
+         * This handle can then be used to end or ignore a given transaction safely from any context.
+         * It is best used with newrelic.startWebTransaction() and newrelic.startBackgroundTransaction().
+         */
+        getTransaction(): TransactionHandle;
+
+        /**
+         * Specify the `Dispatcher` and `Dispatcher Version` environment values.
+         *
+         * A dispatcher is typically the service responsible for brokering
+         * the request with the process responsible for responding to the
+         * request.  For example Node's `http` module would be the dispatcher
+         * for incoming HTTP requests.
+         */
+        setDispatcher(name: string, version?: string): void;
+
+        /**
+         * Give the current transaction a name based on your own idea of what
+         * constitutes a controller in your Node application. Also allows you to
+         * optionally specify the action being invoked on the controller. If the action
+         * is omitted, then the API will default to using the HTTP method used in the
+         * request (e.g. GET, POST, DELETE). Overrides any New Relic naming rules set
+         * in configuration or from New Relic's servers.
+         *
+         * IMPORTANT: this function must be called when a transaction is active. New
+         * Relic transactions are tied to web requests, so this method may be called
+         * from within HTTP or HTTPS listener functions, Express routes, or other
+         * contexts where a web request or response object are in scope.
+         *
+         * The `name` will be prefixed with 'Controller/' when sent.
+         * The `action` defaults to the HTTP method used for the request.
+         */
+        setControllerName(name: string, action: string): void;
+
+        /**
+         * Add a custom attribute to the current transaction.
+         *
+         * Some attributes are reserved (see CUSTOM_BLACKLIST in the docs for the current, very short list), and
+         * as with most API methods, this must be called in the context of an
+         * active transaction.
+         *
+         * Most recently set value wins.
+         */
+        addCustomAttribute(key: string, value: string): void;
+
+        /**
+         * Adds all custom attributes in an object to the current transaction.
+         *
+         * See documentation for `addCustomAttribute` for more information on setting custom attributes.
+         */
+        addCustomAttributes(atts: { [key: string]: string }): void;
+
+        /**
+         * Tell the tracer whether to ignore the current transaction.
+         *
+         * The most common use for this will be to mark a transaction as ignored (maybe it's handling
+         * a websocket polling channel, or maybe it's an external call you don't care
+         * is slow), but it's also useful when you want a transaction that would
+         * otherwise be ignored due to URL or transaction name normalization rules
+         * to *not* be ignored.
+         */
+        setIgnoreTransaction(ignored: boolean): void;
+
+        /**
+         * Send errors to New Relic that you've already handled yourself.
+         *
+         * NOTE: Errors that are recorded using this method do _not_ obey the `ignore_status_codes` configuration.
+         *
+         *  Optional. Any custom attributes to be displayed in the New Relic UI.
+         */
+        noticeError(error: Error, customAttributes?: { [key: string]: string }): void;
+
+        /**
+         * If the URL for a transaction matches the provided pattern, name the
+         * transaction with the provided name.
+         *
+         * If there are capture groups in the pattern (which is a standard JavaScript regular expression,
+         * and can be passed as either a RegExp or a string), then the substring matches ($1, $2,
+         * etc.) are replaced in the name string. BE CAREFUL WHEN USING SUBSTITUTION.
+         * If the replacement substrings are highly variable (i.e. are identifiers,
+         * GUIDs, or timestamps), the rule will generate too many metrics and
+         * potentially get your application blacklisted by New Relic.
+         *
+         * An example of a good rule with replacements:
+         *
+         *   newrelic.addNamingRule('^/storefront/(v[1-5])/(item|category|tag)', 'CommerceAPI/$1/$2')
+         *
+         * An example of a bad rule with replacements:
+         *
+         *   newrelic.addNamingRule('^/item/([0-9a-f]+)', 'Item/$1')
+         *
+         * Keep in mind that the original URL and any query parameters will be sent
+         * along with the request, so slow transactions will still be identifiable.
+         *
+         * Naming rules can not be removed once added. They can also be added via the
+         * agent's configuration. See configuration documentation for details.
+         */
+        addNamingRule(pattern: RegExp | string, name: string): void;
+
+        /**
+         * If the URL for a transaction matches the provided pattern, ignore the transaction attached to that URL.
+         *
+         * Useful for filtering socket.io connections and other long-polling requests out of your agents to keep
+         * them from distorting an app's apdex or mean response time.
+         *
+         * Example:
+         *
+         *   newrelic.addIgnoringRule('^/socket\\.io/')
+         */
+        addIgnoringRule(pattern: RegExp | string): void;
+
+        /**
+         * Get the <script>...</script> header necessary for Browser Monitoring.
+         *
+         * This script must be manually injected into your templates, as high as possible
+         * in the header, but _after_ any X-UA-COMPATIBLE HTTP-EQUIV meta tags.
+         * Otherwise you may hurt IE!
+         *
+         * This method must be called _during_ a transaction, and must be called every
+         * time you want to generate the headers.
+         *
+         * Do *not* reuse the headers between users, or even between requests.
+         */
+        getBrowserTimingHeader(): string;
+
+        /**
+         * Instrument a particular callback to improve visibility into a transaction.
+         *
+         * Use this API call to improve instrumentation of a particular method, or to track work across asynchronous
+         * boundaries by calling createTracer() in both the target function and its parent asynchronous function.
+         *
+         * The name will be visible in transaction traces and as a new metric in the New Relic UI.
+         *
+         * The agent begins timing the segment when createTracer is called, and ends the segment when the callback
+         * defined by the callback argument finishes executing.
+         */
+        createTracer<T extends (...args: any[]) => any>(name: string, handle: T): T;
+
+        /**
+         * Creates and starts a web transaction to record work done in the handle supplied.
+         *
+         * This transaction will run until the handle
+         * synchronously returns UNLESS:
+         * 1. The handle function returns a promise, where the end of the
+         *    transaction will be tied to the end of the promise returned.
+         * 2. `getTransaction` is called in the handle, flagging the
+         *    transaction as externally handled.  In this case the transaction
+         *    will be ended when `TransactionHandle#end` is called in the user's code.
+         *
+         * @example
+         * var newrelic = require('newrelic')
+         * newrelic.startWebTransaction('/some/url/path', function() {
+         *   var transaction = newrelic.getTransaction()
+         *   setTimeout(function() {
+         *     // do some work
+         *     transaction.end()
+         *   }, 100)
+         * })
+         *
+         * The `url` is used to name and group related transactions in APM,
+         * so it should be a generic name and not include any variable parameters.
+         */
+        startWebTransaction(url: string, handle: (...args: any[]) => any): any;
+
+        /**
+         * Creates and starts a background transaction to record work done in the handle supplied.
+         *
+         * This transaction will run until the handle
+         * synchronously returns UNLESS:
+         * 1. The handle function returns a promise, where the end of the
+         *    transaction will be tied to the end of the promise returned.
+         * 2. `API#getTransaction` is called in the handle, flagging the
+         *    transaction as externally handled.  In this case the transaction
+         *    will be ended when `TransactionHandle#end` is called in the user's code.
+         *
+         * @example
+         * var newrelic = require('newrelic')
+         * newrelic.startBackgroundTransaction('Red October', 'Subs', function() {
+         *   var transaction = newrelic.getTransaction()
+         *   setTimeout(function() {
+         *     // do some work
+         *     transaction.end()
+         *   }, 100)
+         * })
+         *
+         * The `url` is used to name and group related transactions in APM,
+         * so it should be a generic name and not include any variable parameters.
+         *
+         * The optional `group can be used for grouping background transactions in APM.
+         * For more information see:
+         *  https://docs.newrelic.com/docs/apm/applications-menu/monitoring/transactions-page#txn-type-dropdown
+         */
+        startBackgroundTransaction(name: string, handle: (...args: any[]) => any): any;
+        startBackgroundTransaction(name: string, group: string, handle: (...args: any[]) => any): any;
+
+        /**
+         * End the current web or background custom transaction.
+         *
+         * This method requires being in the correct transaction context when called.
+         */
+        endTransaction(): void;
+
+        /**
+         * Record an event-based metric, usually associated with a particular duration.
+         *
+         * The `name` must be a string following standard metric naming rules. The `value` will
+         * usually be a number, but it can also be an object.
+         *   * When `value` is a numeric value, it should represent the magnitude of a measurement
+         *     associated with an event; for example, the duration for a particular method call.
+         *   * When `value` is an object, it must contain count, total, min, max, and sumOfSquares
+         *     keys, all with number values. This form is useful to aggregate metrics on your own
+         *     and report them periodically; for example, from a setInterval. These values will
+         *     be aggregated with any previously collected values for the same metric. The names
+         *     of these keys match the names of the keys used by the platform API.
+         */
+        recordMetric(name: string, value: number | Metric): void;
+
+        /**
+         * Update a metric that acts as a simple counter.
+         *
+         * The count of the selected metric will be incremented by the specified amount, defaulting to 1.
+         */
+        incrementMetric(name: string, value?: number): void;
+
+        /**
+         * Record an event-based metric, usually associated with a particular duration.
+         *
+         * `eventType` must be an alphanumeric string less than 255 characters.
+         * The keys of `attributes` must be shorter than 255 characters.
+         */
+        recordCustomEvent(eventType: string, attributes: { [keys: string]: boolean | number | string }): void;
+
+        /**
+         * Registers an instrumentation function.
+         *
+         * The provided onRequire callback will be fired when the given module is loaded with require.
+         * The moduleName parameter should be the string that will be passed to require;
+         * for example, 'express' or 'amqplib/callback_api'.
+         *
+         * The optional onError callback is called if the onRequire parameters throws an error.
+         * This is useful for debugging your instrumentation.
+         *
+         * Use this method to:
+         * - Add instrumentation for modules not currently instrumented by New Relic.
+         * - Instrument your own code.
+         * - Replace the Node.js agent's built-in instrumentation with your own.
+         */
+        instrument: Instrument;
+
+        /**
+         * Sets an instrumentation callback for a datastore module.
+         *
+         * This method is just like `instrument`, except it provides a datastore-service-specialized shim.
+         */
+        instrumentDatastore: Instrument;
+
+        /**
+         * Sets an instrumentation callback for a web framework module.
+         *
+         * This method is just like `instrument`, except it provides a web-framework-specialized  shim.
+         */
+        instrumentWebframework: Instrument;
+
+        /**
+         * Sets an instrumentation callback for a message service client module.
+         *
+         * This method is just like `instrument`, except it provides a message-service-specialized shim.
+         */
+        instrumentMessages: Instrument;
+
+        /**
+         * Gracefully shuts down the agent.
+         *
+         * If `collectPendingData` is true, the agent will send any pending data to the collector
+         * before shutting down. Defaults to `false`.
+         */
+        shutdown(cb?: (error?: Error) => void): void;
+        shutdown(options?: { collectPendingData?: boolean, timeout?: number }, cb?: (error?: Error) => void): void;
+    }
+
+    interface Instrument {
+        (opts: { moduleName: string, onRequire: () => void, onError?: (err: Error) => void }): void;
+        (moduleName: string, onRequire: () => void, onError?: (err: Error) => void): void;
+    }
+
+    interface Metric {
+        count: number;
+        total: number;
+        min: number;
+        max: number;
+        sumOfSquares: number;
+    }
+
+    interface TransactionHandle {
+        /**
+         * End the transaction.
+         */
+        end(callback?: () => any): void;
+
+        /**
+         * Mark the transaction to be ignored.
+         */
+        ignore(): void;
+    }
+}
+declare const api: newrelic.NewRelicAPI;
+export = api;
diff --git a/types/newrelic/newrelic-tests.ts b/types/newrelic/newrelic-tests.ts
new file mode 100644
index 0000000000..73cd53cc78
--- /dev/null
+++ b/types/newrelic/newrelic-tests.ts
@@ -0,0 +1,98 @@
+/// <reference types="node" />
+import * as newrelic from "newrelic";
+
+newrelic.setTransactionName("foo"); // $ExpectType void
+
+const trans = newrelic.getTransaction();
+trans.ignore(); // $ExpectType void
+trans.end(); // $ExpectType void
+trans.end(() => { }); // $ExpectType void
+
+newrelic.setDispatcher("foo"); // $ExpectType void
+newrelic.setDispatcher("foo", "42"); // $ExpectType void
+
+newrelic.setControllerName("foo", "GET"); // $ExpectType void
+
+newrelic.addCustomAttribute("foo", "bar"); // $ExpectType void
+newrelic.addCustomAttributes({ foo: "bar", baz: "bang" }); // $ExpectType void
+
+newrelic.setIgnoreTransaction(true); // $ExpectType void
+
+newrelic.noticeError(Error("Oh no!")); // $ExpectType void
+newrelic.noticeError(Error("Oh no!"), { foo: "bar" }); // $ExpectType void
+
+newrelic.addNamingRule("/user/customers/all/.*", "/user/customers/all"); // $ExpectType void
+newrelic.addNamingRule(/\/user\/customers\/.*/, "/user/customers/:customer"); // $ExpectType void
+
+newrelic.addIgnoringRule("^/items/[0-9]+$"); // $ExpectType void
+newrelic.addIgnoringRule(/^[0-9]+$/); // $ExpectType void
+
+newrelic.getBrowserTimingHeader(); // $ExpectType string
+
+const wrappedFn = newrelic.createTracer("foo", (x: number) => {
+    return x * x;
+});
+const wrappedResult: number = wrappedFn(42);
+
+newrelic.startWebTransaction('/some/url/path', () => {
+    const transaction = newrelic.getTransaction();
+    Promise.all([]);
+    setTimeout(() => {
+        // do some work
+        transaction.end();
+    }, 100);
+});
+
+newrelic.startBackgroundTransaction('Red October', (foo) => foo); // $ExpectType any
+newrelic.startBackgroundTransaction('Red October', 'Subs', () => {
+    const transaction = newrelic.getTransaction();
+    setTimeout(() => {
+        // do some work
+        transaction.end();
+    }, 100);
+});
+
+newrelic.endTransaction(); // $ExpectType void
+
+newrelic.recordMetric("foo", 42); // $ExpectType void
+newrelic.recordMetric("foo", {
+    count: 10,
+    total: 42,
+    min: 1,
+    max: 17,
+    sumOfSquares: 60,
+});
+
+newrelic.incrementMetric("foo"); // $ExpectType void
+newrelic.incrementMetric("foo", 42); // $ExpectType void
+
+newrelic.recordCustomEvent("my_event", {
+    foo: true,
+    bar: 42,
+    baz: "don't panic",
+});
+
+newrelic.instrument("foo", () => { }); // $ExpectType void
+newrelic.instrumentDatastore("foo", () => { }, (err: Error) => { });
+newrelic.instrumentWebframework({
+    moduleName: "foo",
+    onRequire: () => { },
+});
+newrelic.instrumentMessages({
+    moduleName: "foo",
+    onRequire: () => { },
+    onError: (err) => {
+        const error: Error = err;
+     },
+});
+
+newrelic.shutdown(); // $ExpectType void
+newrelic.shutdown({ collectPendingData: true });
+newrelic.shutdown({ timeout: 3000 });
+newrelic.shutdown({ collectPendingData: true, timeout: 3000 });
+newrelic.shutdown({ collectPendingData: true, timeout: 3000 }, (err) => {
+    const error: Error | undefined = err;
+});
+newrelic.shutdown((err) => {
+    const error: Error | undefined = err;
+});
diff --git a/types/newrelic/tsconfig.json b/types/newrelic/tsconfig.json
new file mode 100644
index 0000000000..479dde054f
--- /dev/null
+++ b/types/newrelic/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",
+        "newrelic-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/newrelic/tslint.json b/types/newrelic/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/newrelic/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/next-redux-wrapper/index.d.ts b/types/next-redux-wrapper/index.d.ts
index a6b1da550e..38e20f608a 100644
--- a/types/next-redux-wrapper/index.d.ts
+++ b/types/next-redux-wrapper/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/kirill-konshin/next-redux-wrapper
 // Definitions by: Steve <https://github.com/stevegeek>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.4
+// TypeScript Version: 2.6
 
 /// <reference types="node" />
 /*~ Note that ES6 modules cannot directly export callable functions.
diff --git a/types/next/index.d.ts b/types/next/index.d.ts
index 70bc8ef049..036e9f58ce 100644
--- a/types/next/index.d.ts
+++ b/types/next/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Drew Hays <https://github.com/dru89>
 //                 Brice BERNARD <https://github.com/brikou>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 /// <reference types="node" />
 
diff --git a/types/ngreact/index.d.ts b/types/ngreact/index.d.ts
index cb39e45ee1..6db92506ce 100644
--- a/types/ngreact/index.d.ts
+++ b/types/ngreact/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/ngReact/ngReact
 // Definitions by: Vicky Lai <https://github.com/velveret>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 /// <reference types="angular"/>
 /// <reference types="react"/>
diff --git a/types/nock/nock-tests.ts b/types/nock/nock-tests.ts
index e81e3fd096..44397db941 100644
--- a/types/nock/nock-tests.ts
+++ b/types/nock/nock-tests.ts
@@ -1,6 +1,4 @@
-
-
-import * as nock from 'nock';
+import nock = require('nock');
 import * as fs from 'fs';
 
 var scope: nock.Scope;
diff --git a/types/node-cron/tsconfig.json b/types/node-cron/tsconfig.json
index e1ec63395b..9fb50ab907 100644
--- a/types/node-cron/tsconfig.json
+++ b/types/node-cron/tsconfig.json
@@ -22,4 +22,4 @@
         "index.d.ts",
         "node-cron-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/node-geocoder/node-geocoder-tests.ts b/types/node-geocoder/node-geocoder-tests.ts
index 33ed4b3036..bb554d03ba 100644
--- a/types/node-geocoder/node-geocoder-tests.ts
+++ b/types/node-geocoder/node-geocoder-tests.ts
@@ -1,4 +1,4 @@
-import * as NodeGeocoder from 'node-geocoder';
+import NodeGeocoder = require('node-geocoder');
 
 const geocoder = NodeGeocoder({
     provider: 'google',
diff --git a/types/node-horseman/tsconfig.json b/types/node-horseman/tsconfig.json
index 5490648512..8ac7d67c3e 100644
--- a/types/node-horseman/tsconfig.json
+++ b/types/node-horseman/tsconfig.json
@@ -21,4 +21,4 @@
         "index.d.ts",
         "node-horseman-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/node-powershell/node-powershell-tests.ts b/types/node-powershell/node-powershell-tests.ts
index a60f9db331..186d0bd68e 100644
--- a/types/node-powershell/node-powershell-tests.ts
+++ b/types/node-powershell/node-powershell-tests.ts
@@ -1,4 +1,4 @@
-import * as nodePowershell from 'node-powershell';
+import nodePowershell = require('node-powershell');
 
 var options: nodePowershell.ShellOptions = {
     debugMsg: true
diff --git a/types/node-rsa/node-rsa-tests.ts b/types/node-rsa/node-rsa-tests.ts
index e210d5b68d..0f8defacbd 100644
--- a/types/node-rsa/node-rsa-tests.ts
+++ b/types/node-rsa/node-rsa-tests.ts
@@ -1,4 +1,4 @@
-import * as NodeRSA from 'node-rsa';
+import NodeRSA = require('node-rsa');
 
 const key = new NodeRSA({ b: 512 });
 
diff --git a/types/node-sass-middleware/node-sass-middleware-tests.ts b/types/node-sass-middleware/node-sass-middleware-tests.ts
index bfc755a424..34820155ed 100644
--- a/types/node-sass-middleware/node-sass-middleware-tests.ts
+++ b/types/node-sass-middleware/node-sass-middleware-tests.ts
@@ -1,6 +1,5 @@
-
-import * as express from "express";
-import * as sassMiddleware from "node-sass-middleware";
+import express = require("express");
+import sassMiddleware = require("node-sass-middleware");
 import * as path from "path";
 var app = express();
 app.use(sassMiddleware({
diff --git a/types/node-sprite-generator/node-sprite-generator-tests.ts b/types/node-sprite-generator/node-sprite-generator-tests.ts
index 23309cea6d..7490d84865 100644
--- a/types/node-sprite-generator/node-sprite-generator-tests.ts
+++ b/types/node-sprite-generator/node-sprite-generator-tests.ts
@@ -1,5 +1,5 @@
-import * as nsg from 'node-sprite-generator';
-import * as express from 'express';
+import nsg = require('node-sprite-generator');
+import express = require('express');
 const app = express();
 
 app.use(nsg.middleware({
diff --git a/types/node-vault/node-vault-tests.ts b/types/node-vault/node-vault-tests.ts
index d6d85980a1..6ce23bd4cd 100644
--- a/types/node-vault/node-vault-tests.ts
+++ b/types/node-vault/node-vault-tests.ts
@@ -1,4 +1,4 @@
-import * as nv from "node-vault";
+import nv = require("node-vault");
 
 // Test code came from the sample code in README of the module.
 const options = {
diff --git a/types/node/index.d.ts b/types/node/index.d.ts
index 38f043554b..717b906b28 100644
--- a/types/node/index.d.ts
+++ b/types/node/index.d.ts
@@ -18,6 +18,7 @@
 //                 Hannes Magnusson <https://github.com/Hannes-Magnusson-CK>
 //                 Alberto Schiabel <https://github.com/jkomyno>
 //                 Klaus Meinhardt <https://github.com/ajafff>
+//                 Huw <https://github.com/hoo29>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /** inspector module types */
@@ -113,17 +114,22 @@ declare function clearImmediate(immediateId: any): void;
 
 // TODO: change to `type NodeRequireFunction = (id: string) => any;` in next mayor version.
 interface NodeRequireFunction {
-/* tslint:disable-next-line:callable-types */
+    /* tslint:disable-next-line:callable-types */
     (id: string): any;
 }
 
 interface NodeRequire extends NodeRequireFunction {
-    resolve(id: string): string;
+    resolve: RequireResolve;
     cache: any;
     extensions: NodeExtensions;
     main: NodeModule | undefined;
 }
 
+interface RequireResolve {
+    (id: string, options?: { paths?: string[]; }): string;
+    paths(request: string): string[] | null;
+}
+
 interface NodeExtensions {
     '.js': (m: NodeModule, filename: string) => any;
     '.json': (m: NodeModule, filename: string) => any;
@@ -1740,33 +1746,20 @@ declare module "https" {
     import * as http from "http";
     import { URL } from "url";
 
-    export interface ServerOptions {
-        pfx?: any;
-        key?: any;
-        passphrase?: string;
-        cert?: any;
-        ca?: any;
-        crl?: any;
-        ciphers?: string;
-        honorCipherOrder?: boolean;
-        requestCert?: boolean;
-        rejectUnauthorized?: boolean;
-        NPNProtocols?: any;
-        SNICallback?: (servername: string, cb: (err: Error | null, ctx: tls.SecureContext) => void) => void;
-        secureProtocol?: string;
-    }
+    export type ServerOptions = tls.SecureContextOptions & tls.TlsOptions;
 
-    export interface RequestOptions extends http.RequestOptions {
-        pfx?: any;
-        key?: any;
+    export type RequestOptions = http.RequestOptions & {
+        rejectUnauthorized?: boolean; // Defaults to true
+        servername?: string; // SNI TLS Extension
+        pfx?: string | Buffer | Array<string | Buffer | Object>;
+        key?: string | Buffer | Array<Buffer | Object>;
         passphrase?: string;
-        cert?: any;
-        ca?: any;
+        cert?: string | Buffer | Array<string | Buffer>;
+        ca?: string | Buffer | Array<string | Buffer>;
         ciphers?: string;
-        rejectUnauthorized?: boolean;
-        secureProtocol?: string;
-        servername?: string;
-    }
+        clientCertEngine?: string;
+        secureProtocol?: string; // SSL Method, e.g. SSLv23_method
+    };
 
     export interface AgentOptions extends http.AgentOptions, tls.ConnectionOptions {
         rejectUnauthorized?: boolean;
@@ -2621,9 +2614,9 @@ declare module "net" {
         destroy(err?: any): void;
         pause(): this;
         resume(): this;
-        setTimeout(timeout: number, callback?: Function): void;
-        setNoDelay(noDelay?: boolean): void;
-        setKeepAlive(enable?: boolean, initialDelay?: number): void;
+        setTimeout(timeout: number, callback?: Function): this;
+        setNoDelay(noDelay?: boolean): this;
+        setKeepAlive(enable?: boolean, initialDelay?: number): this;
         address(): { port: number; family: string; address: string; };
         unref(): void;
         ref(): void;
@@ -3716,7 +3709,7 @@ declare module "fs" {
      * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
      * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
      */
-    export function readdir(path: PathLike, options: { encoding?: string | null } | string | undefined | null, callback: (err: NodeJS.ErrnoException, files: Array<string | Buffer>) => void): void;
+    export function readdir(path: PathLike, options: { encoding?: string | null } | string | undefined | null, callback: (err: NodeJS.ErrnoException, files: string[] | Buffer[]) => void): void;
 
     /**
      * Asynchronous readdir(3) - read a directory.
@@ -3745,7 +3738,7 @@ declare module "fs" {
          * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
          * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
          */
-        export function __promisify__(path: PathLike, options?: { encoding?: string | null } | string | null): Promise<Array<string | Buffer>>;
+        export function __promisify__(path: PathLike, options?: { encoding?: string | null } | string | null): Promise<string[] | Buffer[]>;
     }
 
     /**
@@ -3767,7 +3760,7 @@ declare module "fs" {
      * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
      * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
      */
-    export function readdirSync(path: PathLike, options?: { encoding?: string | null } | string | null): Array<string | Buffer>;
+    export function readdirSync(path: PathLike, options?: { encoding?: string | null } | string | null): string[] | Buffer[];
 
     /**
      * Asynchronous close(2) - close a file descriptor.
@@ -4839,7 +4832,7 @@ declare module "tls" {
              * An array of strings or a Buffer naming possible NPN protocols.
              * (Protocols should be ordered by their priority.)
              */
-            NPNProtocols?: string[] | Buffer,
+            NPNProtocols?: string[] | Buffer[] | Uint8Array[] | Buffer | Uint8Array,
             /**
              * An array of strings or a Buffer naming possible ALPN protocols.
              * (Protocols should be ordered by their priority.) When the server
@@ -4847,7 +4840,7 @@ declare module "tls" {
              * precedence over NPN and the server does not send an NPN extension
              * to the client.
              */
-            ALPNProtocols?: string[] | Buffer,
+            ALPNProtocols?: string[] | Buffer[] | Uint8Array[] | Buffer | Uint8Array,
             /**
              * SNICallback(servername, cb) <Function> A function that will be
              * called if the client supports SNI TLS extension. Two arguments
@@ -4923,7 +4916,7 @@ declare module "tls" {
          * @param callback - callback(err) will be executed with null as err, once the renegotiation
          * is successfully completed.
          */
-        renegotiate(options: TlsOptions, callback: (err: Error | null) => void): any;
+        renegotiate(options: { rejectUnauthorized?: boolean, requestCert?: boolean }, callback: (err: Error | null) => void): any;
         /**
          * Set maximum TLS fragment size (default and maximum value is: 16384, minimum is: 512).
          * Smaller fragment size decreases buffering latency on the client: large fragments are buffered by
@@ -4966,30 +4959,16 @@ declare module "tls" {
         prependOnceListener(event: "secureConnect", listener: () => void): this;
     }
 
-    export interface TlsOptions {
-        host?: string;
-        port?: number;
-        pfx?: string | Buffer[];
-        key?: string | string[] | Buffer | any[];
-        passphrase?: string;
-        cert?: string | string[] | Buffer | Buffer[];
-        ca?: string | string[] | Buffer | Buffer[];
-        crl?: string | string[];
-        ciphers?: string;
-        honorCipherOrder?: boolean;
+    export interface TlsOptions extends SecureContextOptions {
+        clientCertEngine?: string;
+        handshakeTimeout?: number;
         requestCert?: boolean;
         rejectUnauthorized?: boolean;
-        NPNProtocols?: string[] | Buffer;
+        NPNProtocols?: string[] | Buffer[] | Uint8Array[] | Buffer | Uint8Array;
+        ALPNProtocols?: string[] | Buffer[] | Uint8Array[] | Buffer | Uint8Array;
         SNICallback?: (servername: string, cb: (err: Error | null, ctx: SecureContext) => void) => void;
-        ecdhCurve?: string;
-        dhparam?: string | Buffer;
-        handshakeTimeout?: number;
-        ALPNProtocols?: string[] | Buffer;
         sessionTimeout?: number;
         ticketKeys?: Buffer;
-        sessionIdContext?: string;
-        secureProtocol?: string;
-        secureOptions?: number;
     }
 
     export interface ConnectionOptions extends SecureContextOptions {
@@ -4998,8 +4977,8 @@ declare module "tls" {
         path?: string; // Creates unix socket connection to path. If this option is specified, `host` and `port` are ignored.
         socket?: net.Socket; // Establish secure connection on a given socket rather than creating a new socket
         rejectUnauthorized?: boolean; // Defaults to true
-        NPNProtocols?: Array<string | Buffer>;
-        ALPNProtocols?: Array<string | Buffer>;
+        NPNProtocols?: string[] | Buffer[] | Uint8Array[] | Buffer | Uint8Array;
+        ALPNProtocols?: string[] | Buffer[] | Uint8Array[] | Buffer | Uint8Array;
         checkServerIdentity?: typeof checkServerIdentity;
         servername?: string; // SNI TLS Extension
         session?: Buffer;
@@ -5097,6 +5076,7 @@ declare module "tls" {
         ciphers?: string;
         honorCipherOrder?: boolean;
         ecdhCurve?: string;
+        clientCertEngine?: string;
         crl?: string | Buffer | Array<string | Buffer>;
         dhparam?: string | Buffer;
         secureOptions?: number; // Value is a numeric bitmask of the `SSL_OP_*` options
@@ -5335,7 +5315,6 @@ declare module "stream" {
              * 5. error
              */
             addListener(event: string, listener: (...args: any[]) => void): this;
-            addListener(event: string, listener: (...args: any[]) => void): this;
             addListener(event: "close", listener: () => void): this;
             addListener(event: "data", listener: (chunk: Buffer | string) => void): this;
             addListener(event: "end", listener: () => void): this;
@@ -5401,7 +5380,7 @@ declare module "stream" {
             readonly writableLength: number;
             constructor(opts?: WritableOptions);
             _write(chunk: any, encoding: string, callback: (err?: Error) => void): void;
-            _writev?(chunks: Array<{chunk: any, encoding: string}>, callback: (err?: Error) => void): void;
+            _writev?(chunks: Array<{ chunk: any, encoding: string }>, callback: (err?: Error) => void): void;
             _destroy(err: Error, callback: Function): void;
             _final(callback: Function): void;
             write(chunk: any, cb?: Function): boolean;
@@ -5494,7 +5473,7 @@ declare module "stream" {
             readonly writableLength: number;
             constructor(opts?: DuplexOptions);
             _write(chunk: any, encoding: string, callback: (err?: Error) => void): void;
-            _writev?(chunks: Array<{chunk: any, encoding: string}>, callback: (err?: Error) => void): void;
+            _writev?(chunks: Array<{ chunk: any, encoding: string }>, callback: (err?: Error) => void): void;
             _destroy(err: Error, callback: Function): void;
             _final(callback: Function): void;
             write(chunk: any, cb?: Function): boolean;
@@ -5574,9 +5553,9 @@ declare module "util" {
     export function callbackify<T1, T2>(fn: (arg1: T1, arg2: T2) => Promise<void>): (arg1: T1, arg2: T2, callback: (err: NodeJS.ErrnoException) => void) => void;
     export function callbackify<T1, T2, TResult>(fn: (arg1: T1, arg2: T2) => Promise<TResult>): (arg1: T1, arg2: T2, callback: (err: NodeJS.ErrnoException, result: TResult) => void) => void;
     export function callbackify<T1, T2, T3>(fn: (arg1: T1, arg2: T2, arg3: T3) => Promise<void>): (arg1: T1, arg2: T2, arg3: T3, callback: (err: NodeJS.ErrnoException) => void) => void;
-    export function callbackify<T1, T2, T3, TResult>(fn: (arg1: T1, arg2: T2, arg3: T3) => Promise<TResult>): (arg1: T1, arg2: T2, arg3: T3,  callback: (err: NodeJS.ErrnoException, result: TResult) => void) => void;
+    export function callbackify<T1, T2, T3, TResult>(fn: (arg1: T1, arg2: T2, arg3: T3) => Promise<TResult>): (arg1: T1, arg2: T2, arg3: T3, callback: (err: NodeJS.ErrnoException, result: TResult) => void) => void;
     export function callbackify<T1, T2, T3, T4>(fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4) => Promise<void>): (arg1: T1, arg2: T2, arg3: T3, arg4: T4, callback: (err: NodeJS.ErrnoException) => void) => void;
-    export function callbackify<T1, T2, T3, T4, TResult>(fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4) => Promise<TResult>): (arg1: T1, arg2: T2, arg3: T3, arg4: T4,  callback: (err: NodeJS.ErrnoException, result: TResult) => void) => void;
+    export function callbackify<T1, T2, T3, T4, TResult>(fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4) => Promise<TResult>): (arg1: T1, arg2: T2, arg3: T3, arg4: T4, callback: (err: NodeJS.ErrnoException, result: TResult) => void) => void;
     export function callbackify<T1, T2, T3, T4, T5>(fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5) => Promise<void>): (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5, callback: (err: NodeJS.ErrnoException) => void) => void;
     export function callbackify<T1, T2, T3, T4, T5, TResult>(fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5) => Promise<TResult>): (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5, callback: (err: NodeJS.ErrnoException, result: TResult) => void) => void;
     export function callbackify<T1, T2, T3, T4, T5, T6>(fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5, arg6: T6) => Promise<void>): (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5, arg6: T6, callback: (err: NodeJS.ErrnoException) => void) => void;
@@ -5650,12 +5629,12 @@ declare module "tty" {
     import * as net from "net";
 
     export function isatty(fd: number): boolean;
-    export interface ReadStream extends net.Socket {
+    export class ReadStream extends net.Socket {
         isRaw: boolean;
         setRawMode(mode: boolean): void;
         isTTY: boolean;
     }
-    export interface WriteStream extends net.Socket {
+    export class WriteStream extends net.Socket {
         columns: number;
         rows: number;
         isTTY: boolean;
@@ -6169,7 +6148,7 @@ declare module "http2" {
     }
 
     export interface ServerStreamFileResponseOptions {
-        statCheck?: (stats: fs.Stats, headers: OutgoingHttpHeaders, statOptions: StatOptions) => void|boolean;
+        statCheck?: (stats: fs.Stats, headers: OutgoingHttpHeaders, statOptions: StatOptions) => void | boolean;
         getTrailers?: (trailers: OutgoingHttpHeaders) => void;
         offset?: number;
         length?: number;
@@ -6181,15 +6160,12 @@ declare module "http2" {
 
     export interface Http2Stream extends stream.Duplex {
         readonly aborted: boolean;
+        close(code: number, callback?: () => void): void;
+        readonly closed: boolean;
         readonly destroyed: boolean;
+        readonly pending: boolean;
         priority(options: StreamPriorityOptions): void;
         readonly rstCode: number;
-        rstStream(code: number): void;
-        rstWithNoError(): void;
-        rstWithProtocolError(): void;
-        rstWithCancel(): void;
-        rstWithRefuse(): void;
-        rstWithInternalError(): void;
         readonly session: Http2Session;
         setTimeout(msecs: number, callback?: () => void): void;
         readonly state: StreamState;
@@ -6321,8 +6297,8 @@ declare module "http2" {
         additionalHeaders(headers: OutgoingHttpHeaders): void;
         readonly headersSent: boolean;
         readonly pushAllowed: boolean;
-        pushStream(headers: OutgoingHttpHeaders, callback?: (pushStream: ServerHttp2Stream) => void): void;
-        pushStream(headers: OutgoingHttpHeaders, options?: StreamPriorityOptions, callback?: (pushStream: ServerHttp2Stream) => void): void;
+        pushStream(headers: OutgoingHttpHeaders, callback?: (err: Error | null, pushStream: ServerHttp2Stream, headers: OutgoingHttpHeaders) => void): void;
+        pushStream(headers: OutgoingHttpHeaders, options?: StreamPriorityOptions, callback?: (err: Error | null, pushStream: ServerHttp2Stream, headers: OutgoingHttpHeaders) => void): void;
         respond(headers?: OutgoingHttpHeaders, options?: ServerStreamResponseOptions): void;
         respondWithFD(fd: number, headers?: OutgoingHttpHeaders, options?: ServerStreamFileResponseOptions): void;
         respondWithFile(path: string, headers?: OutgoingHttpHeaders, options?: ServerStreamFileResponseOptionsWithError): void;
@@ -6347,13 +6323,6 @@ declare module "http2" {
         getTrailers?: (trailers: OutgoingHttpHeaders, flags: number) => void;
     }
 
-    export interface SessionShutdownOptions {
-        graceful?: boolean;
-        errorCode?: number;
-        lastStreamID?: number;
-        opaqueData?: Buffer | Uint8Array;
-    }
-
     export interface SessionState {
         effectiveLocalWindowSize?: number;
         effectiveRecvDataLength?: number;
@@ -6367,20 +6336,26 @@ declare module "http2" {
     }
 
     export interface Http2Session extends events.EventEmitter {
-        destroy(): void;
+        readonly alpnProtocol?: string;
+        close(callback?: () => void): void;
+        readonly closed: boolean;
+        destroy(error?: Error, code?: number): void;
         readonly destroyed: boolean;
+        readonly encrypted?: boolean;
+        goaway(code?: number, lastStreamID?: number, opaqueData?: Buffer | DataView /*| TypedArray*/): void;
         readonly localSettings: Settings;
+        readonly originSet?: string[];
         readonly pendingSettingsAck: boolean;
+        ref(): void;
         readonly remoteSettings: Settings;
         rstStream(stream: Http2Stream, code?: number): void;
         setTimeout(msecs: number, callback?: () => void): void;
-        shutdown(callback?: () => void): void;
-        shutdown(options: SessionShutdownOptions, callback?: () => void): void;
         readonly socket: net.Socket | tls.TLSSocket;
         readonly state: SessionState;
         priority(stream: Http2Stream, options: StreamPriorityOptions): void;
         settings(settings: Settings): void;
         readonly type: number;
+        unref(): void;
 
         addListener(event: string, listener: (...args: any[]) => void): this;
         addListener(event: "close", listener: () => void): this;
@@ -6389,7 +6364,6 @@ declare module "http2" {
         addListener(event: "goaway", listener: (errorCode: number, lastStreamID: number, opaqueData: Buffer) => void): this;
         addListener(event: "localSettings", listener: (settings: Settings) => void): this;
         addListener(event: "remoteSettings", listener: (settings: Settings) => void): this;
-        addListener(event: "socketError", listener: (err: Error) => void): this;
         addListener(event: "timeout", listener: () => void): this;
 
         emit(event: string | symbol, ...args: any[]): boolean;
@@ -6399,7 +6373,6 @@ declare module "http2" {
         emit(event: "goaway", errorCode: number, lastStreamID: number, opaqueData: Buffer): boolean;
         emit(event: "localSettings", settings: Settings): boolean;
         emit(event: "remoteSettings", settings: Settings): boolean;
-        emit(event: "socketError", err: Error): boolean;
         emit(event: "timeout"): boolean;
 
         on(event: string, listener: (...args: any[]) => void): this;
@@ -6409,7 +6382,6 @@ declare module "http2" {
         on(event: "goaway", listener: (errorCode: number, lastStreamID: number, opaqueData: Buffer) => void): this;
         on(event: "localSettings", listener: (settings: Settings) => void): this;
         on(event: "remoteSettings", listener: (settings: Settings) => void): this;
-        on(event: "socketError", listener: (err: Error) => void): this;
         on(event: "timeout", listener: () => void): this;
 
         once(event: string, listener: (...args: any[]) => void): this;
@@ -6419,7 +6391,6 @@ declare module "http2" {
         once(event: "goaway", listener: (errorCode: number, lastStreamID: number, opaqueData: Buffer) => void): this;
         once(event: "localSettings", listener: (settings: Settings) => void): this;
         once(event: "remoteSettings", listener: (settings: Settings) => void): this;
-        once(event: "socketError", listener: (err: Error) => void): this;
         once(event: "timeout", listener: () => void): this;
 
         prependListener(event: string, listener: (...args: any[]) => void): this;
@@ -6429,7 +6400,6 @@ declare module "http2" {
         prependListener(event: "goaway", listener: (errorCode: number, lastStreamID: number, opaqueData: Buffer) => void): this;
         prependListener(event: "localSettings", listener: (settings: Settings) => void): this;
         prependListener(event: "remoteSettings", listener: (settings: Settings) => void): this;
-        prependListener(event: "socketError", listener: (err: Error) => void): this;
         prependListener(event: "timeout", listener: () => void): this;
 
         prependOnceListener(event: string, listener: (...args: any[]) => void): this;
@@ -6439,7 +6409,6 @@ declare module "http2" {
         prependOnceListener(event: "goaway", listener: (errorCode: number, lastStreamID: number, opaqueData: Buffer) => void): this;
         prependOnceListener(event: "localSettings", listener: (settings: Settings) => void): this;
         prependOnceListener(event: "remoteSettings", listener: (settings: Settings) => void): this;
-        prependOnceListener(event: "socketError", listener: (err: Error) => void): this;
         prependOnceListener(event: "timeout", listener: () => void): this;
     }
 
@@ -6447,31 +6416,42 @@ declare module "http2" {
         request(headers?: OutgoingHttpHeaders, options?: ClientSessionRequestOptions): ClientHttp2Stream;
 
         addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "altsvc", listener: (alt: string, origin: string, stream: number) => void): this;
         addListener(event: "connect", listener: (session: ClientHttp2Session, socket: net.Socket | tls.TLSSocket) => void): this;
         addListener(event: "stream", listener: (stream: ClientHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
 
         emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "altsvc", alt: string, origin: string, stream: number): boolean;
         emit(event: "connect", session: ClientHttp2Session, socket: net.Socket | tls.TLSSocket): boolean;
         emit(event: "stream", stream: ClientHttp2Stream, headers: IncomingHttpHeaders, flags: number): boolean;
 
         on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "altsvc", listener: (alt: string, origin: string, stream: number) => void): this;
         on(event: "connect", listener: (session: ClientHttp2Session, socket: net.Socket | tls.TLSSocket) => void): this;
         on(event: "stream", listener: (stream: ClientHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
 
         once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "altsvc", listener: (alt: string, origin: string, stream: number) => void): this;
         once(event: "connect", listener: (session: ClientHttp2Session, socket: net.Socket | tls.TLSSocket) => void): this;
         once(event: "stream", listener: (stream: ClientHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
 
         prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "altsvc", listener: (alt: string, origin: string, stream: number) => void): this;
         prependListener(event: "connect", listener: (session: ClientHttp2Session, socket: net.Socket | tls.TLSSocket) => void): this;
         prependListener(event: "stream", listener: (stream: ClientHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
 
         prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "altsvc", listener: (alt: string, origin: string, stream: number) => void): this;
         prependOnceListener(event: "connect", listener: (session: ClientHttp2Session, socket: net.Socket | tls.TLSSocket) => void): this;
         prependOnceListener(event: "stream", listener: (stream: ClientHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
     }
 
+    export interface AlternativeServiceOptions {
+        origin: number | string | url.URL;
+    }
+
     export interface ServerHttp2Session extends Http2Session {
+        altsvc(alt: string, originOrStream: number | string | url.URL | AlternativeServiceOptions): void;
         readonly server: Http2Server | Http2SecureServer;
 
         addListener(event: string, listener: (...args: any[]) => void): this;
@@ -6527,93 +6507,93 @@ declare module "http2" {
 
     export interface Http2Server extends net.Server {
         addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "checkContinue", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
         addListener(event: "request", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
         addListener(event: "sessionError", listener: (err: Error) => void): this;
-        addListener(event: "socketError", listener: (err: Error) => void): this;
         addListener(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
         addListener(event: "timeout", listener: () => void): this;
 
         emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "checkContinue", request: Http2ServerRequest, response: Http2ServerResponse): boolean;
         emit(event: "request", request: Http2ServerRequest, response: Http2ServerResponse): boolean;
         emit(event: "sessionError", err: Error): boolean;
-        emit(event: "socketError", err: Error): boolean;
         emit(event: "stream", stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number): boolean;
         emit(event: "timeout"): boolean;
 
         on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "checkContinue", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
         on(event: "request", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
         on(event: "sessionError", listener: (err: Error) => void): this;
-        on(event: "socketError", listener: (err: Error) => void): this;
         on(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
         on(event: "timeout", listener: () => void): this;
 
         once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "checkContinue", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
         once(event: "request", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
         once(event: "sessionError", listener: (err: Error) => void): this;
-        once(event: "socketError", listener: (err: Error) => void): this;
         once(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
         once(event: "timeout", listener: () => void): this;
 
         prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "checkContinue", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
         prependListener(event: "request", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
         prependListener(event: "sessionError", listener: (err: Error) => void): this;
-        prependListener(event: "socketError", listener: (err: Error) => void): this;
         prependListener(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
         prependListener(event: "timeout", listener: () => void): this;
 
         prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "checkContinue", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
         prependOnceListener(event: "request", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
         prependOnceListener(event: "sessionError", listener: (err: Error) => void): this;
-        prependOnceListener(event: "socketError", listener: (err: Error) => void): this;
         prependOnceListener(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
         prependOnceListener(event: "timeout", listener: () => void): this;
     }
 
     export interface Http2SecureServer extends tls.Server {
         addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "checkContinue", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
         addListener(event: "request", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
         addListener(event: "sessionError", listener: (err: Error) => void): this;
-        addListener(event: "socketError", listener: (err: Error) => void): this;
         addListener(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
         addListener(event: "timeout", listener: () => void): this;
         addListener(event: "unknownProtocol", listener: (socket: tls.TLSSocket) => void): this;
 
         emit(event: string | symbol, ...args: any[]): boolean;
+        emit(event: "checkContinue", request: Http2ServerRequest, response: Http2ServerResponse): boolean;
         emit(event: "request", request: Http2ServerRequest, response: Http2ServerResponse): boolean;
         emit(event: "sessionError", err: Error): boolean;
-        emit(event: "socketError", err: Error): boolean;
         emit(event: "stream", stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number): boolean;
         emit(event: "timeout"): boolean;
         emit(event: "unknownProtocol", socket: tls.TLSSocket): boolean;
 
         on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "checkContinue", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
         on(event: "request", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
         on(event: "sessionError", listener: (err: Error) => void): this;
-        on(event: "socketError", listener: (err: Error) => void): this;
         on(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
         on(event: "timeout", listener: () => void): this;
         on(event: "unknownProtocol", listener: (socket: tls.TLSSocket) => void): this;
 
         once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "checkContinue", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
         once(event: "request", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
         once(event: "sessionError", listener: (err: Error) => void): this;
-        once(event: "socketError", listener: (err: Error) => void): this;
         once(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
         once(event: "timeout", listener: () => void): this;
         once(event: "unknownProtocol", listener: (socket: tls.TLSSocket) => void): this;
 
         prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "checkContinue", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
         prependListener(event: "request", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
         prependListener(event: "sessionError", listener: (err: Error) => void): this;
-        prependListener(event: "socketError", listener: (err: Error) => void): this;
         prependListener(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
         prependListener(event: "timeout", listener: () => void): this;
         prependListener(event: "unknownProtocol", listener: (socket: tls.TLSSocket) => void): this;
 
         prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "checkContinue", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
         prependOnceListener(event: "request", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
         prependOnceListener(event: "sessionError", listener: (err: Error) => void): this;
-        prependOnceListener(event: "socketError", listener: (err: Error) => void): this;
         prependOnceListener(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
         prependOnceListener(event: "timeout", listener: () => void): this;
         prependOnceListener(event: "unknownProtocol", listener: (socket: tls.TLSSocket) => void): this;
diff --git a/types/node/node-tests.ts b/types/node/node-tests.ts
index dccde2db47..0572c58fea 100644
--- a/types/node/node-tests.ts
+++ b/types/node/node-tests.ts
@@ -1,4 +1,4 @@
-import * as assert from "assert";
+import assert = require("assert");
 import * as fs from "fs";
 import * as events from "events";
 import events2 = require("events");
@@ -235,6 +235,25 @@ namespace fs_tests {
         });
     }
 
+    {
+        let listS: string[];
+        listS = fs.readdirSync('path');
+        listS = fs.readdirSync('path', { encoding: 'utf8' });
+        listS = fs.readdirSync('path', { encoding: null });
+        listS = fs.readdirSync('path', { encoding: undefined });
+        listS = fs.readdirSync('path', 'utf8');
+        listS = fs.readdirSync('path', null);
+        listS = fs.readdirSync('path', undefined);
+
+        let listB: Buffer[];
+        listB = fs.readdirSync('path', { encoding: 'buffer' });
+        listB = fs.readdirSync("path", 'buffer');
+
+        let enc = 'buffer';
+        fs.readdirSync('path', { encoding: enc }); // $ExpectType string[] | Buffer[]
+        fs.readdirSync('path', { }); // $ExpectType string[] | Buffer[]
+    }
+
     {
         fs.mkdtemp('/tmp/foo-', (err, folder) => {
             console.log(folder);
@@ -3373,16 +3392,22 @@ namespace http2_tests {
         http2Session.on('localSettings', (settings: http2.Settings) => {});
         http2Session.on('remoteSettings', (settings: http2.Settings) => {});
         http2Session.on('stream', (stream: http2.Http2Stream, headers: http2.IncomingHttpHeaders, flags: number) => {});
-        http2Session.on('socketError', (err: Error) => {});
         http2Session.on('timeout', () => {});
 
         http2Session.destroy();
 
+        let alpnProtocol: string = http2Session.alpnProtocol;
         let destroyed: boolean = http2Session.destroyed;
+        let encrypted: boolean = http2Session.encrypted;
+        let originSet: string[] = http2Session.originSet;
         let pendingSettingsAck: boolean = http2Session.pendingSettingsAck;
         let settings: http2.Settings = http2Session.localSettings;
+        let closed: boolean = http2Session.closed;
         settings = http2Session.remoteSettings;
 
+        http2Session.ref();
+        http2Session.unref();
+
         let headers: http2.OutgoingHttpHeaders;
         let options: http2.ClientSessionRequestOptions = {
             endStream: true,
@@ -3400,16 +3425,7 @@ namespace http2_tests {
         http2Session.rstStream(stream, 0);
 
         http2Session.setTimeout(100, () => {});
-
-        let shutdownOptions: http2.SessionShutdownOptions = {
-            graceful: true,
-            errorCode: 0,
-            lastStreamID: 0,
-            opaqueData: Buffer.from([])
-        };
-        shutdownOptions.opaqueData = Uint8Array.from([]);
-        http2Session.shutdown(shutdownOptions);
-        http2Session.shutdown(shutdownOptions, () => {});
+        http2Session.close(() => {});
 
         let socket: net.Socket | tls.TLSSocket = http2Session.socket;
         let state: http2.SessionState = http2Session.state;
@@ -3448,7 +3464,9 @@ namespace http2_tests {
         http2Stream.on('trailers', (trailers: http2.IncomingHttpHeaders, flags: number) => {});
 
         let aborted: boolean = http2Stream.aborted;
+        let closed: boolean = http2Stream.closed;
         let destroyed: boolean = http2Stream.destroyed;
+        let pending: boolean = http2Stream.pending;
 
         http2Stream.priority({
             exclusive: true,
@@ -3457,14 +3475,6 @@ namespace http2_tests {
             silent: true
         });
 
-        let rstCode: number = http2Stream.rstCode;
-        http2Stream.rstStream(rstCode);
-        http2Stream.rstWithNoError();
-        http2Stream.rstWithProtocolError();
-        http2Stream.rstWithCancel();
-        http2Stream.rstWithRefuse();
-        http2Stream.rstWithInternalError();
-
         let sesh: http2.Http2Session = http2Stream.session;
 
         http2Stream.setTimeout(100, () => {});
@@ -3492,7 +3502,7 @@ namespace http2_tests {
         serverHttp2Stream.additionalHeaders(headers);
         let headerSent: boolean = serverHttp2Stream.headersSent;
         let pushAllowed: boolean = serverHttp2Stream.pushAllowed;
-        serverHttp2Stream.pushStream(headers, (pushStream: http2.ServerHttp2Stream) => {});
+        serverHttp2Stream.pushStream(headers, (err: Error | null, pushStream: http2.ServerHttp2Stream, headers: http2.OutgoingHttpHeaders) => {});
 
         let options: http2.ServerStreamResponseOptions = {
             endStream: true,
@@ -3533,7 +3543,7 @@ namespace http2_tests {
         let s2: tls.Server = http2SecureServer;
         [http2Server, http2SecureServer].forEach((server) => {
             server.on('sessionError', (err: Error) => {});
-            server.on('socketError', (err: Error) => {});
+            server.on('checkContinue', (stream: http2.ServerHttp2Stream, headers: http2.IncomingHttpHeaders, flags: number) => {});
             server.on('stream', (stream: http2.ServerHttp2Stream, headers: http2.IncomingHttpHeaders, flags: number) => {});
             server.on('request', (request: http2.Http2ServerRequest, response: http2.Http2ServerResponse) => {});
             server.on('timeout', () => {});
@@ -3658,6 +3668,15 @@ namespace http2_tests {
         secureClientSessionOptions.ca = '';
         let onConnectHandler = (session: http2.Http2Session, socket: net.Socket) => {};
 
+        let serverHttp2Session: http2.ServerHttp2Session;
+
+        serverHttp2Session.altsvc('', '');
+        serverHttp2Session.altsvc('', 0);
+        serverHttp2Session.altsvc('', new url.URL(''));
+        serverHttp2Session.altsvc('', { origin: '' });
+        serverHttp2Session.altsvc('', { origin: 0 });
+        serverHttp2Session.altsvc('', { origin: new url.URL('') });
+
         let clientHttp2Session: http2.ClientHttp2Session;
 
         clientHttp2Session = http2.connect('');
@@ -3666,6 +3685,7 @@ namespace http2_tests {
         clientHttp2Session = http2.connect('', clientSessionOptions, onConnectHandler);
         clientHttp2Session = http2.connect('', secureClientSessionOptions);
         clientHttp2Session = http2.connect('', secureClientSessionOptions, onConnectHandler);
+        clientHttp2Session.on('altsvc', (alt: string, origin: string, number: number) => {});
 
         settings = http2.getDefaultSettings();
         settings = http2.getPackedSettings(settings);
diff --git a/types/node/v0/index.d.ts b/types/node/v0/index.d.ts
index 814bbe793e..800a909c49 100644
--- a/types/node/v0/index.d.ts
+++ b/types/node/v0/index.d.ts
@@ -1902,11 +1902,11 @@ declare module "tty" {
     import * as net from "net";
 
     export function isatty(fd: number): boolean;
-    export interface ReadStream extends net.Socket {
+    export class ReadStream extends net.Socket {
         isRaw: boolean;
         setRawMode(mode: boolean): void;
     }
-    export interface WriteStream extends net.Socket {
+    export class WriteStream extends net.Socket {
         columns: number;
         rows: number;
     }
diff --git a/types/node/v0/node-tests.ts b/types/node/v0/node-tests.ts
index 8e2443b360..d8e0a40699 100644
--- a/types/node/v0/node-tests.ts
+++ b/types/node/v0/node-tests.ts
@@ -1,5 +1,4 @@
-
-import * as assert from "assert";
+import assert = require("assert");
 import * as fs from "fs";
 import * as events from "events";
 import * as zlib from "zlib";
diff --git a/types/node/v4/index.d.ts b/types/node/v4/index.d.ts
index b2db9f80ee..09cbd8bb43 100644
--- a/types/node/v4/index.d.ts
+++ b/types/node/v4/index.d.ts
@@ -1549,9 +1549,9 @@ declare module "net" {
         destroy(): void;
         pause(): void;
         resume(): void;
-        setTimeout(timeout: number, callback?: Function): void;
-        setNoDelay(noDelay?: boolean): void;
-        setKeepAlive(enable?: boolean, initialDelay?: number): void;
+        setTimeout(timeout: number, callback?: Function): this;
+        setNoDelay(noDelay?: boolean): this;
+        setKeepAlive(enable?: boolean, initialDelay?: number): this;
         address(): { port: number; family: string; address: string; };
         unref(): void;
         ref(): void;
@@ -2477,12 +2477,12 @@ declare module "tty" {
     import * as net from "net";
 
     export function isatty(fd: number): boolean;
-    export interface ReadStream extends net.Socket {
+    export class ReadStream extends net.Socket {
         isRaw: boolean;
         setRawMode(mode: boolean): void;
         isTTY: boolean;
     }
-    export interface WriteStream extends net.Socket {
+    export class WriteStream extends net.Socket {
         columns: number;
         rows: number;
         isTTY: boolean;
diff --git a/types/node/v4/node-tests.ts b/types/node/v4/node-tests.ts
index 2bb28ce779..e60b578ccf 100644
--- a/types/node/v4/node-tests.ts
+++ b/types/node/v4/node-tests.ts
@@ -1,4 +1,4 @@
-import * as assert from "assert";
+import assert = require("assert");
 import * as fs from "fs";
 import * as events from "events";
 import * as zlib from "zlib";
diff --git a/types/node/v6/index.d.ts b/types/node/v6/index.d.ts
index 5cbe7ab3dc..3c81e212b7 100644
--- a/types/node/v6/index.d.ts
+++ b/types/node/v6/index.d.ts
@@ -5,6 +5,7 @@
 //                 Wilco Bakker <https://github.com/WilcoBakker>
 //                 Thomas Bouldin <https://github.com/inlined>
 //                 Sebastian Silbermann <https://github.com/eps1lon>
+//                 Alorel <https://github.com/Alorel>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /************************************************
@@ -2093,9 +2094,9 @@ declare module "net" {
         setEncoding(encoding?: string): void;
         write(data: any, encoding?: string, callback?: Function): void;
         destroy(): void;
-        setTimeout(timeout: number, callback?: Function): void;
-        setNoDelay(noDelay?: boolean): void;
-        setKeepAlive(enable?: boolean, initialDelay?: number): void;
+        setTimeout(timeout: number, callback?: Function): this;
+        setNoDelay(noDelay?: boolean): this;
+        setKeepAlive(enable?: boolean, initialDelay?: number): this;
         address(): { port: number; family: string; address: string; };
         unref(): void;
         ref(): void;
@@ -2595,8 +2596,51 @@ declare module "fs" {
      * @returns Returns the created folder path.
      */
     export function mkdtempSync(prefix: string): string;
-    export function readdir(path: string | Buffer, callback?: (err: NodeJS.ErrnoException, files: string[]) => void): void;
-    export function readdirSync(path: string | Buffer): string[];
+    /**
+     * Asynchronous readdir(3) - read a directory.
+     * @param path A path to a file.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    export function readdir(path: string | Buffer, options: { encoding: BufferEncoding | null } | BufferEncoding | undefined | null, callback: (err: NodeJS.ErrnoException, files: string[]) => void): void;
+       /**
+     * Asynchronous readdir(3) - read a directory.
+     * @param path A path to a file.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    export function readdir(path: string | Buffer, options: { encoding: "buffer" } | "buffer", callback: (err: NodeJS.ErrnoException, files: Buffer[]) => void): void;
+
+    /**
+     * Asynchronous readdir(3) - read a directory.
+     * @param path A path to a file.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    export function readdir(path: string | Buffer, options: { encoding?: string | null } | string | undefined | null, callback: (err: NodeJS.ErrnoException, files: string[] | Buffer[]) => void): void;
+
+    /**
+     * Asynchronous readdir(3) - read a directory.
+     * @param path A path to a file.
+     */
+    export function readdir(path: string | Buffer, callback: (err: NodeJS.ErrnoException, files: string[]) => void): void;
+        /**
+     * Synchronous readdir(3) - read a directory.
+     * @param path A path to a file.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    export function readdirSync(path: string | Buffer, options?: { encoding: BufferEncoding | null } | BufferEncoding | null): string[];
+
+    /**
+     * Synchronous readdir(3) - read a directory.
+     * @param path A path to a file.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    export function readdirSync(path: string | Buffer, options: { encoding: "buffer" } | "buffer"): Buffer[];
+
+    /**
+     * Synchronous readdir(3) - read a directory.
+     * @param path A path to a file.
+     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+     */
+    export function readdirSync(path: string | Buffer, options?: { encoding?: string | null } | string | null): string[] | Buffer[];
     export function close(fd: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
     export function closeSync(fd: number): void;
     export function open(path: string | Buffer, flags: string | number, callback: (err: NodeJS.ErrnoException, fd: number) => void): void;
@@ -3605,7 +3649,6 @@ declare module "stream" {
              *   5. error
              **/
             addListener(event: string, listener: Function): this;
-            addListener(event: string, listener: Function): this;
             addListener(event: "close", listener: () => void): this;
             addListener(event: "data", listener: (chunk: Buffer | string) => void): this;
             addListener(event: "end", listener: () => void): this;
@@ -3854,12 +3897,12 @@ declare module "tty" {
     import * as net from "net";
 
     export function isatty(fd: number): boolean;
-    export interface ReadStream extends net.Socket {
+    export class ReadStream extends net.Socket {
         isRaw: boolean;
         setRawMode(mode: boolean): void;
         isTTY: boolean;
     }
-    export interface WriteStream extends net.Socket {
+    export class WriteStream extends net.Socket {
         columns: number;
         rows: number;
         isTTY: boolean;
diff --git a/types/node/v6/node-tests.ts b/types/node/v6/node-tests.ts
index 34a62bf88d..cd363c708c 100644
--- a/types/node/v6/node-tests.ts
+++ b/types/node/v6/node-tests.ts
@@ -1,4 +1,4 @@
-import * as assert from "assert";
+import assert = require("assert");
 import * as fs from "fs";
 import * as events from "events";
 import events2 = require("events");
@@ -218,6 +218,25 @@ namespace fs_tests {
         fs.readFile('testfile', { flag: 'r' }, (err, data) => buffer = data);
     }
 
+    {
+        fs.readdir('foo', (err: any, files: string[]) => {})
+        fs.readdir('foo', 'utf8', (err: any, files: string[]) => {});
+        fs.readdir('foo', {encoding: 'utf8'}, (err: any, files: string[]) => {});
+        fs.readdir('foo', 'buffer', (err: any, files: Buffer[]) => {});
+        fs.readdir('foo', {encoding: 'buffer'}, (err: any, files: Buffer[]) => {});
+
+        let fsStringOut: string[] = fs.readdirSync('utf8');
+        fsStringOut = fs.readdirSync('foo', 'utf8');
+        fsStringOut = fs.readdirSync('foo', {encoding: 'utf8'});
+
+        let fsBufferOut: Buffer[] = fs.readdirSync('utf8', 'buffer');
+        fsBufferOut = fs.readdirSync('foo', {encoding: 'buffer'});
+
+        let enc = 'buffer';
+        fs.readdirSync('path', { encoding: enc }); // $ExpectType string[] | Buffer[]
+        fs.readdirSync('path', { }); // $ExpectType string[] | Buffer[]
+    }
+
     {
         var errno: number;
         fs.readFile('testfile', (err, data) => {
diff --git a/types/node/v7/index.d.ts b/types/node/v7/index.d.ts
index 038c4a6f58..de69dc94c3 100644
--- a/types/node/v7/index.d.ts
+++ b/types/node/v7/index.d.ts
@@ -2219,9 +2219,9 @@ declare module "net" {
         destroy(err?: any): void;
         pause(): this;
         resume(): this;
-        setTimeout(timeout: number, callback?: Function): void;
-        setNoDelay(noDelay?: boolean): void;
-        setKeepAlive(enable?: boolean, initialDelay?: number): void;
+        setTimeout(timeout: number, callback?: Function): this;
+        setNoDelay(noDelay?: boolean): this;
+        setKeepAlive(enable?: boolean, initialDelay?: number): this;
         address(): { port: number; family: string; address: string; };
         unref(): void;
         ref(): void;
@@ -3754,7 +3754,6 @@ declare module "stream" {
              *   5. error
              **/
             addListener(event: string, listener: Function): this;
-            addListener(event: string, listener: Function): this;
             addListener(event: "close", listener: () => void): this;
             addListener(event: "data", listener: (chunk: Buffer | string) => void): this;
             addListener(event: "end", listener: () => void): this;
@@ -4003,12 +4002,12 @@ declare module "tty" {
     import * as net from "net";
 
     export function isatty(fd: number): boolean;
-    export interface ReadStream extends net.Socket {
+    export class ReadStream extends net.Socket {
         isRaw: boolean;
         setRawMode(mode: boolean): void;
         isTTY: boolean;
     }
-    export interface WriteStream extends net.Socket {
+    export class WriteStream extends net.Socket {
         columns: number;
         rows: number;
         isTTY: boolean;
diff --git a/types/node/v7/node-tests.ts b/types/node/v7/node-tests.ts
index a2f25db8ec..0240dcc120 100644
--- a/types/node/v7/node-tests.ts
+++ b/types/node/v7/node-tests.ts
@@ -1,4 +1,4 @@
-import * as assert from "assert";
+import assert = require("assert");
 import * as fs from "fs";
 import * as events from "events";
 import events2 = require("events");
diff --git a/types/node/v8/index.d.ts b/types/node/v8/index.d.ts
index 18ba96575d..5d672296f2 100644
--- a/types/node/v8/index.d.ts
+++ b/types/node/v8/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Node.js 8.5.x
+// Type definitions for Node.js 8.9.x
 // Project: http://nodejs.org/
 // Definitions by: Microsoft TypeScript <http://typescriptlang.org>
 //                 DefinitelyTyped <https://github.com/DefinitelyTyped/DefinitelyTyped>
@@ -17,7 +17,9 @@
 //                 Sebastian Silbermann <https://github.com/eps1lon>
 //                 Hannes Magnusson <https://github.com/Hannes-Magnusson-CK>
 //                 Alberto Schiabel <https://github.com/jkomyno>
+//                 Huw <https://github.com/hoo29>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
 
 /** inspector module types */
 /// <reference path="./inspector.d.ts" />
@@ -111,17 +113,22 @@ declare function clearImmediate(immediateId: any): void;
 
 // TODO: change to `type NodeRequireFunction = (id: string) => any;` in next mayor version.
 interface NodeRequireFunction {
-/* tslint:disable-next-line:callable-types */
+    /* tslint:disable-next-line:callable-types */
     (id: string): any;
 }
 
 interface NodeRequire extends NodeRequireFunction {
-    resolve(id: string): string;
+    resolve: RequireResolve;
     cache: any;
     extensions: NodeExtensions;
     main: NodeModule | undefined;
 }
 
+interface RequireResolve {
+    (id: string, options?: { paths?: string[]; }): string;
+    paths(request: string): string[] | null;
+}
+
 interface NodeExtensions {
     '.js': (m: NodeModule, filename: string) => any;
     '.json': (m: NodeModule, filename: string) => any;
@@ -1728,33 +1735,20 @@ declare module "https" {
     import * as http from "http";
     import { URL } from "url";
 
-    export interface ServerOptions {
-        pfx?: any;
-        key?: any;
-        passphrase?: string;
-        cert?: any;
-        ca?: any;
-        crl?: any;
-        ciphers?: string;
-        honorCipherOrder?: boolean;
-        requestCert?: boolean;
-        rejectUnauthorized?: boolean;
-        NPNProtocols?: any;
-        SNICallback?: (servername: string, cb: (err: Error | null, ctx: tls.SecureContext) => void) => void;
-        secureProtocol?: string;
-    }
+    export type ServerOptions = tls.SecureContextOptions & tls.TlsOptions;
 
-    export interface RequestOptions extends http.RequestOptions {
-        pfx?: any;
-        key?: any;
-        passphrase?: string;
-        cert?: any;
-        ca?: any;
-        ciphers?: string;
-        rejectUnauthorized?: boolean;
-        secureProtocol?: string;
-        servername?: string;
-    }
+    // see https://nodejs.org/docs/latest-v8.x/api/https.html#https_https_request_options_callback
+    type extendedRequestKeys = "pfx" |
+        "key" |
+        "passphrase" |
+        "cert" |
+        "ca" |
+        "ciphers" |
+        "rejectUnauthorized" |
+        "secureProtocol" |
+        "servername";
+
+    export type RequestOptions = http.RequestOptions & Pick<tls.ConnectionOptions, extendedRequestKeys>;
 
     export interface AgentOptions extends http.AgentOptions, tls.ConnectionOptions {
         rejectUnauthorized?: boolean;
@@ -2609,9 +2603,9 @@ declare module "net" {
         destroy(err?: any): void;
         pause(): this;
         resume(): this;
-        setTimeout(timeout: number, callback?: Function): void;
-        setNoDelay(noDelay?: boolean): void;
-        setKeepAlive(enable?: boolean, initialDelay?: number): void;
+        setTimeout(timeout: number, callback?: Function): this;
+        setNoDelay(noDelay?: boolean): this;
+        setKeepAlive(enable?: boolean, initialDelay?: number): this;
         address(): { port: number; family: string; address: string; };
         unref(): void;
         ref(): void;
@@ -3693,7 +3687,7 @@ declare module "fs" {
      * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
      * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
      */
-    export function readdir(path: PathLike, options: { encoding?: string | null } | string | undefined | null, callback: (err: NodeJS.ErrnoException, files: Array<string | Buffer>) => void): void;
+    export function readdir(path: PathLike, options: { encoding?: string | null } | string | undefined | null, callback: (err: NodeJS.ErrnoException, files: string[] | Buffer[]) => void): void;
 
     /**
      * Asynchronous readdir(3) - read a directory.
@@ -3722,7 +3716,7 @@ declare module "fs" {
          * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
          * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
          */
-        export function __promisify__(path: PathLike, options?: { encoding?: string | null } | string | null): Promise<Array<string | Buffer>>;
+        export function __promisify__(path: PathLike, options?: { encoding?: string | null } | string | null): Promise<string[] | Buffer[]>;
     }
 
     /**
@@ -3744,7 +3738,7 @@ declare module "fs" {
      * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
      * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
      */
-    export function readdirSync(path: PathLike, options?: { encoding?: string | null } | string | null): Array<string | Buffer>;
+    export function readdirSync(path: PathLike, options?: { encoding?: string | null } | string | null): string[] | Buffer[];
 
     /**
      * Asynchronous close(2) - close a file descriptor.
@@ -4816,7 +4810,7 @@ declare module "tls" {
              * An array of strings or a Buffer naming possible NPN protocols.
              * (Protocols should be ordered by their priority.)
              */
-            NPNProtocols?: string[] | Buffer,
+            NPNProtocols?: string[] | Buffer[] | Uint8Array[] | Buffer | Uint8Array,
             /**
              * An array of strings or a Buffer naming possible ALPN protocols.
              * (Protocols should be ordered by their priority.) When the server
@@ -4824,7 +4818,7 @@ declare module "tls" {
              * precedence over NPN and the server does not send an NPN extension
              * to the client.
              */
-            ALPNProtocols?: string[] | Buffer,
+            ALPNProtocols?: string[] | Buffer[] | Uint8Array[] | Buffer | Uint8Array,
             /**
              * SNICallback(servername, cb) <Function> A function that will be
              * called if the client supports SNI TLS extension. Two arguments
@@ -4900,7 +4894,7 @@ declare module "tls" {
          * @param callback - callback(err) will be executed with null as err, once the renegotiation
          * is successfully completed.
          */
-        renegotiate(options: TlsOptions, callback: (err: Error | null) => void): any;
+        renegotiate(options: { rejectUnauthorized?: boolean, requestCert?: boolean }, callback: (err: Error | null) => void): any;
         /**
          * Set maximum TLS fragment size (default and maximum value is: 16384, minimum is: 512).
          * Smaller fragment size decreases buffering latency on the client: large fragments are buffered by
@@ -4943,30 +4937,15 @@ declare module "tls" {
         prependOnceListener(event: "secureConnect", listener: () => void): this;
     }
 
-    export interface TlsOptions {
-        host?: string;
-        port?: number;
-        pfx?: string | Buffer[];
-        key?: string | string[] | Buffer | any[];
-        passphrase?: string;
-        cert?: string | string[] | Buffer | Buffer[];
-        ca?: string | string[] | Buffer | Buffer[];
-        crl?: string | string[];
-        ciphers?: string;
-        honorCipherOrder?: boolean;
+    export interface TlsOptions extends SecureContextOptions {
+        handshakeTimeout?: number;
         requestCert?: boolean;
         rejectUnauthorized?: boolean;
-        NPNProtocols?: string[] | Buffer;
+        NPNProtocols?: string[] | Buffer[] | Uint8Array[] | Buffer | Uint8Array;
+        ALPNProtocols?: string[] | Buffer[] | Uint8Array[] | Buffer | Uint8Array;
         SNICallback?: (servername: string, cb: (err: Error | null, ctx: SecureContext) => void) => void;
-        ecdhCurve?: string;
-        dhparam?: string | Buffer;
-        handshakeTimeout?: number;
-        ALPNProtocols?: string[] | Buffer;
         sessionTimeout?: number;
         ticketKeys?: Buffer;
-        sessionIdContext?: string;
-        secureProtocol?: string;
-        secureOptions?: number;
     }
 
     export interface ConnectionOptions extends SecureContextOptions {
@@ -4975,8 +4954,8 @@ declare module "tls" {
         path?: string; // Creates unix socket connection to path. If this option is specified, `host` and `port` are ignored.
         socket?: net.Socket; // Establish secure connection on a given socket rather than creating a new socket
         rejectUnauthorized?: boolean; // Defaults to true
-        NPNProtocols?: Array<string | Buffer>;
-        ALPNProtocols?: Array<string | Buffer>;
+        NPNProtocols?: string[] | Buffer[] | Uint8Array[] | Buffer | Uint8Array;
+        ALPNProtocols?: string[] | Buffer[] | Uint8Array[] | Buffer | Uint8Array;
         checkServerIdentity?: typeof checkServerIdentity;
         servername?: string; // SNI TLS Extension
         session?: Buffer;
@@ -5310,7 +5289,6 @@ declare module "stream" {
              * 5. error
              */
             addListener(event: string, listener: (...args: any[]) => void): this;
-            addListener(event: string, listener: (...args: any[]) => void): this;
             addListener(event: "close", listener: () => void): this;
             addListener(event: "data", listener: (chunk: Buffer | string) => void): this;
             addListener(event: "end", listener: () => void): this;
@@ -5374,7 +5352,7 @@ declare module "stream" {
             writable: boolean;
             constructor(opts?: WritableOptions);
             _write(chunk: any, encoding: string, callback: (err?: Error) => void): void;
-            _writev?(chunks: Array<{chunk: any, encoding: string}>, callback: (err?: Error) => void): void;
+            _writev?(chunks: Array<{ chunk: any, encoding: string }>, callback: (err?: Error) => void): void;
             _destroy(err: Error, callback: Function): void;
             _final(callback: Function): void;
             write(chunk: any, cb?: Function): boolean;
@@ -5465,7 +5443,7 @@ declare module "stream" {
             writable: boolean;
             constructor(opts?: DuplexOptions);
             _write(chunk: any, encoding: string, callback: (err?: Error) => void): void;
-            _writev?(chunks: Array<{chunk: any, encoding: string}>, callback: (err?: Error) => void): void;
+            _writev?(chunks: Array<{ chunk: any, encoding: string }>, callback: (err?: Error) => void): void;
             _destroy(err: Error, callback: Function): void;
             _final(callback: Function): void;
             write(chunk: any, cb?: Function): boolean;
@@ -5545,9 +5523,9 @@ declare module "util" {
     export function callbackify<T1, T2>(fn: (arg1: T1, arg2: T2) => Promise<void>): (arg1: T1, arg2: T2, callback: (err: NodeJS.ErrnoException) => void) => void;
     export function callbackify<T1, T2, TResult>(fn: (arg1: T1, arg2: T2) => Promise<TResult>): (arg1: T1, arg2: T2, callback: (err: NodeJS.ErrnoException, result: TResult) => void) => void;
     export function callbackify<T1, T2, T3>(fn: (arg1: T1, arg2: T2, arg3: T3) => Promise<void>): (arg1: T1, arg2: T2, arg3: T3, callback: (err: NodeJS.ErrnoException) => void) => void;
-    export function callbackify<T1, T2, T3, TResult>(fn: (arg1: T1, arg2: T2, arg3: T3) => Promise<TResult>): (arg1: T1, arg2: T2, arg3: T3,  callback: (err: NodeJS.ErrnoException, result: TResult) => void) => void;
+    export function callbackify<T1, T2, T3, TResult>(fn: (arg1: T1, arg2: T2, arg3: T3) => Promise<TResult>): (arg1: T1, arg2: T2, arg3: T3, callback: (err: NodeJS.ErrnoException, result: TResult) => void) => void;
     export function callbackify<T1, T2, T3, T4>(fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4) => Promise<void>): (arg1: T1, arg2: T2, arg3: T3, arg4: T4, callback: (err: NodeJS.ErrnoException) => void) => void;
-    export function callbackify<T1, T2, T3, T4, TResult>(fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4) => Promise<TResult>): (arg1: T1, arg2: T2, arg3: T3, arg4: T4,  callback: (err: NodeJS.ErrnoException, result: TResult) => void) => void;
+    export function callbackify<T1, T2, T3, T4, TResult>(fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4) => Promise<TResult>): (arg1: T1, arg2: T2, arg3: T3, arg4: T4, callback: (err: NodeJS.ErrnoException, result: TResult) => void) => void;
     export function callbackify<T1, T2, T3, T4, T5>(fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5) => Promise<void>): (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5, callback: (err: NodeJS.ErrnoException) => void) => void;
     export function callbackify<T1, T2, T3, T4, T5, TResult>(fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5) => Promise<TResult>): (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5, callback: (err: NodeJS.ErrnoException, result: TResult) => void) => void;
     export function callbackify<T1, T2, T3, T4, T5, T6>(fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5, arg6: T6) => Promise<void>): (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5, arg6: T6, callback: (err: NodeJS.ErrnoException) => void) => void;
@@ -5621,12 +5599,12 @@ declare module "tty" {
     import * as net from "net";
 
     export function isatty(fd: number): boolean;
-    export interface ReadStream extends net.Socket {
+    export class ReadStream extends net.Socket {
         isRaw: boolean;
         setRawMode(mode: boolean): void;
         isTTY: boolean;
     }
-    export interface WriteStream extends net.Socket {
+    export class WriteStream extends net.Socket {
         columns: number;
         rows: number;
         isTTY: boolean;
@@ -6142,7 +6120,7 @@ declare module "http2" {
     }
 
     export interface ServerStreamFileResponseOptions {
-        statCheck?: (stats: fs.Stats, headers: OutgoingHttpHeaders, statOptions: StatOptions) => void|boolean;
+        statCheck?: (stats: fs.Stats, headers: OutgoingHttpHeaders, statOptions: StatOptions) => void | boolean;
         getTrailers?: (trailers: OutgoingHttpHeaders) => void;
         offset?: number;
         length?: number;
diff --git a/types/node/v8/node-tests.ts b/types/node/v8/node-tests.ts
index 8f4c7f9850..74d4c5c222 100644
--- a/types/node/v8/node-tests.ts
+++ b/types/node/v8/node-tests.ts
@@ -1,4 +1,4 @@
-import * as assert from "assert";
+import assert = require("assert");
 import * as fs from "fs";
 import * as events from "events";
 import events2 = require("events");
@@ -235,6 +235,25 @@ namespace fs_tests {
         });
     }
 
+    {
+        let listS: string[];
+        listS = fs.readdirSync('path');
+        listS = fs.readdirSync('path', { encoding: 'utf8' });
+        listS = fs.readdirSync('path', { encoding: null });
+        listS = fs.readdirSync('path', { encoding: undefined });
+        listS = fs.readdirSync('path', 'utf8');
+        listS = fs.readdirSync('path', null);
+        listS = fs.readdirSync('path', undefined);
+
+        let listB: Buffer[];
+        listB = fs.readdirSync('path', { encoding: 'buffer' });
+        listB = fs.readdirSync("path", 'buffer');
+
+        let enc = 'buffer';
+        fs.readdirSync('path', { encoding: enc }); // $ExpectType string[] | Buffer[]
+        fs.readdirSync('path', { }); // $ExpectType string[] | Buffer[]
+    }
+
     {
         fs.mkdtemp('/tmp/foo-', (err, folder) => {
             console.log(folder);
diff --git a/types/node/v8/tsconfig.json b/types/node/v8/tsconfig.json
index 3f4614bef4..8deb391829 100644
--- a/types/node/v8/tsconfig.json
+++ b/types/node/v8/tsconfig.json
@@ -26,4 +26,4 @@
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     }
-}
+}
\ No newline at end of file
diff --git a/types/nodegit/tsconfig.json b/types/nodegit/tsconfig.json
index e097a77133..5d80518149 100644
--- a/types/nodegit/tsconfig.json
+++ b/types/nodegit/tsconfig.json
@@ -119,4 +119,4 @@
         "tree-update.d.ts",
         "tree.d.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/nodemailer-ses-transport/nodemailer-ses-transport-tests.ts b/types/nodemailer-ses-transport/nodemailer-ses-transport-tests.ts
index 393091816d..271dc6cf41 100644
--- a/types/nodemailer-ses-transport/nodemailer-ses-transport-tests.ts
+++ b/types/nodemailer-ses-transport/nodemailer-ses-transport-tests.ts
@@ -1,6 +1,6 @@
 import * as AWS from "aws-sdk";
 import * as nodemailer from "nodemailer";
-import * as sesTransport from 'nodemailer-ses-transport';
+import sesTransport = require('nodemailer-ses-transport');
 
 const opts: sesTransport.SesOptions = {
   SES: new AWS.SES(),
diff --git a/types/normalize-package-data/tsconfig.json b/types/normalize-package-data/tsconfig.json
index 0e79738d04..3105673d24 100644
--- a/types/normalize-package-data/tsconfig.json
+++ b/types/normalize-package-data/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "normalize-package-data-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/notyf/tsconfig.json b/types/notyf/tsconfig.json
index 9cf78d162a..18fb007211 100644
--- a/types/notyf/tsconfig.json
+++ b/types/notyf/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "notyf-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/npm-package-arg/npm-package-arg-tests.ts b/types/npm-package-arg/npm-package-arg-tests.ts
index ed95eb5243..d7f08c6c10 100644
--- a/types/npm-package-arg/npm-package-arg-tests.ts
+++ b/types/npm-package-arg/npm-package-arg-tests.ts
@@ -1,4 +1,4 @@
-import * as npa from "npm-package-arg";
+import npa = require("npm-package-arg");
 
 const result1 = npa("npm-package-arg@5.1");
 const result2 = npa("npm-package-arg@5.1", "..");
diff --git a/types/npm-packlist/index.d.ts b/types/npm-packlist/index.d.ts
new file mode 100644
index 0000000000..934d2f8967
--- /dev/null
+++ b/types/npm-packlist/index.d.ts
@@ -0,0 +1,16 @@
+// Type definitions for npm-packlist 1.1
+// Project: https://github.com/npm/npm-packlist
+// Definitions by: Klaus Meinhardt <https://github.com/ajafff>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
+
+declare function packlist(options?: packlist.Options): Promise<string[]>;
+declare function packlist<T>(options: packlist.Options | undefined, callback: (result: string[]) => T): Promise<T>;
+declare namespace packlist {
+    interface Options {
+        /** Directory to walk recusively. Defaults to `process.cwd()`. */
+        path?: string;
+    }
+    function sync(options?: Options): string[];
+}
+export = packlist;
diff --git a/types/npm-packlist/npm-packlist-tests.ts b/types/npm-packlist/npm-packlist-tests.ts
new file mode 100644
index 0000000000..162a7d86f5
--- /dev/null
+++ b/types/npm-packlist/npm-packlist-tests.ts
@@ -0,0 +1,14 @@
+import packlist = require('npm-packlist');
+
+let result: string[] = packlist.sync();
+result = packlist.sync({});
+result = packlist.sync({path: 'foo'});
+
+(async () => {
+    result = await packlist();
+    result = await packlist({});
+    result = await packlist({path: 'foo'});
+
+    packlist(undefined, (r) => result = r);
+    packlist({path: 'foo'}, (r) => result = r);
+})();
diff --git a/types/npm-packlist/tsconfig.json b/types/npm-packlist/tsconfig.json
new file mode 100644
index 0000000000..2c60fe863a
--- /dev/null
+++ b/types/npm-packlist/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",
+        "npm-packlist-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/npm-packlist/tslint.json b/types/npm-packlist/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/npm-packlist/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/ns-api/ns-api-tests.ts b/types/ns-api/ns-api-tests.ts
index 5063a97e48..ab8c7e343d 100644
--- a/types/ns-api/ns-api-tests.ts
+++ b/types/ns-api/ns-api-tests.ts
@@ -1,4 +1,4 @@
-import * as NsApi from "ns-api";
+import NsApi = require("ns-api");
 
 declare var console: { log(msg: any): string };
 
diff --git a/types/nsqjs/tsconfig.json b/types/nsqjs/tsconfig.json
index 6681afbdb9..2e65f5637c 100644
--- a/types/nsqjs/tsconfig.json
+++ b/types/nsqjs/tsconfig.json
@@ -14,11 +14,10 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,
-        "strictFunctionTypes": true
+        "forceConsistentCasingInFileNames": true
     },
     "files": [
         "index.d.ts",
         "nsqjs-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/nunjucks/tsconfig.json b/types/nunjucks/tsconfig.json
index 5824ce2f1f..4324f01fa8 100644
--- a/types/nunjucks/tsconfig.json
+++ b/types/nunjucks/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "nunjucks-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/o.js/o.js-tests.ts b/types/o.js/o.js-tests.ts
index 26cc187723..be3e5c824a 100644
--- a/types/o.js/o.js-tests.ts
+++ b/types/o.js/o.js-tests.ts
@@ -1,4 +1,4 @@
-import * as o from 'o.js';
+import o = require('o.js');
 import * as Q from "q";
 
 interface Product {
diff --git a/types/oauth2-server/oauth2-server-tests.ts b/types/oauth2-server/oauth2-server-tests.ts
index be8fa83705..faf9976873 100644
--- a/types/oauth2-server/oauth2-server-tests.ts
+++ b/types/oauth2-server/oauth2-server-tests.ts
@@ -1,5 +1,5 @@
-import * as express from "express";
-import * as OAuth2Server from "oauth2-server";
+import express = require("express");
+import OAuth2Server = require("oauth2-server");
 
 const oauth2Model: OAuth2Server.AuthorizationCodeModel = {
         getClient: async (clientId: string, clientSecret: string): Promise<OAuth2Server.Client | OAuth2Server.Falsey> => {
diff --git a/types/object-assign/object-assign-tests.ts b/types/object-assign/object-assign-tests.ts
index e7c58cf5fb..dc8db6ba07 100644
--- a/types/object-assign/object-assign-tests.ts
+++ b/types/object-assign/object-assign-tests.ts
@@ -1,4 +1,4 @@
-import * as objectAssign from 'object-assign';
+import objectAssign = require('object-assign');
 
 interface Target {
   hellow: string;
@@ -9,7 +9,7 @@ interface Source1 {
 }
 
 interface Result extends Target, Source1 {
-  
+
 }
 
 interface Source2 {
@@ -17,7 +17,7 @@ interface Source2 {
 }
 
 interface Result2 extends Result, Source2 {
-  
+
 }
 
 interface Source3 {
@@ -25,7 +25,7 @@ interface Source3 {
 }
 
 interface Result3 extends Result2, Source3 {
-  
+
 }
 
 interface Source4 {
@@ -33,7 +33,7 @@ interface Source4 {
 }
 
 interface Result4 extends Result3, Source4 {
-  
+
 }
 
 interface Source5 {
@@ -41,7 +41,7 @@ interface Source5 {
 }
 
 interface Result5 extends Result4, Source5 {
-  
+
 }
 
 function assign1(): Result {
diff --git a/types/object-hash/index.d.ts b/types/object-hash/index.d.ts
index c6b16df950..4da49c262c 100644
--- a/types/object-hash/index.d.ts
+++ b/types/object-hash/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for object-hash v1.1.8
+// Type definitions for object-hash v1.2.0
 // Project: https://github.com/puleos/object-hash
 // Definitions by: Michael Zabka <https://github.com/misak113>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -18,6 +18,7 @@ declare namespace ObjectHash {
 		respectFunctionNames?: boolean;
 		unorderedArrays?: boolean;
 		unorderedSets?: boolean;
+		excludeKeys?: (key: string) => boolean;
 	}
 
 	interface HashTableItem {
diff --git a/types/object-inspect/tsconfig.json b/types/object-inspect/tsconfig.json
index 1f167ba039..295f490d24 100644
--- a/types/object-inspect/tsconfig.json
+++ b/types/object-inspect/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "object-inspect-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/object-merge/index.d.ts b/types/object-merge/index.d.ts
new file mode 100644
index 0000000000..bd9f0ce8ee
--- /dev/null
+++ b/types/object-merge/index.d.ts
@@ -0,0 +1,164 @@
+// Type definitions for object-merge 2.5
+// Project: https://github.com/matthewkastor/object-merge
+// Definitions by: OpenByteDev <https://github.com/OpenByteDev>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// TypeScript Version: 2.2
+
+interface ObjectMergeOptions {
+    depth: number|boolean;
+    throwOnCircularRef: boolean;
+}
+
+interface ObjectMerge {
+    /**
+     * Merges JavaScript objects recursively without altering the objects merged.
+     * @author <a href="mailto:matthewkastor@gmail.com">Matthew Kastor</a>
+     * @param [opts] An options object created by
+     *  objectMerge.createOptions. Options must be specified as the first argument
+     *  and must be an object created with createOptions or else the object will
+     *  not be recognized as an options object and will be merged instead.
+     * @param shadows [[shadows]...] One or more objects to merge. Each
+     *  argument given will be treated as an object to merge. Each object
+     *  overwrites the previous objects descendant properties if the property name
+     *  matches. If objects properties are objects they will be merged recursively
+     *  as well.
+     * @returns Returns a single merged object composed from clones of the
+     *  input objects.
+     * @example
+     *  var objectMerge = require('object-merge');
+     *  var x = {
+     *      a : 'a',
+     *      b : 'b',
+     *      c : {
+     *          d : 'd',
+     *          e : 'e',
+     *          f : {
+     *              g : 'g'
+     *          }
+     *      }
+     *  };
+     *  var y = {
+     *      a : '`a',
+     *      b : '`b',
+     *      c : {
+     *          d : '`d'
+     *      }
+     *  };
+     *  var z = {
+     *      a : {
+     *          b : '``b'
+     *      },
+     *      fun : function foo () {
+     *          return 'foo';
+     *      },
+     *      aps : Array.prototype.slice
+     *  };
+     *  var out = objectMerge(x, y, z);
+     *  // out.a will be {
+     *  //         b : '``b'
+     *  //     }
+     *  // out.b will be '`b'
+     *  // out.c will be {
+     *  //         d : '`d',
+     *  //         e : 'e',
+     *  //         f : {
+     *  //             g : 'g'
+     *  //         }
+     *  //     }
+     *  // out.fun will be a clone of z.fun
+     *  // out.aps will be equal to z.aps
+     */
+    (opts: ObjectMergeOptions, ...shadows: object[]): object;
+    /**
+     * Merges JavaScript objects recursively without altering the objects merged.
+     * @author <a href="mailto:matthewkastor@gmail.com">Matthew Kastor</a>
+     * @param shadows [[shadows]...] One or more objects to merge. Each
+     *  argument given will be treated as an object to merge. Each object
+     *  overwrites the previous objects descendant properties if the property name
+     *  matches. If objects properties are objects they will be merged recursively
+     *  as well.
+     * @returns Returns a single merged object composed from clones of the
+     *  input objects.
+     * @example
+     *  var objectMerge = require('object-merge');
+     *  var x = {
+     *      a : 'a',
+     *      b : 'b',
+     *      c : {
+     *          d : 'd',
+     *          e : 'e',
+     *          f : {
+     *              g : 'g'
+     *          }
+     *      }
+     *  };
+     *  var y = {
+     *      a : '`a',
+     *      b : '`b',
+     *      c : {
+     *          d : '`d'
+     *      }
+     *  };
+     *  var z = {
+     *      a : {
+     *          b : '``b'
+     *      },
+     *      fun : function foo () {
+     *          return 'foo';
+     *      },
+     *      aps : Array.prototype.slice
+     *  };
+     *  var out = objectMerge(x, y, z);
+     *  // out.a will be {
+     *  //         b : '``b'
+     *  //     }
+     *  // out.b will be '`b'
+     *  // out.c will be {
+     *  //         d : '`d',
+     *  //         e : 'e',
+     *  //         f : {
+     *  //             g : 'g'
+     *  //         }
+     *  //     }
+     *  // out.fun will be a clone of z.fun
+     *  // out.aps will be equal to z.aps
+     */
+    (...shadows: object[]): object;
+    /**
+     * Creates a new options object suitable for use with objectMerge.
+     * @param [opts] An object specifying the options.
+     * @param [opts.depth = false] Specifies the depth to traverse objects
+     *  during merging. If this is set to false then there will be no depth limit.
+     * @param [opts.throwOnCircularRef = true] Set to false to suppress
+     *  errors on circular references.
+     * @returns Returns an instance of ObjectMergeOptions
+     *  to be used with objectMerge.
+     * @example
+     *  var opts = objectMerge.createOptions({
+     *      depth : 2,
+     *      throwOnCircularRef : false
+     *  });
+     *  var obj1 = {
+     *      a1 : {
+     *          a2 : {
+     *              a3 : {}
+     *          }
+     *      }
+     *  };
+     *  var obj2 = {
+     *      a1 : {
+     *          a2 : {
+     *              a3 : 'will not be in output'
+     *          },
+     *          a22 : {}
+     *      }
+     *  };
+     *  objectMerge(opts, obj1, obj2);
+     */
+    createOptions: (options: object) => ObjectMergeOptions;
+}
+
+declare const objectMerge: ObjectMerge;
+
+export = objectMerge;
diff --git a/types/object-merge/object-merge-tests.ts b/types/object-merge/object-merge-tests.ts
new file mode 100644
index 0000000000..edaf9885ba
--- /dev/null
+++ b/types/object-merge/object-merge-tests.ts
@@ -0,0 +1,47 @@
+import objectMerge = require('object-merge');
+
+const x = {
+    a : 'a',
+    b : 'b',
+    c : {
+        d : 'd',
+        e : 'e',
+        f : {
+            g : 'g'
+        }
+    }
+};
+const y = {
+    a : '`a',
+    b : '`b',
+    c : {
+        d : '`d'
+    }
+};
+const z = {
+    a : {
+        b : '``b'
+    },
+    fun : function foo() {
+        return 'foo';
+    },
+    aps : Array.prototype.slice
+};
+const out = objectMerge(x, y, z);
+
+const a = {
+    a1 : {
+        a2 : {
+            a3 : {}
+        }
+    }
+};
+const b = {
+    b1 : {
+        b2 : {
+            b3 : {}
+        }
+    }
+};
+const opts = objectMerge.createOptions({depth : 2});
+const res = objectMerge(opts, a, b);
diff --git a/types/object-merge/tsconfig.json b/types/object-merge/tsconfig.json
new file mode 100644
index 0000000000..c098631639
--- /dev/null
+++ b/types/object-merge/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "esModuleInterop": true
+    },
+    "files": [
+        "index.d.ts",
+        "object-merge-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/object-merge/tslint.json b/types/object-merge/tslint.json
new file mode 100644
index 0000000000..4e88071852
--- /dev/null
+++ b/types/object-merge/tslint.json
@@ -0,0 +1 @@
+{"extends": "dtslint/dt.json"}
diff --git a/types/object-refs/object-refs-tests.ts b/types/object-refs/object-refs-tests.ts
index 9b602aea0d..ba71756c3c 100644
--- a/types/object-refs/object-refs-tests.ts
+++ b/types/object-refs/object-refs-tests.ts
@@ -1,4 +1,4 @@
-import * as Refs from 'object-refs';
+import Refs = require('object-refs');
 
 let refs = new Refs({ name: 'wheels', collection: true, enumerable: true }, { name: 'car' });
 
diff --git a/types/odata/odata-tests.ts b/types/odata/odata-tests.ts
index 522dc3d529..58e1505f21 100644
--- a/types/odata/odata-tests.ts
+++ b/types/odata/odata-tests.ts
@@ -1,4 +1,4 @@
-import * as o from 'odata';
+import o = require('odata');
 import * as Q from "q";
 
 interface Product {
diff --git a/types/ol/tsconfig.json b/types/ol/tsconfig.json
index b307225e58..6402adb0f7 100644
--- a/types/ol/tsconfig.json
+++ b/types/ol/tsconfig.json
@@ -173,4 +173,4 @@
         "vectortile/index.d.ts",
         "view/index.d.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/onesignal-cordova-plugin/tsconfig.json b/types/onesignal-cordova-plugin/tsconfig.json
index bcee47426f..a256428f0e 100644
--- a/types/onesignal-cordova-plugin/tsconfig.json
+++ b/types/onesignal-cordova-plugin/tsconfig.json
@@ -21,4 +21,4 @@
         "index.d.ts",
         "onesignal-cordova-plugin-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/openlayers/index.d.ts b/types/openlayers/index.d.ts
index c217a6d873..f9593fcb09 100644
--- a/types/openlayers/index.d.ts
+++ b/types/openlayers/index.d.ts
@@ -12344,13 +12344,42 @@ declare module ol {
          */
         constructor(opt_options?: olx.ViewOptions);
 
+        /**
+         * Animate the view. The view's center, zoom (or resolution), and
+         * rotation can be animated for smooth transitions between view states.
+         * @param {olx.AnimateOptions} var_args Animation options.
+         * @param {olx.AnimateOptions | (completed: boolean) => void } restArgs
+         * @api experimental
+         */
+        animate(...var_args: Array<olx.animation.AnimateOptions | olx.animation.AnimateCallback>): void;
+
+        /**
+         * Determine if the view is being animated.
+         * @return {boolean} The view is being animated.
+         * @api
+         */
+        getAnimating(): boolean;
+
+        /**
+         * Determine if the user is interacting with the view, such as panning or zooming.
+         * @return {boolean} The view is being interacted with.
+         * @api
+         */
+        getInteracting(): boolean;
+
+        /**
+         * Cancel any ongoing animations.
+         * @api
+         */
+        cancelAnimations(): void;
+
         /**
          * Get the constrained center of this view.
          * @param {ol.Coordinate|undefined} center Center.
          * @return {ol.Coordinate|undefined} Constrained center.
          * @api
          */
-        constrainCenter(center: (ol.Coordinate)): (ol.Coordinate);
+        constrainCenter(center?: ol.Coordinate): ol.Coordinate;
 
         /**
          * Get the constrained resolution of this view.
@@ -12360,7 +12389,7 @@ declare module ol {
          * @return {number|undefined} Constrained resolution.
          * @api
          */
-        constrainResolution(resolution: (number), opt_delta?: number, opt_direction?: number): (number);
+        constrainResolution(resolution?: number, opt_delta?: number, opt_direction?: number): number;
 
         /**
          * Get the constrained rotation of this view.
@@ -12369,7 +12398,7 @@ declare module ol {
          * @return {number|undefined} Constrained rotation.
          * @api
          */
-        constrainRotation(rotation: (number), opt_delta?: number): (number);
+        constrainRotation(rotation?: number, opt_delta?: number): number;
 
         /**
          * Get the view center.
@@ -12377,7 +12406,7 @@ declare module ol {
          * @observable
          * @api stable
          */
-        getCenter(): (ol.Coordinate);
+        getCenter(): ol.Coordinate;
 
         /**
          * Calculate the extent for the current view state and the passed size.
@@ -12404,6 +12433,34 @@ declare module ol {
          */
         getMinResolution(): number;
 
+        /**
+         * Get the maximum zoom level for the view.
+         * @return {number} The maximum zoom level.
+         * @api
+         */
+        getMaxZoom(): number;
+
+        /**
+         * Set a new maximum zoom level for the view.
+         * @param {number} zoom The maximum zoom level.
+         * @api stable
+         */
+        setMaxZoom(zoom: number): void;
+
+        /**
+         * Get the minimum zoom level for the view.
+         * @return {number} The minimum zoom level.
+         * @api
+         */
+        getMinZoom(): number;
+
+        /**
+         * Set a new minimum zoom level for the view.
+         * @param {number} zoom The minimum zoom level.
+         * @api stable
+         */
+        setMinZoom(zoom: number): void;
+
         /**
          * Get the view projection.
          * @return {ol.proj.Projection} The projection of the view.
@@ -12417,7 +12474,7 @@ declare module ol {
          * @observable
          * @api stable
          */
-        getResolution(): (number);
+        getResolution(): number;
 
         /**
          * Get the resolutions for the view. This returns the array of resolutions
@@ -12425,7 +12482,17 @@ declare module ol {
          * @return {Array.<number>|undefined} The resolutions of the view.
          * @api stable
          */
-        getResolutions(): (number[]);
+        getResolutions(): number[];
+
+        /**
+         * Get the resolution for a provided extent (in map units) and size (in pixels).
+         * @param {ol.Extent} extent Extent.
+         * @param {ol.Size=} opt_size Box pixel size.
+         * @return {number} The resolution at which the provided extent will render at
+         *     the given size.
+         * @api
+         */
+        getResolutionForExtent(extent: ol.Extent, opt_size?: ol.Size): number;
 
         /**
          * Get the view rotation.
@@ -12436,12 +12503,29 @@ declare module ol {
         getRotation(): number;
 
         /**
-         * Get the current zoom level. Return undefined if the current
-         * resolution is undefined or not within the "resolution constraints".
+         * Get the current zoom level.  If you configured your view with a resolutions
+         * array (this is rare), this method may return non-integer zoom levels (so
+         * the zoom level is not safe to use as an index into a resolutions array).
          * @return {number|undefined} Zoom.
-         * @api stable
+         * @api
          */
-        getZoom(): (number);
+        getZoom(): number;
+
+        /**
+         * Get the zoom level for a resolution.
+         * @param {number} resolution The resolution.
+         * @return {number|undefined} The zoom level for the provided resolution.
+         * @api
+         */
+        getZoomForResolution(resolution: number): number;
+
+        /**
+         * Get the resolution for a zoom level.
+         * @param {number} zoom Zoom level.
+         * @return {number} The view resolution for the provided zoom level.
+         * @api
+         */
+        getResolutionForZoom(zoom: number): number;
 
         /**
          * Fit the given geometry or extent based on the given map size and border.
@@ -12452,7 +12536,7 @@ declare module ol {
          * @param {olx.view.FitOptions=} opt_options Options.
          * @api
          */
-        fit(geometry: (ol.geom.SimpleGeometry | ol.Extent), opt_options?: olx.view.FitOptions): void;
+        fit(geometryOrExtent: (ol.geom.SimpleGeometry | ol.Extent), opt_options?: olx.view.FitOptions): void;
 
         /**
          * Center on coordinate and view position.
@@ -12477,7 +12561,7 @@ declare module ol {
          * @observable
          * @api stable
          */
-        setCenter(center: (ol.Coordinate)): void;
+        setCenter(center: ol.Coordinate): void;
 
         /**
          * Set the resolution for this view.
@@ -12485,7 +12569,7 @@ declare module ol {
          * @observable
          * @api stable
          */
-        setResolution(resolution: (number)): void;
+        setResolution(resolution?: number): void;
 
         /**
          * Set the rotation for this view.
@@ -12495,20 +12579,6 @@ declare module ol {
          */
         setRotation(rotation: number): void;
 
-        /**
-         * Set a new maximum zoom level for the view.
-         * @param {number} zoom The maximum zoom level.
-         * @api stable
-         */
-        setMaxZoom(zoom: number): void;
-
-        /**
-         * Set a new minimum zoom level for the view.
-         * @param {number} zoom The minimum zoom level.
-         * @api stable
-         */
-        setMinZoom(zoom: number): void;
-
         /**
          * Zoom to a specific zoom level.
          * @param {number} zoom Zoom level.
@@ -12516,15 +12586,6 @@ declare module ol {
          */
         setZoom(zoom: number): void;
 
-        /**
-         * Animate the view. The view's center, zoom (or resolution), and
-         * rotation can be animated for smooth transitions between view states.
-         * @param {olx.AnimateOptions} var_args Animation options.
-         * @param {olx.AnimateOptions | (completed: boolean) => void } restArgs
-         * @api experimental
-         */
-        animate(...var_args: Array<olx.animation.AnimateOptions | olx.animation.AnimateCallback>): void;
-
     }
 
 }
@@ -12607,7 +12668,7 @@ declare module olx {
             zoom?: number | undefined;
             resolution?: number | undefined;
             rotation?: number | undefined;
-            anchor?: number | undefined;
+            anchor?: ol.Coordinate | undefined;
             duration?: number | undefined;
             easing?: ((t: number) => number) | undefined;
         }
diff --git a/types/openlayers/openlayers-tests.ts b/types/openlayers/openlayers-tests.ts
index 4353f48960..1981e50847 100644
--- a/types/openlayers/openlayers-tests.ts
+++ b/types/openlayers/openlayers-tests.ts
@@ -55,6 +55,7 @@ let mapBrowserEvent: ol.MapBrowserEvent;
 let multiLineString: ol.geom.MultiLineString;
 let multiPoint: ol.geom.MultiPoint;
 let multiPolygon: ol.geom.MultiPolygon;
+let pixel: ol.Pixel;
 let point: ol.geom.Point;
 let polygon: ol.geom.Polygon;
 let projection: ol.proj.Projection;
@@ -392,17 +393,97 @@ voidValue = feature.setProperties(object);
 // ol.View
 //
 
-let view: ol.View = new ol.View({
-    center: [0, 0],
+let view: ol.View;
+view = new ol.View();
+view = new ol.View({});
+view = new ol.View({
+    center: coordinate,
+    constrainRotation: numberValue,
+    enableRotation: booleanValue,
+    extent: extent,
+    maxResolution: numberValue,
+    minResolution: numberValue,
+    maxZoom: numberValue,
+    minZoom: numberValue,
+    projection: projectionLike,
+    resolution: numberValue,
+    resolutions: [numberValue, numberValue, numberValue, numberValue, numberValue],
+    rotation: numberValue,
     zoom: numberValue,
+    zoomFactor: numberValue,
+});
+view = new ol.View({
+    constrainRotation: booleanValue,
 });
 
-voidValue = view.setMaxZoom(numberValue);
-voidValue = view.setMinZoom(numberValue);
+voidValue = view.animate();
+voidValue = view.animate({});
+voidValue = view.animate({zoom: view.getZoom() + 1});
+voidValue = view.animate({zoom: 10}, {center: [0, 0]});
+voidValue = view.animate({
+    center: coordinate,
+    zoom: numberValue,
+    resolution: numberValue,
+    rotation: numberValue,
+    anchor: coordinate,
+    duration: numberValue,
+    easing: easingFunction,
+});
+extent = view.calculateExtent();
+extent = view.calculateExtent(size);
+voidValue = view.cancelAnimations();
+voidValue = view.centerOn(coordinate, size, pixel);
+coordinate = view.constrainCenter();
+coordinate = view.constrainCenter(coordinate);
+numberValue = view.constrainResolution();
+numberValue = view.constrainResolution(numberValue);
+numberValue = view.constrainResolution(numberValue, numberValue);
+numberValue = view.constrainResolution(numberValue, numberValue, numberValue);
+numberValue = view.constrainRotation();
+numberValue = view.constrainRotation(numberValue);
+numberValue = view.constrainRotation(numberValue, numberValue);
 voidValue = view.fit(simpleGeometry);
+voidValue = view.fit(simpleGeometry, {});
 voidValue = view.fit(extent);
+voidValue = view.fit(extent, {});
 voidValue = view.fit(extent, {callback: () => {}});
 voidValue = view.fit(extent, {callback: (animationCompleted: boolean) => {}});
+voidValue = view.fit(extent, {
+    size: size,
+    padding: [numberValue, numberValue, numberValue, numberValue],
+    constrainResolution: booleanValue,
+    nearest: booleanValue,
+    minResolution: numberValue,
+    maxZoom: numberValue,
+    duration: numberValue,
+    easing: easingFunction,
+    callback: (animationCompleted: boolean) => {}
+});
+booleanValue = view.getAnimating();
+coordinate = view.getCenter();
+booleanValue = view.getInteracting();
+numberValue = view.getMaxResolution();
+numberValue = view.getMaxZoom();
+numberValue = view.getMinResolution();
+numberValue = view.getMinZoom();
+projection = view.getProjection();
+numberValue = view.getResolution();
+numberValue = view.getResolutionForExtent(extent);
+numberValue = view.getResolutionForExtent(extent, size);
+numberValue = view.getResolutionForZoom(numberValue);
+[numberValue, numberValue, numberValue, numberValue, numberValue] = view.getResolutions();
+numberValue = view.getRotation();
+numberValue = view.getZoom();
+numberValue = view.getZoomForResolution(numberValue);
+voidValue = view.rotate(numberValue);
+voidValue = view.rotate(numberValue, coordinate);
+voidValue = view.setCenter(coordinate);
+voidValue = view.setMaxZoom(numberValue);
+voidValue = view.setMinZoom(numberValue);
+voidValue = view.setResolution();
+voidValue = view.setResolution(numberValue);
+voidValue = view.setRotation(numberValue);
+voidValue = view.setZoom(numberValue);
 
 //
 // ol.layer.Base
@@ -468,6 +549,7 @@ let vectorTileLayer: ol.layer.VectorTile = new ol.layer.VectorTile({
     zIndex: 2
 });
 
+
 //
 // ol.Object
 //
diff --git a/types/opentok/opentok-tests.ts b/types/opentok/opentok-tests.ts
index c0f93f333f..28553463b4 100644
--- a/types/opentok/opentok-tests.ts
+++ b/types/opentok/opentok-tests.ts
@@ -1,4 +1,4 @@
-import * as OpenTok from 'opentok';
+import OpenTok = require('opentok');
 
 const client = new OpenTok('API_KEY', 'API_SECRET');
 
diff --git a/types/opn/tsconfig.json b/types/opn/tsconfig.json
index 2a51fff8ca..7551867ee1 100644
--- a/types/opn/tsconfig.json
+++ b/types/opn/tsconfig.json
@@ -1,16 +1,23 @@
 {
     "compilerOptions": {
         "module": "commonjs",
-        "lib": ["es6"],
+        "lib": [
+            "es6"
+        ],
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
-        "typeRoots": ["../"],
+        "typeRoots": [
+            "../"
+        ],
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     },
-    "files": ["index.d.ts", "opn-tests.ts"]
-}
+    "files": [
+        "index.d.ts",
+        "opn-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/optics-agent/optics-agent-tests.ts b/types/optics-agent/optics-agent-tests.ts
index 2135c810d4..22b9b479e9 100644
--- a/types/optics-agent/optics-agent-tests.ts
+++ b/types/optics-agent/optics-agent-tests.ts
@@ -9,9 +9,9 @@ import OpticsAgent, {
   Agent,
 } from 'optics-agent';
 import { GraphQLSchema } from 'graphql';
-import * as express from 'express';
+import express = require('express');
 import * as hapi from 'hapi';
-import * as KoaServer from 'koa';
+import KoaServer = require('koa');
 
 const configOptions: Options = {
   apiKey: "",
diff --git a/types/optics-agent/tsconfig.json b/types/optics-agent/tsconfig.json
index e7dbc8958b..010406be2f 100644
--- a/types/optics-agent/tsconfig.json
+++ b/types/optics-agent/tsconfig.json
@@ -14,7 +14,9 @@
         ],
         "types": [],
         "paths": {
-            "boom": ["boom/v4"]
+            "boom": [
+                "boom/v4"
+            ]
         },
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
@@ -23,4 +25,4 @@
         "index.d.ts",
         "optics-agent-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/optimize-css-assets-webpack-plugin/index.d.ts b/types/optimize-css-assets-webpack-plugin/index.d.ts
index b16d384d72..788b2e6a1f 100644
--- a/types/optimize-css-assets-webpack-plugin/index.d.ts
+++ b/types/optimize-css-assets-webpack-plugin/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/NMFR/optimize-css-assets-webpack-plugin
 // Definitions by: Armando Meziat <https://github.com/odnamrataizem>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 import { Plugin } from 'webpack';
 
diff --git a/types/optimize-css-assets-webpack-plugin/optimize-css-assets-webpack-plugin-tests.ts b/types/optimize-css-assets-webpack-plugin/optimize-css-assets-webpack-plugin-tests.ts
index 74cf685649..0dd1531313 100644
--- a/types/optimize-css-assets-webpack-plugin/optimize-css-assets-webpack-plugin-tests.ts
+++ b/types/optimize-css-assets-webpack-plugin/optimize-css-assets-webpack-plugin-tests.ts
@@ -1,4 +1,4 @@
-import * as OptimizeCssAssets from 'optimize-css-assets-webpack-plugin';
+import OptimizeCssAssets = require('optimize-css-assets-webpack-plugin');
 
 const ocap: OptimizeCssAssets = new OptimizeCssAssets({
 	assetNameRegExp: /\.min\.css$/,
diff --git a/types/orientjs/orientjs-tests.ts b/types/orientjs/orientjs-tests.ts
index ec083b84e3..9b11968058 100644
--- a/types/orientjs/orientjs-tests.ts
+++ b/types/orientjs/orientjs-tests.ts
@@ -1,4 +1,4 @@
-import * as orientjs from 'orientjs';
+import orientjs = require('orientjs');
 
 const dbserver = orientjs({
     host: 'localhost',
diff --git a/types/osrm/osrm-tests.ts b/types/osrm/osrm-tests.ts
index fd53363dd7..513e8c1fd2 100644
--- a/types/osrm/osrm-tests.ts
+++ b/types/osrm/osrm-tests.ts
@@ -1,5 +1,5 @@
 import * as fs from 'fs';
-import * as OSRM from 'osrm';
+import OSRM = require('osrm');
 
 // Access to Types from namespace
 const tile: OSRM.Tile = [0, 0, 0];
diff --git a/types/otplib/tsconfig.json b/types/otplib/tsconfig.json
index cfb2b07081..4aa529c51c 100644
--- a/types/otplib/tsconfig.json
+++ b/types/otplib/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "otplib-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/owasp-password-strength-test/tsconfig.json b/types/owasp-password-strength-test/tsconfig.json
index 0206d30034..926835b3e5 100644
--- a/types/owasp-password-strength-test/tsconfig.json
+++ b/types/owasp-password-strength-test/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "owasp-password-strength-test-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/p-loading/tsconfig.json b/types/p-loading/tsconfig.json
index 3aeb261695..09fd52fdda 100644
--- a/types/p-loading/tsconfig.json
+++ b/types/p-loading/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "p-loading-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/package-json/tsconfig.json b/types/package-json/tsconfig.json
index 52c1adb7d3..7bca217f58 100644
--- a/types/package-json/tsconfig.json
+++ b/types/package-json/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "package-json-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/page-icon/page-icon-tests.ts b/types/page-icon/page-icon-tests.ts
index 4a6bc8c2b6..2b2873dae1 100644
--- a/types/page-icon/page-icon-tests.ts
+++ b/types/page-icon/page-icon-tests.ts
@@ -1,4 +1,4 @@
-import * as pageIcon from "page-icon";
+import pageIcon = require("page-icon");
 
 const siteUrl = "https://www.facebook.com/";
 pageIcon(siteUrl)
diff --git a/types/pangu/tsconfig.json b/types/pangu/tsconfig.json
index a1084b5b06..91b1b9f43a 100644
--- a/types/pangu/tsconfig.json
+++ b/types/pangu/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "pangu-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/parent-package-json/parent-package-json-tests.ts b/types/parent-package-json/parent-package-json-tests.ts
index 41a5a7bdd0..50091ff376 100644
--- a/types/parent-package-json/parent-package-json-tests.ts
+++ b/types/parent-package-json/parent-package-json-tests.ts
@@ -1,4 +1,4 @@
-import * as parent from 'parent-package-json';
+import parent = require('parent-package-json');
 
 const hasParent = parent('/optional/path/', 1);
 
diff --git a/types/parent-package-json/tsconfig.json b/types/parent-package-json/tsconfig.json
index 33d474c851..c3c9be507a 100644
--- a/types/parent-package-json/tsconfig.json
+++ b/types/parent-package-json/tsconfig.json
@@ -21,4 +21,4 @@
         "index.d.ts",
         "parent-package-json-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/parse-json/tsconfig.json b/types/parse-json/tsconfig.json
index 448f6787ba..d163b65cda 100644
--- a/types/parse-json/tsconfig.json
+++ b/types/parse-json/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "parse-json-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/parse-link-header/parse-link-header-tests.ts b/types/parse-link-header/parse-link-header-tests.ts
index 01a4de8a8f..ce32e1a1cd 100644
--- a/types/parse-link-header/parse-link-header-tests.ts
+++ b/types/parse-link-header/parse-link-header-tests.ts
@@ -1,4 +1,4 @@
-import * as parse from "parse-link-header";
+import parse = require("parse-link-header");
 
 const linkHeader =
     '<https://api.github.com/user/9287/repos?page=3&per_page=100>; rel="next", ' +
diff --git a/types/parse-ms/tsconfig.json b/types/parse-ms/tsconfig.json
index 3fecf7615f..a4d7591291 100644
--- a/types/parse-ms/tsconfig.json
+++ b/types/parse-ms/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "parse-ms-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/parse-torrent-file/parse-torrent-file-tests.ts b/types/parse-torrent-file/parse-torrent-file-tests.ts
index a981c0bc81..43b8c7d0fd 100644
--- a/types/parse-torrent-file/parse-torrent-file-tests.ts
+++ b/types/parse-torrent-file/parse-torrent-file-tests.ts
@@ -1,4 +1,4 @@
-import * as parseTorrentFile from 'parse-torrent-file';
+import parseTorrentFile = require('parse-torrent-file');
 import * as fs from 'fs';
 
 const torrent = fs.readFileSync(__filename);
diff --git a/types/parse-torrent/parse-torrent-tests.ts b/types/parse-torrent/parse-torrent-tests.ts
index 24d00dbe98..c2676ff080 100644
--- a/types/parse-torrent/parse-torrent-tests.ts
+++ b/types/parse-torrent/parse-torrent-tests.ts
@@ -1,4 +1,4 @@
-import * as parseTorrent from 'parse-torrent';
+import parseTorrent = require('parse-torrent');
 import * as fs from 'fs';
 
 // info hash (as a hex string)
diff --git a/types/parse/index.d.ts b/types/parse/index.d.ts
index 1973c8938b..d186211983 100644
--- a/types/parse/index.d.ts
+++ b/types/parse/index.d.ts
@@ -4,6 +4,7 @@
 //                  David Poetzsch-Heffter <https://github.com/dpoetzsch>
 //                  Cedric Kemp <https://github.com/jaeggerr>
 //                  Flavio Negrão <https://github.com/flavionegrao>
+//                  Wes Grimes <https://github.com/wesleygrimes>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -644,6 +645,7 @@ declare namespace Parse {
         select(...keys: string[]): Query<T>;
         skip(n: number): Query<T>;
         startsWith(key: string, prefix: string): Query<T>;
+        subscribe(): Events;
         withinGeoBox(key: string, southwest: GeoPoint, northeast: GeoPoint): Query<T>;
         withinKilometers(key: string, point: GeoPoint, maxDistance: number): Query<T>;
         withinMiles(key: string, point: GeoPoint, maxDistance: number): Query<T>;
diff --git a/types/parse/parse-tests.ts b/types/parse/parse-tests.ts
index 87194ba02c..06ec062880 100644
--- a/types/parse/parse-tests.ts
+++ b/types/parse/parse-tests.ts
@@ -491,3 +491,16 @@ function test_batch_operations() {
     Parse.Object.fetchAllIfNeeded(games, { sessionToken: '' })
 }
 
+function test_query_subscribe() {
+    // create new query from Game object type
+    const query = new Parse.Query(Game);
+
+    // create subscription to Game object
+    const subscription = query.subscribe();
+
+    // listen for new Game objects created on Parse server
+    subscription.on('create', (game: any) => {
+        console.log(game);
+    });
+}
+
diff --git a/types/parsimmon/tsconfig.json b/types/parsimmon/tsconfig.json
index 676b349a37..7fec29b8cc 100644
--- a/types/parsimmon/tsconfig.json
+++ b/types/parsimmon/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "parsimmon-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/passport-facebook-token/passport-facebook-token-tests.ts b/types/passport-facebook-token/passport-facebook-token-tests.ts
index c926748286..1539118879 100644
--- a/types/passport-facebook-token/passport-facebook-token-tests.ts
+++ b/types/passport-facebook-token/passport-facebook-token-tests.ts
@@ -1,6 +1,6 @@
 import * as express from 'express';
 import * as passport from 'passport';
-import * as PassportFacebookToken from 'passport-facebook-token';
+import PassportFacebookToken = require('passport-facebook-token');
 
 const User = {
     findOrCreate(id: string, provider: string, callback: (err: any, user: any) => void): void {
diff --git a/types/passport-google-oauth/tsconfig.json b/types/passport-google-oauth/tsconfig.json
index 7f3b315c07..adde576621 100644
--- a/types/passport-google-oauth/tsconfig.json
+++ b/types/passport-google-oauth/tsconfig.json
@@ -1,16 +1,23 @@
 {
     "compilerOptions": {
         "module": "commonjs",
-        "lib": ["es6"],
+        "lib": [
+            "es6"
+        ],
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": false,
         "strictFunctionTypes": true,
         "baseUrl": "../",
-        "typeRoots": ["../"],
+        "typeRoots": [
+            "../"
+        ],
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     },
-    "files": ["index.d.ts", "passport-google-oauth-tests.ts"]
-}
+    "files": [
+        "index.d.ts",
+        "passport-google-oauth-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/passport-http/index.d.ts b/types/passport-http/index.d.ts
index e9a66964ea..fa3f968e7e 100644
--- a/types/passport-http/index.d.ts
+++ b/types/passport-http/index.d.ts
@@ -1,60 +1,70 @@
-// Type definitions for passport-http 0.3.0
+// Type definitions for passport-http 0.3
 // Project: https://github.com/jaredhanson/passport-http
 // Definitions by: Christophe Vidal <https://github.com/krizalys>
+//                 Tomek Łaziuk <https://github.com/tlaziuk>
+//                 Chris Barth <https://github.com/cjbarth>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
 import passport = require("passport");
 import express = require("express");
 
-interface BasicStrategyOptions {
+export interface BasicStrategyOptions<req extends boolean = boolean> {
     realm?: string;
     passReqToCallback?: boolean;
 }
 
-interface DigestStrategyOptions {
+export interface DigestStrategyOptions {
     realm?: string;
-    domain?: string | Array<string>;
+    domain?: string | string[];
     opaque?: string;
     algorithm?: string;
-    qop?: string | Array<string>;
+    qop?: string | string[];
 }
 
-interface DigestValidateOptions {
+export interface DigestValidateOptions {
     nonce: string;
     cnonce: string;
     nc: number;
     opaque: string;
 }
 
-interface BasicVerifyFunction {
-    (username: string, password: string, done: (error: any, user?: any) => void): void;
-}
+export type BasicVerifyFunction = (
+    username: string,
+    password: string,
+    done: (error: any, user?: any) => void,
+) => any;
 
-interface BasicVerifyFunctionWithRequest {
-    (req: express.Request, username: string, password: string, done: (error: any, user?: any) => void): void;
-}
+export type BasicVerifyFunctionWithRequest = (
+    req: express.Request,
+    username: string,
+    password: string,
+    done: (error: any, user?: any) => void,
+) => any;
 
-interface DigestSecretFunction {
-    (username: string, done: (error: any, user?: any, password?: any) => void): void;
-}
+export type DigestSecretFunction = (
+    username: string,
+    done: (error: any, user?: any, password?: any) => void,
+) => any;
 
-interface DigestValidateFunction {
-    (params: DigestValidateOptions, done: (error: any, valid: boolean) => void): void;
-}
+export type DigestValidateFunction = (
+    params: DigestValidateOptions,
+    done: (error: any, valid: boolean) => void,
+) => any;
 
-declare class BasicStrategy implements passport.Strategy {
+export class BasicStrategy implements passport.Strategy {
     constructor(verify: BasicVerifyFunction);
-    constructor(options: BasicStrategyOptions, verify: BasicVerifyFunction);
+    constructor(options: BasicStrategyOptions<false>, verify: BasicVerifyFunction);
+    constructor(options: BasicStrategyOptions<true>, verify: BasicVerifyFunctionWithRequest);
 
     name: string;
-    authenticate: (req: express.Request, options?: Object) => void;
+    authenticate: (req: express.Request, options?: object) => void;
 }
 
-declare class DigestStrategy implements passport.Strategy {
+export class DigestStrategy implements passport.Strategy {
     constructor(secret: DigestSecretFunction, validate?: DigestValidateFunction);
     constructor(options: DigestStrategyOptions, secret: DigestSecretFunction, validate?: DigestValidateFunction);
 
     name: string;
-    authenticate: (req: express.Request, options?: Object) => void;
+    authenticate: (req: express.Request, options?: object) => void;
 }
diff --git a/types/passport-http/passport-http-tests.ts b/types/passport-http/passport-http-tests.ts
index 4a70d30b89..ee728b2d47 100644
--- a/types/passport-http/passport-http-tests.ts
+++ b/types/passport-http/passport-http-tests.ts
@@ -4,16 +4,17 @@
 
 import passport = require("passport");
 import http = require("passport-http");
+import express = require("express");
 
-interface IUser {
+interface UserInterface {
     username: string;
     password?: string;
 }
 
 class User {
-    public password: string;
+    password: string;
 
-    static findOne(user: IUser, callback: (error: Error, user: User) => void): void {
+    static findOne(user: UserInterface, callback: (error: Error, user: User) => void): void {
         callback(null, new User());
     }
 }
@@ -24,17 +25,19 @@ function validateNonce(nonce: string) {
 function validateParams(nonce: string, cnonce: string, nc: number, opaque: string) {
 }
 
-passport.use(new http.BasicStrategy((username: string, password: string, done: any) => {
+passport.use(new http.BasicStrategy((username, password, done) => {
     User.findOne({
-        username: username,
-        password: password,
+        username,
+        password,
     }, (error, user) => {
         if (error) {
-            return done(error);
+            done(error);
+            return;
         }
 
         if (!user) {
-            return done(null, false);
+            done(null, false);
+            return;
         }
 
         done(null, user);
@@ -44,25 +47,25 @@ passport.use(new http.BasicStrategy((username: string, password: string, done: a
 passport.use(new http.BasicStrategy({
     realm: "User",
     passReqToCallback: true,
-}, (username: string, password: string, done: any) => {
-    User.findOne({
-        username: username,
-        password: password,
-    }, (error, user) => {
-        if (error) {
-            return done(error);
-        }
+}, (req: express.Request, username: string, password: string, done: (error: any, user?: any) => void) => {
+    // with req when needed
+}));
 
-        if (!user) {
-            return done(null, false);
-        }
+passport.use(new http.BasicStrategy({
+    realm: "User",
+}, (username, password, done) => {
+    // without req by default
+}));
 
-        done(null, user);
-    });
+passport.use(new http.BasicStrategy({
+    realm: "User",
+    passReqToCallback: false,
+}, (username, password, done) => {
+    // without req
 }));
 
 passport.use(new http.DigestStrategy((username: string, done: any) => {
-    User.findOne({username: username}, (error, user) => {
+    User.findOne({ username }, (error, user) => {
         if (error) {
             return done(error);
         }
@@ -76,7 +79,7 @@ passport.use(new http.DigestStrategy((username: string, done: any) => {
 }));
 
 passport.use(new http.DigestStrategy((username: string, done: any) => {
-    User.findOne({username: username}, (error, user) => {
+    User.findOne({ username }, (error, user) => {
         if (error) {
             return done(error);
         }
@@ -99,7 +102,7 @@ passport.use(new http.DigestStrategy({
     algorithm: "MD5",
     qop: "auth",
 }, (username: string, done: any) => {
-    User.findOne({username: username}, (error, user) => {
+    User.findOne({ username }, (error, user) => {
         if (error) {
             return done(error);
         }
@@ -119,7 +122,7 @@ passport.use(new http.DigestStrategy({
     algorithm: "MD5",
     qop: "auth",
 }, (username: string, done: any) => {
-    User.findOne({username: username}, (error, user) => {
+    User.findOne({ username }, (error, user) => {
         if (error) {
             return done(error);
         }
diff --git a/types/passport-http/tslint.json b/types/passport-http/tslint.json
index a41bf5d19a..f93cf8562a 100644
--- a/types/passport-http/tslint.json
+++ b/types/passport-http/tslint.json
@@ -1,79 +1,3 @@
 {
-    "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/passport-kakao/tsconfig.json b/types/passport-kakao/tsconfig.json
index 784cbe32e8..6240d3f149 100644
--- a/types/passport-kakao/tsconfig.json
+++ b/types/passport-kakao/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "passport-kakao-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/passport-local-mongoose/passport-local-mongoose-tests.ts b/types/passport-local-mongoose/passport-local-mongoose-tests.ts
index 63c82a9913..5058cb88ef 100644
--- a/types/passport-local-mongoose/passport-local-mongoose-tests.ts
+++ b/types/passport-local-mongoose/passport-local-mongoose-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="express" />
-
 /**
  * Created by Linus Brolin <https://github.com/linusbrolin/>.
  */
@@ -14,7 +12,7 @@ import {
     PassportLocalOptions,
     PassportLocalErrorMessages
 } from 'mongoose';
-import * as passportLocalMongoose from 'passport-local-mongoose';
+import passportLocalMongoose = require('passport-local-mongoose');
 
 import { Router, Request, Response } from 'express';
 import * as passport from 'passport';
diff --git a/types/passport-naver/tsconfig.json b/types/passport-naver/tsconfig.json
index 1a8826dcfd..3412d6be4a 100644
--- a/types/passport-naver/tsconfig.json
+++ b/types/passport-naver/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "passport-naver-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/passport/passport-tests.ts b/types/passport/passport-tests.ts
index b6c033b907..58c306964c 100644
--- a/types/passport/passport-tests.ts
+++ b/types/passport/passport-tests.ts
@@ -1,5 +1,5 @@
 import * as passport from 'passport';
-import * as express from 'express';
+import express = require('express');
 import 'express-session';
 
 class TestStrategy implements passport.Strategy {
diff --git a/types/password-hash-and-salt/password-hash-and-salt-tests.ts b/types/password-hash-and-salt/password-hash-and-salt-tests.ts
index 4865cf0eed..f224074555 100644
--- a/types/password-hash-and-salt/password-hash-and-salt-tests.ts
+++ b/types/password-hash-and-salt/password-hash-and-salt-tests.ts
@@ -1,4 +1,4 @@
-import * as password from 'password-hash-and-salt';
+import password = require('password-hash-and-salt');
 
 const myuser: { hash: string } = { hash: '' };
 
diff --git a/types/path-parse/path-parse-tests.ts b/types/path-parse/path-parse-tests.ts
index da2b63f6b4..a632d768f1 100644
--- a/types/path-parse/path-parse-tests.ts
+++ b/types/path-parse/path-parse-tests.ts
@@ -1,4 +1,4 @@
-import * as parse from "path-parse";
+import parse = require("path-parse");
 
 const parsed = parse("/foo/bar.img");
 const { root, dir, base, ext, name } = parsed;
diff --git a/types/pathwatcher/tsconfig.json b/types/pathwatcher/tsconfig.json
index 41bb35a03c..f63edaf188 100644
--- a/types/pathwatcher/tsconfig.json
+++ b/types/pathwatcher/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "pathwatcher-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/pdfjs-dist/index.d.ts b/types/pdfjs-dist/index.d.ts
index f72d70f44e..81de4624f9 100644
--- a/types/pdfjs-dist/index.d.ts
+++ b/types/pdfjs-dist/index.d.ts
@@ -26,466 +26,462 @@ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 OTHER DEALINGS IN THE SOFTWARE.
 */
-declare module "pdfjs-dist" {
-  export = PDF;
+
+interface PDFPromise<T> {
+  isResolved(): boolean;
+  isRejected(): boolean;
+  resolve(value: T): void;
+  reject(reason: string): void;
+  then<U>(onResolve: (promise: T) => U, onReject?: (reason: string) => void): PDFPromise<U>;
 }
 
-declare namespace PDF {
-  interface PDFPromise<T> {
-    isResolved(): boolean;
-    isRejected(): boolean;
-    resolve(value: T): void;
-    reject(reason: string): void;
-    then<U>(onResolve: (promise: T) => U, onReject?: (reason: string) => void): PDFPromise<U>;
-  }
-
-  interface PDFTreeNode {
-    title: string;
-    bold: boolean;
-    italic: boolean;
-    color: number[]; // [r,g,b]
-    dest: any;
-    items: PDFTreeNode[];
-  }
-
-  interface PDFInfo {
-    PDFFormatVersion: string;
-    IsAcroFormPresent: boolean;
-    IsXFAPresent: boolean;
-    [key: string]: any;	// return type is string, typescript chokes
-  }
-
-  interface PDFMetadata {
-    parse(): void;
-    get(name: string): string;
-    has(name: string): boolean;
-  }
-
-  interface PDFSource {
-    url?: string;
-    data?: Uint8Array;
-    httpHeaders?: any;
-    password?: string;
-  }
-
-  interface PDFProgressData {
-    loaded: number;
-    total: number;
-  }
-
-  interface PDFDocumentProxy {
-
-    /**
-     * Total number of pages the PDF contains.
-     **/
-    numPages: number;
-
-    /**
-     * A unique ID to identify a PDF.  Not guaranteed to be unique.  [jbaldwin: haha what]
-     **/
-    fingerprint: string;
-
-    /**
-     * True if embedded document fonts are in use.  Will be set during rendering of the pages.
-     **/
-    embeddedFontsUsed(): boolean;
-
-    /**
-     * @param number The page number to get.  The first page is 1.
-     * @return A promise that is resolved with a PDFPageProxy.
-     **/
-    getPage(number: number): PDFPromise<PDFPageProxy>;
-
-    /**
-     * TODO: return type of Promise<???>
-     *  A promise that is resolved with a lookup table for mapping named destinations to reference numbers.
-     **/
-    getDestinations(): PDFPromise<any[]>;
-
-    /**
-     *  A promise that is resolved with an array of all the JavaScript strings in the name tree.
-     **/
-    getJavaScript(): PDFPromise<string[]>;
-
-    /**
-     *  A promise that is resolved with an array that is a tree outline (if it has one) of the PDF.  @see PDFTreeNode
-     **/
-    getOutline(): PDFPromise<PDFTreeNode[]>;
-
-    /**
-     * A promise that is resolved with the info and metadata of the PDF.
-     **/
-    getMetadata(): PDFPromise<{ info: PDFInfo; metadata: PDFMetadata }>;
-
-    /**
-     * Is the PDF encrypted?
-     **/
-    isEncrypted(): PDFPromise<boolean>;
-
-    /**
-     * A promise that is resolved with Uint8Array that has the raw PDF data.
-     **/
-    getData(): PDFPromise<Uint8Array>;
-
-    /**
-     * TODO: return type of Promise<???>
-     * A promise that is resolved when the document's data is loaded.
-     **/
-    dataLoaded(): PDFPromise<any[]>;
-
-    /**
-     *
-     **/
-    destroy(): void;
-  }
-
-  interface PDFRef {
-    num: number;
-    gen: any; // todo
-  }
-
-  interface PDFPageViewportOptions {
-    viewBox: any;
-    scale: number;
-    rotation: number;
-    offsetX: number;
-    offsetY: number;
-    dontFlip: boolean;
-  }
-
-  interface PDFPageViewport {
-    width: number;
-    height: number;
-    fontScale: number;
-    transforms: number[];
-
-    clone(options: PDFPageViewportOptions): PDFPageViewport;
-    convertToViewportPoint(x: number, y: number): number[]; // [x, y]
-    convertToViewportRectangle(rect: number[]): number[]; // [x1, y1, x2, y2]
-    convertToPdfPoint(x: number, y: number): number[]; // [x, y]
-  }
-
-  interface PDFAnnotationData {
-    subtype: string;
-    rect: number[]; // [x1, y1, x2, y2]
-    annotationFlags: any; // todo
-    color: number[]; // [r,g,b]
-    borderWidth: number;
-    hasAppearance: boolean;
-  }
-
-  interface PDFAnnotations {
-    getData(): PDFAnnotationData;
-    hasHtml(): boolean; // always false
-    getHtmlElement(commonOjbs: any): HTMLElement; // throw new NotImplementedException()
-    getEmptyContainer(tagName: string, rect: number[]): HTMLElement; // deprecated
-    isViewable(): boolean;
-    loadResources(keys: any): PDFPromise<any>;
-    getOperatorList(evaluator: any): PDFPromise<any>;
-    // ... todo
-  }
-
-  interface PDFRenderTextLayer {
-    beginLayout(): void;
-    endLayout(): void;
-    appendText(): void;
-  }
-
-  interface PDFRenderImageLayer {
-    beginLayout(): void;
-    endLayout(): void;
-    appendImage(): void;
-  }
-
-  interface PDFRenderParams {
-    canvasContext: CanvasRenderingContext2D;
-    viewport?: PDFPageViewport;
-    textLayer?: PDFRenderTextLayer;
-    imageLayer?: PDFRenderImageLayer;
-    continueCallback?: (_continue: () => void) => void;
-  }
-
-  interface PDFViewerParams {
-    container: HTMLElement;
-    viewer?: HTMLElement;
-  }
-
-  /**
-   * RenderTask is basically a promise but adds a cancel function to termiate it.
+interface PDFTreeNode {
+  title: string;
+  bold: boolean;
+  italic: boolean;
+  color: number[]; // [r,g,b]
+  dest: any;
+  items: PDFTreeNode[];
+}
+
+interface PDFInfo {
+  PDFFormatVersion: string;
+  IsAcroFormPresent: boolean;
+  IsXFAPresent: boolean;
+  [key: string]: any;	// return type is string, typescript chokes
+}
+
+interface PDFMetadata {
+  parse(): void;
+  get(name: string): string;
+  has(name: string): boolean;
+}
+
+interface PDFSource {
+  url?: string;
+  data?: Uint8Array;
+  httpHeaders?: any;
+  password?: string;
+}
+
+interface PDFProgressData {
+  loaded: number;
+  total: number;
+}
+
+interface PDFDocumentProxy {
+
+  /**
+   * Total number of pages the PDF contains.
+   **/
+  numPages: number;
+
+  /**
+   * A unique ID to identify a PDF.  Not guaranteed to be unique.  [jbaldwin: haha what]
+   **/
+  fingerprint: string;
+
+  /**
+   * True if embedded document fonts are in use.  Will be set during rendering of the pages.
+   **/
+  embeddedFontsUsed(): boolean;
+
+  /**
+   * @param number The page number to get.  The first page is 1.
+   * @return A promise that is resolved with a PDFPageProxy.
+   **/
+  getPage(number: number): PDFPromise<PDFPageProxy>;
+
+  /**
+   * TODO: return type of Promise<???>
+   *  A promise that is resolved with a lookup table for mapping named destinations to reference numbers.
+   **/
+  getDestinations(): PDFPromise<any[]>;
+
+  /**
+   *  A promise that is resolved with an array of all the JavaScript strings in the name tree.
+   **/
+  getJavaScript(): PDFPromise<string[]>;
+
+  /**
+   *  A promise that is resolved with an array that is a tree outline (if it has one) of the PDF.  @see PDFTreeNode
+   **/
+  getOutline(): PDFPromise<PDFTreeNode[]>;
+
+  /**
+   * A promise that is resolved with the info and metadata of the PDF.
+   **/
+  getMetadata(): PDFPromise<{ info: PDFInfo; metadata: PDFMetadata }>;
+
+  /**
+   * Is the PDF encrypted?
+   **/
+  isEncrypted(): PDFPromise<boolean>;
+
+  /**
+   * A promise that is resolved with Uint8Array that has the raw PDF data.
+   **/
+  getData(): PDFPromise<Uint8Array>;
+
+  /**
+   * TODO: return type of Promise<???>
+   * A promise that is resolved when the document's data is loaded.
+   **/
+  dataLoaded(): PDFPromise<any[]>;
+
+  /**
+   *
+   **/
+  destroy(): void;
+}
+
+interface PDFRef {
+  num: number;
+  gen: any; // todo
+}
+
+interface PDFPageViewportOptions {
+  viewBox: any;
+  scale: number;
+  rotation: number;
+  offsetX: number;
+  offsetY: number;
+  dontFlip: boolean;
+}
+
+interface PDFPageViewport {
+  width: number;
+  height: number;
+  fontScale: number;
+  transforms: number[];
+
+  clone(options: PDFPageViewportOptions): PDFPageViewport;
+  convertToViewportPoint(x: number, y: number): number[]; // [x, y]
+  convertToViewportRectangle(rect: number[]): number[]; // [x1, y1, x2, y2]
+  convertToPdfPoint(x: number, y: number): number[]; // [x, y]
+}
+
+interface PDFAnnotationData {
+  subtype: string;
+  rect: number[]; // [x1, y1, x2, y2]
+  annotationFlags: any; // todo
+  color: number[]; // [r,g,b]
+  borderWidth: number;
+  hasAppearance: boolean;
+}
+
+interface PDFAnnotations {
+  getData(): PDFAnnotationData;
+  hasHtml(): boolean; // always false
+  getHtmlElement(commonOjbs: any): HTMLElement; // throw new NotImplementedException()
+  getEmptyContainer(tagName: string, rect: number[]): HTMLElement; // deprecated
+  isViewable(): boolean;
+  loadResources(keys: any): PDFPromise<any>;
+  getOperatorList(evaluator: any): PDFPromise<any>;
+  // ... todo
+}
+
+interface PDFRenderTextLayer {
+  beginLayout(): void;
+  endLayout(): void;
+  appendText(): void;
+}
+
+interface PDFRenderImageLayer {
+  beginLayout(): void;
+  endLayout(): void;
+  appendImage(): void;
+}
+
+interface PDFRenderParams {
+  canvasContext: CanvasRenderingContext2D;
+  viewport?: PDFPageViewport;
+  textLayer?: PDFRenderTextLayer;
+  imageLayer?: PDFRenderImageLayer;
+  continueCallback?: (_continue: () => void) => void;
+}
+
+interface PDFViewerParams {
+  container: HTMLElement;
+  viewer?: HTMLElement;
+}
+
+/**
+ * RenderTask is basically a promise but adds a cancel function to termiate it.
+ **/
+interface PDFRenderTask extends PDFPromise<PDFPageProxy> {
+
+  /**
+   * Cancel the rendering task.  If the task is currently rendering it will not be cancelled until graphics pauses with a timeout.  The promise that this object extends will resolve when cancelled.
+   **/
+  cancel(): void;
+}
+
+interface PDFPageProxy {
+
+  /**
+   * Page number of the page.  First page is 1.
+   **/
+  pageNumber: number;
+
+  /**
+   * The number of degrees the page is rotated clockwise.
+   **/
+  rotate: number;
+
+  /**
+   * The reference that points to this page.
+   **/
+  ref: PDFRef;
+
+  /**
+   * @return An array of the visible portion of the PDF page in the user space units - [x1, y1, x2, y2].
+   **/
+  view: number[];
+
+  /**
+   * @param scale The desired scale of the viewport.
+   * @param rotate Degrees to rotate the viewport.  If omitted this defaults to the page rotation.
+   * @return
+   **/
+  getViewport(scale: number, rotate?: number): PDFPageViewport;
+
+  /**
+   * A promise that is resolved with an array of the annotation objects.
+   **/
+  getAnnotations(): PDFPromise<PDFAnnotations>;
+
+  /**
+   * Begins the process of rendering a page to the desired context.
+   * @param params Rendering options.
+   * @return An extended promise that is resolved when the page finishes rendering.
    **/
-  interface PDFRenderTask extends PDFPromise<PDFPageProxy> {
-
-    /**
-     * Cancel the rendering task.  If the task is currently rendering it will not be cancelled until graphics pauses with a timeout.  The promise that this object extends will resolve when cancelled.
-     **/
-    cancel(): void;
-  }
-
-  interface PDFPageProxy {
-
-    /**
-     * Page number of the page.  First page is 1.
-     **/
-    pageNumber: number;
-
-    /**
-     * The number of degrees the page is rotated clockwise.
-     **/
-    rotate: number;
-
-    /**
-     * The reference that points to this page.
-     **/
-    ref: PDFRef;
-
-    /**
-     * @return An array of the visible portion of the PDF page in the user space units - [x1, y1, x2, y2].
-     **/
-    view: number[];
-
-    /**
-     * @param scale The desired scale of the viewport.
-     * @param rotate Degrees to rotate the viewport.  If omitted this defaults to the page rotation.
-     * @return
-     **/
-    getViewport(scale: number, rotate?: number): PDFPageViewport;
-
-    /**
-     * A promise that is resolved with an array of the annotation objects.
-     **/
-    getAnnotations(): PDFPromise<PDFAnnotations>;
-
-    /**
-     * Begins the process of rendering a page to the desired context.
-     * @param params Rendering options.
-     * @return An extended promise that is resolved when the page finishes rendering.
-     **/
-    render(params: PDFRenderParams): PDFRenderTask;
-
-    /**
-     * A promise that is resolved with the string that is the text content frm the page.
-     **/
-    getTextContent(): PDFPromise<TextContent>;
-
-    /**
-     * marked as future feature
-     **/
-    //getOperationList(): PDFPromise<>;
-
-    /**
-     * Destroyes resources allocated by the page.
-     **/
-    destroy(): void;
-  }
-
-  interface TextContentItem {
-    str: string;
-    transform: number[]; // [0..5]   4=x, 5=y
-    width: number;
-    height: number;
-    dir: string; // Left-to-right (ltr), etc
-    fontName: string; // A lookup into the styles map of the owning TextContent
-  }
-
-  interface TextContent {
-    items: TextContentItem[];
-    styles: any;
-  }
-
-  /**
-   * A PDF document and page is built of many objects.  E.g. there are objects for fonts, images, rendering code and such.  These objects might get processed inside of a worker.  The `PDFObjects` implements some basic functions to manage these objects.
+  render(params: PDFRenderParams): PDFRenderTask;
+
+  /**
+   * A promise that is resolved with the string that is the text content frm the page.
+   **/
+  getTextContent(): PDFPromise<TextContent>;
+
+  /**
+   * marked as future feature
+   **/
+  //getOperationList(): PDFPromise<>;
+
+  /**
+   * Destroyes resources allocated by the page.
+   **/
+  destroy(): void;
+}
+
+interface TextContentItem {
+  str: string;
+  transform: number[]; // [0..5]   4=x, 5=y
+  width: number;
+  height: number;
+  dir: string; // Left-to-right (ltr), etc
+  fontName: string; // A lookup into the styles map of the owning TextContent
+}
+
+interface TextContent {
+  items: TextContentItem[];
+  styles: any;
+}
+
+/**
+ * A PDF document and page is built of many objects.  E.g. there are objects for fonts, images, rendering code and such.  These objects might get processed inside of a worker.  The `PDFObjects` implements some basic functions to manage these objects.
+ **/
+interface PDFObjects {
+  get(objId: number, callback?: any): any;
+  resolve(objId: number, data: any): any;
+  isResolved(objId: number): boolean;
+  hasData(objId: number): boolean;
+  getData(objId: number): any;
+  clear(): void;
+}
+
+interface PDFJSUtilStatic {
+  /**
+   * Normalize rectangle so that (x1,y1) < (x2,y2)
+   * @param {number[]} rect - the rectangle with [x1,y1,x2,y2]
+   *
+   * For coordinate systems whose origin lies in the bottom-left, this
+   * means normalization to (BL,TR) ordering. For systems with origin in the
+   * top-left, this means (TL,BR) ordering.
+   **/
+  normalizeRect(rect:number[]): number[];
+}
+
+export const PDFJS: PDFJSStatic;
+
+interface PDFJSStatic {
+  /**
+   * The maximum allowed image size in total pixels e.g. width * height.  Images above this value will not be drawn.  Use -1 for no limit.
+   **/
+  maxImageSize: number;
+
+  /**
+   * The url of where the predefined Adobe CMaps are located. Include trailing
+   * slash.
+   */
+  cMapUrl: string;
+
+  /**
+   * Specifies if CMaps are binary packed.
+   */
+  cMapPacked: boolean;
+
+  /**
+   * By default fonts are converted to OpenType fonts and loaded via font face rules.  If disabled, the font will be rendered using a built in font renderer that constructs the glyphs with primitive path commands.
+   **/
+  disableFontFace: boolean;
+
+  /**
+   * Path for image resources, mainly for annotation icons. Include trailing
+   * slash.
+   */
+  imageResourcesPath: string;
+
+  /**
+   * Disable the web worker and run all code on the main thread. This will happen
+   * automatically if the browser doesn't support workers or sending typed arrays
+   * to workers.
+   */
+  disableWorker: boolean;
+
+  /**
+   * Path and filename of the worker file. Required when the worker is enabled in
+   * development mode. If unspecified in the production build, the worker will be
+   * loaded based on the location of the pdf.js file.
+   */
+  workerSrc: string;
+
+  /**
+   * Disable range request loading of PDF files. When enabled and if the server
+   * supports partial content requests then the PDF will be fetched in chunks.
+   * Enabled (false) by default.
+   */
+  disableRange: boolean;
+
+  /**
+   * Disable streaming of PDF file data. By default PDF.js attempts to load PDF
+   * in chunks. This default behavior can be disabled.
+   */
+  disableStream: boolean;
+
+  /**
+   * Disable pre-fetching of PDF file data. When range requests are enabled PDF.js
+   * will automatically keep fetching more data even if it isn't needed to display
+   * the current page. This default behavior can be disabled.
+   *
+   * NOTE: It is also necessary to disable streaming, see above,
+   *       in order for disabling of pre-fetching to work correctly.
+   */
+  disableAutoFetch: boolean;
+
+  /**
+   * Enables special hooks for debugging PDF.js.
+   */
+  pdfBug: boolean;
+
+  /**
+   * Enables transfer usage in postMessage for ArrayBuffers.
+   */
+  postMessageTransfers: boolean;
+
+  /**
+   * Disables URL.createObjectURL usage.
+   */
+  disableCreateObjectURL: boolean;
+
+  /**
+   * Disables WebGL usage.
+   */
+  disableWebGL: boolean;
+
+  /**
+   * Disables fullscreen support, and by extension Presentation Mode,
+   * 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.
+   */
+  useOnlyCssZoom: boolean;
+
+  /**
+   * Controls the logging level.
+   * The constants from PDFJS.VERBOSITY_LEVELS should be used:
+   * - errors
+   * - warnings [default]
+   * - infos
+   */
+  verbosity: number;
+
+  /**
+   * The maximum supported canvas size in total pixels e.g. width * height.
+   * The default value is 4096 * 4096. Use -1 for no limit.
+   */
+  maxCanvasPixels: number;
+
+  /**
+   * Opens external links in a new window if enabled. The default behavior opens
+   * external links in the PDF.js window.
+   */
+  openExternalLinksInNewWindow: boolean;
+
+  /**
+   * Determines if we can eval strings as JS. Primarily used to improve
+   * performance for font rendering.
+   */
+  isEvalSupported: boolean;
+
+  Util: PDFJSUtilStatic;
+
+  /**
+   * This is the main entry point for loading a PDF and interacting with it.
+   * NOTE: If a URL is used to fetch the PDF data a standard XMLHttpRequest(XHR)
+   * is used, which means it must follow the same origin rules that any XHR does
+   * e.g. No corss domain requests without CORS.
+   * @param source
+   * @param pdfDataRangeTransport Used if you want to manually server range requests for data in the PDF.  @ee viewer.js for an example of pdfDataRangeTransport's interface.
+   * @param passwordCallback Used to request a password if wrong or no password was provided.  The callback receives two parameters: function that needs to be called with new password and the reason.
+   * @param progressCallback Progress callback.
+   * @return A promise that is resolved with PDFDocumentProxy object.
    **/
-  interface PDFObjects {
-    get(objId: number, callback?: any): any;
-    resolve(objId: number, data: any): any;
-    isResolved(objId: number): boolean;
-    hasData(objId: number): boolean;
-    getData(objId: number): any;
-    clear(): void;
-  }
-
-  interface PDFJSUtilStatic {
-    /**
-     * Normalize rectangle so that (x1,y1) < (x2,y2)
-     * @param {number[]} rect - the rectangle with [x1,y1,x2,y2]
-     *
-     * For coordinate systems whose origin lies in the bottom-left, this
-     * means normalization to (BL,TR) ordering. For systems with origin in the
-     * top-left, this means (TL,BR) ordering.
-     **/
-    normalizeRect(rect:number[]): number[];
-  }
-
-  interface PDFJSStatic {
-
-    /**
-     * The maximum allowed image size in total pixels e.g. width * height.  Images above this value will not be drawn.  Use -1 for no limit.
-     **/
-    maxImageSize: number;
-
-    /**
-     * The url of where the predefined Adobe CMaps are located. Include trailing
-     * slash.
-     */
-    cMapUrl: string;
-
-    /**
-     * Specifies if CMaps are binary packed.
-     */
-    cMapPacked: boolean;
-
-    /**
-     * By default fonts are converted to OpenType fonts and loaded via font face rules.  If disabled, the font will be rendered using a built in font renderer that constructs the glyphs with primitive path commands.
-     **/
-    disableFontFace: boolean;
-
-    /**
-     * Path for image resources, mainly for annotation icons. Include trailing
-     * slash.
-     */
-    imageResourcesPath: string;
-
-    /**
-     * Disable the web worker and run all code on the main thread. This will happen
-     * automatically if the browser doesn't support workers or sending typed arrays
-     * to workers.
-     */
-    disableWorker: boolean;
-
-    /**
-     * Path and filename of the worker file. Required when the worker is enabled in
-     * development mode. If unspecified in the production build, the worker will be
-     * loaded based on the location of the pdf.js file.
-     */
-    workerSrc: string;
-
-    /**
-     * Disable range request loading of PDF files. When enabled and if the server
-     * supports partial content requests then the PDF will be fetched in chunks.
-     * Enabled (false) by default.
-     */
-    disableRange: boolean;
-
-    /**
-     * Disable streaming of PDF file data. By default PDF.js attempts to load PDF
-     * in chunks. This default behavior can be disabled.
-     */
-    disableStream: boolean;
-
-    /**
-     * Disable pre-fetching of PDF file data. When range requests are enabled PDF.js
-     * will automatically keep fetching more data even if it isn't needed to display
-     * the current page. This default behavior can be disabled.
-     *
-     * NOTE: It is also necessary to disable streaming, see above,
-     *       in order for disabling of pre-fetching to work correctly.
-     */
-    disableAutoFetch: boolean;
-
-    /**
-     * Enables special hooks for debugging PDF.js.
-     */
-    pdfBug: boolean;
-
-    /**
-     * Enables transfer usage in postMessage for ArrayBuffers.
-     */
-    postMessageTransfers: boolean;
-
-    /**
-     * Disables URL.createObjectURL usage.
-     */
-    disableCreateObjectURL: boolean;
-
-    /**
-     * Disables WebGL usage.
-     */
-    disableWebGL: boolean;
-
-    /**
-     * Disables fullscreen support, and by extension Presentation Mode,
-     * 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.
-     */
-    useOnlyCssZoom: boolean;
-
-    /**
-     * Controls the logging level.
-     * The constants from PDFJS.VERBOSITY_LEVELS should be used:
-     * - errors
-     * - warnings [default]
-     * - infos
-     */
-    verbosity: number;
-
-    /**
-     * The maximum supported canvas size in total pixels e.g. width * height.
-     * The default value is 4096 * 4096. Use -1 for no limit.
-     */
-    maxCanvasPixels: number;
-
-    /**
-     * Opens external links in a new window if enabled. The default behavior opens
-     * external links in the PDF.js window.
-     */
-    openExternalLinksInNewWindow: boolean;
-
-    /**
-     * Determines if we can eval strings as JS. Primarily used to improve
-     * performance for font rendering.
-     */
-    isEvalSupported: boolean;
-
-    Util: PDFJSUtilStatic;
-
-    /**
-     * This is the main entry point for loading a PDF and interacting with it.
-     * NOTE: If a URL is used to fetch the PDF data a standard XMLHttpRequest(XHR)
-     * is used, which means it must follow the same origin rules that any XHR does
-     * e.g. No corss domain requests without CORS.
-     * @param source
-     * @param pdfDataRangeTransport Used if you want to manually server range requests for data in the PDF.  @ee viewer.js for an example of pdfDataRangeTransport's interface.
-     * @param passwordCallback Used to request a password if wrong or no password was provided.  The callback receives two parameters: function that needs to be called with new password and the reason.
-     * @param progressCallback Progress callback.
-     * @return A promise that is resolved with PDFDocumentProxy object.
-     **/
-    getDocument(
-        source: string,
-        pdfDataRangeTransport?: any,
-        passwordCallback?: (fn: (password: string) => void, reason: string) => string,
-        progressCallback?: (progressData: PDFProgressData) => void)
-        : PDFPromise<PDFDocumentProxy>;
-
-    getDocument(
-        source: Uint8Array,
-        pdfDataRangeTransport?: any,
-        passwordCallback?: (fn: (password: string) => void, reason: string) => string,
-        progressCallback?: (progressData: PDFProgressData) => void)
-        : PDFPromise<PDFDocumentProxy>;
-
-    getDocument(
-        source: PDFSource,
-        pdfDataRangeTransport?: any,
-        passwordCallback?: (fn: (password: string) => void, reason: string) => string,
-        progressCallback?: (progressData: PDFProgressData) => void)
-        : 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;
-  }
+  getDocument(
+      source: string,
+      pdfDataRangeTransport?: any,
+      passwordCallback?: (fn: (password: string) => void, reason: string) => string,
+      progressCallback?: (progressData: PDFProgressData) => void)
+      : PDFPromise<PDFDocumentProxy>;
+
+  getDocument(
+      source: Uint8Array,
+      pdfDataRangeTransport?: any,
+      passwordCallback?: (fn: (password: string) => void, reason: string) => string,
+      progressCallback?: (progressData: PDFProgressData) => void)
+      : PDFPromise<PDFDocumentProxy>;
+
+  getDocument(
+      source: PDFSource,
+      pdfDataRangeTransport?: any,
+      passwordCallback?: (fn: (password: string) => void, reason: string) => string,
+      progressCallback?: (progressData: PDFProgressData) => void)
+      : 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/pdfjs-dist/pdfjs-dist-tests.ts b/types/pdfjs-dist/pdfjs-dist-tests.ts
index cd2325975a..ef569b2fda 100644
--- a/types/pdfjs-dist/pdfjs-dist-tests.ts
+++ b/types/pdfjs-dist/pdfjs-dist-tests.ts
@@ -1,11 +1,10 @@
-import { PDFJSStatic, PDFDocumentProxy, PDFPromise } from 'pdfjs-dist';
+import { PDFJS, PDFDocumentProxy, PDFPromise } from 'pdfjs-dist';
 
 //
 // Fetch the PDF document from the URL using promises
 //
 var pdfDoc: PDFDocumentProxy;
 var pageNum: number;
-var PDFJS: PDFJSStatic;
 
 PDFJS.getDocument('helloworld.pdf').then(function (pdf) {
 	// Using promise to fetch the page
@@ -26,7 +25,7 @@ function renderPage(pageNum: number) {
 		var context = canvas.getContext('2d');
 		canvas.height = viewport.height;
 		canvas.width = viewport.width;
-		
+
 		//
 		// test viewport conversion methods
 		// convertToViewportRectangle and normalizeRect are used in the acroforms example:
diff --git a/types/peer-dial/peer-dial-tests.ts b/types/peer-dial/peer-dial-tests.ts
index cb4238da62..6cc4376458 100644
--- a/types/peer-dial/peer-dial-tests.ts
+++ b/types/peer-dial/peer-dial-tests.ts
@@ -1,5 +1,5 @@
 import { Server, Client, App, AppInfo, CorsOptions, ServerOptions, Delegate, DialDevice, DeviceInfo } from 'peer-dial';
-import * as express from 'express';
+import express = require('express');
 
 class AppImpl implements App {
     name: string;
diff --git a/types/pg-escape/pg-escape-tests.ts b/types/pg-escape/pg-escape-tests.ts
index 36636cf0c2..87d70dbd9f 100644
--- a/types/pg-escape/pg-escape-tests.ts
+++ b/types/pg-escape/pg-escape-tests.ts
@@ -1,4 +1,4 @@
-import * as escape from 'pg-escape';
+import escape = require('pg-escape');
 
 escape('INSERT INTO %I VALUES(%L)', 'books', "O'Reilly");
 escape.string("ab'cd");
diff --git a/types/pg-query-stream/pg-query-stream-tests.ts b/types/pg-query-stream/pg-query-stream-tests.ts
index 1df78ea648..49a2f41b0b 100644
--- a/types/pg-query-stream/pg-query-stream-tests.ts
+++ b/types/pg-query-stream/pg-query-stream-tests.ts
@@ -1,4 +1,4 @@
-import * as QueryStream from 'pg-query-stream';
+import QueryStream = require('pg-query-stream');
 import * as pg from 'pg';
 
 const options: QueryStream.Options = {
@@ -12,7 +12,7 @@ const pool = new pg.Pool();
 pool.connect((err, client, done) => {
     const stream = client.query(query);
     stream.on('end', () => {
-        client.end();
+        client.release();
     });
     stream.on('data', (data: any) => {
         console.log(data);
diff --git a/types/pg/index.d.ts b/types/pg/index.d.ts
index 9f945082cd..b2b8af73e5 100644
--- a/types/pg/index.d.ts
+++ b/types/pg/index.d.ts
@@ -33,21 +33,24 @@ export interface ClientConfig extends ConnectionConfig {
 }
 
 export interface PoolConfig extends ClientConfig {
-      // properties from module 'node-pool'
-      max?: number;
-      min?: number;
-      connectionTimeoutMillis?: number;
-      idleTimeoutMillis?: number;
+    // properties from module 'node-pool'
+    max?: number;
+    min?: number;
+    connectionTimeoutMillis?: number;
+    idleTimeoutMillis?: number;
 
-      application_name?: string;
-      Promise?: PromiseConstructorLike;
+    application_name?: string;
+    Promise?: PromiseConstructorLike;
 }
 
 export interface QueryConfig {
     name?: string;
     text: string;
     values?: any[];
-    rowMode?: string;
+}
+
+export interface QueryArrayConfig extends QueryConfig {
+    rowMode: 'array';
 }
 
 export interface QueryResult {
@@ -57,6 +60,24 @@ export interface QueryResult {
     rows: any[];
 }
 
+export interface FieldDef {
+    name: string;
+    tableID: number;
+    columnID: number;
+    dataTypeID: number;
+    dataTypeSize: number;
+    dataTypeModifier: number;
+    format: string;
+}
+
+export interface QueryArrayResult {
+    command: string;
+    rowCount: number;
+    oid: number;
+    rows: any[][];
+    fields: FieldDef[];
+}
+
 export interface Notification {
     processId: number;
     channel: string;
@@ -77,36 +98,35 @@ export class Pool extends events.EventEmitter {
     readonly idleCount: number;
     readonly waitingCount: number;
 
-    connect(): Promise<Client>;
-    connect(callback: (err: Error, client: Client, done: () => void) => void): void;
+    connect(): Promise<PoolClient>;
+    connect(callback: (err: Error, client: PoolClient, done: () => void) => void): void;
 
     end(): Promise<void>;
     end(callback: () => void): void;
 
     query(queryStream: QueryConfig & stream.Readable): stream.Readable;
+    query(queryConfig: QueryArrayConfig): Promise<QueryArrayResult>;
     query(queryConfig: QueryConfig): Promise<QueryResult>;
     query(queryText: string, values?: any[]): Promise<QueryResult>;
+    query(queryConfig: QueryArrayConfig, callback: (err: Error, result: QueryArrayResult) => void): Query;
     query(queryTextOrConfig: string | QueryConfig, callback: (err: Error, result: QueryResult) => void): Query;
     query(queryText: string, values: any[], callback: (err: Error, result: QueryResult) => void): Query;
 
-    on(event: "error", listener: (err: Error, client: Client) => void): this;
-    on(event: "connect" | "acquire", listener: (client: Client) => void): this;
+    on(event: "error", listener: (err: Error, client: PoolClient) => void): this;
+    on(event: "connect" | "acquire" | "remove", listener: (client: PoolClient) => void): this;
 }
 
-export class Client extends events.EventEmitter {
+export class ClientBase extends events.EventEmitter {
     constructor(config: string | ClientConfig);
 
     connect(): Promise<void>;
     connect(callback: (err: Error) => void): void;
 
-    end(): Promise<void>;
-    end(callback: (err: Error) => void): void;
-
-    release(err?: Error): void;
-
     query(queryStream: QueryConfig & stream.Readable): stream.Readable;
+    query(queryConfig: QueryArrayConfig): Promise<QueryArrayResult>;
     query(queryConfig: QueryConfig): Promise<QueryResult>;
     query(queryText: string, values?: any[]): Promise<QueryResult>;
+    query(queryConfig: QueryArrayConfig, callback: (err: Error, result: QueryArrayResult) => void): Query;
     query(queryTextOrConfig: string | QueryConfig, callback: (err: Error, result: QueryResult) => void): Query;
     query(queryText: string, values: any[], callback: (err: Error, result: QueryResult) => void): Query;
 
@@ -126,6 +146,17 @@ export class Client extends events.EventEmitter {
     on(event: "end", listener: () => void): this;
 }
 
+export class Client extends ClientBase {
+    constructor(config: string | ClientConfig);
+
+    end(): Promise<void>;
+    end(callback: (err: Error) => void): void;
+}
+
+export interface PoolClient extends ClientBase {
+    release(err?: Error): void;
+}
+
 export class Query extends events.EventEmitter {
     on(event: "row", listener: (row: any, result?: ResultBuilder) => void): this;
     on(event: "error", listener: (err: Error) => void): this;
diff --git a/types/pg/pg-tests.ts b/types/pg/pg-tests.ts
index 1f1e312544..b9b3f80d4e 100644
--- a/types/pg/pg-tests.ts
+++ b/types/pg/pg-tests.ts
@@ -48,8 +48,7 @@ client.query('SELECT $1::text as name', ['brianc'], (err, res) => {
 const query = {
   name: 'get-name',
   text: 'SELECT $1::text',
-  values: ['brianc'],
-  rowMode: 'array'
+  values: ['brianc']
 };
 client.query(query, (err, res) => {
   if (err) {
@@ -66,6 +65,33 @@ client.query(query)
     console.error(e.stack);
   });
 
+const queryArrMode: pg.QueryArrayConfig = {
+  name: 'get-name-array',
+  text: 'SELECT $1::text',
+  values: ['brianc'],
+  rowMode: 'array'
+};
+client.query(queryArrMode, (err, res) => {
+  if (err) {
+    console.error(err.stack);
+  } else {
+    console.log(res.rows);
+    console.log(res.fields.map(f => f.name));
+  }
+});
+client.query(queryArrMode)
+  .then(res => {
+    console.log(res.rows);
+    console.log(res.fields.map(f => f.name));
+  })
+  .catch(e => {
+    console.error(e.stack);
+  });
+client.query({
+  text: 'select 1',
+  rowMode: 'array',
+}).then(res => console.log(res.fields[0]));
+
 client.end((err) => {
   console.log('client has disconnected');
   if (err) {
@@ -107,6 +133,12 @@ pool.connect((err, client, done) => {
   });
 });
 
+pool.connect().then(client => {
+  client.query({ text: 'SELECT $1::int AS number', values: ['1'], rowMode: 'array' }).then(result => {
+    console.log(result.rowCount, result.rows[0][0], result.fields[0].name);
+  }).then(() => client.release(), e => client.release(e));
+});
+
 pool.on('error', (err, client) => {
   console.error('idle client error', err.message, err.stack);
 });
diff --git a/types/pg/v6/index.d.ts b/types/pg/v6/index.d.ts
index 5624989ac7..150dad74fa 100644
--- a/types/pg/v6/index.d.ts
+++ b/types/pg/v6/index.d.ts
@@ -36,15 +36,15 @@ export interface ClientConfig extends ConnectionConfig {
 }
 
 export interface PoolConfig extends ClientConfig {
-      // properties from module 'node-pool'
-      max?: number;
-      min?: number;
-      refreshIdle?: boolean;
-      idleTimeoutMillis?: number;
-      reapIntervalMillis?: number;
-      returnToHead?: boolean;
-      application_name?: string;
-      Promise?: PromiseConstructorLike;
+    // properties from module 'node-pool'
+    max?: number;
+    min?: number;
+    refreshIdle?: boolean;
+    idleTimeoutMillis?: number;
+    reapIntervalMillis?: number;
+    returnToHead?: boolean;
+    application_name?: string;
+    Promise?: PromiseConstructorLike;
 }
 
 export interface QueryConfig {
diff --git a/types/photoswipe/photoswipe-tests.ts b/types/photoswipe/photoswipe-tests.ts
index 05cdb5db53..48add333c5 100644
--- a/types/photoswipe/photoswipe-tests.ts
+++ b/types/photoswipe/photoswipe-tests.ts
@@ -1,5 +1,5 @@
-import * as PhotoSwipeUI_Default from './dist/photoswipe-ui-default/index';
-import * as PhotoSwipe from './index';
+import PhotoSwipeUI_Default = require('./dist/photoswipe-ui-default/index');
+import PhotoSwipe = require('./index');
 
 function test_defaultUI() {
     var items: PhotoSwipeUI_Default.Item[] = [
diff --git a/types/pick-weight/pick-weight-tests.ts b/types/pick-weight/pick-weight-tests.ts
index 5707b1c598..a7b35e7e37 100644
--- a/types/pick-weight/pick-weight-tests.ts
+++ b/types/pick-weight/pick-weight-tests.ts
@@ -1,4 +1,4 @@
-import * as weight from "pick-weight";
+import weight = require("pick-weight");
 
 const x = weight(["a", "b", "c"], [1, 2, 3]);
 
diff --git a/types/pify/pify-tests.ts b/types/pify/pify-tests.ts
index f77eb9f10d..27022b7390 100644
--- a/types/pify/pify-tests.ts
+++ b/types/pify/pify-tests.ts
@@ -1,4 +1,4 @@
-import * as pify from 'pify';
+import pify = require('pify');
 
 function assert(actual: string, expected: string): void {
     if (actual !== expected) {
diff --git a/types/pikaday-time/pikaday-time-tests.ts b/types/pikaday-time/pikaday-time-tests.ts
index fec72dc553..6ae7f82406 100644
--- a/types/pikaday-time/pikaday-time-tests.ts
+++ b/types/pikaday-time/pikaday-time-tests.ts
@@ -1,7 +1,7 @@
 /// <reference types="jquery" />
 
-import * as Pikaday from "pikaday-time";
-import * as moment from "moment";
+import Pikaday = require("pikaday-time");
+import moment = require("moment");
 
 new Pikaday({field: document.getElementById('datepicker')});
 new Pikaday({field: $('#datepicker')[0]});
diff --git a/types/pikaday/pikaday-tests.ts b/types/pikaday/pikaday-tests.ts
index 9084455622..e61cb635e3 100644
--- a/types/pikaday/pikaday-tests.ts
+++ b/types/pikaday/pikaday-tests.ts
@@ -1,7 +1,7 @@
 /// <reference types="jquery" />
 
-import * as Pikaday from "pikaday";
-import * as moment from "moment";
+import Pikaday = require("pikaday");
+import moment = require("moment");
 
 new Pikaday({field: document.getElementById('datepicker')});
 new Pikaday({field: $('#datepicker')[0]});
diff --git a/types/pino-multi-stream/pino-multi-stream-tests.ts b/types/pino-multi-stream/pino-multi-stream-tests.ts
index d9d0899256..dc48ed3bd4 100644
--- a/types/pino-multi-stream/pino-multi-stream-tests.ts
+++ b/types/pino-multi-stream/pino-multi-stream-tests.ts
@@ -1,6 +1,6 @@
 import * as fs from 'fs';
-import * as pino from 'pino';
-import * as pinoms from 'pino-multi-stream';
+import pino = require('pino');
+import pinoms = require('pino-multi-stream');
 
 const streams: pinoms.Streams = [
     { stream: process.stdout }, // an "info" level destination stream
diff --git a/types/pino-multi-stream/tsconfig.json b/types/pino-multi-stream/tsconfig.json
index 7a060abb2e..df16842f19 100644
--- a/types/pino-multi-stream/tsconfig.json
+++ b/types/pino-multi-stream/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "pino-multi-stream-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/pixelmatch/tsconfig.json b/types/pixelmatch/tsconfig.json
index 02115e3fdc..ef11da582a 100644
--- a/types/pixelmatch/tsconfig.json
+++ b/types/pixelmatch/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "pixelmatch-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/pixi.js/index.d.ts b/types/pixi.js/index.d.ts
index 6d7dfaf351..f75bb4a1ca 100644
--- a/types/pixi.js/index.d.ts
+++ b/types/pixi.js/index.d.ts
@@ -329,7 +329,7 @@ declare namespace PIXI {
         renderable: boolean;
         parent: Container;
         worldAlpha: number;
-        filterArea: Rectangle;
+        filterArea: Rectangle | null;
         protected _filters: Array<Filter<any>> | null;
         protected _enabledFilters: Array<Filter<any>> | null;
         protected _bounds: Bounds;
@@ -337,7 +337,7 @@ declare namespace PIXI {
         protected _lastBoundsID: number;
         protected _boundsRect: Rectangle;
         protected _localBoundsRect: Rectangle;
-        protected _mask: PIXI.Graphics | PIXI.Sprite;
+        protected _mask: PIXI.Graphics | PIXI.Sprite | null;
         protected readonly _destroyed: boolean;
         x: number;
         y: number;
@@ -349,7 +349,7 @@ declare namespace PIXI {
         skew: ObservablePoint;
         rotation: number;
         worldVisible: boolean;
-        mask: PIXI.Graphics | PIXI.Sprite;
+        mask: PIXI.Graphics | PIXI.Sprite | null;
         filters: Array<Filter<any>> | null;
 
         updateTransform(): void;
@@ -509,8 +509,8 @@ declare namespace PIXI {
         updateLocalBounds(): void;
         drawShape(shape: Circle | Rectangle | Ellipse | Polygon | RoundedRectangle | any): GraphicsData;
         generateCanvasTexture(scaleMode?: number, resolution?: number): Texture;
-        protected closePath(): Graphics;
-        protected addHole(): Graphics;
+        closePath(): Graphics;
+        addHole(): Graphics;
         destroy(options?: DestroyOptions | boolean): void;
     }
     class CanvasGraphicsRenderer {
diff --git a/types/pkg-dir/tsconfig.json b/types/pkg-dir/tsconfig.json
index 2701860736..a5647ed0eb 100644
--- a/types/pkg-dir/tsconfig.json
+++ b/types/pkg-dir/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "pkg-dir-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/playcanvas/engine/asset/asset-registry.d.ts b/types/playcanvas/engine/asset/asset-registry.d.ts
index 7e03744ef2..47dede11a3 100644
--- a/types/playcanvas/engine/asset/asset-registry.d.ts
+++ b/types/playcanvas/engine/asset/asset-registry.d.ts
@@ -11,6 +11,8 @@ declare namespace pc {
     class AssetRegistry {
         constructor(loader: pc.ResourceLoader)
 
+        prefix: string;
+
         /**
         * @function
         * @name pc.AssetRegistry#list
@@ -164,4 +166,4 @@ declare namespace pc {
         */
         find(name: string, type?: string): pc.Asset;
     }
-}
\ No newline at end of file
+}
diff --git a/types/playcanvas/engine/framework/application.d.ts b/types/playcanvas/engine/framework/application.d.ts
index ae52a6cea3..404ce2e71f 100644
--- a/types/playcanvas/engine/framework/application.d.ts
+++ b/types/playcanvas/engine/framework/application.d.ts
@@ -206,6 +206,25 @@ declare namespace pc {
         */
         loadSceneSettings(url: string, callback: (...args: any[]) => {}): void;
 
+        /**
+        * @function
+        * @name pc.Application#loadScene
+        * @description Load a scene file.
+        * @param {String} url The URL of the scene file. Usually this will be "scene_id.json"
+        * @param {Function} callback The function to call after loading, passed (err, entity) where err is null if no errors occurred.
+        * @example
+        *
+        * app.loadScene("1000.json", function (err, entity) {
+        *     if (!err) {
+        *       var e = app.root.find("My New Entity");
+        *     } else {
+        *       // error
+        *     }
+        *   }
+        * });
+        */
+       loadScene(url: string, callback: (...args: any[]) => {}): void;
+
         /**
          * @function
          * @name pc.Application#start
diff --git a/types/playcanvas/tsconfig.json b/types/playcanvas/tsconfig.json
index a2a2c895a0..ef89113006 100644
--- a/types/playcanvas/tsconfig.json
+++ b/types/playcanvas/tsconfig.json
@@ -21,4 +21,4 @@
         "index.d.ts",
         "playcanvas-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/plotly.js/index.d.ts b/types/plotly.js/index.d.ts
index 81286fe0a4..6e7c9a67bc 100644
--- a/types/plotly.js/index.d.ts
+++ b/types/plotly.js/index.d.ts
@@ -4,6 +4,7 @@
 // 				Martin Duparc <https://github.com/martinduparc>
 // 				Frederik Aalund <https://github.com/frederikaalund>
 // 				taoqf <https://github.com/taoqf>
+// 				Dadstart <https://github.com/Dadstart>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -22,40 +23,54 @@ export interface Point {
 	z: number;
 }
 
+export interface PlotScatterDataPoint {
+	pointNumber: number;
+	curveNumber: number;
+	data: ScatterData;
+}
+
+export interface PlotMouseEvent {
+	points: PlotScatterDataPoint[];
+	event: MouseEvent;
+}
+
+export interface PlotCoordinate {
+	x: number;
+	y: number;
+	pointNumber: number;
+}
+
+export interface PlotSelectionEvent {
+	points: PlotCoordinate[];
+}
+
+export type PlotRestyleEvent = [
+	any,  // update object -- attribute updated: new value
+	number[]       // array of traces updated
+];
+
+export interface PlotAxis {
+	range: [number, number];
+	autorange: boolean;
+}
+
+export interface PlotScene {
+	center: Point;
+	eye: Point;
+	up: Point;
+}
+
+export interface PlotRelayoutEvent {
+	xaxis: PlotAxis;
+	yaxis: PlotAxis;
+	scene: PlotScene;
+}
+
 export interface PlotlyHTMLElement extends HTMLElement {
-	on(event: 'plotly_click' | 'plotly_hover' | 'plotly_unhover', callback: (data: {
-		points: Array<{
-			pointNumber: number;
-			curveNumber: number;
-			data: ScatterData;
-		}>;
-	}) => void): void;
-	on(event: 'plotly_selecting' | 'plotly_selected', callback: (data: {
-		points: Array<{
-			x: number;
-			y: number;
-			pointNumber: number;
-		}>;
-	}) => void): void;
-	on(event: 'plotly_restyle', callback: (data: [
-		any,  // update object -- attribute updated: new value
-		number[]       // array of traces updated
-	]) => void): void;
-	on(event: 'plotly_relayout', callback: (data: {
-		xaxis: {
-			range: [number, number];
-			autorange: boolean;
-		};
-		yaxis: {
-			range: [number, number];
-			autorange: boolean;
-		};
-		scene: {
-			center: Point;
-			eye: Point;
-			up: Point;
-		};
-	}) => void): void;
+	on(event: 'plotly_click' | 'plotly_hover' | 'plotly_unhover', callback: (event: PlotMouseEvent) => void): void;
+	on(event: 'plotly_selecting' | 'plotly_selected', callback: (event: PlotSelectionEvent) => void): void;
+	on(event: 'plotly_restyle', callback: (data: PlotRestyleEvent) => void): void;
+	on(event: 'plotly_relayout', callback: (event: PlotRelayoutEvent) => void): void;
 	// on(event: 'plotly_event', callback: (data: any) => void): void;
 	on(event: 'plotly_afterplot' | 'plotly_autosize' | 'plotly_deselect' | 'plotly_doubleclick' | 'plotly_redraw' | 'plotly_animated', callback: () => void): void;
 }
diff --git a/types/plugin-error/tsconfig.json b/types/plugin-error/tsconfig.json
index ee9cd8e61f..9c57996e49 100644
--- a/types/plugin-error/tsconfig.json
+++ b/types/plugin-error/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "plugin-error-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/pouch-redux-middleware/pouch-redux-middleware-tests.ts b/types/pouch-redux-middleware/pouch-redux-middleware-tests.ts
index bacd6c4b7a..a966a3edb8 100644
--- a/types/pouch-redux-middleware/pouch-redux-middleware-tests.ts
+++ b/types/pouch-redux-middleware/pouch-redux-middleware-tests.ts
@@ -1,6 +1,6 @@
 import * as redux from 'redux';
 import makePouchMiddleware, { Document, Path } from 'pouch-redux-middleware';
-import * as PouchDB from 'pouchdb';
+import PouchDB = require('pouchdb');
 
 const types = {
     DELETE_TODO: 'delete-todo',
diff --git a/types/pouchdb-core/pouchdb-core-tests.ts b/types/pouchdb-core/pouchdb-core-tests.ts
index d050b4c6a6..79a151aa3a 100644
--- a/types/pouchdb-core/pouchdb-core-tests.ts
+++ b/types/pouchdb-core/pouchdb-core-tests.ts
@@ -1,4 +1,4 @@
-import * as PouchDB from 'pouchdb-core';
+import PouchDB = require('pouchdb-core');
 
 function isString(someString: string) {
 }
diff --git a/types/pouchdb/pouchdb-tests.ts b/types/pouchdb/pouchdb-tests.ts
index c4b3d6870b..e5b9c356d4 100644
--- a/types/pouchdb/pouchdb-tests.ts
+++ b/types/pouchdb/pouchdb-tests.ts
@@ -1,4 +1,4 @@
-import * as PouchDB from 'pouchdb';
+import PouchDB = require('pouchdb');
 
 function isString(someString: string) {
 }
diff --git a/types/priorityqueuejs/priorityqueuejs-tests.ts b/types/priorityqueuejs/priorityqueuejs-tests.ts
index 15e9211ea8..711e1faedf 100644
--- a/types/priorityqueuejs/priorityqueuejs-tests.ts
+++ b/types/priorityqueuejs/priorityqueuejs-tests.ts
@@ -1,4 +1,4 @@
-import * as PriorityQueue from 'priorityqueuejs';
+import PriorityQueue = require('priorityqueuejs');
 
 var queue = new PriorityQueue<{ cash: number, name: string }>(function(a, b) {
   return a.cash - b.cash;
diff --git a/types/proj4/proj4-tests.ts b/types/proj4/proj4-tests.ts
index c5d549efe7..3d1ab1ab9b 100644
--- a/types/proj4/proj4-tests.ts
+++ b/types/proj4/proj4-tests.ts
@@ -1,4 +1,4 @@
-import * as proj4 from 'proj4';
+import proj4 = require('proj4');
 
 ///////////////////////////////////////////
 // Tests data initialisation
diff --git a/types/promise-queue/promise-queue-tests.ts b/types/promise-queue/promise-queue-tests.ts
index fb3764c98f..b221fddc38 100644
--- a/types/promise-queue/promise-queue-tests.ts
+++ b/types/promise-queue/promise-queue-tests.ts
@@ -1,4 +1,4 @@
-import * as PromiseQueue from 'promise-queue';
+import PromiseQueue = require('promise-queue');
 
 PromiseQueue.configure(Promise);
 
diff --git a/types/promise-queue/tsconfig.json b/types/promise-queue/tsconfig.json
index 3487f5aa3e..e1f2e1fada 100644
--- a/types/promise-queue/tsconfig.json
+++ b/types/promise-queue/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "promise-queue-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/promise-retry/tsconfig.json b/types/promise-retry/tsconfig.json
index cd598fc1f4..660e112726 100644
--- a/types/promise-retry/tsconfig.json
+++ b/types/promise-retry/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "promise-retry-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/promisify-supertest/promisify-supertest-tests.ts b/types/promisify-supertest/promisify-supertest-tests.ts
index 7fa6de147d..84f4205534 100644
--- a/types/promisify-supertest/promisify-supertest-tests.ts
+++ b/types/promisify-supertest/promisify-supertest-tests.ts
@@ -1,6 +1,5 @@
-
-import * as request from 'promisify-supertest';
-import * as express from 'express';
+import request = require('promisify-supertest');
+import express = require('express');
 
 let app = express();
 
diff --git a/types/prompt-sync-history/prompt-sync-history-tests.ts b/types/prompt-sync-history/prompt-sync-history-tests.ts
index 40b00f2270..427d42a465 100644
--- a/types/prompt-sync-history/prompt-sync-history-tests.ts
+++ b/types/prompt-sync-history/prompt-sync-history-tests.ts
@@ -1,4 +1,4 @@
-import * as promptHistory from 'prompt-sync-history';
+import promptHistory = require('prompt-sync-history');
 import * as PromptSync from 'prompt-sync';
 
 let history:PromptSync.History;
diff --git a/types/prompt-sync/prompt-sync-tests.ts b/types/prompt-sync/prompt-sync-tests.ts
index 2c803e0a49..0d1f4f18ed 100644
--- a/types/prompt-sync/prompt-sync-tests.ts
+++ b/types/prompt-sync/prompt-sync-tests.ts
@@ -1,4 +1,4 @@
-import * as promptSync from 'prompt-sync';
+import promptSync = require('prompt-sync');
 
 declare const history: promptSync.History;
 
diff --git a/types/provinces/tsconfig.json b/types/provinces/tsconfig.json
index d08b599b71..20f56bbafd 100644
--- a/types/provinces/tsconfig.json
+++ b/types/provinces/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "provinces-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/pubnub/pubnub-tests.ts b/types/pubnub/pubnub-tests.ts
index 63bd206cde..1d8b2bb1ca 100644
--- a/types/pubnub/pubnub-tests.ts
+++ b/types/pubnub/pubnub-tests.ts
@@ -1,4 +1,4 @@
-import * as Pubnub from 'pubnub';
+import Pubnub = require('pubnub');
 
 const console = {
   log: (params: any) => {}
diff --git a/types/pubnub/tsconfig.json b/types/pubnub/tsconfig.json
index fab1a92335..17bf98f558 100644
--- a/types/pubnub/tsconfig.json
+++ b/types/pubnub/tsconfig.json
@@ -1,23 +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",
-    "pubnub-tests.ts"
-  ]
-}
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "pubnub-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/pulltorefreshjs/index.d.ts b/types/pulltorefreshjs/index.d.ts
index 2eab5b6741..b28d840d7b 100644
--- a/types/pulltorefreshjs/index.d.ts
+++ b/types/pulltorefreshjs/index.d.ts
@@ -1,10 +1,15 @@
 // Type definitions for pulltorefreshjs 0.1
 // Project: https://github.com/BoxFactura/pulltorefresh.js
 // Definitions by: Daniel Rosenwasser <https://github.com/DanielRosenwasser>
+//                 Tamas Kinsztler <https://github.com/humpedli>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 export function init(options?: Options): void;
 
+export function destroyAll(): void;
+
+export function setPassiveMode(isPassive: boolean): void;
+
 export interface Options {
     /**
      * Minimum distance required to trigger the refresh.
@@ -108,6 +113,21 @@ export interface Options {
      * Defaults to `t => Math.min(1, t / 2.5)`
      */
     resistanceFunction?(input: number): number;
+
+    /**
+     * Which condition should be met for pullToRefresh to trigger?
+     *
+     * Defaults to `!window.scrollY`
+     */
+    shouldPullToRefresh?(): boolean;
+
+    /**
+     * This value will be passed as `{ passive: true|false }` to `touchmove`
+     * listeners if passive-handlers are supported.
+     *
+     * Defaults to `false`
+     */
+    passive?: boolean;
 }
 
 /**
diff --git a/types/pulltorefreshjs/pulltorefreshjs-tests.ts b/types/pulltorefreshjs/pulltorefreshjs-tests.ts
index 47ca43a2e9..aa95cc3380 100644
--- a/types/pulltorefreshjs/pulltorefreshjs-tests.ts
+++ b/types/pulltorefreshjs/pulltorefreshjs-tests.ts
@@ -17,3 +17,9 @@ PullToRefresh.init({
   mainElement: "body",
   onRefresh: () => Promise.resolve(),
 });
+
+PullToRefresh.destroyAll();
+
+PullToRefresh.setPassiveMode(true);
+
+PullToRefresh.setPassiveMode(false);
diff --git a/types/pump/pump-tests.ts b/types/pump/pump-tests.ts
index 0c8e91b2c0..cf3393de21 100644
--- a/types/pump/pump-tests.ts
+++ b/types/pump/pump-tests.ts
@@ -1,4 +1,4 @@
-import * as pump from 'pump';
+import pump = require('pump');
 import { createReadStream, createWriteStream } from 'fs';
 import { Transform } from 'stream';
 
diff --git a/types/pupa/tsconfig.json b/types/pupa/tsconfig.json
index 3800bab180..9f7e0652f6 100644
--- a/types/pupa/tsconfig.json
+++ b/types/pupa/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "pupa-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/puppeteer/v0/tsconfig.json b/types/puppeteer/v0/tsconfig.json
index 314d615a7e..ac0a6aa9bb 100644
--- a/types/puppeteer/v0/tsconfig.json
+++ b/types/puppeteer/v0/tsconfig.json
@@ -16,12 +16,12 @@
             "../../"
         ],
         "paths": {
-          "puppeteer": [
-              "puppeteer/v0"
-          ],
-          "puppeteer/*": [
-              "puppeteer/v0/*"
-          ]
+            "puppeteer": [
+                "puppeteer/v0"
+            ],
+            "puppeteer/*": [
+                "puppeteer/v0/*"
+            ]
         },
         "types": [],
         "noEmit": true,
@@ -31,4 +31,4 @@
         "index.d.ts",
         "puppeteer-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/pure-render-decorator/pure-render-decorator-tests.ts b/types/pure-render-decorator/pure-render-decorator-tests.ts
index 4598d60b41..66f95f15f6 100644
--- a/types/pure-render-decorator/pure-render-decorator-tests.ts
+++ b/types/pure-render-decorator/pure-render-decorator-tests.ts
@@ -1,4 +1,4 @@
-import * as PureRender from 'pure-render-decorator';
+import PureRender = require('pure-render-decorator');
 
 @PureRender
 class TestClass {}
diff --git a/types/qrcode.react/index.d.ts b/types/qrcode.react/index.d.ts
index 7771e04293..f730ee7581 100644
--- a/types/qrcode.react/index.d.ts
+++ b/types/qrcode.react/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/zpao/qrcode.react
 // Definitions by: Mleko <https://github.com/mleko>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 /// <reference types="react" />
 
diff --git a/types/qrcode.react/qrcode.react-tests.tsx b/types/qrcode.react/qrcode.react-tests.tsx
index ffae551b01..25136d1a97 100644
--- a/types/qrcode.react/qrcode.react-tests.tsx
+++ b/types/qrcode.react/qrcode.react-tests.tsx
@@ -1,4 +1,4 @@
-import * as QRCode from "qrcode.react";
+import QRCode = require("qrcode.react");
 import * as React from "react";
 
 const qrcodes = [
diff --git a/types/query-string/index.d.ts b/types/query-string/index.d.ts
index e7f51453eb..db823e67d2 100644
--- a/types/query-string/index.d.ts
+++ b/types/query-string/index.d.ts
@@ -1,8 +1,9 @@
-// Type definitions for query-string 5.0
+// Type definitions for query-string 5.1
 // Project: https://github.com/sindresorhus/query-string
 // Definitions by: Sam Verschueren <https://github.com/SamVerschueren>
 //                 Tanguy Krotoff <https://github.com/tkrotoff>
 //                 HuHuanming <https://github.com/huhuanming>
+//                 Madara Uchiha <https://github.com/MadaraUchiha>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
@@ -16,6 +17,8 @@ export interface ParseOptions {
  */
 export function parse(str: string, options?: ParseOptions): any;
 
+export function parseUrl(str: string, options?: ParseOptions): {url: string, query: any};
+
 export interface StringifyOptions {
     strict?: boolean;
     encode?: boolean;
diff --git a/types/quill/index.d.ts b/types/quill/index.d.ts
index a996babf30..6cc5c824c5 100644
--- a/types/quill/index.d.ts
+++ b/types/quill/index.d.ts
@@ -84,9 +84,9 @@ export interface DeltaStatic {
     concat(other: DeltaStatic): DeltaStatic;
     diff(other: DeltaStatic, index?: number): DeltaStatic;
     eachLine(predicate: (line: DeltaStatic, attributes: StringMap, idx: number) => any, newline?: string): DeltaStatic;
-    transform(index: number): number;
+    transform(index: number, priority?: boolean): number;
     transform(other: DeltaStatic, priority: boolean): DeltaStatic;
-    transformPosition(index: number): number;
+    transformPosition(index: number, priority?: boolean): number;
 }
 
 export class Delta implements DeltaStatic {
diff --git a/types/quill/quill-tests.ts b/types/quill/quill-tests.ts
index f907092ed1..bda294251d 100644
--- a/types/quill/quill-tests.ts
+++ b/types/quill/quill-tests.ts
@@ -310,10 +310,14 @@ function test_DeltaTransform() {
     const d1: DeltaStatic = a.transform(b, true);  // new Delta().retain(1).insert('b').retain(5).insert('c');
     const d2: DeltaStatic = a.transform(b, false); // new Delta().insert('b').retain(6).insert('c');
     const n1: number = a.transform(5);
+    const n2: number = a.transform(5, true);
+    const n3: number = a.transform(5, false);
 }
 
 function test_DeltatransformPosition() {
     const delta = new Delta().retain(5).insert('a');
     const n1: number = delta.transformPosition(4); // 4
     const n2: number = delta.transformPosition(5); // 6
+    const n3: number = delta.transformPosition(5, true);
+    const n4: number = delta.transformPosition(5, false);
 }
diff --git a/types/radium/index.d.ts b/types/radium/index.d.ts
index 7dd1387d77..d861783e92 100644
--- a/types/radium/index.d.ts
+++ b/types/radium/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/formidablelabs/radium
 // Definitions by: Alex Gorbatchev <https://github.com/alexgorbatchev>, Philipp Holzer <https://github.com/nupplaphil>, Alexey Svetliakov <https://github.com/asvetliakov>, Mikael Hermansson <https://github.com/mihe>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from 'react';
 
diff --git a/types/radium/radium-tests.tsx b/types/radium/radium-tests.tsx
index 0b1b1408c2..6b7aaa1a46 100644
--- a/types/radium/radium-tests.tsx
+++ b/types/radium/radium-tests.tsx
@@ -1,6 +1,6 @@
 import * as React from "react";
 import { StyleRoot, Style } from "radium";
-import * as Radium from 'radium';
+import Radium = require('radium');
 
 @Radium
 class TestComponent extends React.Component<{ a: number }> {
diff --git a/types/ramda/index.d.ts b/types/ramda/index.d.ts
index 4ee63e0975..108a12bf0e 100644
--- a/types/ramda/index.d.ts
+++ b/types/ramda/index.d.ts
@@ -201,8 +201,8 @@ declare namespace R {
          * A function that returns the first argument if it's falsy otherwise the second argument. Note that this is
          * NOT short-circuited, meaning that if expressions are passed they are both evaluated.
          */
-        and<T extends { and?: ((...a: any[]) => any); } | number | boolean | string>(fn1: T, val2: any): boolean;
-        and<T extends { and?: ((...a: any[]) => any); } | number | boolean | string>(fn1: T): (val2: any) => boolean;
+        and<T extends { and?: ((...a: any[]) => any); } | number | boolean | string | null>(fn1: T, val2: any): boolean;
+        and<T extends { and?: ((...a: any[]) => any); } | number | boolean | string | null>(fn1: T): (val2: any) => boolean;
 
         /**
          * Returns true if at least one of elements of the list match the predicate, false otherwise.
@@ -474,8 +474,8 @@ declare namespace R {
          * Returns the second argument if it is not null or undefined. If it is null or undefined, the
          * first (default) argument is returned.
          */
-        defaultTo<T, U>(a: T, b: U): T | U;
-        defaultTo<T>(a: T): <U>(b: U) => T | U;
+        defaultTo<T, U>(a: T, b: U | null | undefined): T | U;
+        defaultTo<T>(a: T): <U>(b: U | null | undefined) => T | U;
 
         /**
          * Makes a descending comparator function out of a function that returns a value that can be compared with < and >.
diff --git a/types/ramda/ramda-tests.ts b/types/ramda/ramda-tests.ts
index e6433df004..eacb4558e3 100644
--- a/types/ramda/ramda-tests.ts
+++ b/types/ramda/ramda-tests.ts
@@ -415,7 +415,7 @@ R.times(i, 5);
  */
 () => {
     function mergeThree(a: number, b: number, c: number): number[] {
-        return ([]).concat(a, b, c);
+        return (new Array<number>()).concat(a, b, c);
     }
 
     mergeThree(1, 2, 3); // => [1, 2, 3]
@@ -2249,6 +2249,12 @@ class Rectangle {
     defaultTo42(null);  // => 42
     defaultTo42(undefined);  // => 42
     defaultTo42("Ramda");  // => 'Ramda'
+
+    const valueOrUndefined = 2 as number | undefined;
+    defaultTo42(valueOrUndefined) - 2; // => 0
+
+    const valueOrNull = 2 as number | null;
+    defaultTo42(valueOrNull) - 2; // => 0
 };
 
 () => {
@@ -2314,7 +2320,7 @@ class Why {
     const x0: boolean        = R.or(false, true); // => false
     const x1: number | any[] = R.or(0, []); // => []
     const x2: number | any[] = R.or(0)([]); // => []
-    const x3: string         = R.or(null, ""); // => ''
+    const x3: string | null  = R.or(null, ""); // => ''
 
     const why = new Why(true);
     why.or(true);
diff --git a/types/ramda/tsconfig.json b/types/ramda/tsconfig.json
index d29b3d9783..4de4f10d8f 100644
--- a/types/ramda/tsconfig.json
+++ b/types/ramda/tsconfig.json
@@ -7,7 +7,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": false,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "strictFunctionTypes": false,
         "baseUrl": "../",
         "typeRoots": [
diff --git a/types/range-parser/range-parser-tests.ts b/types/range-parser/range-parser-tests.ts
index 68581e82cb..ec1ffa6e4e 100644
--- a/types/range-parser/range-parser-tests.ts
+++ b/types/range-parser/range-parser-tests.ts
@@ -1,4 +1,4 @@
-import * as RangeParser from 'range-parser';
+import RangeParser = require('range-parser');
 
 declare var console: { assert(b: boolean): void };
 
diff --git a/types/ratelimiter/ratelimiter-tests.ts b/types/ratelimiter/ratelimiter-tests.ts
index 4face1baa9..f529ec2faf 100644
--- a/types/ratelimiter/ratelimiter-tests.ts
+++ b/types/ratelimiter/ratelimiter-tests.ts
@@ -1,6 +1,5 @@
-
 import * as redis from 'redis';
-import * as Limiter from 'ratelimiter';
+import Limiter = require('ratelimiter');
 
 declare let id: string;
 declare let db: redis.RedisClient;
diff --git a/types/raven-for-redux/raven-for-redux-tests.ts b/types/raven-for-redux/raven-for-redux-tests.ts
index 957a2017c5..481fd5bd75 100644
--- a/types/raven-for-redux/raven-for-redux-tests.ts
+++ b/types/raven-for-redux/raven-for-redux-tests.ts
@@ -1,5 +1,5 @@
 import * as Raven from "raven-js";
-import * as createRavenMiddleware from "raven-for-redux";
+import createRavenMiddleware = require("raven-for-redux");
 import { applyMiddleware, createStore } from "redux";
 
 const middleware = createRavenMiddleware(Raven);
diff --git a/types/raven-for-redux/tsconfig.json b/types/raven-for-redux/tsconfig.json
index b9ef813901..acd330dac5 100644
--- a/types/raven-for-redux/tsconfig.json
+++ b/types/raven-for-redux/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "raven-for-redux-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/raven/index.d.ts b/types/raven/index.d.ts
index eec1b00f2c..21aee49169 100644
--- a/types/raven/index.d.ts
+++ b/types/raven/index.d.ts
@@ -10,6 +10,7 @@ import { IncomingMessage, ServerResponse } from 'http';
 import { EventEmitter } from 'events';
 
 export const version: string;
+export function config(options?: ConstructorOptions): Client;
 export function config(dsn?: string | false, options?: ConstructorOptions): Client;
 export function wrap<T>(func: () => T): () => T;
 export function wrap<T>(options: any, func: () => T): () => T;
diff --git a/types/raven/raven-tests.ts b/types/raven/raven-tests.ts
index 4d96e7eafa..71f9b54038 100644
--- a/types/raven/raven-tests.ts
+++ b/types/raven/raven-tests.ts
@@ -9,6 +9,10 @@ Raven.config(dsn, {
     autoBreadcrumbs: false,
 });
 console.log(Raven.version);
+
+Raven.config({
+    release: 'foobar'
+});
 Raven.config(dsn).install({ captureUnhandledRejections: true });
 client.setContext({});
 client.on('logged', () => { });
diff --git a/types/rbac-a/tsconfig.json b/types/rbac-a/tsconfig.json
index be60bf248e..911e4f77e6 100644
--- a/types/rbac-a/tsconfig.json
+++ b/types/rbac-a/tsconfig.json
@@ -23,4 +23,4 @@
         "lib/rbac.d.ts",
         "rbac-a-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/rbush/rbush-tests.ts b/types/rbush/rbush-tests.ts
index 4a2de0ef14..07061ff562 100644
--- a/types/rbush/rbush-tests.ts
+++ b/types/rbush/rbush-tests.ts
@@ -1,4 +1,4 @@
-import * as rbush from 'rbush';
+import rbush = require('rbush');
 
 interface IndexedRect extends rbush.BBox {
   index: number;
diff --git a/types/rc-select/index.d.ts b/types/rc-select/index.d.ts
index 18dfb46e67..5fdae43949 100644
--- a/types/rc-select/index.d.ts
+++ b/types/rc-select/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/react-component/select
 // Definitions by: Denis Tirilis <https://github.com/DenisTirilis>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 /// <reference types="react" />
 
diff --git a/types/rc-slider/index.d.ts b/types/rc-slider/index.d.ts
index f2010b3ec9..139f4e2ef0 100644
--- a/types/rc-slider/index.d.ts
+++ b/types/rc-slider/index.d.ts
@@ -5,7 +5,7 @@
 //                 Austin Turner <https://github.com/paustint>
 //                 Jacob Froman <https://github.com/j-fro>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from "react";
 
diff --git a/types/rc-tooltip/index.d.ts b/types/rc-tooltip/index.d.ts
index be0246fc13..9222d9f149 100644
--- a/types/rc-tooltip/index.d.ts
+++ b/types/rc-tooltip/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: rhysd <https://rhysd.github.io>
 //                 ahstro <http://ahst.ro>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from 'react';
 
diff --git a/types/rc-tree/index.d.ts b/types/rc-tree/index.d.ts
index 4dc789824d..7cee0d8371 100644
--- a/types/rc-tree/index.d.ts
+++ b/types/rc-tree/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/react-component/tree
 // Definitions by: John Reilly <https://github.com/johnnyreilly>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import {
     Component,
diff --git a/types/rdf-data-model/tsconfig.json b/types/rdf-data-model/tsconfig.json
index e1099949e0..be6946484f 100644
--- a/types/rdf-data-model/tsconfig.json
+++ b/types/rdf-data-model/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "rdf-data-model-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/rdf-js/tsconfig.json b/types/rdf-js/tsconfig.json
index b9c788b408..d010928403 100644
--- a/types/rdf-js/tsconfig.json
+++ b/types/rdf-js/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "rdf-js-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/react-addons-create-fragment/index.d.ts b/types/react-addons-create-fragment/index.d.ts
index 6c998ebc12..1e46046ec4 100644
--- a/types/react-addons-create-fragment/index.d.ts
+++ b/types/react-addons-create-fragment/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://facebook.github.io/react/
 // Definitions by: Asana <https://asana.com>, AssureSign <http://www.assuresign.com>, Microsoft <https://microsoft.com>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from 'react';
 
diff --git a/types/react-addons-css-transition-group/index.d.ts b/types/react-addons-css-transition-group/index.d.ts
index f4857926bd..33d43b4cd1 100644
--- a/types/react-addons-css-transition-group/index.d.ts
+++ b/types/react-addons-css-transition-group/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://facebook.github.io/react/
 // Definitions by: Asana <https://asana.com>, AssureSign <http://www.assuresign.com>, Microsoft <https://microsoft.com>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import 'react-addons-transition-group';
 import { ComponentClass, CSSTransitionGroupProps } from 'react';
diff --git a/types/react-addons-linked-state-mixin/index.d.ts b/types/react-addons-linked-state-mixin/index.d.ts
index 50e4b3ec5a..6358dde535 100644
--- a/types/react-addons-linked-state-mixin/index.d.ts
+++ b/types/react-addons-linked-state-mixin/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://facebook.github.io/react/
 // Definitions by: Asana <https://asana.com>, AssureSign <http://www.assuresign.com>, Microsoft <https://microsoft.com>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import { Mixin } from 'react';
 
diff --git a/types/react-addons-pure-render-mixin/index.d.ts b/types/react-addons-pure-render-mixin/index.d.ts
index 3ffff6f17f..565a108721 100644
--- a/types/react-addons-pure-render-mixin/index.d.ts
+++ b/types/react-addons-pure-render-mixin/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://facebook.github.io/react/
 // Definitions by: Asana <https://asana.com>, AssureSign <http://www.assuresign.com>, Microsoft <https://microsoft.com>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import { Mixin } from 'react';
 
diff --git a/types/react-addons-shallow-compare/index.d.ts b/types/react-addons-shallow-compare/index.d.ts
index d640b68ac5..ff4e5dbdc9 100644
--- a/types/react-addons-shallow-compare/index.d.ts
+++ b/types/react-addons-shallow-compare/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://facebook.github.io/react/
 // Definitions by: Asana <https://asana.com>, AssureSign <http://www.assuresign.com>, Microsoft <https://microsoft.com>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import { Component } from 'react';
 
diff --git a/types/react-addons-shallow-compare/react-addons-shallow-compare-tests.tsx b/types/react-addons-shallow-compare/react-addons-shallow-compare-tests.tsx
index c1c5d902cc..cd1a96a70e 100644
--- a/types/react-addons-shallow-compare/react-addons-shallow-compare-tests.tsx
+++ b/types/react-addons-shallow-compare/react-addons-shallow-compare-tests.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import * as shallowCompare from 'react-addons-shallow-compare';
+import shallowCompare = require('react-addons-shallow-compare');
 
 export class MyComponent extends React.Component {
     shouldComponentUpdate(nextProps: any, nextState: any, nextContext: any): boolean {
diff --git a/types/react-addons-test-utils/index.d.ts b/types/react-addons-test-utils/index.d.ts
index b65262753a..9282f95f4e 100644
--- a/types/react-addons-test-utils/index.d.ts
+++ b/types/react-addons-test-utils/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://facebook.github.io/react/
 // Definitions by: Asana <https://asana.com>, AssureSign <http://www.assuresign.com>, Microsoft <https://microsoft.com>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import { AbstractView, Component, ComponentClass,
     ReactElement, ReactInstance, ClassType,
diff --git a/types/react-addons-transition-group/index.d.ts b/types/react-addons-transition-group/index.d.ts
index c3149f87e3..933533df28 100644
--- a/types/react-addons-transition-group/index.d.ts
+++ b/types/react-addons-transition-group/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://facebook.github.io/react/
 // Definitions by: Asana <https://asana.com>, AssureSign <http://www.assuresign.com>, Microsoft <https://microsoft.com>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import { ComponentClass, TransitionGroupProps } from 'react';
 
diff --git a/types/react-addons-update/index.d.ts b/types/react-addons-update/index.d.ts
index 3b9285a704..874549b7a1 100644
--- a/types/react-addons-update/index.d.ts
+++ b/types/react-addons-update/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://facebook.github.io/react/
 // Definitions by: Asana <https://asana.com>, AssureSign <http://www.assuresign.com>, Microsoft <https://microsoft.com>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from 'react';
 
diff --git a/types/react-alert/index.d.ts b/types/react-alert/index.d.ts
index d402d24ad2..9150bf28b4 100644
--- a/types/react-alert/index.d.ts
+++ b/types/react-alert/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/schiehll/react-alert
 // Definitions by: Steve Syrell <https://github.com/ssyrell>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from "react";
 
diff --git a/types/react-alert/tsconfig.json b/types/react-alert/tsconfig.json
index 9332254f22..755c2cd68b 100644
--- a/types/react-alert/tsconfig.json
+++ b/types/react-alert/tsconfig.json
@@ -21,4 +21,4 @@
         "index.d.ts",
         "react-alert-tests.tsx"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/react-alice-carousel/index.d.ts b/types/react-alice-carousel/index.d.ts
index 47d4fd95de..2d40293003 100644
--- a/types/react-alice-carousel/index.d.ts
+++ b/types/react-alice-carousel/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/maxmarinich/react-alice-carousel
 // Definitions by: endigo <https://github.com/endigo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from "react";
 
diff --git a/types/react-alice-carousel/tsconfig.json b/types/react-alice-carousel/tsconfig.json
index 4245303823..22f3238121 100644
--- a/types/react-alice-carousel/tsconfig.json
+++ b/types/react-alice-carousel/tsconfig.json
@@ -1,24 +1,24 @@
 {
-	"compilerOptions": {
-			"module": "commonjs",
-			"lib": [
-					"es6"
-			],
-			"noImplicitAny": true,
-			"noImplicitThis": true,
-			"strictNullChecks": true,
-			"strictFunctionTypes": true,
-			"baseUrl": "../",
-			"typeRoots": [
-					"../"
-			],
-			"types": [],
-			"noEmit": true,
-			"forceConsistentCasingInFileNames": true,
-			"jsx": "react"
-	},
-	"files": [
-			"index.d.ts",
-			"react-alice-carousel-tests.tsx"
-	]
-}
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "jsx": "react"
+    },
+    "files": [
+        "index.d.ts",
+        "react-alice-carousel-tests.tsx"
+    ]
+}
\ No newline at end of file
diff --git a/types/react-app/index.d.ts b/types/react-app/index.d.ts
index a126c914e2..7c5e00f57a 100644
--- a/types/react-app/index.d.ts
+++ b/types/react-app/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/kriasoft/react-app#readme
 // Definitions by: Prakarsh Pandey <https://github.com/prakarshpandey>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from 'react';
 
diff --git a/types/react-aria-menubutton/index.d.ts b/types/react-aria-menubutton/index.d.ts
index cba4c81540..52a77e7435 100644
--- a/types/react-aria-menubutton/index.d.ts
+++ b/types/react-aria-menubutton/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Muhammad Fawwaz Orabi <https://github.com/forabi>
 //                 Chris Rohlfs <https://github.com/crohlfs>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from "react";
 
diff --git a/types/react-autosuggest/index.d.ts b/types/react-autosuggest/index.d.ts
index 444753bd54..b78ee34ab8 100644
--- a/types/react-autosuggest/index.d.ts
+++ b/types/react-autosuggest/index.d.ts
@@ -7,7 +7,7 @@
 //                 Christopher Deutsch <https://github.com/cdeutsch>
 //                 Kevin Ross <https://github.com/rosskevin>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from 'react';
 
diff --git a/types/react-autosuggest/react-autosuggest-tests.tsx b/types/react-autosuggest/react-autosuggest-tests.tsx
index 3747e8457b..7fea579987 100644
--- a/types/react-autosuggest/react-autosuggest-tests.tsx
+++ b/types/react-autosuggest/react-autosuggest-tests.tsx
@@ -1,7 +1,7 @@
 // region Imports
 import * as React from 'react';
 import * as ReactDOM from 'react-dom';
-import * as Autosuggest from 'react-autosuggest';
+import Autosuggest = require('react-autosuggest');
 // endregion
 
 interface Language {
diff --git a/types/react-autosuggest/tsconfig.json b/types/react-autosuggest/tsconfig.json
index fc78293096..b85bc369dc 100644
--- a/types/react-autosuggest/tsconfig.json
+++ b/types/react-autosuggest/tsconfig.json
@@ -22,4 +22,4 @@
         "index.d.ts",
         "react-autosuggest-tests.tsx"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/react-beautiful-dnd/index.d.ts b/types/react-beautiful-dnd/index.d.ts
index 40f1377042..b405c481c4 100644
--- a/types/react-beautiful-dnd/index.d.ts
+++ b/types/react-beautiful-dnd/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: varHarrie <https://github.com/varHarrie>
 //                 Bradley Ayers <https://github.com/bradleyayers>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.4
+// TypeScript Version: 2.6
 
 import * as React from 'react';
 
diff --git a/types/react-big-calendar/index.d.ts b/types/react-big-calendar/index.d.ts
index 15b7ec2706..bcaee40549 100644
--- a/types/react-big-calendar/index.d.ts
+++ b/types/react-big-calendar/index.d.ts
@@ -1,193 +1,193 @@
-// Type definitions for react-big-calendar 0.17.0
+// Type definitions for react-big-calendar 0.18
 // Project: https://github.com/intljusticemission/react-big-calendar
-// Definitions by: Piotr Witek <http://piotrwitek.github.io>
+// Definitions by: Piotr Witek <https://github.com/piotrwitek>
 //                 Austin Turner <https://github.com/paustint>
+//                 Krzysztof Bezrąk <https://github.com/pikpok>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
-declare module 'react-big-calendar' {
-    import * as React from 'react';
+import * as React from 'react';
 
-    export type stringOrDate = string | Date;
-    export type View = 'month' | 'week' | 'work_week' | 'day' | 'agenda';
-    export type Navigate = 'PREV' | 'NEXT' | 'TODAY' | 'DATE';
-    export interface Format {
-      /**
-       * Format for the day of the month heading in the Month view.
-       * e.g. "01", "02", "03", etc
-       */
-      dateFormat?: string,
+export type stringOrDate = string | Date;
+export type View = 'month' | 'week' | 'work_week' | 'day' | 'agenda';
+export type Navigate = 'PREV' | 'NEXT' | 'TODAY' | 'DATE';
+export interface Format {
+    /**
+     * Format for the day of the month heading in the Month view.
+     * e.g. "01", "02", "03", etc
+     */
+    dateFormat?: string;
 
-      /**
-       * A day of the week format for Week and Day headings,
-       * e.g. "Wed 01/04"
-       *
-       */
-      dayFormat?: string,
+    /**
+     * A day of the week format for Week and Day headings,
+     * e.g. "Wed 01/04"
+     *
+     */
+    dayFormat?: string;
 
-      /**
-       * Week day name format for the Month week day headings,
-       * e.g: "Sun", "Mon", "Tue", etc
-       *
-       */
-      weekdayFormat?: string,
+    /**
+     * Week day name format for the Month week day headings,
+     * e.g: "Sun", "Mon", "Tue", etc
+     *
+     */
+    weekdayFormat?: string;
 
-      /**
-       * The timestamp cell formats in Week and Time views, e.g. "4:00 AM"
-       */
-      timeGutterFormat?: string,
+    /**
+     * The timestamp cell formats in Week and Time views, e.g. "4:00 AM"
+     */
+    timeGutterFormat?: string;
 
-      /**
-       * Toolbar header format for the Month view, e.g "2015 April"
-       *
-       */
-      monthHeaderFormat?: string,
+    /**
+     * Toolbar header format for the Month view, e.g "2015 April"
+     *
+     */
+    monthHeaderFormat?: string;
 
-      /**
-       * Toolbar header format for the Week views, e.g. "Mar 29 - Apr 04"
-       */
-      dayRangeHeaderFormat?: string,
+    /**
+     * Toolbar header format for the Week views, e.g. "Mar 29 - Apr 04"
+     */
+    dayRangeHeaderFormat?: string;
 
-      /**
-       * Toolbar header format for the Day view, e.g. "Wednesday Apr 01"
-       */
-      dayHeaderFormat?: string,
+    /**
+     * Toolbar header format for the Day view, e.g. "Wednesday Apr 01"
+     */
+    dayHeaderFormat?: string;
 
-      /**
-       * Toolbar header format for the Agenda view, e.g. "4/1/2015 — 5/1/2015"
-       */
-      agendaHeaderFormat?: string,
+    /**
+     * Toolbar header format for the Agenda view, e.g. "4/1/2015 — 5/1/2015"
+     */
+    agendaHeaderFormat?: string;
 
-      /**
-       * A time range format for selecting time slots, e.g "8:00am — 2:00pm"
-       */
-      selectRangeFormat?: string,
+    /**
+     * A time range format for selecting time slots, e.g "8:00am — 2:00pm"
+     */
+    selectRangeFormat?: string;
 
-      agendaDateFormat?: string,
-      agendaTimeFormat?: string,
-      agendaTimeRangeFormat?: string,
+    agendaDateFormat?: string;
+    agendaTimeFormat?: string;
+    agendaTimeRangeFormat?: string;
 
-      /**
-       * Time range displayed on events.
-       */
-      eventTimeRangeFormat?: string,
+    /**
+     * Time range displayed on events.
+     */
+    eventTimeRangeFormat?: string;
 
-      /**
-       * An optional event time range for events that continue onto another day
-       */
-      eventTimeRangeStartFormat?: string,
+    /**
+     * An optional event time range for events that continue onto another day
+     */
+    eventTimeRangeStartFormat?: string;
 
-      /**
-       * An optional event time range for events that continue from another day
-       */
-      eventTimeRangeEndFormat?: string,
-    }
+    /**
+     * An optional event time range for events that continue from another day
+     */
+    eventTimeRangeEndFormat?: string;
+}
 
-    export interface Components {
-        event?: React.SFC | React.Component | React.ComponentClass | JSX.Element,
-        eventWrapper?: React.SFC | React.Component | React.ComponentClass | JSX.Element,
-        dayWrapper?: React.SFC | React.Component | React.ComponentClass | JSX.Element,
-        dateCellWrapper?: React.SFC | React.Component | React.ComponentClass | JSX.Element,
-        toolbar?: React.SFC | React.Component | React.ComponentClass | JSX.Element,
-        agenda?: {
-          date?: React.SFC | React.Component | React.ComponentClass | JSX.Element,
-          time?: React.SFC | React.Component | React.ComponentClass | JSX.Element,
-          event?: React.SFC | React.Component | React.ComponentClass | JSX.Element,
-        },
-        day?: {
-          header?: React.SFC | React.Component | React.ComponentClass | JSX.Element,
-          event?: React.SFC | React.Component | React.ComponentClass | JSX.Element,
-        },
-        week?: {
-          header?: React.SFC | React.Component | React.ComponentClass | JSX.Element,
-          event?: React.SFC | React.Component | React.ComponentClass | JSX.Element,
-        },
-        month?: {
-          header?: React.SFC | React.Component | React.ComponentClass | JSX.Element,
-          dateHeader?: React.SFC | React.Component | React.ComponentClass | JSX.Element,
-          event?: React.SFC | React.Component | React.ComponentClass | JSX.Element,
-        },
-    }
+export interface Components {
+    event?: React.SFC | React.Component | React.ComponentClass | JSX.Element;
+    eventWrapper?: React.SFC | React.Component | React.ComponentClass | JSX.Element;
+    dayWrapper?: React.SFC | React.Component | React.ComponentClass | JSX.Element;
+    dateCellWrapper?: React.SFC | React.Component | React.ComponentClass | JSX.Element;
+    toolbar?: React.SFC | React.Component | React.ComponentClass | JSX.Element;
+    agenda?: {
+        date?: React.SFC | React.Component | React.ComponentClass | JSX.Element;
+        time?: React.SFC | React.Component | React.ComponentClass | JSX.Element;
+        event?: React.SFC | React.Component | React.ComponentClass | JSX.Element;
+    };
+    day?: {
+        header?: React.SFC | React.Component | React.ComponentClass | JSX.Element;
+        event?: React.SFC | React.Component | React.ComponentClass | JSX.Element;
+    };
+    week?: {
+        header?: React.SFC | React.Component | React.ComponentClass | JSX.Element;
+        event?: React.SFC | React.Component | React.ComponentClass | JSX.Element;
+    };
+    month?: {
+        header?: React.SFC | React.Component | React.ComponentClass | JSX.Element;
+        dateHeader?: React.SFC | React.Component | React.ComponentClass | JSX.Element;
+        event?: React.SFC | React.Component | React.ComponentClass | JSX.Element;
+    };
+}
 
-    export interface Messages {
-        allDay?: string;
-        previous?: string;
-        next?: string;
-        today?: string;
-        month?: string;
-        week?: string;
-        day?: string;
-        agenda?: string;
-        date?: string;
-        time?: string;
-        event?: string;
-        showMore?: string;
-    }
+export interface Messages {
+    date?: string;
+    time?: string;
+    event?: string;
+    allDay?: string;
+    week?: string;
+    work_week?: string;
+    day?: string;
+    month?: string;
+    previous?: string;
+    next?: string;
+    yesterday?: string;
+    tomorrow?: string;
+    today?: string;
+    agenda?: string;
+    showMore?: (count: number) => string;
+}
 
-    interface BigCalendarProps extends React.Props<BigCalendar> {
-        date?: stringOrDate;
-        now?: Date;
-        view?: View;
-        events?: Object[];
-        onNavigate?: (action: Navigate, newDate: Date) => void;
-        onView?: (view: View) => void;
-        onDrillDown?: (date: Date, view: View) => void;
-        onSelectSlot?: (slotInfo: { start: stringOrDate, end: stringOrDate, slots: Date[] | string[], action: 'select' | 'click' | 'doubleClick' }) => void;
-        onDoubleClickEvent?: (event: Object, e: React.SyntheticEvent<HTMLElement>) => void;
-        onSelectEvent?: (event: Object, e: React.SyntheticEvent<HTMLElement>) => void;
-        onSelecting?: (range: { start: stringOrDate, end: stringOrDate }) => boolean | undefined | null;
-        selected?: any;
-        views?: View[] | {
-            month: boolean | React.SFC | React.Component,
-            week: boolean | React.SFC | React.Component,
-            myweek: boolean | React.SFC | React.Component,
-        };
-        drilldownView?: View | null;
-        getDrilldownView?: ((targetDate: Date, currentViewName: View, configuredViewNames: View[]) => void) | null;
-        length?: number;
-        toolbar?: boolean;
-        popup?: boolean;
-        popupOffset?: number | { x: number, y: number };
-        selectable?: boolean | 'ignoreEvents';
-        longPressThreshold?: number;
-        step?: number;
-        timeslots?: number;
-        rtl?: boolean;
-        eventPropGetter?: (event: Object, start: stringOrDate, end: stringOrDate, isSelected: boolean) => { className?: string, style?: React.CSSProperties };
-        slotPropGetter?: (date: Date) => { className?: string, style?: Object };
-        dayPropGetter?: (date: Date) => { className?: string, style?: Object };
-        showMultiDayTimes?: boolean;
-        min?: stringOrDate;
-        max?: stringOrDate;
-        scrollToTime?: Date;
-        culture?: string;
-        formats?: Format;
-        components?: Components;
-        messages?: Messages;
-        titleAccessor?: string | ((event: any) => string);
-        allDayAccessor?: string | ((event: any) => boolean);
-        startAccessor?: string | ((event: any) => Date);
-        endAccessor?: string | ((event: any) => Date);
-        resourceAccessor?: string | ((event: any) => any);
-        resources?: any[];
-        resourceIdAccessor?: string | ((event: any) => any);
-        resourceTitleAccessor?: string | ((event: any) => string);
-        defaultView?: View;
-        defaultDate?: Date;
-        className?: string;
-        elementProps?: React.HTMLAttributes<HTMLElement>;
-    }
+export interface BigCalendarProps extends React.Props<BigCalendar> {
+    date?: stringOrDate;
+    now?: Date;
+    view?: View;
+    events?: object[];
+    onNavigate?: (newDate: Date, action: Navigate) => void;
+    onView?: (view: View) => void;
+    onDrillDown?: (date: Date, view: View) => void;
+    onSelectSlot?: (slotInfo: { start: stringOrDate, end: stringOrDate, slots: Date[] | string[], action: 'select' | 'click' | 'doubleClick' }) => void;
+    onDoubleClickEvent?: (event: object, e: React.SyntheticEvent<HTMLElement>) => void;
+    onSelectEvent?: (event: object, e: React.SyntheticEvent<HTMLElement>) => void;
+    onSelecting?: (range: { start: stringOrDate, end: stringOrDate }) => boolean | undefined | null;
+    selected?: any;
+    views?: View[] | {
+        month: boolean | React.SFC | React.Component,
+        week: boolean | React.SFC | React.Component,
+        myweek: boolean | React.SFC | React.Component,
+    };
+    drilldownView?: View | null;
+    getDrilldownView?: ((targetDate: Date, currentViewName: View, configuredViewNames: View[]) => void) | null;
+    length?: number;
+    toolbar?: boolean;
+    popup?: boolean;
+    popupOffset?: number | { x: number, y: number };
+    selectable?: boolean | 'ignoreEvents';
+    longPressThreshold?: number;
+    step?: number;
+    timeslots?: number;
+    rtl?: boolean;
+    eventPropGetter?: (event: object, start: stringOrDate, end: stringOrDate, isSelected: boolean) => { className?: string, style?: React.CSSProperties };
+    slotPropGetter?: (date: Date) => { className?: string, style?: object };
+    dayPropGetter?: (date: Date) => { className?: string, style?: object };
+    showMultiDayTimes?: boolean;
+    min?: stringOrDate;
+    max?: stringOrDate;
+    scrollToTime?: Date;
+    culture?: string;
+    formats?: Format;
+    components?: Components;
+    messages?: Messages;
+    titleAccessor?: string | ((event: any) => string);
+    allDayAccessor?: string | ((event: any) => boolean);
+    startAccessor?: string | ((event: any) => Date);
+    endAccessor?: string | ((event: any) => Date);
+    resourceAccessor?: string | ((event: any) => any);
+    resources?: any[];
+    resourceIdAccessor?: string | ((event: any) => any);
+    resourceTitleAccessor?: string | ((event: any) => string);
+    defaultView?: View;
+    defaultDate?: Date;
+    className?: string;
+    elementProps?: React.HTMLAttributes<HTMLElement>;
+}
 
-    class BigCalendar extends React.Component<BigCalendarProps> {
-        /**
-         * Setup the localizer by providing the moment Object
-         */
-        static momentLocalizer(momentInstance: Object): void;
-        /**
-         * Setup the localizer by providing the globalize Object
-         */
-        static globalizeLocalizer(globalizeInstance: Object): void;
-    }
-
-    export default BigCalendar;
+export default class BigCalendar extends React.Component<BigCalendarProps> {
+    /**
+     * Setup the localizer by providing the moment Object
+     */
+    static momentLocalizer(momentInstance: object): void;
+    /**
+     * Setup the localizer by providing the globalize Object
+     */
+    static globalizeLocalizer(globalizeInstance: object): void;
 }
diff --git a/types/react-big-calendar/react-big-calendar-tests.tsx b/types/react-big-calendar/react-big-calendar-tests.tsx
index 16ea44d859..dbb1753332 100644
--- a/types/react-big-calendar/react-big-calendar-tests.tsx
+++ b/types/react-big-calendar/react-big-calendar-tests.tsx
@@ -1,7 +1,7 @@
 import * as React from "react";
 import * as ReactDOM from "react-dom";
 import * as ReactDOMServer from "react-dom/server";
-import BigCalendar, { Navigate, View } from "react-big-calendar";
+import BigCalendar, { BigCalendarProps, Navigate, View } from "react-big-calendar";
 
 // Don't want to add this as a dependency, because it is only used for tests.
 declare const moment: any;
@@ -13,13 +13,13 @@ BigCalendar.momentLocalizer(moment);
 // http://intljusticemission.github.io/react-big-calendar/examples/index.html
 
 class CalendarEvent {
-    public title: string;
-    public allDay: boolean;
-    public start: Date;
-    public end: Date;
-    public desc: string;
+    title: string;
+    allDay: boolean;
+    start: Date;
+    end: Date;
+    desc: string;
 
-    public constructor(_title: string, _start: Date, _end: Date, _allDay?: boolean, _desc?: string) {
+    constructor(_title: string, _start: Date, _end: Date, _allDay?: boolean, _desc?: string) {
         this.title = _title;
         this.allDay = _allDay || false;
         this.start = _start;
@@ -45,7 +45,7 @@ console.log('Test Results -> BasicExample', basicExampleHtml);
 
 // Full API Example Test - based on API Documentation
 // http://intljusticemission.github.io/react-big-calendar/examples/index.html#api
-class FullAPIExample extends React.Component<any, any> {
+class FullAPIExample extends React.Component<BigCalendarProps> {
     render() {
         return (
             <BigCalendar
@@ -53,19 +53,19 @@ class FullAPIExample extends React.Component<any, any> {
                 date={new Date()}
                 view={'day'}
                 events={getEvents()}
-                onNavigate={(action: Navigate, newDate: Date) => { } }
-                onView={(view: View) => { } }
+                onNavigate={(newDate: Date, action: Navigate) => { }}
+                onView={(view: View) => { }}
                 onSelectSlot={(slotInfo) => {
                     const start = slotInfo.start;
                     const end = slotInfo.end;
                     const slots = slotInfo.slots;
-                } }
-                onSelectEvent={(event) => { } }
+                }}
+                onSelectEvent={(event) => { }}
                 onSelecting={(slotInfo) => {
                     const start = slotInfo.start;
                     const end = slotInfo.end;
                     return true;
-                } }
+                }}
                 views={['day']}
                 toolbar={true}
                 popup={true}
@@ -73,7 +73,7 @@ class FullAPIExample extends React.Component<any, any> {
                 selectable={true}
                 step={20}
                 rtl={true}
-                eventPropGetter={(event, start, end, isSelected) => ({ className: 'some-class' }) }
+                eventPropGetter={(event, start, end, isSelected) => ({ className: 'some-class' })}
                 titleAccessor={'title'}
                 allDayAccessor={(event: any) => !!event.allDay}
                 startAccessor={'start'}
@@ -86,7 +86,7 @@ class FullAPIExample extends React.Component<any, any> {
                 timeslots={24}
                 defaultView={'month'}
                 className={'my-calendar'}
-                elementProps={{id: 'myCalendar'}}
+                elementProps={{ id: 'myCalendar' }}
                 components={{
                     event: Event,
                     agenda: {
@@ -106,58 +106,58 @@ console.log('Test Results -> FullAPIExample', fullApiExampleHtml);
 
 // Test fixtures
 function getEvents(): CalendarEvent[] {
-    var events: CalendarEvent[] = [
+    const events: CalendarEvent[] = [
         new CalendarEvent('All Day Event', new Date(2015, 3, 0), new Date(2015, 3, 0), true),
         new CalendarEvent('Long Event', new Date(2015, 3, 7), new Date(2015, 3, 10)),
         new CalendarEvent('DTS STARTS', new Date(2016, 2, 13, 0, 0, 0), new Date(2016, 2, 20, 0, 0, 0)),
         new CalendarEvent('DTS ENDS', new Date(2016, 10, 6, 0, 0, 0), new Date(2016, 10, 13, 0, 0, 0)),
         new CalendarEvent('Some Event', new Date(2015, 3, 9, 0, 0, 0), new Date(2015, 3, 9, 0, 0, 0)),
         new CalendarEvent('Conference', new Date(2015, 3, 11), new Date(2015, 3, 13), undefined, 'Big conference for important people'),
-        new CalendarEvent('Meeting', new Date(2015, 3, 12, 10, 30, 0, 0),new Date(2015, 3, 12, 12, 30, 0, 0), undefined, 'Pre-meeting meeting, to prepare for the meeting'),
-        new CalendarEvent('Lunch', new Date(2015, 3, 12, 12, 0, 0, 0),new Date(2015, 3, 12, 13, 0, 0, 0), undefined, 'Power lunch'),
-        new CalendarEvent('Meeting', new Date(2015, 3, 12, 14, 0, 0, 0),new Date(2015, 3, 12, 15, 0, 0, 0)),
-        new CalendarEvent('Happy Hour', new Date(2015, 3, 12, 17, 0, 0, 0),new Date(2015, 3, 12, 17, 30, 0, 0),undefined,'Most important meal of the day'),
-        new CalendarEvent('Dinner', new Date(2015, 3, 12, 20, 0, 0, 0),new Date(2015, 3, 12, 21, 0, 0, 0)),
-        new CalendarEvent('Birthday Party', new Date(2015, 3, 13, 7, 0, 0),new Date(2015, 3, 13, 10, 30, 0)),
+        new CalendarEvent('Meeting', new Date(2015, 3, 12, 10, 30, 0, 0), new Date(2015, 3, 12, 12, 30, 0, 0), undefined, 'Pre-meeting meeting, to prepare for the meeting'),
+        new CalendarEvent('Lunch', new Date(2015, 3, 12, 12, 0, 0, 0), new Date(2015, 3, 12, 13, 0, 0, 0), undefined, 'Power lunch'),
+        new CalendarEvent('Meeting', new Date(2015, 3, 12, 14, 0, 0, 0), new Date(2015, 3, 12, 15, 0, 0, 0)),
+        new CalendarEvent('Happy Hour', new Date(2015, 3, 12, 17, 0, 0, 0), new Date(2015, 3, 12, 17, 30, 0, 0), undefined, 'Most important meal of the day'),
+        new CalendarEvent('Dinner', new Date(2015, 3, 12, 20, 0, 0, 0), new Date(2015, 3, 12, 21, 0, 0, 0)),
+        new CalendarEvent('Birthday Party', new Date(2015, 3, 13, 7, 0, 0), new Date(2015, 3, 13, 10, 30, 0)),
     ];
     return events;
+}
+
+class EventAgenda extends React.Component<any, any> {
+    render() {
+        // const { label } = this.props;
+        return (
+            <div>
+                <div>Calendar Events</div>
+            </div>
+        );
+    }
+}
+
+const customDayPropGetter = (date: Date) => {
+    if (date.getDate() === 7 || date.getDate() === 15)
+        return {
+            className: 'special-day',
+            style: {
+                border: 'solid 3px ' + (date.getDate() === 7 ? '#faa' : '#afa'),
+            },
+        };
+    else return {};
 };
 
-  class EventAgenda extends React.Component<any, any> {
-    render() {
-      // const { label } = this.props;
-      return (
-        <div>
-          <div>Calendar Events</div>
-        </div>
-      );
-    }
-  }
-
-  const customDayPropGetter = (date: Date) => {
+const customSlotPropGetter = (date: Date) => {
     if (date.getDate() === 7 || date.getDate() === 15)
-      return {
-        className: 'special-day',
-        style: {
-          border: 'solid 3px ' + (date.getDate() === 7 ? '#faa' : '#afa'),
-        },
-      }
-    else return {}
-  }
+        return {
+            className: 'special-day',
+        };
+    else return {};
+};
 
-  const customSlotPropGetter = (date: Date) => {
-    if (date.getDate() === 7 || date.getDate() === 15)
-      return {
-        className: 'special-day',
-      }
-    else return {}
-  }
-
-  function Event(event: any) {
+function Event(event: any) {
     return (
-      <span>
-        <strong>{event.title}</strong>
-        {event.desc && ':  ' + event.desc}
-      </span>
-    )
-  }
+        <span>
+            <strong>{event.title}</strong>
+            {event.desc && ':  ' + event.desc}
+        </span>
+    );
+}
diff --git a/types/react-big-calendar/tsconfig.json b/types/react-big-calendar/tsconfig.json
index 1a28fe79ae..eddf55cc13 100644
--- a/types/react-big-calendar/tsconfig.json
+++ b/types/react-big-calendar/tsconfig.json
@@ -6,8 +6,8 @@
             "dom"
         ],
         "noImplicitAny": true,
-        "noImplicitThis": false,
-        "strictNullChecks": false,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
diff --git a/types/react-big-calendar/tslint.json b/types/react-big-calendar/tslint.json
index a41bf5d19a..e60c15844f 100644
--- a/types/react-big-calendar/tslint.json
+++ b/types/react-big-calendar/tslint.json
@@ -1,79 +1,3 @@
 {
-    "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"
+}
\ No newline at end of file
diff --git a/types/react-body-classname/index.d.ts b/types/react-body-classname/index.d.ts
index 6088e99cb7..23aa8d6f78 100644
--- a/types/react-body-classname/index.d.ts
+++ b/types/react-body-classname/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/PactCoffee/react-body-classname
 // Definitions by: Mohamed Hegazy <https://github.com/mhegazy>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from "react";
 
diff --git a/types/react-bootstrap-date-picker/index.d.ts b/types/react-bootstrap-date-picker/index.d.ts
index 2cbedb674a..96971cc0bb 100644
--- a/types/react-bootstrap-date-picker/index.d.ts
+++ b/types/react-bootstrap-date-picker/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/pushtell/react-bootstrap-date-picker#readme
 // Definitions by: Karol Janyst <https://github.com/LKay>, Antal Bodnar <https://github.com/ssi-hu-antal-bodnar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import { ComponentClass, StatelessComponent, ReactNode, FocusEventHandler, HTMLAttributes } from "react";
 
diff --git a/types/react-bootstrap-date-picker/react-bootstrap-date-picker-tests.tsx b/types/react-bootstrap-date-picker/react-bootstrap-date-picker-tests.tsx
index 07928a09ea..23b6c75d63 100644
--- a/types/react-bootstrap-date-picker/react-bootstrap-date-picker-tests.tsx
+++ b/types/react-bootstrap-date-picker/react-bootstrap-date-picker-tests.tsx
@@ -1,6 +1,6 @@
 import * as React from "react";
 import { DropdownMenu } from "react-bootstrap";
-import * as DatePicker from "react-bootstrap-date-picker";
+import DatePicker = require("react-bootstrap-date-picker");
 
 const Custom: React.StatelessComponent = () => {
     return (<div />);
diff --git a/types/react-bootstrap-daterangepicker/index.d.ts b/types/react-bootstrap-daterangepicker/index.d.ts
index aaf6a5089e..1479b1e1c5 100644
--- a/types/react-bootstrap-daterangepicker/index.d.ts
+++ b/types/react-bootstrap-daterangepicker/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/skratchdot/react-bootstrap-daterangepicker
 // Definitions by: Ian Ker-Seymer <https://github.com/ianks>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 /// <reference types="react" />
 /// <reference types="daterangepicker" />
diff --git a/types/react-bootstrap-daterangepicker/react-bootstrap-daterangepicker-tests.ts b/types/react-bootstrap-daterangepicker/react-bootstrap-daterangepicker-tests.ts
deleted file mode 100644
index 65e44c6086..0000000000
--- a/types/react-bootstrap-daterangepicker/react-bootstrap-daterangepicker-tests.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import DateRangePicker = require("react-bootstrap-daterangepicker");
-import * as React from "react";
-
-class IntegrationTest extends React.Component {
-  render() {
-    const props = {
-      onEvent: (ev: any, picker: any) => true,
-      singleDatePicker: true,
-      startDate: "1999-12-31",
-      endDate: "2000-12-31",
-      dateLimit: 3,
-      timePicker: true,
-      timePickerIncrement: 5,
-      buttonClasses: ["btn-sm"],
-      applyClass: "myclass",
-      cancelClass: "myclass",
-      autoApply: true,
-      linkedCalendars: true,
-    };
-
-    return React.createElement(DateRangePicker, props);
-  }
-}
diff --git a/types/react-bootstrap-daterangepicker/react-bootstrap-daterangepicker-tests.tsx b/types/react-bootstrap-daterangepicker/react-bootstrap-daterangepicker-tests.tsx
index b34646031d..36484ba416 100644
--- a/types/react-bootstrap-daterangepicker/react-bootstrap-daterangepicker-tests.tsx
+++ b/types/react-bootstrap-daterangepicker/react-bootstrap-daterangepicker-tests.tsx
@@ -1,4 +1,25 @@
-import * as DateRangePicker from "react-bootstrap-daterangepicker";
+import DateRangePicker = require("react-bootstrap-daterangepicker");
 import * as React from "react";
 
+class IntegrationTest extends React.Component {
+  render() {
+    const props = {
+      onEvent: (ev: any, picker: any) => true,
+      singleDatePicker: true,
+      startDate: "1999-12-31",
+      endDate: "2000-12-31",
+      dateLimit: 3,
+      timePicker: true,
+      timePickerIncrement: 5,
+      buttonClasses: ["btn-sm"],
+      applyClass: "myclass",
+      cancelClass: "myclass",
+      autoApply: true,
+      linkedCalendars: true,
+    };
+
+    return React.createElement(DateRangePicker, props);
+  }
+}
+
 let pickerCoponent = <DateRangePicker onEvent={(ev: any, picker: any) => true} />;
diff --git a/types/react-bootstrap-daterangepicker/tsconfig.json b/types/react-bootstrap-daterangepicker/tsconfig.json
index bc9c951ccf..a8c612879c 100644
--- a/types/react-bootstrap-daterangepicker/tsconfig.json
+++ b/types/react-bootstrap-daterangepicker/tsconfig.json
@@ -20,7 +20,6 @@
     },
     "files": [
         "index.d.ts",
-        "react-bootstrap-daterangepicker-tests.ts",
         "react-bootstrap-daterangepicker-tests.tsx"
     ]
 }
\ No newline at end of file
diff --git a/types/react-bootstrap-table/index.d.ts b/types/react-bootstrap-table/index.d.ts
index d7618e4db0..c6f5b7654e 100644
--- a/types/react-bootstrap-table/index.d.ts
+++ b/types/react-bootstrap-table/index.d.ts
@@ -6,7 +6,7 @@
 //                 Janeene Beeforth <https://github.com/dawnmist>
 //                 Oscar Andersson <https://github.com/Ogglas>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 // documentation taken from http://allenfang.github.io/react-bootstrap-table/docs.html
 
diff --git a/types/react-bootstrap-table/v2/index.d.ts b/types/react-bootstrap-table/v2/index.d.ts
index 11c0f7f943..5ac31a4a77 100644
--- a/types/react-bootstrap-table/v2/index.d.ts
+++ b/types/react-bootstrap-table/v2/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/AllenFang/react-bootstrap-table
 // Definitions by: Frank Laub <https://github.com/flaub>, Aleksander Lode <https://github.com/alelode>, Josué Us <https://github.com/UJosue10>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 /// <reference types="node" />
 
diff --git a/types/react-bootstrap-table/v2/tsconfig.json b/types/react-bootstrap-table/v2/tsconfig.json
index eee5850865..b1391c9c05 100644
--- a/types/react-bootstrap-table/v2/tsconfig.json
+++ b/types/react-bootstrap-table/v2/tsconfig.json
@@ -27,4 +27,4 @@
         "index.d.ts",
         "react-bootstrap-table-tests.tsx"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/react-bootstrap-typeahead/index.d.ts b/types/react-bootstrap-typeahead/index.d.ts
index c31ddd63b5..659b2034fd 100644
--- a/types/react-bootstrap-typeahead/index.d.ts
+++ b/types/react-bootstrap-typeahead/index.d.ts
@@ -1,63 +1,170 @@
-// Type definitions for react-bootstrap-typeahead 2.0
+// Type definitions for react-bootstrap-typeahead 2.3
 // Project: https://github.com/ericgio/react-bootstrap-typeahead
 // Definitions by: Guymestef <https://github.com/Guymestef>
+//                 Rajab Shakirov <https://github.com/radziksh>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
+// TODO: <Highlighter>, <Menu>, <MenuItem>, <Token> components
 
 import * as React from 'react';
 
 export interface TypeaheadProps<T> {
+    /* For localized accessibility: Should return a string indicating the number of results for screen readers. Receives the current results. */
     a11yNumResults?: () => void;
+
+    /* For localized accessibility: Should return a string indicating the number of selections for screen readers. Receives the current selections. */
     a11yNumSelected?: () => void;
+
+    /* Specify menu alignment. The default value is justify, which makes the menu as wide as the input and truncates long values.
+       Specifying left or right will align the menu to that side and the width will be determined by the length of menu item values. */
     align?: 'justify' | 'left' | 'right';
+
+    /* Allows the creation of new selections on the fly. Any new items will be added to the list of selections,
+       but not the list of original options unless handled as such by Typeahead's parent.
+       The newly added item will always be returned as an object even if the other options are simply strings,
+       so be sure your onChange callback can handle this. */
     allowNew?: boolean;
+
+    /* Autofocus the input when the component initially mounts. */
     autoFocus?: boolean;
+
+    /* Whether to render the menu inline or attach to document.body. */
     bodyContainer?: boolean;
+
+    /* Specify the size of the input. */
     bsSize?: 'large' | 'lg' | 'small' | 'sm';
+
+    /* Whether or not filtering should be case-sensitive. */
     caseSensitive?: boolean;
+
+    /* Displays a button to clear the input when there are selections. */
     clearButton?: boolean;
+
+    /* The initial value displayed in the text input. */
+    defaultInputValue?: string;
+
+    /* Specify any pre-selected options. Use only if you want the component to be uncontrolled. */
     defaultSelected?: T[];
+
+    /* Whether to disable the input. Will also disable selections when multiple={true}. */
     disabled?: boolean;
+
+    /* Specify whether the menu should appear above the input. */
     dropup?: boolean;
+
+    /* Message displayed in the menu when there are no valid results.
+       Passing a falsy value will hide the menu if no matches are found. */
     emptyLabel?: string;
+
+    /* Either an array of fields in option to search, or a custom filtering callback. */
     filterBy?: (string[] | ((option: T | string, text: string) => boolean));
+
+    /* Highlights the menu item if there is only one result and allows selecting that item by hitting enter.
+       Does not work with allowNew. */
     highlightOnlyResult?: boolean;
+
+    /* Whether the filter should ignore accents and other diacritical marks. */
     ignoreDiacritics?: boolean;
+
+    /* Props to be applied directly to the input. onBlur, onChange, onFocus, and onKeyDown are ignored. */
     inputProps?: object;
+
+    /* Indicate whether an asynchronous data fetch is happening. */
+    isLoading?: boolean;
+
+    /* Specify which option key to use for display or a render function. By default, the selector will use the label key. */
     labelKey?: string | ((option: T | string) => string);
+
+    /* Maximum height of the dropdown menu, in px. */
     maxHeight?: number;
+
+    /* Maximum number of results to display by default. Mostly done for performance reasons
+       so as not to render too many DOM nodes in the case of large data sets. */
     maxResults?: number;
+
+    /* Number of input characters that must be entered before showing results. */
     minLength?: number;
+
+    /* Whether or not multiple selections are allowed. */
     multiple?: boolean;
+
+    /* Provides the ability to specify a prefix before the user-entered text to indicate that the selection will be new. No-op unless allowNew={true}. */
     newSelectionPrefix?: string;
+
+    /* Invoked when the input is blurred. Receives an event. */
     onBlur?: (e: Event) => any;
+
+    /* Invoked whenever items are added or removed. Receives an array of the selected options. */
     onChange?: (selected: T[]) => any;
+
+    /* Invoked when the input is focused. Receives an event. */
     onFocus?: (e: Event) => any;
+
+    /* Invoked when the input value changes. Receives the string value of the input. */
     onInputChange?: (input: string) => any;
+
+    /* Invoked when a key is pressed. Receives an event. */
     onKeyDown?: (e: Event) => any;
+
+    /* Invoked when the menu is hidden. */
     onMenuHide?: (e: Event) => any;
+
+    /* Invoked when the menu is shown. */
     onMenuShow?: (e: Event) => any;
+
+    /* Invoked when the pagination menu item is clicked. */
     onPaginate?: (e: Event) => any;
+
+    /* Full set of options, including any pre-selected options. */
     options: T[];
+
+    /* Give user the ability to display additional results if the number of results exceeds maxResults. */
     paginate?: boolean;
+
+    /* Prompt displayed when large data sets are paginated. */
     paginationText?: string;
+
+    /* Placeholder text for the input. */
     placeholder?: string;
+
+    /* Callback for custom menu rendering. */
     renderMenu?: (results: Array<T | string>, menuProps: any) => any;
+
+    /* Provides a hook for customized rendering of menu item contents. */
     renderMenuItemChildren?: (option: T, props: TypeaheadProps<T>, index: number) => any;
+
+    /* Provides a hook for customized rendering of tokens when multiple selections are enabled. */
     renderToken?: (selectedItem: T | string, onRemove: () => void) => any;
+
+    /* The selected option(s) displayed in the input. Use this prop if you want to control the component via its parent. */
     selected?: T[];
+
+    /* Allows selecting the hinted result by pressing enter. */
     selectHintOnEnter?: boolean;
+
+    /* Propagate event to parent form. */
     submitFormOnEnter?: boolean;
 }
 
 export const Typeahead: React.ClassicComponentClass<TypeaheadProps<any>>;
 
 export interface AsyncTypeaheadProps<T> extends TypeaheadProps<T> {
+    /* 	Delay, in milliseconds, before performing search. */
     delay?: number;
+
+    /* Whether or not a request is currently pending. Necessary for the component to know when new results are available. */
     isLoading: boolean;
+
+    /* Callback to perform when the search is executed. */
     onSearch: (query: string) => void;
+
+    /* Message displayed in the menu when there is no user input. */
     promptText?: string;
+
+    /* Message to display in the menu while the request is pending. */
     searchText?: string;
+
+    /* Whether or not the component should cache query results. */
     useCache?: boolean;
 }
 
diff --git a/types/react-bootstrap-typeahead/tsconfig.json b/types/react-bootstrap-typeahead/tsconfig.json
index c8b63ad42b..370b25f75d 100644
--- a/types/react-bootstrap-typeahead/tsconfig.json
+++ b/types/react-bootstrap-typeahead/tsconfig.json
@@ -22,4 +22,4 @@
         "index.d.ts",
         "react-bootstrap-typeahead-tests.tsx"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/react-bootstrap/index.d.ts b/types/react-bootstrap/index.d.ts
index df9e371956..ccbc01d31a 100644
--- a/types/react-bootstrap/index.d.ts
+++ b/types/react-bootstrap/index.d.ts
@@ -12,7 +12,7 @@
 //                 Karol Janyst <https://github.com/LKay>
 //                 Aaron Beall <https://github.com/aaronbeall>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from 'react';
 
diff --git a/types/react-bootstrap/lib/Carousel.d.ts b/types/react-bootstrap/lib/Carousel.d.ts
index cef9214064..23ceeda466 100644
--- a/types/react-bootstrap/lib/Carousel.d.ts
+++ b/types/react-bootstrap/lib/Carousel.d.ts
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { Omit, Sizes, SelectCallback } from 'react-bootstrap';
-import * as CarouselItem from './CarouselItem';
-import * as CarouselCaption from './CarouselCaption';
+import CarouselItem = require('./CarouselItem');
+import CarouselCaption = require('./CarouselCaption');
 
 declare namespace Carousel {
     export type CarouselProps = Omit<React.HTMLProps<Carousel>, 'wrap'> & {
diff --git a/types/react-bootstrap/lib/FormControl.d.ts b/types/react-bootstrap/lib/FormControl.d.ts
index 9f40f81774..dd7528e2d4 100644
--- a/types/react-bootstrap/lib/FormControl.d.ts
+++ b/types/react-bootstrap/lib/FormControl.d.ts
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { Sizes } from 'react-bootstrap';
-import * as FormControlFeedback from './FormControlFeedback';
-import * as FormControlStatic from './FormControlStatic';
+import FormControlFeedback = require('./FormControlFeedback');
+import FormControlStatic = require('./FormControlStatic');
 
 declare namespace FormControl {
     export interface FormControlProps extends React.HTMLProps<FormControl> {
diff --git a/types/react-bootstrap/lib/InputGroup.d.ts b/types/react-bootstrap/lib/InputGroup.d.ts
index 7c99727439..6903fac5cf 100644
--- a/types/react-bootstrap/lib/InputGroup.d.ts
+++ b/types/react-bootstrap/lib/InputGroup.d.ts
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { Sizes } from 'react-bootstrap';
-import * as InputGroupAddon from './InputGroupAddon';
-import * as InputGroupButton from './InputGroupButton';
+import InputGroupAddon = require('./InputGroupAddon');
+import InputGroupButton = require('./InputGroupButton');
 
 declare namespace InputGroup {
     export interface InputGroupProps extends React.HTMLProps<InputGroup> {
diff --git a/types/react-bootstrap/lib/Media.d.ts b/types/react-bootstrap/lib/Media.d.ts
index eac35a0db9..4e85e69a51 100644
--- a/types/react-bootstrap/lib/Media.d.ts
+++ b/types/react-bootstrap/lib/Media.d.ts
@@ -1,10 +1,10 @@
 import * as React from 'react';
-import * as MediaBody from './MediaBody';
-import * as MediaHeading from './MediaHeading';
-import * as MediaLeft from './MediaLeft';
-import * as MediaList from './MediaList';
-import * as MediaListItem from './MediaListItem';
-import * as MediaRight from './MediaRight';
+import MediaBody = require('./MediaBody');
+import MediaHeading = require('./MediaHeading');
+import MediaLeft = require('./MediaLeft');
+import MediaList = require('./MediaList');
+import MediaListItem = require('./MediaListItem');
+import MediaRight = require('./MediaRight');
 
 declare namespace Media {
     export interface MediaProps extends React.HTMLProps<Media> {
diff --git a/types/react-bootstrap/lib/Modal.d.ts b/types/react-bootstrap/lib/Modal.d.ts
index 357b7fc8a6..9b5ada2cdc 100644
--- a/types/react-bootstrap/lib/Modal.d.ts
+++ b/types/react-bootstrap/lib/Modal.d.ts
@@ -1,10 +1,10 @@
 import * as React from 'react';
 import { Sizes, TransitionCallbacks } from 'react-bootstrap';
-import * as ModalBody from './ModalBody';
-import * as ModalHeader from './ModalHeader';
-import * as ModalTitle from './ModalTitle';
-import * as ModalDialog from './ModalDialog';
-import * as ModalFooter from './ModalFooter';
+import ModalBody = require('./ModalBody');
+import ModalHeader = require('./ModalHeader');
+import ModalTitle = require('./ModalTitle');
+import ModalDialog = require('./ModalDialog');
+import ModalFooter = require('./ModalFooter');
 
 declare namespace Modal {
     interface ModalProps extends TransitionCallbacks, React.HTMLProps<Modal> {
diff --git a/types/react-bootstrap/lib/Navbar.d.ts b/types/react-bootstrap/lib/Navbar.d.ts
index 5231c74052..5849c0392e 100644
--- a/types/react-bootstrap/lib/Navbar.d.ts
+++ b/types/react-bootstrap/lib/Navbar.d.ts
@@ -1,9 +1,9 @@
 import * as React from 'react';
 import { Sizes } from 'react-bootstrap';
-import * as NavbarBrand from './NavbarBrand';
-import * as NavbarCollapse from './NavbarCollapse';
-import * as NavbarHeader from './NavbarHeader';
-import * as NavbarToggle from './NavbarToggle';
+import NavbarBrand = require('./NavbarBrand');
+import NavbarCollapse = require('./NavbarCollapse');
+import NavbarHeader = require('./NavbarHeader');
+import NavbarToggle = require('./NavbarToggle');
 
 declare namespace Navbar {
     export interface NavbarProps extends React.HTMLProps<Navbar> {
diff --git a/types/react-bootstrap/lib/Pager.d.ts b/types/react-bootstrap/lib/Pager.d.ts
index 647fd416c9..076d30a0af 100644
--- a/types/react-bootstrap/lib/Pager.d.ts
+++ b/types/react-bootstrap/lib/Pager.d.ts
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { SelectCallback } from 'react-bootstrap';
-import * as PagerItem from './PagerItem';
+import PagerItem = require('./PagerItem');
 
 declare namespace Pager {
     export interface PagerProps extends React.HTMLProps<Pager> {
diff --git a/types/react-bootstrap/lib/Pagination.d.ts b/types/react-bootstrap/lib/Pagination.d.ts
index 7e14e823fb..ead70fe342 100644
--- a/types/react-bootstrap/lib/Pagination.d.ts
+++ b/types/react-bootstrap/lib/Pagination.d.ts
@@ -1,11 +1,11 @@
 import * as React from 'react';
 import { Sizes, SelectCallback } from 'react-bootstrap';
-import * as PaginationFirst from './PaginationFirst'
-import * as PaginationPrev from './PaginationPrev'
-import * as PaginationNext from './PaginationNext'
-import * as PaginationLast from './PaginationLast'
-import * as PaginationEllipsis from './PaginationEllipsis'
-import * as PaginationItem from './PaginationItem'
+import PaginationFirst = require('./PaginationFirst');
+import PaginationPrev = require('./PaginationPrev');
+import PaginationNext = require('./PaginationNext');
+import PaginationLast = require('./PaginationLast');
+import PaginationEllipsis = require('./PaginationEllipsis');
+import PaginationItem = require('./PaginationItem');
 
 declare namespace Pagination {
     export interface PaginationProps extends React.HTMLProps<Pagination> {
diff --git a/types/react-bootstrap/lib/Panel.d.ts b/types/react-bootstrap/lib/Panel.d.ts
index 9957ee1339..1494d69041 100644
--- a/types/react-bootstrap/lib/Panel.d.ts
+++ b/types/react-bootstrap/lib/Panel.d.ts
@@ -1,11 +1,11 @@
 import * as React from 'react';
 import { TransitionCallbacks, Sizes, SelectCallback } from 'react-bootstrap';
-import * as PanelHeading from './PanelHeading'
-import * as PanelTitle from './PanelTitle'
-import * as PanelToggle from './PanelToggle'
-import * as PanelCollapse from './PanelCollapse'
-import * as PanelBody from './PanelBody'
-import * as PanelFooter from './PanelFooter'
+import PanelHeading = require('./PanelHeading');
+import PanelTitle = require('./PanelTitle');
+import PanelToggle = require('./PanelToggle');
+import PanelCollapse = require('./PanelCollapse');
+import PanelBody = require('./PanelBody');
+import PanelFooter = require('./PanelFooter');
 
 declare namespace Panel {
     export interface PanelProps extends TransitionCallbacks, React.HTMLProps<Panel> {
@@ -17,7 +17,7 @@ declare namespace Panel {
         onToggle?: SelectCallback;
     }
 }
-declare class Panel extends React.Component<Panel.PanelProps> { 
+declare class Panel extends React.Component<Panel.PanelProps> {
     static Heading: typeof PanelHeading;
     static Title: typeof PanelTitle;
     static Toggle: typeof PanelToggle;
diff --git a/types/react-bootstrap/lib/Tab.d.ts b/types/react-bootstrap/lib/Tab.d.ts
index 1c98d8c0a3..d3df9dcf8c 100644
--- a/types/react-bootstrap/lib/Tab.d.ts
+++ b/types/react-bootstrap/lib/Tab.d.ts
@@ -1,8 +1,8 @@
 import * as React from 'react';
 import { TransitionCallbacks, Omit } from 'react-bootstrap';
-import * as TabContainer from './TabContainer';
-import * as TabPane from './TabPane';
-import * as TabContent from './TabContent';
+import TabContainer = require('./TabContainer');
+import TabPane = require('./TabPane');
+import TabContent = require('./TabContent');
 
 declare namespace Tab {
     export interface TabProps extends TransitionCallbacks, Omit<React.HTMLProps<Tab>, "title"> {
diff --git a/types/react-bootstrap/lib/ToggleButtonGroup.d.ts b/types/react-bootstrap/lib/ToggleButtonGroup.d.ts
index bca9544d70..27be6b95a9 100644
--- a/types/react-bootstrap/lib/ToggleButtonGroup.d.ts
+++ b/types/react-bootstrap/lib/ToggleButtonGroup.d.ts
@@ -19,16 +19,19 @@ declare namespace ToggleButtonGroup {
         /** Required if `type` is set to "radio" */
         name: string;
         type: "radio";
+        onChange?(value: any): void;
     }
 
     interface CheckboxProps {
         name?: string;
         type: "checkbox";
+        onChange?(values: any[]): void;
     }
 
     export type ToggleButtonGroupProps = BaseProps
                                        & (RadioProps | CheckboxProps)
-                                       & Omit<React.HTMLProps<ToggleButtonGroup>, "defaultValue" | "type" | "value">;
+                                       & Omit<React.HTMLProps<ToggleButtonGroup>, "defaultValue" | "type" | "value">
+                                       & Omit<React.HTMLProps<ToggleButtonGroup>, "defaultValue" | "type" | "value" | "onChange">;
 
 }
 declare class ToggleButtonGroup extends React.Component<ToggleButtonGroup.ToggleButtonGroupProps> { }
diff --git a/types/react-bootstrap/test/react-bootstrap-individual-components-tests.tsx b/types/react-bootstrap/test/react-bootstrap-individual-components-tests.tsx
index 7e44d8c600..07d6a8a442 100644
--- a/types/react-bootstrap/test/react-bootstrap-individual-components-tests.tsx
+++ b/types/react-bootstrap/test/react-bootstrap-individual-components-tests.tsx
@@ -1,103 +1,103 @@
 import * as React from 'react';
-import * as Accordion from 'react-bootstrap/lib/Accordion';
-import * as Alert from 'react-bootstrap/lib/Alert';
-import * as Badge from 'react-bootstrap/lib/Badge';
-import * as Breadcrumb from 'react-bootstrap/lib/Breadcrumb';
-import * as BreadcrumbItem from 'react-bootstrap/lib/BreadcrumbItem';
-import * as Button from 'react-bootstrap/lib/Button';
-import * as ButtonGroup from 'react-bootstrap/lib/ButtonGroup';
-import * as ButtonToolbar from 'react-bootstrap/lib/ButtonToolbar';
-import * as Carousel from 'react-bootstrap/lib/Carousel';
-import * as CarouselCaption from 'react-bootstrap/lib/CarouselCaption';
-import * as CarouselItem from 'react-bootstrap/lib/CarouselItem';
-import * as Checkbox from 'react-bootstrap/lib/Checkbox';
-import * as Clearfix from 'react-bootstrap/lib/Clearfix';
-import * as Col from 'react-bootstrap/lib/Col';
-import * as Collapse from 'react-bootstrap/lib/Collapse';
-import * as ControlLabel from 'react-bootstrap/lib/ControlLabel';
-import * as Dropdown from 'react-bootstrap/lib/Dropdown';
-import * as DropdownButton from 'react-bootstrap/lib/DropdownButton';
-import * as DropdownMenu from 'react-bootstrap/lib/DropdownMenu';
-import * as DropdownToggle from 'react-bootstrap/lib/DropdownToggle';
-import * as Fade from 'react-bootstrap/lib/Fade';
-import * as Form from 'react-bootstrap/lib/Form';
-import * as FormControl from 'react-bootstrap/lib/FormControl';
-import * as FormControlFeedback from 'react-bootstrap/lib/FormControlFeedback';
-import * as FormControlStatic from 'react-bootstrap/lib/FormControlStatic';
-import * as FormGroup from 'react-bootstrap/lib/FormGroup';
-import * as Glyphicon from 'react-bootstrap/lib/Glyphicon';
-import * as Grid from 'react-bootstrap/lib/Grid';
-import * as HelpBlock from 'react-bootstrap/lib/HelpBlock';
-import * as Image from 'react-bootstrap/lib/Image';
-import * as InputGroup from 'react-bootstrap/lib/InputGroup';
-import * as InputGroupAddon from 'react-bootstrap/lib/InputGroupAddon';
-import * as InputGroupButton from 'react-bootstrap/lib/InputGroupButton';
-import * as Jumbotron from 'react-bootstrap/lib/Jumbotron';
-import * as Label from 'react-bootstrap/lib/Label';
-import * as ListGroup from 'react-bootstrap/lib/ListGroup';
-import * as ListGroupItem from 'react-bootstrap/lib/ListGroupItem';
-import * as Media from 'react-bootstrap/lib/Media';
-import * as MediaBody from 'react-bootstrap/lib/MediaBody';
-import * as MediaHeading from 'react-bootstrap/lib/MediaHeading';
-import * as MediaLeft from 'react-bootstrap/lib/MediaLeft';
-import * as MediaList from 'react-bootstrap/lib/MediaList';
-import * as MediaListItem from 'react-bootstrap/lib/MediaListItem';
-import * as MediaRight from 'react-bootstrap/lib/MediaRight';
-import * as MenuItem from 'react-bootstrap/lib/MenuItem';
-import * as Modal from 'react-bootstrap/lib/Modal';
-import * as ModalBody from 'react-bootstrap/lib/ModalBody';
-import * as ModalDialog from 'react-bootstrap/lib/ModalDialog';
-import * as ModalFooter from 'react-bootstrap/lib/ModalFooter';
-import * as ModalHeader from 'react-bootstrap/lib/ModalHeader';
-import * as ModalTitle from 'react-bootstrap/lib/ModalTitle';
-import * as Nav from 'react-bootstrap/lib/Nav';
-import * as NavDropdown from 'react-bootstrap/lib/NavDropdown';
-import * as NavItem from 'react-bootstrap/lib/NavItem';
-import * as Navbar from 'react-bootstrap/lib/Navbar';
-import * as NavbarBrand from 'react-bootstrap/lib/NavbarBrand';
-import * as NavbarCollapse from 'react-bootstrap/lib/NavbarCollapse';
-import * as NavbarHeader from 'react-bootstrap/lib/NavbarHeader';
-import * as NavbarToggle from 'react-bootstrap/lib/NavbarToggle';
-import * as Overlay from 'react-bootstrap/lib/Overlay';
-import * as OverlayTrigger from 'react-bootstrap/lib/OverlayTrigger';
-import * as PageHeader from 'react-bootstrap/lib/PageHeader';
-import * as PageItem from 'react-bootstrap/lib/PageItem';
-import * as Pager from 'react-bootstrap/lib/Pager';
-import * as PagerItem from 'react-bootstrap/lib/PagerItem';
-import * as Pagination from 'react-bootstrap/lib/Pagination';
-import * as PaginationFirst from 'react-bootstrap/lib/PaginationFirst';
-import * as PaginationPrev from 'react-bootstrap/lib/PaginationPrev';
-import * as PaginationNext from 'react-bootstrap/lib/PaginationNext';
-import * as PaginationLast from 'react-bootstrap/lib/PaginationLast';
-import * as PaginationEllipsis from 'react-bootstrap/lib/PaginationEllipsis';
-import * as PaginationItem from 'react-bootstrap/lib/PaginationItem';
-import * as Panel from 'react-bootstrap/lib/Panel';
-import * as PanelHeading from 'react-bootstrap/lib/PanelHeading';
-import * as PanelTitle from 'react-bootstrap/lib/PanelTitle';
-import * as PanelToggle from 'react-bootstrap/lib/PanelToggle';
-import * as PanelCollapse from 'react-bootstrap/lib/PanelCollapse';
-import * as PanelBody from 'react-bootstrap/lib/PanelBody';
-import * as PanelFooter from 'react-bootstrap/lib/PanelFooter';
-import * as PanelGroup from 'react-bootstrap/lib/PanelGroup';
-import * as Popover from 'react-bootstrap/lib/Popover';
-import * as ProgressBar from 'react-bootstrap/lib/ProgressBar';
-import * as Radio from 'react-bootstrap/lib/Radio';
-import * as ResponsiveEmbed from 'react-bootstrap/lib/ResponsiveEmbed';
-import * as Row from 'react-bootstrap/lib/Row';
-import * as SafeAnchor from 'react-bootstrap/lib/SafeAnchor';
-import * as SplitButton from 'react-bootstrap/lib/SplitButton';
-import * as SplitToggle from 'react-bootstrap/lib/SplitToggle';
-import * as Tab from 'react-bootstrap/lib/Tab';
-import * as TabContainer from 'react-bootstrap/lib/TabContainer';
-import * as TabContent from 'react-bootstrap/lib/TabContent';
-import * as TabPane from 'react-bootstrap/lib/TabPane';
-import * as Table from 'react-bootstrap/lib/Table';
-import * as Tabs from 'react-bootstrap/lib/Tabs';
-import * as Thumbnail from 'react-bootstrap/lib/Thumbnail';
-import * as ToggleButton from 'react-bootstrap/lib/ToggleButton';
-import * as ToggleButtonGroup from 'react-bootstrap/lib/ToggleButtonGroup';
-import * as Tooltip from 'react-bootstrap/lib/Tooltip';
-import * as Well from 'react-bootstrap/lib/Well';
+import Accordion = require('react-bootstrap/lib/Accordion');
+import Alert = require('react-bootstrap/lib/Alert');
+import Badge = require('react-bootstrap/lib/Badge');
+import Breadcrumb = require('react-bootstrap/lib/Breadcrumb');
+import BreadcrumbItem = require('react-bootstrap/lib/BreadcrumbItem');
+import Button = require('react-bootstrap/lib/Button');
+import ButtonGroup = require('react-bootstrap/lib/ButtonGroup');
+import ButtonToolbar = require('react-bootstrap/lib/ButtonToolbar');
+import Carousel = require('react-bootstrap/lib/Carousel');
+import CarouselCaption = require('react-bootstrap/lib/CarouselCaption');
+import CarouselItem = require('react-bootstrap/lib/CarouselItem');
+import Checkbox = require('react-bootstrap/lib/Checkbox');
+import Clearfix = require('react-bootstrap/lib/Clearfix');
+import Col = require('react-bootstrap/lib/Col');
+import Collapse = require('react-bootstrap/lib/Collapse');
+import ControlLabel = require('react-bootstrap/lib/ControlLabel');
+import Dropdown = require('react-bootstrap/lib/Dropdown');
+import DropdownButton = require('react-bootstrap/lib/DropdownButton');
+import DropdownMenu = require('react-bootstrap/lib/DropdownMenu');
+import DropdownToggle = require('react-bootstrap/lib/DropdownToggle');
+import Fade = require('react-bootstrap/lib/Fade');
+import Form = require('react-bootstrap/lib/Form');
+import FormControl = require('react-bootstrap/lib/FormControl');
+import FormControlFeedback = require('react-bootstrap/lib/FormControlFeedback');
+import FormControlStatic = require('react-bootstrap/lib/FormControlStatic');
+import FormGroup = require('react-bootstrap/lib/FormGroup');
+import Glyphicon = require('react-bootstrap/lib/Glyphicon');
+import Grid = require('react-bootstrap/lib/Grid');
+import HelpBlock = require('react-bootstrap/lib/HelpBlock');
+import Image = require('react-bootstrap/lib/Image');
+import InputGroup = require('react-bootstrap/lib/InputGroup');
+import InputGroupAddon = require('react-bootstrap/lib/InputGroupAddon');
+import InputGroupButton = require('react-bootstrap/lib/InputGroupButton');
+import Jumbotron = require('react-bootstrap/lib/Jumbotron');
+import Label = require('react-bootstrap/lib/Label');
+import ListGroup = require('react-bootstrap/lib/ListGroup');
+import ListGroupItem = require('react-bootstrap/lib/ListGroupItem');
+import Media = require('react-bootstrap/lib/Media');
+import MediaBody = require('react-bootstrap/lib/MediaBody');
+import MediaHeading = require('react-bootstrap/lib/MediaHeading');
+import MediaLeft = require('react-bootstrap/lib/MediaLeft');
+import MediaList = require('react-bootstrap/lib/MediaList');
+import MediaListItem = require('react-bootstrap/lib/MediaListItem');
+import MediaRight = require('react-bootstrap/lib/MediaRight');
+import MenuItem = require('react-bootstrap/lib/MenuItem');
+import Modal = require('react-bootstrap/lib/Modal');
+import ModalBody = require('react-bootstrap/lib/ModalBody');
+import ModalDialog = require('react-bootstrap/lib/ModalDialog');
+import ModalFooter = require('react-bootstrap/lib/ModalFooter');
+import ModalHeader = require('react-bootstrap/lib/ModalHeader');
+import ModalTitle = require('react-bootstrap/lib/ModalTitle');
+import Nav = require('react-bootstrap/lib/Nav');
+import NavDropdown = require('react-bootstrap/lib/NavDropdown');
+import NavItem = require('react-bootstrap/lib/NavItem');
+import Navbar = require('react-bootstrap/lib/Navbar');
+import NavbarBrand = require('react-bootstrap/lib/NavbarBrand');
+import NavbarCollapse = require('react-bootstrap/lib/NavbarCollapse');
+import NavbarHeader = require('react-bootstrap/lib/NavbarHeader');
+import NavbarToggle = require('react-bootstrap/lib/NavbarToggle');
+import Overlay = require('react-bootstrap/lib/Overlay');
+import OverlayTrigger = require('react-bootstrap/lib/OverlayTrigger');
+import PageHeader = require('react-bootstrap/lib/PageHeader');
+import PageItem = require('react-bootstrap/lib/PageItem');
+import Pager = require('react-bootstrap/lib/Pager');
+import PagerItem = require('react-bootstrap/lib/PagerItem');
+import Pagination = require('react-bootstrap/lib/Pagination');
+import PaginationFirst = require('react-bootstrap/lib/PaginationFirst');
+import PaginationPrev = require('react-bootstrap/lib/PaginationPrev');
+import PaginationNext = require('react-bootstrap/lib/PaginationNext');
+import PaginationLast = require('react-bootstrap/lib/PaginationLast');
+import PaginationEllipsis = require('react-bootstrap/lib/PaginationEllipsis');
+import PaginationItem = require('react-bootstrap/lib/PaginationItem');
+import Panel = require('react-bootstrap/lib/Panel');
+import PanelHeading = require('react-bootstrap/lib/PanelHeading');
+import PanelTitle = require('react-bootstrap/lib/PanelTitle');
+import PanelToggle = require('react-bootstrap/lib/PanelToggle');
+import PanelCollapse = require('react-bootstrap/lib/PanelCollapse');
+import PanelBody = require('react-bootstrap/lib/PanelBody');
+import PanelFooter = require('react-bootstrap/lib/PanelFooter');
+import PanelGroup = require('react-bootstrap/lib/PanelGroup');
+import Popover = require('react-bootstrap/lib/Popover');
+import ProgressBar = require('react-bootstrap/lib/ProgressBar');
+import Radio = require('react-bootstrap/lib/Radio');
+import ResponsiveEmbed = require('react-bootstrap/lib/ResponsiveEmbed');
+import Row = require('react-bootstrap/lib/Row');
+import SafeAnchor = require('react-bootstrap/lib/SafeAnchor');
+import SplitButton = require('react-bootstrap/lib/SplitButton');
+import SplitToggle = require('react-bootstrap/lib/SplitToggle');
+import Tab = require('react-bootstrap/lib/Tab');
+import TabContainer = require('react-bootstrap/lib/TabContainer');
+import TabContent = require('react-bootstrap/lib/TabContent');
+import TabPane = require('react-bootstrap/lib/TabPane');
+import Table = require('react-bootstrap/lib/Table');
+import Tabs = require('react-bootstrap/lib/Tabs');
+import Thumbnail = require('react-bootstrap/lib/Thumbnail');
+import ToggleButton = require('react-bootstrap/lib/ToggleButton');
+import ToggleButtonGroup = require('react-bootstrap/lib/ToggleButtonGroup');
+import Tooltip = require('react-bootstrap/lib/Tooltip');
+import Well = require('react-bootstrap/lib/Well');
 
 const noop = () => {};
 
diff --git a/types/react-breadcrumbs-dynamic/index.d.ts b/types/react-breadcrumbs-dynamic/index.d.ts
index 21fb9f977a..ed0521ec28 100644
--- a/types/react-breadcrumbs-dynamic/index.d.ts
+++ b/types/react-breadcrumbs-dynamic/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/oklas/react-breadcrumbs-dynamic
 // Definitions by: mitsuruog <https://github.com/mitsuruog>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from "react";
 
diff --git a/types/react-breadcrumbs-dynamic/tsconfig.json b/types/react-breadcrumbs-dynamic/tsconfig.json
index 8b058ae2d6..1bb8a2273c 100644
--- a/types/react-breadcrumbs-dynamic/tsconfig.json
+++ b/types/react-breadcrumbs-dynamic/tsconfig.json
@@ -22,4 +22,4 @@
         "index.d.ts",
         "react-breadcrumbs-dynamic-tests.tsx"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/react-breadcrumbs/index.d.ts b/types/react-breadcrumbs/index.d.ts
index c004e4aba4..d43b5ba81c 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.4
+// TypeScript Version: 2.6
 
 import * as React from "react";
 import * as ReactRouter from "react-router";
diff --git a/types/react-breadcrumbs/react-breadcrumbs-tests.tsx b/types/react-breadcrumbs/react-breadcrumbs-tests.tsx
index b8a51bf36e..980b27fe41 100644
--- a/types/react-breadcrumbs/react-breadcrumbs-tests.tsx
+++ b/types/react-breadcrumbs/react-breadcrumbs-tests.tsx
@@ -1,12 +1,10 @@
 import * as React from 'react';
 import * as ReactRouter from "react-router";
-import * as Breadcrumbs from 'react-breadcrumbs';
-
+import Breadcrumbs = require('react-breadcrumbs');
 
 interface MyComponentProps extends ReactRouter.RouteComponentProps<{}, { id: number }> {
 }
 
-
 class MyComponent extends React.Component<MyComponentProps> {
     render() {
         return (
diff --git a/types/react-broadcast/tsconfig.json b/types/react-broadcast/tsconfig.json
index 270151cc33..9cfb3a43b0 100644
--- a/types/react-broadcast/tsconfig.json
+++ b/types/react-broadcast/tsconfig.json
@@ -1,17 +1,25 @@
 {
-  "compilerOptions": {
-    "baseUrl": "../",
-    "typeRoots": ["../"],
-    "types": [],
-    "module": "commonjs",
-    "lib": ["es6", "dom"],
-    "jsx": "react",
-    "strictNullChecks": true,
-    "strictFunctionTypes": false,
-    "noImplicitAny": true,
-    "noImplicitThis": true,
-    "forceConsistentCasingInFileNames": true,
-    "noEmit": true
-  },
-  "files": ["index.d.ts", "react-broadcast-tests.tsx"]
-}
+    "compilerOptions": {
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "jsx": "react",
+        "strictNullChecks": true,
+        "strictFunctionTypes": false,
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "forceConsistentCasingInFileNames": true,
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-broadcast-tests.tsx"
+    ]
+}
\ No newline at end of file
diff --git a/types/react-burger-menu/index.d.ts b/types/react-burger-menu/index.d.ts
index 585026eeee..51aec4fcd1 100644
--- a/types/react-burger-menu/index.d.ts
+++ b/types/react-burger-menu/index.d.ts
@@ -1,29 +1,41 @@
-// Type definitions for react-burger-menu 2.1
+// Type definitions for react-burger-menu 2.2
 // Project: https://github.com/negomi/react-burger-menu
 // Definitions by: Rajab Shakirov <https://github.com/radziksh>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from "react";
 
 export interface State {
-  isOpen: boolean;
+    isOpen: boolean;
+}
+
+export interface Styles {
+    bmBurgerBars: Partial<CSSStyleDeclaration>;
+    bmBurgerButton: Partial<CSSStyleDeclaration>;
+    bmCross: Partial<CSSStyleDeclaration>;
+    bmCrossButton: Partial<CSSStyleDeclaration>;
+    bmItemList: Partial<CSSStyleDeclaration>;
+    bmMenu: Partial<CSSStyleDeclaration>;
+    bmMorphShape: Partial<CSSStyleDeclaration>;
+    bmOverlay: Partial<CSSStyleDeclaration>;
 }
 
 export interface Props {
+    bodyClassName?: string;
     burgerBarClassName?: string;
     burgerButtonClassName?: string;
     crossButtonClassName?: string;
     crossClassName?: string;
     customBurgerIcon?: JSX.Element | false;
     customCrossIcon?: JSX.Element | false;
+    disableOverlayClick?: boolean;
     id?: string;
     isOpen?: boolean;
     itemListClassName?: string;
     menuClassName?: string;
     morphShapeClassName?: string;
     noOverlay?: boolean;
-    disableOverlayClick?: boolean;
     onStateChange?(state: State): void;
     // TODO (Rajab) This can be improved, though I do not know how. From PropTypes:
     // styles && styles.outerContainer ? PropTypes.string.isRequired : PropTypes.string
@@ -33,16 +45,7 @@ export interface Props {
     // styles && styles.pageWrap ? PropTypes.string.isRequired : PropTypes.string,
     pageWrapId?: string;
     right?: boolean;
-    styles?: {
-        bmBurgerButton: CSSStyleDeclaration;
-        bmBurgerBars: CSSStyleDeclaration;
-        bmCrossButton: CSSStyleDeclaration;
-        bmCross: CSSStyleDeclaration;
-        bmMenu: CSSStyleDeclaration;
-        bmMorphShape: CSSStyleDeclaration;
-        bmItemList: CSSStyleDeclaration;
-        bmOverlay: CSSStyleDeclaration;
-    };
+    styles?: Styles;
     width?: number | string;
 }
 
@@ -57,3 +60,4 @@ export class pushRotate extends ReactBurgerMenu { }
 export class scaleDown extends ReactBurgerMenu { }
 export class scaleRotate extends ReactBurgerMenu { }
 export class fallDown extends ReactBurgerMenu { }
+export class reveal extends ReactBurgerMenu { }
diff --git a/types/react-bytesize-icons/index.d.ts b/types/react-bytesize-icons/index.d.ts
index d1176b810b..d9dd1a50f7 100644
--- a/types/react-bytesize-icons/index.d.ts
+++ b/types/react-bytesize-icons/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/abdelhai/react-bytesize-icons
 // Definitions by: rhysd <https://rhysd.github.io>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from "react";
 
diff --git a/types/react-calendar-heatmap/index.d.ts b/types/react-calendar-heatmap/index.d.ts
index f15ff887ca..9f85b5bd2f 100644
--- a/types/react-calendar-heatmap/index.d.ts
+++ b/types/react-calendar-heatmap/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/patientslikeme/react-calendar-heatmap
 // Definitions by: Keisuke Kan <https://github.com/9renpoto>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from 'react';
 
diff --git a/types/react-calendar-timeline/index.d.ts b/types/react-calendar-timeline/index.d.ts
index a8f76daca1..69e5d037dc 100644
--- a/types/react-calendar-timeline/index.d.ts
+++ b/types/react-calendar-timeline/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/namespace-ee/react-calendar-timeline
 // Definitions by: Rajab Shakirov <https://github.com/radziksh>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 /// <reference types="react"/>
 
diff --git a/types/react-click-outside/index.d.ts b/types/react-click-outside/index.d.ts
index 4f5f7e96cb..5a1ce6d220 100644
--- a/types/react-click-outside/index.d.ts
+++ b/types/react-click-outside/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/kentor/react-click-outside
 // Definitions by: Christian Rackerseder <https://github.com/screendriver>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 import * as React from "react";
 
 declare function enhanceWithClickOutside<P = {}>(wrappedComponent: React.ComponentClass<P>): React.ComponentClass<P>;
diff --git a/types/react-click-outside/react-click-outside-tests.tsx b/types/react-click-outside/react-click-outside-tests.tsx
index 6f215e39a8..6aa375b153 100644
--- a/types/react-click-outside/react-click-outside-tests.tsx
+++ b/types/react-click-outside/react-click-outside-tests.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { render } from 'react-dom';
-import * as enhanceWithClickOutside from 'react-click-outside';
+import enhanceWithClickOutside = require('react-click-outside');
 
 interface Props {
     text: string;
diff --git a/types/react-click-outside/tsconfig.json b/types/react-click-outside/tsconfig.json
index 57ca39a8f0..caf91fdc1d 100644
--- a/types/react-click-outside/tsconfig.json
+++ b/types/react-click-outside/tsconfig.json
@@ -1,25 +1,25 @@
 {
-  "compilerOptions": {
-      "module": "commonjs",
-      "lib": [
-          "es6",
-          "dom"
-      ],
-      "noImplicitAny": true,
-      "noImplicitThis": true,
-      "strictNullChecks": true,
-      "strictFunctionTypes": true,
-      "baseUrl": "../",
-      "jsx": "react",
-      "typeRoots": [
-          "../"
-      ],
-      "types": [],
-      "noEmit": true,
-      "forceConsistentCasingInFileNames": true
-  },
-  "files": [
-      "index.d.ts",
-      "react-click-outside-tests.tsx"
-  ]
-}
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "jsx": "react",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-click-outside-tests.tsx"
+    ]
+}
\ No newline at end of file
diff --git a/types/react-codemirror/index.d.ts b/types/react-codemirror/index.d.ts
index afe3db2f75..607554b269 100644
--- a/types/react-codemirror/index.d.ts
+++ b/types/react-codemirror/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Vicky Lai <https://github.com/velveret>
 //                 Rudi Chen <https://github.com/rudi-c>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.4
+// TypeScript Version: 2.6
 
 /// <reference types="react"/>
 /// <reference types="codemirror"/>
diff --git a/types/react-codemirror/react-codemirror-tests.tsx b/types/react-codemirror/react-codemirror-tests.tsx
index f794e49d94..8673925d1c 100644
--- a/types/react-codemirror/react-codemirror-tests.tsx
+++ b/types/react-codemirror/react-codemirror-tests.tsx
@@ -1,7 +1,7 @@
-import * as CodeMirror from "codemirror";
+import CodeMirror = require("codemirror");
 import * as React from "react";
 import * as ReactDOM from "react-dom";
-import * as Codemirror from "react-codemirror";
+import Codemirror = require("react-codemirror");
 
 class CodemirrorTest extends React.Component<React.Props<{}>> {
     private editorRef: ReactCodeMirror.ReactCodeMirror;
diff --git a/types/react-collapse/index.d.ts b/types/react-collapse/index.d.ts
index ebb15e2dbb..a4061860ba 100644
--- a/types/react-collapse/index.d.ts
+++ b/types/react-collapse/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/nkbt/react-collapse
 // Definitions by: Adam Binford <https://github.com/Kimahriman>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 import * as React from 'react';
 
 export interface CollapseProps extends React.HTMLProps<Collapse> {
diff --git a/types/react-collapse/tsconfig.json b/types/react-collapse/tsconfig.json
index 291864c9d3..c3dbb022a3 100644
--- a/types/react-collapse/tsconfig.json
+++ b/types/react-collapse/tsconfig.json
@@ -21,4 +21,4 @@
         "index.d.ts",
         "react-collapse-tests.tsx"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/react-color/index.d.ts b/types/react-color/index.d.ts
index b3cf15bc98..051d9d4b7f 100644
--- a/types/react-color/index.d.ts
+++ b/types/react-color/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/casesandberg/react-color/
 // Definitions by: Karol Janyst <https://github.com/LKay>, Marks Polakovs <https://github.com/markspolakovs>, Matthieu Montaudouin <https://github.com/mntdn>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import { ComponentClass, ClassAttributes, StatelessComponent, ReactNode } from "react";
 
diff --git a/types/react-confirm/index.d.ts b/types/react-confirm/index.d.ts
index 23b9f40772..d07a367eab 100644
--- a/types/react-confirm/index.d.ts
+++ b/types/react-confirm/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/haradakunihiko/react-confirm
 // Definitions by: santiagodoldan <https://github.com/santiagodoldan>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from "react";
 
diff --git a/types/react-confirm/tsconfig.json b/types/react-confirm/tsconfig.json
index da3acdd363..10f1988053 100644
--- a/types/react-confirm/tsconfig.json
+++ b/types/react-confirm/tsconfig.json
@@ -21,4 +21,4 @@
         "index.d.ts",
         "react-confirm-tests.tsx"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/react-content-loader/index.d.ts b/types/react-content-loader/index.d.ts
index a8f320eaa9..21f58664ca 100644
--- a/types/react-content-loader/index.d.ts
+++ b/types/react-content-loader/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/danilowoz/react-content-loader
 // Definitions by: Alaa Masoud <https://github.com/alaatm>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from 'react';
 
diff --git a/types/react-content-loader/tsconfig.json b/types/react-content-loader/tsconfig.json
index 4385503dc9..6ec4332426 100644
--- a/types/react-content-loader/tsconfig.json
+++ b/types/react-content-loader/tsconfig.json
@@ -21,4 +21,4 @@
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     }
-}
+}
\ No newline at end of file
diff --git a/types/react-copy-to-clipboard/index.d.ts b/types/react-copy-to-clipboard/index.d.ts
index 1ee7dc0f9d..33e9549d30 100644
--- a/types/react-copy-to-clipboard/index.d.ts
+++ b/types/react-copy-to-clipboard/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Meno Abels <https://github.com/mabels>
 //                 Bernabe <https://github.com/BernabeFelix>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from "react";
 
diff --git a/types/react-copy-to-clipboard/react-copy-to-clipboard-tests.tsx b/types/react-copy-to-clipboard/react-copy-to-clipboard-tests.tsx
index a3459a66a5..c411139501 100644
--- a/types/react-copy-to-clipboard/react-copy-to-clipboard-tests.tsx
+++ b/types/react-copy-to-clipboard/react-copy-to-clipboard-tests.tsx
@@ -1,5 +1,5 @@
 import * as React from "react";
-import * as CopyToClipboard from "react-copy-to-clipboard";
+import CopyToClipboard = require("react-copy-to-clipboard");
 
 export class Test extends React.Component {
     render() {
diff --git a/types/react-cropper/index.d.ts b/types/react-cropper/index.d.ts
index 43f2cac063..3ab1106754 100644
--- a/types/react-cropper/index.d.ts
+++ b/types/react-cropper/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/roadmanfong/react-cropper
 // Definitions by: Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as cropperjs from 'cropperjs';
 import * as React from 'react';
diff --git a/types/react-css-modules/index.d.ts b/types/react-css-modules/index.d.ts
index 5ab7755478..955f76efa5 100644
--- a/types/react-css-modules/index.d.ts
+++ b/types/react-css-modules/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/gajus/react-css-modules
 // Definitions by: Kostya Esmukov <https://github.com/KostyaEsmukov>, Tadas Dailyda <https://github.com/skirsdeda>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 interface TypeOptions {
     allowMultiple?: boolean;
diff --git a/types/react-css-modules/react-css-modules-tests.tsx b/types/react-css-modules/react-css-modules-tests.tsx
index da191799c7..967036a8d0 100644
--- a/types/react-css-modules/react-css-modules-tests.tsx
+++ b/types/react-css-modules/react-css-modules-tests.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import * as CSSModules from 'react-css-modules';
+import CSSModules= require('react-css-modules');
 
 const styles = {};
 
diff --git a/types/react-css-transition-replace/index.d.ts b/types/react-css-transition-replace/index.d.ts
index 96f0952391..f252707f42 100644
--- a/types/react-css-transition-replace/index.d.ts
+++ b/types/react-css-transition-replace/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://marnusw.github.io/react-css-transition-replace/
 // Definitions by: Karol Janyst <https://github.com/LKay>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from "react";
 import * as CSSTransitionGroup from "react-addons-css-transition-group";
diff --git a/types/react-css-transition-replace/react-css-transition-replace-tests.tsx b/types/react-css-transition-replace/react-css-transition-replace-tests.tsx
index 2da448d448..acbd376a1b 100644
--- a/types/react-css-transition-replace/react-css-transition-replace-tests.tsx
+++ b/types/react-css-transition-replace/react-css-transition-replace-tests.tsx
@@ -1,6 +1,6 @@
 import * as React from "react"
 import { render } from 'react-dom';
-import * as CSSTransitionReplace from "react-css-transition-replace"
+import CSSTransitionReplace = require("react-css-transition-replace");
 
 render(
     <CSSTransitionReplace overflowHidden transitionName="test">
diff --git a/types/react-custom-scrollbars/index.d.ts b/types/react-custom-scrollbars/index.d.ts
index 4af4d37d06..a55675ed8d 100644
--- a/types/react-custom-scrollbars/index.d.ts
+++ b/types/react-custom-scrollbars/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by:  David-LeBlanc-git <https://github.com/David-LeBlanc-git>
 //                  kittimiyo <https://github.com/kittimiyo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from "react";
 
diff --git a/types/react-custom-scrollbars/v3/index.d.ts b/types/react-custom-scrollbars/v3/index.d.ts
index 6c408ec6f8..c0e7c1709e 100644
--- a/types/react-custom-scrollbars/v3/index.d.ts
+++ b/types/react-custom-scrollbars/v3/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/malte-wessel/react-custom-scrollbars
 // Definitions by: David-LeBlanc-git <https://github.com/David-LeBlanc-git>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from "react";
 
diff --git a/types/react-data-grid/index.d.ts b/types/react-data-grid/index.d.ts
index f712b43e1b..27f12bccb6 100644
--- a/types/react-data-grid/index.d.ts
+++ b/types/react-data-grid/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/adazzle/react-data-grid.git
 // Definitions by: Simon Gellis <https://github.com/SupernaviX>, Kieran Peat <https://github.com/KieranPeat>, Martin Novak <https://github.com/martinnov92>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 /// <reference types="react" />
 
diff --git a/types/react-data-grid/react-data-grid-tests.tsx b/types/react-data-grid/react-data-grid-tests.tsx
index 1b42af7ae6..827e20c820 100644
--- a/types/react-data-grid/react-data-grid-tests.tsx
+++ b/types/react-data-grid/react-data-grid-tests.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import * as ReactDataGrid from 'react-data-grid';
+import ReactDataGrid = require('react-data-grid');
 import * as ReactDataGridPlugins from 'react-data-grid-addons';
 import faker = require('faker');
 
diff --git a/types/react-data-grid/v1/index.d.ts b/types/react-data-grid/v1/index.d.ts
index 20ffef6c2b..81d7386dca 100644
--- a/types/react-data-grid/v1/index.d.ts
+++ b/types/react-data-grid/v1/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/adazzle/react-data-grid.git
 // Definitions by: Simon Gellis <https://github.com/SupernaviX>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 /// <reference types="react" />
 
diff --git a/types/react-data-grid/v1/react-data-grid-tests.tsx b/types/react-data-grid/v1/react-data-grid-tests.tsx
index bff860ee02..371831b43a 100644
--- a/types/react-data-grid/v1/react-data-grid-tests.tsx
+++ b/types/react-data-grid/v1/react-data-grid-tests.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import * as ReactDataGrid from 'react-data-grid';
+import ReactDataGrid = require('react-data-grid');
 import * as ReactDataGridPlugins from 'react-data-grid/addons';
 import faker = require('faker');
 
diff --git a/types/react-datagrid/index.d.ts b/types/react-datagrid/index.d.ts
index e3c8d983ea..8b8d6e4848 100644
--- a/types/react-datagrid/index.d.ts
+++ b/types/react-datagrid/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/zippyui/react-datagrid.git
 // Definitions by: Stephen Jelfs <https://github.com/stephenjelfs>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 /// <reference types="react"/>
 
diff --git a/types/react-date-range/index.d.ts b/types/react-date-range/index.d.ts
index 68df9722bf..e5be9f751b 100644
--- a/types/react-date-range/index.d.ts
+++ b/types/react-date-range/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/Adphorus/react-date-range/
 // Definitions by: Junbong Lee <https://github.com/Junbong>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.4
+// TypeScript Version: 2.6
 
 import * as React from 'react';
 import * as moment from "moment-timezone";
diff --git a/types/react-datepicker/index.d.ts b/types/react-datepicker/index.d.ts
index 60309b7f20..368894c0ed 100644
--- a/types/react-datepicker/index.d.ts
+++ b/types/react-datepicker/index.d.ts
@@ -7,7 +7,7 @@
 //                 Roy Xue <https://github.com/royxue>
 // 				   Koala Human <https://github.com/KoalaHuman>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.4
+// TypeScript Version: 2.6
 
 import * as React from "react";
 import * as moment from "moment";
@@ -59,6 +59,7 @@ export interface ReactDatePickerProps {
 	peekNextMonth?: boolean;
 	placeholderText?: string;
 	popperClassName?: string;
+	popperContainer?(props: { children: React.ReactNode[] }): React.ReactNode;
 	popperModifiers?: any;
 	popperPlacement?: string;
 	preventOpenOnFocus?: boolean;
diff --git a/types/react-datepicker/react-datepicker-tests.tsx b/types/react-datepicker/react-datepicker-tests.tsx
index 4d5edad58e..92cf23e38b 100644
--- a/types/react-datepicker/react-datepicker-tests.tsx
+++ b/types/react-datepicker/react-datepicker-tests.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import * as moment from 'moment';
+import moment = require('moment');
 import DatePicker from 'react-datepicker';
 
 class ReactDatePicker extends React.Component<{}, { startDate: moment.Moment; displayName: string; }> {
diff --git a/types/react-daterange-picker/index.d.ts b/types/react-daterange-picker/index.d.ts
index 55e33ff2bb..e6fac4c33d 100644
--- a/types/react-daterange-picker/index.d.ts
+++ b/types/react-daterange-picker/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: UNCOVER TRUTH Inc. <https://github.com/uncovertruth>
 //                 MartynasZilinskas <https://github.com/MartynasZilinskas>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from "react";
 import * as moment from "moment";
diff --git a/types/react-daterange-picker/react-daterange-picker-tests.tsx b/types/react-daterange-picker/react-daterange-picker-tests.tsx
index e1259dd81e..11bc2a3852 100644
--- a/types/react-daterange-picker/react-daterange-picker-tests.tsx
+++ b/types/react-daterange-picker/react-daterange-picker-tests.tsx
@@ -5,7 +5,7 @@ import DateRangePicker from "react-daterange-picker";
 import * as ReactDateRangePicker from "react-daterange-picker";
 
 import * as MomentRange from "moment-range";
-import * as Moment from "moment";
+import Moment = require("moment");
 
 const moment = MomentRange.extendMoment(Moment);
 
diff --git a/types/react-dates/index.d.ts b/types/react-dates/index.d.ts
index 2038b8a5d2..f9444c1b7c 100644
--- a/types/react-dates/index.d.ts
+++ b/types/react-dates/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/airbnb/react-dates
 // Definitions by: Artur Ampilogov <https://github.com/Artur-A>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from "react";
 import * as moment from "moment";
@@ -72,8 +72,8 @@ declare namespace ReactDates {
         // navigation related props
         navPrev?: string | JSX.Element,
         navNext?: string | JSX.Element,
-        onPrevMonthClick?: (e: React.EventHandler<React.MouseEvent<HTMLSpanElement>>) => void,
-        onNextMonthClick?: (e: React.EventHandler<React.MouseEvent<HTMLSpanElement>>) => void,
+        onPrevMonthClick?: (newCurrentMonth: momentPropTypes.momentObj) => void,
+        onNextMonthClick?: (newCurrentMonth: momentPropTypes.momentObj) => void,
         onClose?: (final: { startDate: momentPropTypes.momentObj, endDate: momentPropTypes.momentObj }) => void,
         transitionDuration?: number,
 
@@ -146,6 +146,9 @@ declare namespace ReactDates {
         customInputIcon?: string | JSX.Element,
         noBorder?: boolean,
         block?: boolean,
+        small?: boolean,
+        regular?: boolean,
+        keepFocusOnInput?: boolean,
 
         // calendar presentation and interaction related props
         renderMonth?: (day: momentPropTypes.momentObj) => (string | JSX.Element),
@@ -163,12 +166,14 @@ declare namespace ReactDates {
         hideKeyboardShortcutsPanel?: boolean,
         daySize?: number,
         isRTL?: boolean,
+        verticalSpacing?: number,        
+        verticalHeight?: number| null,
 
         // navigation related props
         navPrev?: string | JSX.Element,
         navNext?: string | JSX.Element,
-        onPrevMonthClick?: (e: React.EventHandler<React.MouseEvent<HTMLSpanElement>>) => void,
-        onNextMonthClick?: (e: React.EventHandler<React.MouseEvent<HTMLSpanElement>>) => void,
+        onPrevMonthClick?: (newCurrentMonth: momentPropTypes.momentObj) => void,
+        onNextMonthClick?: (newCurrentMonth: momentPropTypes.momentObj) => void,
         onClose?: (final: { startDate: momentPropTypes.momentObj, endDate: momentPropTypes.momentObj }) => void,
         transitionDuration?: number,
 
@@ -244,8 +249,8 @@ declare namespace ReactDates {
         navPrev?: string | JSX.Element,
         navNext?: string | JSX.Element,
         hideKeyboardShortcutsPanel?: boolean;
-        onPrevMonthClick?: (e: React.EventHandler<React.MouseEvent<HTMLSpanElement>>) => void,
-        onNextMonthClick?: (e: React.EventHandler<React.MouseEvent<HTMLSpanElement>>) => void,
+        onPrevMonthClick?: (newCurrentMonth: momentPropTypes.momentObj) => void,
+        onNextMonthClick?: (newCurrentMonth: momentPropTypes.momentObj) => void,
         transitionDuration?: number,
 
         // day presentation and interaction related props
diff --git a/types/react-dates/react-dates-tests.tsx b/types/react-dates/react-dates-tests.tsx
index f9d3118a4f..6462a6ebd5 100644
--- a/types/react-dates/react-dates-tests.tsx
+++ b/types/react-dates/react-dates-tests.tsx
@@ -1,5 +1,5 @@
 import * as React from "react";
-import * as moment from "moment";
+import moment = require("moment");
 
 import {
         SingleDatePicker,
@@ -13,9 +13,6 @@ import {
         toLocalizedDateString,
         toMomentObject } from "react-dates";
 
-
-
-
 class SingleDatePickerMinimumTest extends React.Component {
     render() {
         return <SingleDatePicker
@@ -64,6 +61,11 @@ class SingleDatePickerFullTest extends React.Component {
                     orientation="horizontal"
                     monthFormat="MM"
                     renderDayContents={day => day.toString()}
+                    verticalSpacing={4}
+                    keepFocusOnInput={true}
+                    verticalHeight={5}
+                    regular={true}
+                    small={true}
                     />
     }
 }
diff --git a/types/react-daum-postcode/index.d.ts b/types/react-daum-postcode/index.d.ts
index 058777bc29..b6d093db2d 100644
--- a/types/react-daum-postcode/index.d.ts
+++ b/types/react-daum-postcode/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/kimminsik-bernard/react-daum-postcode
 // Definitions by: Sa-ryong Kang <https://github.com/Sa-ryong>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import { Component } from 'react';
 
diff --git a/types/react-dnd-html5-backend/index.d.ts b/types/react-dnd-html5-backend/index.d.ts
index 6789ab3a19..1cf8f78335 100644
--- a/types/react-dnd-html5-backend/index.d.ts
+++ b/types/react-dnd-html5-backend/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/gaearon/react-dnd
 // Definitions by: Pedro Pereira <https://github.com/oizie>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as ReactDnd from "react-dnd";
 
diff --git a/types/react-dnd-multi-backend/index.d.ts b/types/react-dnd-multi-backend/index.d.ts
index 25029631cb..7e8b3ff209 100644
--- a/types/react-dnd-multi-backend/index.d.ts
+++ b/types/react-dnd-multi-backend/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/LouisBrunner/react-dnd-multi-backend
 // Definitions by: Janeene Beeforth <https://github.com/dawnmist>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import { CSSProperties, PureComponent } from "react";
 import { Backend } from "react-dnd";
diff --git a/types/react-dnd-multi-backend/tsconfig.json b/types/react-dnd-multi-backend/tsconfig.json
index e9857447ef..7ee0ca562c 100644
--- a/types/react-dnd-multi-backend/tsconfig.json
+++ b/types/react-dnd-multi-backend/tsconfig.json
@@ -23,4 +23,4 @@
         "lib/HTML5toTouch.d.ts",
         "react-dnd-multi-backend-tests.tsx"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/react-dnd-test-backend/tsconfig.json b/types/react-dnd-test-backend/tsconfig.json
index aaf674e57e..b83ff74de3 100644
--- a/types/react-dnd-test-backend/tsconfig.json
+++ b/types/react-dnd-test-backend/tsconfig.json
@@ -22,4 +22,4 @@
         "index.d.ts",
         "react-dnd-test-backend-tests.tsx"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/react-dnd-touch-backend/index.d.ts b/types/react-dnd-touch-backend/index.d.ts
index 6cf6037048..d8e1681f96 100644
--- a/types/react-dnd-touch-backend/index.d.ts
+++ b/types/react-dnd-touch-backend/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/yahoo/react-dnd-touch-backend#readme
 // Definitions by: Daniel Król <https://github.com/mleko>, Janeene Beeforth <https://github.com/dawnmist>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as ReactDnd from "react-dnd";
 
diff --git a/types/react-dnd-touch-backend/tsconfig.json b/types/react-dnd-touch-backend/tsconfig.json
index 926592e1c3..de3b6da377 100644
--- a/types/react-dnd-touch-backend/tsconfig.json
+++ b/types/react-dnd-touch-backend/tsconfig.json
@@ -21,4 +21,4 @@
         "index.d.ts",
         "react-dnd-touch-backend-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/react-dnd/index.d.ts b/types/react-dnd/index.d.ts
index fe7d3c18f8..6625903ad1 100644
--- a/types/react-dnd/index.d.ts
+++ b/types/react-dnd/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/gaearon/react-dnd
 // Definitions by: Asana <https://asana.com>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 ///<reference types="react" />
 
@@ -125,6 +125,8 @@ declare module __ReactDnd {
         captureDraggingState?: boolean;
         anchorX?: number;
         anchorY?: number;
+        offsetX?: number;
+        offsetY?: number;
     }
 
     type ConnectDragSource = DragElementWrapper<DragSourceOptions>;
diff --git a/types/react-document-title/index.d.ts b/types/react-document-title/index.d.ts
index fa22fe30dc..85e9f3eb48 100644
--- a/types/react-document-title/index.d.ts
+++ b/types/react-document-title/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/gaearon/react-document-title
 // Definitions by: Cleve Littlefield <https://github.com/cleverguy25>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from 'react';
 
diff --git a/types/react-dom-factories/index.d.ts b/types/react-dom-factories/index.d.ts
index a0c63f0562..eaf04f766f 100644
--- a/types/react-dom-factories/index.d.ts
+++ b/types/react-dom-factories/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://facebook.github.io/react/
 // Definitions by: John Gozde <https://github.com/jgoz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 export as namespace ReactDOMFactories;
 export = ReactDOMFactories;
diff --git a/types/react-dom-factories/tsconfig.json b/types/react-dom-factories/tsconfig.json
index 8cdf540399..fa72301516 100644
--- a/types/react-dom-factories/tsconfig.json
+++ b/types/react-dom-factories/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "react-dom-factories-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/react-dom/index.d.ts b/types/react-dom/index.d.ts
index 20b870a8b8..da494182d6 100644
--- a/types/react-dom/index.d.ts
+++ b/types/react-dom/index.d.ts
@@ -6,7 +6,7 @@
 //                 MartynasZilinskas <https://github.com/MartynasZilinskas>
 //                 Josh Rutherford <https://github.com/theruther4d>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 export as namespace ReactDOM;
 
diff --git a/types/react-dom/v15/index.d.ts b/types/react-dom/v15/index.d.ts
index 796314e19f..bd39e0a5e1 100644
--- a/types/react-dom/v15/index.d.ts
+++ b/types/react-dom/v15/index.d.ts
@@ -5,7 +5,7 @@
 //                 Microsoft <https://microsoft.com>
 //                 MartynasZilinskas <https://github.com/MartynasZilinskas>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 export as namespace ReactDOM;
 
diff --git a/types/react-dropzone/v2/index.d.ts b/types/react-dropzone/v2/index.d.ts
index 396fccc3b3..995e2cdb7d 100644
--- a/types/react-dropzone/v2/index.d.ts
+++ b/types/react-dropzone/v2/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/okonet/react-dropzone
 // Definitions by: Mathieu Larouche Dube <https://github.com/matdube>, Ivo Jesus <https://github.com/LynxEyes>, Luís Rodrigues <https://github.com/goblindegook>, Ben Bayard <https://github.com/benbayard>
 // Definitions: https://github.com/Vooban/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 /// <reference types="react"/>
 
diff --git a/types/react-dropzone/v3/index.d.ts b/types/react-dropzone/v3/index.d.ts
index c2ab8820de..55f485203f 100644
--- a/types/react-dropzone/v3/index.d.ts
+++ b/types/react-dropzone/v3/index.d.ts
@@ -6,7 +6,7 @@
 //                 Ben Bayard <https://github.com/benbayard>,
 //                 Karol Janyst <https://github.com/LKay>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import { CSSProperties, Component, DragEvent, InputHTMLAttributes } from "react";
 
diff --git a/types/react-dynamic-number/tsconfig.json b/types/react-dynamic-number/tsconfig.json
index ad1a3aee65..f0d426113b 100644
--- a/types/react-dynamic-number/tsconfig.json
+++ b/types/react-dynamic-number/tsconfig.json
@@ -1,17 +1,25 @@
 {
     "compilerOptions": {
         "module": "commonjs",
-        "lib": ["es6", "dom"],
+        "lib": [
+            "es6",
+            "dom"
+        ],
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
         "baseUrl": "../",
-        "typeRoots": ["../"],
+        "typeRoots": [
+            "../"
+        ],
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true,
         "jsx": "react",
         "strictFunctionTypes": true
     },
-    "files": ["index.d.ts", "react-dynamic-number-tests.tsx"]
-}
+    "files": [
+        "index.d.ts",
+        "react-dynamic-number-tests.tsx"
+    ]
+}
\ No newline at end of file
diff --git a/types/react-easy-chart/index.d.ts b/types/react-easy-chart/index.d.ts
index 9c254c6a28..fa3eb07b2c 100644
--- a/types/react-easy-chart/index.d.ts
+++ b/types/react-easy-chart/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/rma-consulting/react-easy-chart
 // Definitions by: Dave Leaver <https://github.com/danzel>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 /// <reference types="react" />
 
diff --git a/types/react-event-listener/index.d.ts b/types/react-event-listener/index.d.ts
index abfee41683..4b343c67e4 100644
--- a/types/react-event-listener/index.d.ts
+++ b/types/react-event-listener/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/oliviertassinari/react-event-listener
 // Definitions by: Alexey Svetliakov <https://github.com/asvetliakov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from "react";
 
diff --git a/types/react-fa/index.d.ts b/types/react-fa/index.d.ts
index 38d9e9e1f2..86480a197e 100644
--- a/types/react-fa/index.d.ts
+++ b/types/react-fa/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/andreypopp/react-fa
 // Definitions by: Frank Laub <https://github.com/flaub>, Pat Sissons <https://github.com/patsissons>, Karol Janyst <https://github.com/LKay>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import { Component, ComponentClass, HTMLProps, StatelessComponent, ReactElement } from "react";
 
diff --git a/types/react-facebook-login/index.d.ts b/types/react-facebook-login/index.d.ts
index d8fd4a0c8b..3cb1c21605 100644
--- a/types/react-facebook-login/index.d.ts
+++ b/types/react-facebook-login/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/keppelen/react-facebook-login
 // Definitions by: Alexandre Paré <https://github.com/apare>, Jan Karres <https://github.com/jankarres>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from "react";
 
diff --git a/types/react-faux-dom/index.d.ts b/types/react-faux-dom/index.d.ts
index 59c771527d..70257b5ce5 100644
--- a/types/react-faux-dom/index.d.ts
+++ b/types/react-faux-dom/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Ali Taheri Moghaddar <https://github.com/alitaheri>
 //                 Cleve Littlefield <https://github.com/cleverguy25>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from "react";
 
diff --git a/types/react-file-input/index.d.ts b/types/react-file-input/index.d.ts
index 48c9854e55..d2aa7c70cf 100644
--- a/types/react-file-input/index.d.ts
+++ b/types/react-file-input/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://www.npmjs.com/package/react-file-input
 // Definitions by: Dmitry Rogozhny <https://github.com/dmitryrogozhny>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 ///<reference types="react" />
 
diff --git a/types/react-file-reader-input/index.d.ts b/types/react-file-reader-input/index.d.ts
index af87636234..c198d2c5f1 100644
--- a/types/react-file-reader-input/index.d.ts
+++ b/types/react-file-reader-input/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://www.npmjs.com/package/react-file-reader-input
 // Definitions by: Dmitry Rogozhny <https://github.com/dmitryrogozhny>, Ali Taheri <https://github.com/alitaheri>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from 'react';
 
diff --git a/types/react-file-reader-input/react-file-reader-input-tests.tsx b/types/react-file-reader-input/react-file-reader-input-tests.tsx
index 5170780d8b..0367152f27 100644
--- a/types/react-file-reader-input/react-file-reader-input-tests.tsx
+++ b/types/react-file-reader-input/react-file-reader-input-tests.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import * as FileReaderInput from 'react-file-reader-input';
+import FileReaderInput = require('react-file-reader-input');
 
 class MyComponent extends React.Component {
   handleChange = (event: React.SyntheticEvent<any>, results: FileReaderInput.Result[]) => {
diff --git a/types/react-flags-select/index.d.ts b/types/react-flags-select/index.d.ts
index 6a2e1dc964..df01a33ae4 100644
--- a/types/react-flags-select/index.d.ts
+++ b/types/react-flags-select/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/ekwonye-richard/react-flags-select#readme
 // Definitions by: Artur Sianiuk <https://github.com/senukartur>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import { Component } from 'react';
 
diff --git a/types/react-flags-select/tsconfig.json b/types/react-flags-select/tsconfig.json
index f42fa48c4a..f1b35fc914 100644
--- a/types/react-flags-select/tsconfig.json
+++ b/types/react-flags-select/tsconfig.json
@@ -22,4 +22,4 @@
         "index.d.ts",
         "react-flags-select-tests.tsx"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/react-flatpickr/index.d.ts b/types/react-flatpickr/index.d.ts
index ebac89f48d..68d79a2b6c 100644
--- a/types/react-flatpickr/index.d.ts
+++ b/types/react-flatpickr/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/coderhaoxin/react-flatpickr
 // Definitions by: begincalendar <https://github.com/begincalendar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import { Component } from 'react';
 import { Options } from 'flatpickr';
diff --git a/types/react-flex/index.d.ts b/types/react-flex/index.d.ts
index 446445b2ba..50df2b6fb1 100644
--- a/types/react-flex/index.d.ts
+++ b/types/react-flex/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/zippyui/react-flex
 // Definitions by: Jeffery Grajkowski <https://github.com/pushplay>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from "react";
 
diff --git a/types/react-flexr/index.d.ts b/types/react-flexr/index.d.ts
index 4b610711f6..31be71a93e 100644
--- a/types/react-flexr/index.d.ts
+++ b/types/react-flexr/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/kodyl/react-flexr
 // Definitions by: Jeffery Grajkowski <https://github.com/pushplay>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 /// <reference types="react" />
 
diff --git a/types/react-fontawesome/index.d.ts b/types/react-fontawesome/index.d.ts
index 2e76b305b7..118f6fb4cd 100644
--- a/types/react-fontawesome/index.d.ts
+++ b/types/react-fontawesome/index.d.ts
@@ -5,7 +5,7 @@
 //                 Vincas Stonys <https://github.com/vincaslt>
 //                 Gavin Gregory <https://github.com/gavingregory>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from 'react';
 
diff --git a/types/react-form/index.d.ts b/types/react-form/index.d.ts
index 965f55e7e7..e2c2823d7f 100644
--- a/types/react-form/index.d.ts
+++ b/types/react-form/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/tannerlinsley/react-form#readme
 // Definitions by: Cameron McAteer <https://github.com/cameron-mcateer>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from 'react';
 
diff --git a/types/react-form/v1/index.d.ts b/types/react-form/v1/index.d.ts
index 4694efa926..41ca659a2d 100644
--- a/types/react-form/v1/index.d.ts
+++ b/types/react-form/v1/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/tannerlinsley/react-form#readme
 // Definitions by: Cameron McAteer <https://github.com/cameron-mcateer>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from 'react';
 
diff --git a/types/react-form/v1/tsconfig.json b/types/react-form/v1/tsconfig.json
index c1691ba3b1..0823491b1a 100644
--- a/types/react-form/v1/tsconfig.json
+++ b/types/react-form/v1/tsconfig.json
@@ -1,30 +1,30 @@
 {
-  "compilerOptions": {
-      "module": "commonjs",
-      "lib": [
-          "es6",
-          "dom"
-      ],
-      "noImplicitAny": true,
-      "noImplicitThis": true,
-      "strictNullChecks": true,
-      "strictFunctionTypes": true,
-      "baseUrl": "../../",
-      "jsx": "react",
-      "typeRoots": [
-          "../../"
-      ],
-      "types": [],
-      "noEmit": true,
-      "forceConsistentCasingInFileNames": true,
-      "paths": {
-        "react-form": [
-            "react-form/v1"
-        ]
-      }
-  },
-  "files": [
-      "index.d.ts",
-      "react-form-tests.tsx"
-  ]
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../../",
+        "jsx": "react",
+        "typeRoots": [
+            "../../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "paths": {
+            "react-form": [
+                "react-form/v1"
+            ]
+        }
+    },
+    "files": [
+        "index.d.ts",
+        "react-form-tests.tsx"
+    ]
 }
\ No newline at end of file
diff --git a/types/react-foundation/index.d.ts b/types/react-foundation/index.d.ts
index d50d73f556..9c88ff2f7e 100644
--- a/types/react-foundation/index.d.ts
+++ b/types/react-foundation/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/digiaonline/react-foundation
 // Definitions by: Daniel Earwicker <https://github.com/danielearwicker>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 export { Accordion, AccordionItem, AccordionTitle, AccordionContent } from './components/accordion';
 export { Badge } from './components/badge';
diff --git a/types/react-geosuggest/index.d.ts b/types/react-geosuggest/index.d.ts
index c0f2aa5ede..8a06859b53 100644
--- a/types/react-geosuggest/index.d.ts
+++ b/types/react-geosuggest/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/ubilabs/react-geosuggest
 // Definitions by: Brad Menchl <https://github.com/brmenchl>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.4
+// TypeScript Version: 2.6
 
 /// <reference types="googlemaps" />
 
@@ -34,7 +34,7 @@ export interface GeosuggestProps extends InputHTMLAttributes<HTMLInputElement> {
     queryDelay?: number;
     minLength?: number;
     highlightMatch?: boolean;
-    onFocus?(): void;
+    onFocus?(value: any): void;
     onBlur?(value: any): void;
     onChange?(value: any): void;
     onKeyDown?(event: any): void;
diff --git a/types/react-google-recaptcha/index.d.ts b/types/react-google-recaptcha/index.d.ts
index fee09c3ec8..841b6440af 100644
--- a/types/react-google-recaptcha/index.d.ts
+++ b/types/react-google-recaptcha/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/dozoisch/react-google-recaptcha
 // Definitions by: Koala Human <https://github.com/KoalaHuman>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from 'react';
 
diff --git a/types/react-google-recaptcha/tsconfig.json b/types/react-google-recaptcha/tsconfig.json
index bbd1cfd004..52df741020 100644
--- a/types/react-google-recaptcha/tsconfig.json
+++ b/types/react-google-recaptcha/tsconfig.json
@@ -22,4 +22,4 @@
         "index.d.ts",
         "react-google-recaptcha-tests.tsx"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/react-gravatar/index.d.ts b/types/react-gravatar/index.d.ts
index d7941f9224..e2418c2cf6 100644
--- a/types/react-gravatar/index.d.ts
+++ b/types/react-gravatar/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://kyleamathews.github.io/react-gravatar/
 // Definitions by: invliD <https://github.com/invliD>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from "react";
 
diff --git a/types/react-gravatar/react-gravatar-tests.tsx b/types/react-gravatar/react-gravatar-tests.tsx
index 1482af274d..f89881e930 100644
--- a/types/react-gravatar/react-gravatar-tests.tsx
+++ b/types/react-gravatar/react-gravatar-tests.tsx
@@ -1,5 +1,5 @@
 import * as React from "react";
-import * as Gravatar from "react-gravatar";
+import Gravatar = require("react-gravatar");
 
 class GravatarEmailTest extends React.Component {
 	render() {
diff --git a/types/react-grid-layout/index.d.ts b/types/react-grid-layout/index.d.ts
index 8dddb624d1..ff25317a96 100644
--- a/types/react-grid-layout/index.d.ts
+++ b/types/react-grid-layout/index.d.ts
@@ -5,7 +5,7 @@
 //                 Zheyang Song <https://github.com/ZheyangSong>,
 //                 Andrew Hathaway <https://github.com/andrewhathaway>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from "react";
 
diff --git a/types/react-grid-layout/react-grid-layout-tests.tsx b/types/react-grid-layout/react-grid-layout-tests.tsx
index 6c47e42d95..78ecf594ef 100644
--- a/types/react-grid-layout/react-grid-layout-tests.tsx
+++ b/types/react-grid-layout/react-grid-layout-tests.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import * as ReactGridLayout from 'react-grid-layout';
+import ReactGridLayout = require('react-grid-layout');
 import { Responsive, WidthProvider } from 'react-grid-layout';
 
 const ResponsiveWidth = WidthProvider(Responsive);
diff --git a/types/react-hamburger-menu/index.d.ts b/types/react-hamburger-menu/index.d.ts
index 1f91e6e8f0..c187a7ace3 100644
--- a/types/react-hamburger-menu/index.d.ts
+++ b/types/react-hamburger-menu/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/cameronbourke/react-hamburger-menu
 // Definitions by: Grzegorz Kielak <https://github.com/grzesie2k>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from "react";
 
diff --git a/types/react-helmet/index.d.ts b/types/react-helmet/index.d.ts
index 359836bea8..4a2a9e46c8 100644
--- a/types/react-helmet/index.d.ts
+++ b/types/react-helmet/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/nfl/react-helmet
 // Definitions by: Evan Bremer <https://github.com/evanbb>, Isman Usoh <https://github.com/isman-usoh>, François Nguyen <https://github.com/lith-light-g>, Kok Sam <https://github.com/sammkj>, Yui T. <https://github.com/yuit>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from "react";
 
diff --git a/types/react-helmet/v4/index.d.ts b/types/react-helmet/v4/index.d.ts
index ab5ea373df..b9a813b432 100644
--- a/types/react-helmet/v4/index.d.ts
+++ b/types/react-helmet/v4/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/nfl/react-helmet
 // Definitions by: Evan Bremer <https://github.com/evanbb>, Isman Usoh <https://github.com/isman-usoh>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 /// <reference types="react" />
 
diff --git a/types/react-helmet/v4/react-helmet-tests.tsx b/types/react-helmet/v4/react-helmet-tests.tsx
index e6b78955b3..695751d381 100644
--- a/types/react-helmet/v4/react-helmet-tests.tsx
+++ b/types/react-helmet/v4/react-helmet-tests.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import * as Helmet from 'react-helmet';
+import Helmet = require('react-helmet');
 
 <Helmet title="My Title" />
 
diff --git a/types/react-highlight-words/index.d.ts b/types/react-highlight-words/index.d.ts
index 3f37a70aaf..669a600dc9 100644
--- a/types/react-highlight-words/index.d.ts
+++ b/types/react-highlight-words/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/bvaughn/react-highlight-words#readme
 // Definitions by: Mohamed Hegazy <https://github.com/mhegazy>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from "react";
 
diff --git a/types/react-highlighter/index.d.ts b/types/react-highlighter/index.d.ts
index 8e918d87b7..022cdc911a 100644
--- a/types/react-highlighter/index.d.ts
+++ b/types/react-highlighter/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/helior/react-highlighter
 // Definitions by: Pedro Pereira <https://github.com/oizie>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 /// <reference types="react" />
 
diff --git a/types/react-holder/index.d.ts b/types/react-holder/index.d.ts
index a82731f8ba..3fa3541786 100644
--- a/types/react-holder/index.d.ts
+++ b/types/react-holder/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/Moeriki/react-holder
 // Definitions by: Isman Usoh <https://github.com/isman-usoh>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 ///<reference types="react"/>
 
diff --git a/types/react-hot-loader/index.d.ts b/types/react-hot-loader/index.d.ts
index 6bd1234259..6443fd1f43 100644
--- a/types/react-hot-loader/index.d.ts
+++ b/types/react-hot-loader/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/gaearon/react-hot-loader
 // Definitions by: Jacek Jagiello <https://github.com/jacekjagiello>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from "react"
 
diff --git a/types/react-hyperscript/index.d.ts b/types/react-hyperscript/index.d.ts
index 207ffe18ce..09030de2a9 100644
--- a/types/react-hyperscript/index.d.ts
+++ b/types/react-hyperscript/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/mlmorg/react-hyperscript
 // Definitions by: tock203 <https://github.com/tock203>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import { ComponentClass, StatelessComponent, ReactElement } from 'react';
 
diff --git a/types/react-hyperscript/react-hyperscript-tests.ts b/types/react-hyperscript/react-hyperscript-tests.ts
index 4be72a9b6a..12303dfd2e 100644
--- a/types/react-hyperscript/react-hyperscript-tests.ts
+++ b/types/react-hyperscript/react-hyperscript-tests.ts
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import * as h from 'react-hyperscript';
+import h = require('react-hyperscript');
 
 interface PropTypes {
     foo: string;
diff --git a/types/react-hyperscript/tsconfig.json b/types/react-hyperscript/tsconfig.json
index 1ad5f62543..a16169c511 100644
--- a/types/react-hyperscript/tsconfig.json
+++ b/types/react-hyperscript/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "react-hyperscript-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/react-i18next/index.d.ts b/types/react-i18next/index.d.ts
index 9831c0b049..356418fe2e 100644
--- a/types/react-i18next/index.d.ts
+++ b/types/react-i18next/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Giedrius Grabauskas <https://github.com/GiedriusGrabauskas>
 //                 Simon Baumann <https://github.com/chnoch>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.4
+// TypeScript Version: 2.6
 
 import { TranslationFunction } from "i18next";
 
diff --git a/types/react-i18next/tsconfig.json b/types/react-i18next/tsconfig.json
index e38c27a93e..f90b5c3ff0 100644
--- a/types/react-i18next/tsconfig.json
+++ b/types/react-i18next/tsconfig.json
@@ -16,7 +16,6 @@
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true,
-        "strictFunctionTypes": true,
         "jsx": "react",
         "experimentalDecorators": true
     },
@@ -31,4 +30,4 @@
         "src/trans.d.ts",
         "src/translate.d.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/react-i18next/v1/index.d.ts b/types/react-i18next/v1/index.d.ts
index cf56874445..451e18c34a 100644
--- a/types/react-i18next/v1/index.d.ts
+++ b/types/react-i18next/v1/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/i18next/react-i18next
 // Definitions by: Kostya Esmukov <https://github.com/KostyaEsmukov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as I18next from "i18next";
 import * as React from "react";
diff --git a/types/react-i18next/v4/index.d.ts b/types/react-i18next/v4/index.d.ts
index da6a12396d..6b87326975 100644
--- a/types/react-i18next/v4/index.d.ts
+++ b/types/react-i18next/v4/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/i18next/react-i18next
 // Definitions by: Giedrius Grabauskas <https://github.com/GiedriusGrabauskas>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import { TranslationFunction } from "i18next";
 
diff --git a/types/react-i18next/v4/tsconfig.json b/types/react-i18next/v4/tsconfig.json
index 1e7a8d9eea..b2c29f0bea 100644
--- a/types/react-i18next/v4/tsconfig.json
+++ b/types/react-i18next/v4/tsconfig.json
@@ -33,4 +33,4 @@
         "trans.d.ts",
         "translate.d.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/react-icon-base/index.d.ts b/types/react-icon-base/index.d.ts
index 0bd0005244..7459349b82 100644
--- a/types/react-icon-base/index.d.ts
+++ b/types/react-icon-base/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/gorangajic/react-icon-base#readme
 // Definitions by: Alexandre Paré <https://github.com/apare>, Karol Janyst <https://github.com/LKay>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from "react";
 
diff --git a/types/react-icons/index.d.ts b/types/react-icons/index.d.ts
index fb0026ff40..93c531c3b4 100644
--- a/types/react-icons/index.d.ts
+++ b/types/react-icons/index.d.ts
@@ -4,4 +4,4 @@
 //                 John Reilly <https://github.com/johnnyreilly>
 //                 Karol Janyst <https://github.com/LKay>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
diff --git a/types/react-image-gallery/index.d.ts b/types/react-image-gallery/index.d.ts
index 479b743e21..5b10b5925b 100644
--- a/types/react-image-gallery/index.d.ts
+++ b/types/react-image-gallery/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/xiaolin/react-image-gallery
 // Definitions by: Adam Webb <https://github.com/adamwpc>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from 'react';
 
diff --git a/types/react-image-gallery/tsconfig.json b/types/react-image-gallery/tsconfig.json
index 9970170355..d822cade87 100644
--- a/types/react-image-gallery/tsconfig.json
+++ b/types/react-image-gallery/tsconfig.json
@@ -21,4 +21,4 @@
         "index.d.ts",
         "react-image-gallery-tests.tsx"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/react-imageloader/index.d.ts b/types/react-imageloader/index.d.ts
index 4038e90ae0..bab7a49a34 100644
--- a/types/react-imageloader/index.d.ts
+++ b/types/react-imageloader/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/hzdg/react-imageloader
 // Definitions by: Stephen Jelfs <https://github.com/stephenjelfs>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 /// <reference types="react" />
 
diff --git a/types/react-infinite-scroller/index.d.ts b/types/react-infinite-scroller/index.d.ts
index a136ececa7..066714344c 100644
--- a/types/react-infinite-scroller/index.d.ts
+++ b/types/react-infinite-scroller/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Lauri Lavanti <https://github.com/Lapanti>,
 //                 Piotr Srebniak <https://github.com/psrebniak>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from "react";
 
diff --git a/types/react-infinite/index.d.ts b/types/react-infinite/index.d.ts
index 442764fe76..80a2594464 100644
--- a/types/react-infinite/index.d.ts
+++ b/types/react-infinite/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/seatgeek/react-infinite
 // Definitions by: rhysd <https://github.com/rhysd>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 ///<reference types="react" />
 
diff --git a/types/react-infinite/react-infinite-tests.tsx b/types/react-infinite/react-infinite-tests.tsx
index 295be25528..478f436e66 100644
--- a/types/react-infinite/react-infinite-tests.tsx
+++ b/types/react-infinite/react-infinite-tests.tsx
@@ -1,6 +1,5 @@
 import * as React from 'react';
 import Infinite = require('react-infinite');
-import * as ReactInfinite from 'react-infinite';
 
 class Test1 extends React.Component {
     render() {
@@ -52,15 +51,15 @@ class Test4 extends React.Component {
     }
 }
 
-class Test5 extends React.Component<ReactInfinite.InfiniteProps> {
+class Test5 extends React.Component<Infinite.InfiniteProps> {
     render() {
         return (
-            <ReactInfinite containerHeight={200} elementHeight={[111, 252, 143]}
+            <Infinite containerHeight={200} elementHeight={[111, 252, 143]}
                 displayBottomUpwards>
                 <div className="third-latest-chat" />
                 <div className="second-latest-chat" />
                 <div className="latest-chat-message" />
-            </ReactInfinite>
+            </Infinite>
         );
     }
 }
diff --git a/types/react-input-calendar/index.d.ts b/types/react-input-calendar/index.d.ts
index daa97aed68..c0e33783b4 100644
--- a/types/react-input-calendar/index.d.ts
+++ b/types/react-input-calendar/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/Rudeg/react-input-calendar
 // Definitions by: Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 /// <reference types="react"/>
 
diff --git a/types/react-input-calendar/react-input-calendar-tests.tsx b/types/react-input-calendar/react-input-calendar-tests.tsx
index 4cd465d9c5..9589c51046 100644
--- a/types/react-input-calendar/react-input-calendar-tests.tsx
+++ b/types/react-input-calendar/react-input-calendar-tests.tsx
@@ -1,4 +1,4 @@
-import * as ReactInputCalendar from 'react-input-calendar';
+import ReactInputCalendar = require('react-input-calendar');
 import * as React from 'react';
 import * as ReactDOM from 'react-dom';
 ReactDOM.render(<ReactInputCalendar />, document.body);
diff --git a/types/react-input-mask/index.d.ts b/types/react-input-mask/index.d.ts
index a830650812..6ed7660196 100644
--- a/types/react-input-mask/index.d.ts
+++ b/types/react-input-mask/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/sanniassin/react-input-mask
 // Definitions by: Alexandre Paré <https://github.com/apare>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from "react";
 
diff --git a/types/react-intl-redux/index.d.ts b/types/react-intl-redux/index.d.ts
index e47a48110c..300bd0542d 100644
--- a/types/react-intl-redux/index.d.ts
+++ b/types/react-intl-redux/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/ratson/react-intl-redux
 // Definitions by: Karol Janyst <https://github.com/LKay>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.4
+// TypeScript Version: 2.6
 
 import { Action } from "redux"
 import { Provider as ReduxProvider } from "react-redux"
diff --git a/types/react-intl/index.d.ts b/types/react-intl/index.d.ts
index 383fdef681..72d5d69f51 100644
--- a/types/react-intl/index.d.ts
+++ b/types/react-intl/index.d.ts
@@ -9,7 +9,7 @@
 //                 Krister Kari <https://github.com/kristerkari>
 //                 Martin Raedlinger <https://github.com/formatlos>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 declare namespace ReactIntl {
     type DateSource = Date | string | number;
diff --git a/types/react-intl/tsconfig.json b/types/react-intl/tsconfig.json
index d44df31af7..30bb669631 100644
--- a/types/react-intl/tsconfig.json
+++ b/types/react-intl/tsconfig.json
@@ -22,4 +22,4 @@
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     }
-}
+}
\ No newline at end of file
diff --git a/types/react-intl/v1/index.d.ts b/types/react-intl/v1/index.d.ts
index fcbd8ccddf..a891167f91 100644
--- a/types/react-intl/v1/index.d.ts
+++ b/types/react-intl/v1/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://formatjs.io/react/
 // Definitions by: Bruno Grieder <https://github.com/bgrieder>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 ///<reference types="react" />
 
diff --git a/types/react-is-deprecated/index.d.ts b/types/react-is-deprecated/index.d.ts
index b493f793fe..791cb97862 100644
--- a/types/react-is-deprecated/index.d.ts
+++ b/types/react-is-deprecated/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/Aweary/react-is-deprecated
 // Definitions by: Sean Kelley <https://github.com/seansfkelley>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 declare module 'react-is-deprecated' {
   import { Validator, Requireable, ValidationMap, ReactPropTypes } from 'react';
diff --git a/types/react-joyride/index.d.ts b/types/react-joyride/index.d.ts
index 757b538db1..4af8ab7d43 100644
--- a/types/react-joyride/index.d.ts
+++ b/types/react-joyride/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/gilbarbara/react-joyride
 // Definitions by: Daniel Rosenwasser <https://github.com/DanielRosenwasser>, Ben Dixon <https://github.com/bendxn>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from "react";
 
diff --git a/types/react-json-pretty/index.d.ts b/types/react-json-pretty/index.d.ts
index 56ee3e50b8..4229ff7c3b 100644
--- a/types/react-json-pretty/index.d.ts
+++ b/types/react-json-pretty/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/chenckang/react-json-pretty
 // Definitions by: Karol Janyst <https://github.com/LKay>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import { ComponentClass, HTMLProps } from "react";
 
diff --git a/types/react-json-pretty/react-json-pretty-tests.tsx b/types/react-json-pretty/react-json-pretty-tests.tsx
index 95818442df..4821e195e9 100644
--- a/types/react-json-pretty/react-json-pretty-tests.tsx
+++ b/types/react-json-pretty/react-json-pretty-tests.tsx
@@ -1,5 +1,5 @@
 import * as React from "react";
-import * as JSONPretty from "react-json-pretty";
+import JSONPretty = require("react-json-pretty");
 
 export class Test extends React.Component {
     render() {
diff --git a/types/react-json-tree/index.d.ts b/types/react-json-tree/index.d.ts
index e82be59e33..f275070a62 100644
--- a/types/react-json-tree/index.d.ts
+++ b/types/react-json-tree/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/alexkuz/react-json-tree/
 // Definitions by: Grant Nestor <https://github.com/gnestor>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import {
     Component,
diff --git a/types/react-json/index.d.ts b/types/react-json/index.d.ts
index 58bfd488f8..fa7eadeccc 100644
--- a/types/react-json/index.d.ts
+++ b/types/react-json/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/arqex/react-json
 // Definitions by: Christoph Spielmann <https://github.com/spielc>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from 'react';
 
diff --git a/types/react-jsonschema-form/index.d.ts b/types/react-jsonschema-form/index.d.ts
index 785ee072e9..0a43e0f0c8 100644
--- a/types/react-jsonschema-form/index.d.ts
+++ b/types/react-jsonschema-form/index.d.ts
@@ -5,7 +5,7 @@
 //                 Ivan Jiang <https://github.com/iplus26>
 //                 Kurt Preston <https://github.com/KurtPreston>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 declare module "react-jsonschema-form" {
     import * as React from "react";
diff --git a/types/react-lazyload/index.d.ts b/types/react-lazyload/index.d.ts
index ed90c3f973..b739b7d8cc 100644
--- a/types/react-lazyload/index.d.ts
+++ b/types/react-lazyload/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/jasonslyvia/react-lazyload
 // Definitions by: m0a <https://github.com/m0a>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import { Component } from 'react';
 
diff --git a/types/react-leaflet/index.d.ts b/types/react-leaflet/index.d.ts
index 5fdc5831e9..48a98bfbca 100644
--- a/types/react-leaflet/index.d.ts
+++ b/types/react-leaflet/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/PaulLeCam/react-leaflet
 // Definitions by: Dave Leaver <https://github.com/danzel>, David Schneider <https://github.com/davschne>, Yui T. <https://github.com/yuit>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as Leaflet from 'leaflet';
 import * as React from 'react';
diff --git a/types/react-list/index.d.ts b/types/react-list/index.d.ts
index 30371fc35b..77559988da 100644
--- a/types/react-list/index.d.ts
+++ b/types/react-list/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/orgsync/react-list
 // Definitions by: Yifei Yan <https://github.com/buptyyf>, Tom Shen <https://github.com/tomshen>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import {
     Component,
diff --git a/types/react-list/react-list-tests.tsx b/types/react-list/react-list-tests.tsx
index f02b1643a5..83aba8f698 100644
--- a/types/react-list/react-list-tests.tsx
+++ b/types/react-list/react-list-tests.tsx
@@ -1,5 +1,5 @@
 import * as React from "react";
-import * as ReactList from "react-list";
+import ReactList = require("react-list");
 
 const renderItem = (index: number, key: number) =>
     <div key={key} className={'item' + (index % 2 ? '' : ' even')}>
diff --git a/types/react-loadable/index.d.ts b/types/react-loadable/index.d.ts
index 08c5b52e39..d2229d4bf6 100644
--- a/types/react-loadable/index.d.ts
+++ b/types/react-loadable/index.d.ts
@@ -5,7 +5,7 @@
 //                 Ian Ker-Seymer <https://github.com/ianks>
 //                 Tomek Łaziuk <https://github.com/tlaziuk>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.4
+// TypeScript Version: 2.6
 
 /// <reference types="react" />
 
diff --git a/types/react-loadable/test/index.tsx b/types/react-loadable/test/index.tsx
index 7d25d849a7..5045fdf125 100644
--- a/types/react-loadable/test/index.tsx
+++ b/types/react-loadable/test/index.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import * as Loadable from 'react-loadable';
+import Loadable = require('react-loadable');
 
 class LoadingComponent extends React.Component<Loadable.LoadingComponentProps> {
   render() {
diff --git a/types/react-loader/index.d.ts b/types/react-loader/index.d.ts
index 8734d1cfd9..2d8f7a99a0 100644
--- a/types/react-loader/index.d.ts
+++ b/types/react-loader/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/quickleft/react-loader
 // Definitions by: Sudarsan Balaji <https://github.com/artfuldev>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import { Component } from 'react';
 
diff --git a/types/react-loader/react-loader-tests.tsx b/types/react-loader/react-loader-tests.tsx
index bc303f149a..92efaf9401 100644
--- a/types/react-loader/react-loader-tests.tsx
+++ b/types/react-loader/react-loader-tests.tsx
@@ -1,4 +1,4 @@
-import * as Loader from 'react-loader';
+import Loader = require('react-loader');
 import * as React from 'react';
 
 const options = {
diff --git a/types/react-maskedinput/index.d.ts b/types/react-maskedinput/index.d.ts
index 298f48ea30..3a1b4687eb 100644
--- a/types/react-maskedinput/index.d.ts
+++ b/types/react-maskedinput/index.d.ts
@@ -4,7 +4,7 @@
 //                 Adam Lavin <https://github.com/lavoaster>
 //                 Carlos Bonetti <https://github.com/CarlosBonetti>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from "react";
 
diff --git a/types/react-mce/index.d.ts b/types/react-mce/index.d.ts
index 861ce80e9e..6f1fb978db 100644
--- a/types/react-mce/index.d.ts
+++ b/types/react-mce/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/janstuemmel/react-mce
 // Definitions by: Gavin Heise <https://github.com/morphologue>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from 'react';
 import * as ActualTinyMCE from 'tinymce';
diff --git a/types/react-mdl/index.d.ts b/types/react-mdl/index.d.ts
index 8e70852190..caf910d421 100644
--- a/types/react-mdl/index.d.ts
+++ b/types/react-mdl/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/tleunen/react-mdl
 // Definitions by: Brad Zacher <https://github.com/bradzacher>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from 'react';
 
diff --git a/types/react-measure/index.d.ts b/types/react-measure/index.d.ts
index 945a49213a..c61b22b187 100644
--- a/types/react-measure/index.d.ts
+++ b/types/react-measure/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/souporserious/react-measure
 // Definitions by: Alexey Svetliakov <https://github.com/asvetliakov>, Marc Fallows <https://github.com/marcfallows>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from "react";
 
diff --git a/types/react-mixin/index.d.ts b/types/react-mixin/index.d.ts
index 09f7eb8366..265794afe2 100644
--- a/types/react-mixin/index.d.ts
+++ b/types/react-mixin/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/brigand/react-mixin
 // Definitions by: Qubo <https://github.com/tkqubo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 /// <reference types="react" />
 
diff --git a/types/react-modal/index.d.ts b/types/react-modal/index.d.ts
index 16ee347cfd..9a0d534af2 100644
--- a/types/react-modal/index.d.ts
+++ b/types/react-modal/index.d.ts
@@ -7,7 +7,7 @@
 //                 Uwe Wiemer <https://github.com/hallowatcher>,
 //                 Peter Blazejewicz <https://github.com/peterblazejewicz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from "react";
 
diff --git a/types/react-monaco-editor/index.d.ts b/types/react-monaco-editor/index.d.ts
index a493f3e194..f6245a82f4 100644
--- a/types/react-monaco-editor/index.d.ts
+++ b/types/react-monaco-editor/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/superRaytin/react-monaco-editor
 // Definitions by: Joshua Netterfield <https://github.com/jnetterf>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 /// <reference types="monaco-editor" />
 
diff --git a/types/react-motion-slider/index.d.ts b/types/react-motion-slider/index.d.ts
index 3bc8f75400..2e7ea921ef 100644
--- a/types/react-motion-slider/index.d.ts
+++ b/types/react-motion-slider/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/souporserious/react-motion-slider
 // Definitions by: Alexey Svetliakov <https://github.com/asvetliakov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 declare module "react-motion-slider" {
     import * as React from "react";
diff --git a/types/react-motion/index.d.ts b/types/react-motion/index.d.ts
index c33b6c8936..2c2958a62e 100644
--- a/types/react-motion/index.d.ts
+++ b/types/react-motion/index.d.ts
@@ -4,7 +4,7 @@
 //                 Alexey Svetliakov <https://github.com/asvetliakov>
 //                 Dimitar Nestorov <https://github.com/dimitarnestorov>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import { Component, ReactElement } from 'react';
 
diff --git a/types/react-native-collapsible/index.d.ts b/types/react-native-collapsible/index.d.ts
index bdd8dd9ea5..bdfc7cde09 100644
--- a/types/react-native-collapsible/index.d.ts
+++ b/types/react-native-collapsible/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/oblador/react-native-collapsible
 // Definitions by: Kyle Roach <https://github.com/iRoachie>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from 'react';
 
diff --git a/types/react-native-datepicker/index.d.ts b/types/react-native-datepicker/index.d.ts
index 19b2f488ca..ceb0e612aa 100644
--- a/types/react-native-datepicker/index.d.ts
+++ b/types/react-native-datepicker/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/xgfe/react-native-datepicker
 // Definitions by: Jacob Baskin <https://github.com/jacobbaskin>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from 'react';
 import { ImageURISource } from 'react-native';
diff --git a/types/react-native-doc-viewer/index.d.ts b/types/react-native-doc-viewer/index.d.ts
index 118104f1ae..6d09e3966a 100644
--- a/types/react-native-doc-viewer/index.d.ts
+++ b/types/react-native-doc-viewer/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/philipphecht/react-native-doc-viewer/blob/master/README.md
 // Definitions by: Kyle Roach <https://github.com/iRoachie>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.4
+// TypeScript Version: 2.6
 
 export function openDoc(
     files: Array<{ url: string; fileName?: string }>,
diff --git a/types/react-native-drawer-layout/index.d.ts b/types/react-native-drawer-layout/index.d.ts
index f6cf7a0d4a..e77bcb268c 100644
--- a/types/react-native-drawer-layout/index.d.ts
+++ b/types/react-native-drawer-layout/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/react-native-community/react-native-drawer-layout
 // Definitions by: Justin Firth <https://github.com/jmfirth>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from 'react';
 import { ViewProperties } from 'react-native';
@@ -94,12 +94,16 @@ export interface DrawerLayoutProperties extends ViewProperties {
 }
 
 export default class DrawerLayout extends React.Component<DrawerLayoutProperties> {
-  /**
-   * Opens the drawer.
-   */
-  openDrawer(): void;
-  /**
-   * Closes the drawer.
-   */
-  closeDrawer(): void;
+    static positions: {
+        Left: "left";
+        Right: "right";
+    };
+    /**
+     * Opens the drawer.
+     */
+    openDrawer(): void;
+    /**
+     * Closes the drawer.
+     */
+    closeDrawer(): void;
 }
diff --git a/types/react-native-drawer-layout/react-native-drawer-layout-tests.tsx b/types/react-native-drawer-layout/react-native-drawer-layout-tests.tsx
index c194756333..e0371643ee 100644
--- a/types/react-native-drawer-layout/react-native-drawer-layout-tests.tsx
+++ b/types/react-native-drawer-layout/react-native-drawer-layout-tests.tsx
@@ -32,6 +32,16 @@ class DrawerTest extends React.Component<{}, DrawerTestState> {
             >
               <View>
                 <Text>Screen content</Text>
+                <Text>
+                    {
+                        DrawerLayout.positions.Left
+                    }
+                </Text>
+                <Text>
+                    {
+                        DrawerLayout.positions.Right
+                    }
+                </Text>
               </View>
             </DrawerLayout>
         );
diff --git a/types/react-native-drawer/index.d.ts b/types/react-native-drawer/index.d.ts
index c36b3614f7..ac64c55fd9 100644
--- a/types/react-native-drawer/index.d.ts
+++ b/types/react-native-drawer/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/root-two/react-native-drawer
 // Definitions by: jnbt <https://github.com/jnbt>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from 'react';
 import { ViewStyle, ScaledSize } from 'react-native';
diff --git a/types/react-native-fabric/tsconfig.json b/types/react-native-fabric/tsconfig.json
index 90e24b408e..f3dcb77b3d 100644
--- a/types/react-native-fabric/tsconfig.json
+++ b/types/react-native-fabric/tsconfig.json
@@ -22,4 +22,4 @@
         "index.d.ts",
         "react-native-fabric-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/react-native-fbsdk/index.d.ts b/types/react-native-fbsdk/index.d.ts
index 8a07d47e88..8b948d6b0d 100644
--- a/types/react-native-fbsdk/index.d.ts
+++ b/types/react-native-fbsdk/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/facebook/react-native-fbsdk
 // Definitions by: Ifiok Jr. <https://github.com/ifiokjr>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import { ComponentClass, Component } from 'react';
 import { ViewStyle } from 'react-native';
diff --git a/types/react-native-fs/index.d.ts b/types/react-native-fs/index.d.ts
index 0e6fc8a3bf..17f26a5514 100644
--- a/types/react-native-fs/index.d.ts
+++ b/types/react-native-fs/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Paulo Cesar <https://github.com/pocesar>
 //                 Joseph Roque <https://github.com/josephroque>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 /// <reference types="react-native" />
 
diff --git a/types/react-native-google-signin/index.d.ts b/types/react-native-google-signin/index.d.ts
index 6166f99a98..c99a767b8a 100644
--- a/types/react-native-google-signin/index.d.ts
+++ b/types/react-native-google-signin/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/devfd/react-native-google-signin
 // Definitions by: Jacob Froman <https://github.com/j-fro>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from 'react';
 import { ViewProperties } from 'react-native';
diff --git a/types/react-native-google-signin/tsconfig.json b/types/react-native-google-signin/tsconfig.json
index aaa8a4b253..3c99f9f985 100644
--- a/types/react-native-google-signin/tsconfig.json
+++ b/types/react-native-google-signin/tsconfig.json
@@ -21,4 +21,4 @@
         "index.d.ts",
         "react-native-google-signin-tests.tsx"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/react-native-keep-awake/index.d.ts b/types/react-native-keep-awake/index.d.ts
index 21ca38b83f..f22d1342c6 100644
--- a/types/react-native-keep-awake/index.d.ts
+++ b/types/react-native-keep-awake/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/corbt/react-native-keep-awake
 // Definitions by: huhuanming <https://github.com/huhuanming>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from 'react';
 declare class KeepAwake extends React.Component<{ children?: JSX.Element }> {
diff --git a/types/react-native-linear-gradient/index.d.ts b/types/react-native-linear-gradient/index.d.ts
index 9c7bfbc1fd..687bd4e432 100644
--- a/types/react-native-linear-gradient/index.d.ts
+++ b/types/react-native-linear-gradient/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/brentvatne/react-native-linear-gradient#readme
 // Definitions by: Jacob Froman <https://github.com/j-fro>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from 'react';
 import { ViewProperties } from 'react-native';
diff --git a/types/react-native-linear-gradient/tsconfig.json b/types/react-native-linear-gradient/tsconfig.json
index 11c04115c3..60d93ae024 100644
--- a/types/react-native-linear-gradient/tsconfig.json
+++ b/types/react-native-linear-gradient/tsconfig.json
@@ -22,4 +22,4 @@
         "index.d.ts",
         "react-native-linear-gradient-tests.tsx"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/react-native-material-design-searchbar/index.d.ts b/types/react-native-material-design-searchbar/index.d.ts
index b00f921dc4..3c2aad9c51 100644
--- a/types/react-native-material-design-searchbar/index.d.ts
+++ b/types/react-native-material-design-searchbar/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/ananddayalan/react-native-material-design-searchbar
 // Definitions by: Kyle Roach <https://github.com/iRoachie>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from 'react';
 import {
diff --git a/types/react-native-material-kit/index.d.ts b/types/react-native-material-kit/index.d.ts
index 5dc9b63aff..79379e599a 100644
--- a/types/react-native-material-kit/index.d.ts
+++ b/types/react-native-material-kit/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Kyle Roach <https://github.com/iRoachie>
 //                 Tim Wang <https://github.com/timwangdev>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.4
+// TypeScript Version: 2.6
 
 import * as React from 'react';
 import {
diff --git a/types/react-native-material-ui/index.d.ts b/types/react-native-material-ui/index.d.ts
index f3147eecf7..e643b4198f 100644
--- a/types/react-native-material-ui/index.d.ts
+++ b/types/react-native-material-ui/index.d.ts
@@ -1,8 +1,8 @@
-// Type definitions for react-native-material-ui 1.12
+// Type definitions for react-native-material-ui 1.19
 // Project: https://github.com/xotahal/react-native-material-ui
 // Definitions by: Kyle Roach <https://github.com/iRoachie>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import { Component } from 'react';
 import { ViewStyle, TextStyle, Image } from 'react-native';
@@ -18,6 +18,7 @@ export interface ActionButtonProps {
     style?: {
         container?: ViewStyle
         icon?: TextStyle
+        positionContainer?: ViewStyle
     };
     transition?: 'toolbar' | 'speedDial';
     onPress?(): void;
diff --git a/types/react-native-material-ui/react-native-material-ui-tests.tsx b/types/react-native-material-ui/react-native-material-ui-tests.tsx
index 4acb9db12e..b4380fc388 100644
--- a/types/react-native-material-ui/react-native-material-ui-tests.tsx
+++ b/types/react-native-material-ui/react-native-material-ui-tests.tsx
@@ -25,7 +25,7 @@ const theme = {
 const Example = () =>
     <ThemeProvider uiTheme={theme}>
         <View>
-            <ActionButton />
+            <ActionButton style={{ positionContainer: { marginBottom: 3 }}} />
             <ActionButton icon="done" />
 
             <Avatar text="A" />
diff --git a/types/react-native-mixpanel/tsconfig.json b/types/react-native-mixpanel/tsconfig.json
index 489842ded8..e0eed7022f 100644
--- a/types/react-native-mixpanel/tsconfig.json
+++ b/types/react-native-mixpanel/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "react-native-mixpanel-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/react-native-modalbox/index.d.ts b/types/react-native-modalbox/index.d.ts
index 457872889b..683773e995 100644
--- a/types/react-native-modalbox/index.d.ts
+++ b/types/react-native-modalbox/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/maxs15/react-native-modalbox#readme
 // Definitions by: Kyle Roach <https://github.com/iRoachie>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from 'react';
 import { ViewProperties } from 'react-native';
diff --git a/types/react-native-navigation/index.d.ts b/types/react-native-navigation/index.d.ts
index 893a904f73..5b5344a4d5 100644
--- a/types/react-native-navigation/index.d.ts
+++ b/types/react-native-navigation/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/wix/react-native-navigation
 // Definitions by: Egor Shulga <https://github.com/egorshulga>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from 'react';
 
@@ -40,10 +40,18 @@ export interface TabBasedApp {
     animationType?: 'none' | 'slide-down' | 'fade';
 }
 
+export interface IconInsets {
+  top?: number;
+  left?: number;
+  bottom?: number;
+  right?: number;
+}
+
 export interface TabScreen {
     label?: string;
     screen: string;
     icon?: any;
+    iconInsets?: IconInsets;
     selectedIcon?: any;
     title?: string;
     navigatorStyle?: NavigatorStyle;
@@ -102,7 +110,7 @@ export interface LightBox {
     adjustSoftInput?: 'nothing' | 'pan' | 'resize' | 'unspecified';
 }
 
-export interface Navigator {
+export class Navigator {
     push(params: PushedScreen): void;
     pop(params?: { animated?: boolean; animationType?: 'fade' | 'slide-horizontal'; }): void;
     popToRoot(params?: { animated?: boolean; animationType?: 'fade' | 'slide-horizontal'; }): void;
@@ -150,10 +158,9 @@ export interface ListenerParams {
     commandType: string;
 }
 
-export type NavigationComponentProps<P = {}> =
-    P & {
-        navigator: Navigator;
-    };
+export interface NavigationComponentProps {
+    navigator: Navigator;
+}
 
 export interface NavigatorStyle {
     navBarTextColor?: string;
@@ -224,6 +231,7 @@ export interface NavigatorStyle {
 export interface NavigatorButtons {
     leftButtons?: NavigatorButton[];
     rightButtons?: NavigatorButton[];
+    fab?: FABAndroid;
 }
 
 export type IdAndroid = 'back' | 'cancel' | 'accept' | 'sideMenu';
diff --git a/types/react-native-navigation/react-native-navigation-tests.tsx b/types/react-native-navigation/react-native-navigation-tests.tsx
index 292b0fb375..b67aa3cfed 100644
--- a/types/react-native-navigation/react-native-navigation-tests.tsx
+++ b/types/react-native-navigation/react-native-navigation-tests.tsx
@@ -2,7 +2,7 @@ import * as React from 'react';
 import { Text, View } from 'react-native';
 import { Navigation, NavigationComponentProps, NavigatorStyle, NavigatorButtons } from 'react-native-navigation';
 
-class Screen1 extends React.Component<NavigationComponentProps<{ height: number }>> {
+class Screen1 extends React.Component<NavigationComponentProps & { height: number }> {
     static navigatorButtons: NavigatorButtons = {
         leftButtons: [{
             id: 'sideMenu'
diff --git a/types/react-native-navigation/tsconfig.json b/types/react-native-navigation/tsconfig.json
index 715f1f9e62..a8e66bb44a 100644
--- a/types/react-native-navigation/tsconfig.json
+++ b/types/react-native-navigation/tsconfig.json
@@ -21,4 +21,4 @@
         "index.d.ts",
         "react-native-navigation-tests.tsx"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/react-native-popup-dialog/index.d.ts b/types/react-native-popup-dialog/index.d.ts
index 73466d1b9d..c295a21ca2 100644
--- a/types/react-native-popup-dialog/index.d.ts
+++ b/types/react-native-popup-dialog/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Paito Anderson <https://github.com/PaitoAnderson>
 //                 connectdotz <https://github.com/connectdotz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from 'react';
 import { GestureResponderEvent, StyleProp, ViewStyle, TextStyle } from 'react-native';
diff --git a/types/react-native-popup-dialog/tsconfig.json b/types/react-native-popup-dialog/tsconfig.json
index ee710ade52..f870dbf139 100644
--- a/types/react-native-popup-dialog/tsconfig.json
+++ b/types/react-native-popup-dialog/tsconfig.json
@@ -22,4 +22,4 @@
         "index.d.ts",
         "react-native-popup-dialog-tests.tsx"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/react-native-push-notification/tsconfig.json b/types/react-native-push-notification/tsconfig.json
index a030044ab2..55402caca2 100644
--- a/types/react-native-push-notification/tsconfig.json
+++ b/types/react-native-push-notification/tsconfig.json
@@ -21,4 +21,4 @@
         "index.d.ts",
         "react-native-push-notification-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/react-native-qrcode/index.d.ts b/types/react-native-qrcode/index.d.ts
index 11b54f3a95..7c745aa1b6 100644
--- a/types/react-native-qrcode/index.d.ts
+++ b/types/react-native-qrcode/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/cssivision/react-native-qrcode
 // Definitions by: York Yao <https://github.com/plantain-00>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from 'react';
 
diff --git a/types/react-native-safari-view/index.d.ts b/types/react-native-safari-view/index.d.ts
index 9a398fde28..658a6664ce 100644
--- a/types/react-native-safari-view/index.d.ts
+++ b/types/react-native-safari-view/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/naoufal/react-native-safari-view
 // Definitions by: Michael Randolph <https://github.com/mrand01>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import { EmitterSubscription } from 'react-native';
 
diff --git a/types/react-native-scrollable-tab-view/index.d.ts b/types/react-native-scrollable-tab-view/index.d.ts
index 2ee0982c86..b18ee374a9 100644
--- a/types/react-native-scrollable-tab-view/index.d.ts
+++ b/types/react-native-scrollable-tab-view/index.d.ts
@@ -1,107 +1,154 @@
-// Type definitions for react-native-scrollable-tab-view 0.7
-// Project: https://github.com/brentvatne/react-native-scrollable-tab-view#readme
+// Type definitions for react-native-scrollable-tab-view 0.8
+// Project: https://github.com/skv-headless/react-native-scrollable-tab-view
 // Definitions by: CaiHuan <https://github.com/CaiHuan>
+//                 Egor Shulga <https://github.com/egorshulga>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from 'react';
-import {
-  Animated,
-  ViewStyle,
-  ScrollViewProperties
-} from 'react-native';
-
-export interface onChangeTabProperties {
-  // currentPage
-  i: number;
-
-  // currentPage object
-  ref: JSX.Element;
-
-  // previousPage
-  from: number;
-}
-
-export interface renderTabBarProperties {
-  goToPage(pageNumber: number): void;
-
-  tabs: JSX.Element;
-
-  activeTab: number;
-
-  scrollValue: Animated.Value;
-
-  containerWidth: number;
-}
+import { Animated, ScrollViewProperties, ViewStyle, TextStyle } from 'react-native';
 
 export interface ScrollableTabViewProperties extends React.Props<ScrollableTabView> {
-  /**
-   * tabBarPosition (String) Defaults to "top".
-   * "bottom" to position the tab bar below content.
-   * "overlayTop" or "overlayBottom" for a semitransparent tab bar that overlays content. Custom
-   * tab bars must consume a style prop on their outer element to support this feature: style={this.props.style}.
-   */
-  tabBarPosition?: 'top' | 'bottom' | 'overlayTop' | 'overlayBottom';
+    /**
+     * accept 1 argument props and should return a component
+     * to use as the tab bar. The component has goToPage, tabs, activeTab and ref added to the props,
+     * and should implement setAnimationValue to be able to animate itself along with the tab content.
+     * You can manually pass the props to the TabBar component.
+     */
+    renderTabBar?: ((props: TabBarProps) => JSX.Element) | false;
 
-  /**
-   * (Integer) - the index of the initially selected tab, defaults to 0 === first tab
-   */
-  initialPage?: number;
+    /**
+     * Defaults to "top".
+     * "bottom" to position the tab bar below content.
+     * "overlayTop" or "overlayBottom" for a semitransparent tab bar that overlays content. Custom
+     * tab bars must consume a style prop on their outer element to support this feature: style={this.props.style}.
+     */
+    tabBarPosition?: 'top' | 'bottom' | 'overlayTop' | 'overlayBottom';
 
-  /**
-   * (Integer) - set selected tab(can be buggy see
-   * https://github.com/skv-headless/react-native-scrollable-tab-view/issues/126
-   */
-  page?: number;
+    /**
+     * function to call when tab changes, should accept 1 argument which is
+     * an Object containing two keys: i: the index of the tab that is selected, ref: the ref of the
+     * tab that is selected
+     */
+    onChangeTab?(value: ChangeTabProperties): void;
 
-  /**
-   * onChangeTab (Function) - function to call when tab changes, should accept 1 argument which is
-   * an Object containing two keys: i: the index of the tab that is selected, ref: the ref of the
-   * tab that is selected
-   */
-  onChangeTab?(value: onChangeTabProperties): void;
+    /**
+     * function to call when the pages are sliding,
+     * should accept 1 argument which is an Float number representing the page position in the slide frame.
+     */
+    onScroll?(value: number): void;
 
-  /**
-   * onScroll (Function) - function to call when the pages are sliding,
-   * should accept 1 argument which is an Float number representing the page position in the slide frame.
-   */
-  onScroll?(value: number): void;
+    /**
+     * disables horizontal dragging to scroll between tabs, default is false.
+     */
+    locked?: boolean;
 
-  /**
-   * renderTabBar (Function:ReactComponent) - accept 1 argument props and should return a component
-   * to use as the tab bar. The component has goToPage, tabs, activeTab and ref added to the props,
-   * and should implement setAnimationValue to be able to animate itself along with the tab content.
-   * You can manually pass the props to the TabBar component.
-   */
-  renderTabBar?(value: JSX.Element): JSX.Element;
+    /**
+     * the index of the initially selected tab, defaults to 0 === first tab
+     */
+    initialPage?: number;
 
-  /**
-   * style (View.propTypes.style)
-   */
-  style?: ViewStyle;
+    /**
+     * set selected tab(can be buggy see
+     * https://github.com/skv-headless/react-native-scrollable-tab-view/issues/126
+     */
+    page?: number;
 
-  /**
-   * contentProps (Object) - props that are applied to root ScrollView/ViewPagerAndroid.
-   * Note that overriding defaults set by the library may break functionality; see the source for details.
-   */
-  contentProps?: ScrollViewProperties;
+    /**
+     * style of the default tab bar's underline
+     */
+    tabBarUnderlineStyle?: ViewStyle;
 
-  /**
-   * scrollWithoutAnimation (Bool) - on tab press change tab without animation.
-   */
-  scrollWithoutAnimation?: boolean;
+    /**
+     * color of the default tab bar's background, defaults to white
+     */
+    tabBarBackgroundColor?: string;
 
-  /**
-   * locked (Bool) - disables horizontal dragging to scroll between tabs, default is false.
-   */
-  locked?: boolean;
+    /**
+     * color of the default tab bar's text when active, defaults to navy
+     */
+    tabBarActiveTextColor?: string;
 
-  /**
-   * prerenderingSiblingsNumber (Integer) - pre-render nearby # sibling, Infinity === render all
-   * the siblings, default to 0 === render current page.
-   */
-  prerenderingSiblingsNumber?: number;
+    /**
+     * color of the default tab bar's text when inactive, defaults to black
+     */
+    tabBarInactiveTextColor?: string;
+
+    /**
+     * additional styles to the tab bar's text
+     */
+    tabBarTextStyle?: TextStyle;
+
+    /**
+     * style (View.propTypes.style)
+     */
+    style?: ViewStyle;
+
+    /**
+     * props that are applied to root ScrollView/ViewPagerAndroid.
+     * Note that overriding defaults set by the library may break functionality; see the source for details.
+     */
+    contentProps?: ScrollViewProperties;
+
+    /**
+     * on tab press change tab without animation.
+     */
+    scrollWithoutAnimation?: boolean;
+
+    /**
+     * pre-render nearby # sibling, Infinity === render all
+     * the siblings, default to 0 === render current page.
+     */
+    prerenderingSiblingsNumber?: number;
+}
+
+export type TabBarProps<T = {}> = T & {
+    goToPage?: (pageNumber: number) => void;
+    tabs?: JSX.Element[];
+    activeTab?: number;
+    scrollValue?: Animated.Value;
+    containerWidth?: number;
+};
+
+export interface ChangeTabProperties {
+    // currentPage
+    i: number;
+    // currentPage object
+    ref: JSX.Element;
+    // previousPage
+    from: number;
 }
 
 export default class ScrollableTabView extends React.Component<ScrollableTabViewProperties> {
 }
+
+// Each top-level child component should have a tabLabel prop
+// that can be used by the tab bar component to render out the labels.
+export type TabProps<T = {}> = T & {
+    tabLabel: React.ReactType;
+};
+
+export interface DefaultTabBarProps {
+    backgroundColor?: string;
+    activeTextColor?: string;
+    inactiveTextColor?: string;
+    textStyle?: TextStyle;
+    tabStyle?: ViewStyle;
+    renderTab?: RenderTabProperties;
+    underlineStyle?: ViewStyle;
+}
+
+export type RenderTabProperties =
+    (name: string, pageIndex: number, isTabActive: boolean, goToPage: (pageNumber: number) => void) => JSX.Element;
+
+export class DefaultTabBar extends React.Component<TabBarProps<DefaultTabBarProps>> {
+}
+
+export interface ScrollableTabBarProps extends DefaultTabBarProps {
+    scrollOffset?: number;
+    style?: ViewStyle;
+    tabsContainerStyle?: ViewStyle;
+}
+
+export class ScrollableTabBar extends React.Component<TabBarProps<ScrollableTabBarProps>> {
+}
diff --git a/types/react-native-scrollable-tab-view/react-native-scrollable-tab-view-tests.tsx b/types/react-native-scrollable-tab-view/react-native-scrollable-tab-view-tests.tsx
index 8463a7849c..3c5aecc379 100644
--- a/types/react-native-scrollable-tab-view/react-native-scrollable-tab-view-tests.tsx
+++ b/types/react-native-scrollable-tab-view/react-native-scrollable-tab-view-tests.tsx
@@ -1,44 +1,37 @@
 import * as React from 'react';
-import {
-  Text
-} from 'react-native';
-import ScrollableTabView from 'react-native-scrollable-tab-view';
+import { Text, TextStyle, View, ViewStyle } from 'react-native';
+import ScrollableTabView, { ScrollableTabBar, TabProps } from 'react-native-scrollable-tab-view';
 
-interface MyTextProperties extends React.Props<MyText> {
-  tabLabel: string;
-
-  text: string;
-}
-class MyText extends React.Component<MyTextProperties> {
-  constructor(props: MyTextProperties) {
-    super(props);
-  }
-
-  render(): JSX.Element {
-    return(
-      <Text>this.props.text</Text>
-    );
-  }
+interface MyTextProps {
+    style?: TextStyle;
 }
 
-class ScrollableTabViewDemo extends React.Component {
-  constructor(props: ScrollableTabViewDemo) {
-    super(props);
-  }
+const MyText: React.SFC<TabProps<MyTextProps>> = (props) => (
+    <Text style={props.style}>{props.children}</Text>
+);
 
-  render(): JSX.Element {
-    return (
-      <ScrollableTabView>
-        <MyText tabLabel='t1' text='t1'></MyText>
-        <MyText tabLabel='t2' text='t2'></MyText>
-        <MyText tabLabel='t3' text='t3'></MyText>
-      </ScrollableTabView>
-    );
-  }
-
-  componentWillMount?(): void {
-  }
-
-  componentWillUnmount?(): void {
-  }
+interface MyViewProps {
+    style?: ViewStyle;
 }
+
+class MyView extends React.Component<TabProps<MyViewProps>> {
+    render() {
+        return (
+            <View style={this.props.style}>{this.props.children}</View>
+        );
+    }
+}
+
+const TabView1 = () => (
+    <ScrollableTabView
+        style={{ marginTop: 20, }}
+        initialPage={0}
+        renderTabBar={() => <ScrollableTabBar />}
+    >
+        <MyText tabLabel='Tab #1'>My</MyText>
+        <MyText tabLabel='Tab #2 word word'>favorite</MyText>
+        <MyText tabLabel='Tab #3 word word word'>project</MyText>
+        <MyView tabLabel='Tab #4 word word word word'><Text>favorite</Text></MyView>
+        <MyView tabLabel='Tab #5'><Text>project</Text></MyView>
+    </ScrollableTabView>
+);
diff --git a/types/react-native-sensor-manager/index.d.ts b/types/react-native-sensor-manager/index.d.ts
index 85e5870f0a..0b0f0bf67a 100644
--- a/types/react-native-sensor-manager/index.d.ts
+++ b/types/react-native-sensor-manager/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/kprimice/react-native-sensor-manager
 // Definitions by: Sahin Vardar <https://github.com/SahinVardar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 /// <reference types="react-native" />
 
diff --git a/types/react-native-snap-carousel/index.d.ts b/types/react-native-snap-carousel/index.d.ts
index 5bba10bafb..e62301d2fc 100644
--- a/types/react-native-snap-carousel/index.d.ts
+++ b/types/react-native-snap-carousel/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: jnbt <https://github.com/jnbt>
 //                 Jacob Froman <https://github.com/j-fro>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from 'react';
 import {
diff --git a/types/react-native-sortable-grid/index.d.ts b/types/react-native-sortable-grid/index.d.ts
index bc4826dd05..392e9b1b01 100644
--- a/types/react-native-sortable-grid/index.d.ts
+++ b/types/react-native-sortable-grid/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/ollija/react-native-sortable-grid#readme
 // Definitions by: Jacob Froman <https://github.com/j-fro>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from 'react';
 import { StyleProp, ViewStyle, Animated } from 'react-native';
diff --git a/types/react-native-sortable-grid/tsconfig.json b/types/react-native-sortable-grid/tsconfig.json
index d4391d4624..4a2ec708aa 100644
--- a/types/react-native-sortable-grid/tsconfig.json
+++ b/types/react-native-sortable-grid/tsconfig.json
@@ -21,4 +21,4 @@
         "index.d.ts",
         "react-native-sortable-grid-tests.tsx"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/react-native-sortable-list/index.d.ts b/types/react-native-sortable-list/index.d.ts
index 3c1d1c967b..9b8e547b85 100644
--- a/types/react-native-sortable-list/index.d.ts
+++ b/types/react-native-sortable-list/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/gitim/react-native-sortable-list
 // Definitions by: Michael Sivolobov <https://github.com/sivolobov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from 'react';
 import { ViewStyle } from 'react-native';
diff --git a/types/react-native-svg-uri/index.d.ts b/types/react-native-svg-uri/index.d.ts
index ea2607aa19..4529c53d5e 100644
--- a/types/react-native-svg-uri/index.d.ts
+++ b/types/react-native-svg-uri/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/matiascba/react-native-svg-uri#readme
 // Definitions by: Kyle Roach <https://github.com/iRoachie>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from 'react';
 import { ImageURISource } from 'react-native';
diff --git a/types/react-native-swiper/index.d.ts b/types/react-native-swiper/index.d.ts
index 7007fa6f7f..c6616aea0c 100644
--- a/types/react-native-swiper/index.d.ts
+++ b/types/react-native-swiper/index.d.ts
@@ -4,7 +4,7 @@
 //                 HuHuanming <https://github.com/huhuanming>
 //                 mhcgrq <https://github.com/mhcgrq>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from 'react';
 import {
diff --git a/types/react-native-tab-navigator/index.d.ts b/types/react-native-tab-navigator/index.d.ts
index 9c2beb5108..1f4e5e5437 100644
--- a/types/react-native-tab-navigator/index.d.ts
+++ b/types/react-native-tab-navigator/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/exponentjs/react-native-tab-navigator#readme
 // Definitions by: My Self <https://github.com/iRoachie>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.4
+// TypeScript Version: 2.6
 
 import * as React from 'react';
 import { ViewStyle, TextStyle } from 'react-native';
diff --git a/types/react-native-tab-view/index.d.ts b/types/react-native-tab-view/index.d.ts
index ca5a375e74..2c6546a628 100644
--- a/types/react-native-tab-view/index.d.ts
+++ b/types/react-native-tab-view/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/react-native-community/react-native-tab-view
 // Definitions by: Kalle Ott <https://github.com/kaoDev>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.4
+// TypeScript Version: 2.6
 
 import { PureComponent, ReactNode, ComponentType } from 'react'
 import {
diff --git a/types/react-native-tab-view/tsconfig.json b/types/react-native-tab-view/tsconfig.json
index 7449ff01dd..8841b6a2b4 100644
--- a/types/react-native-tab-view/tsconfig.json
+++ b/types/react-native-tab-view/tsconfig.json
@@ -1,17 +1,24 @@
 {
-  "compilerOptions": {
-    "module": "commonjs",
-    "lib": ["es6"],
-    "jsx": "preserve",
-    "noImplicitAny": true,
-    "noImplicitThis": true,
-    "strictNullChecks": true,
-    "baseUrl": "../",
-    "typeRoots": ["../"],
-    "types": [],
-    "noEmit": true,
-    "strictFunctionTypes": true,
-    "forceConsistentCasingInFileNames": true
-  },
-  "files": ["index.d.ts", "react-native-tab-view-tests.tsx"]
-}
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "jsx": "preserve",
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "strictFunctionTypes": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-native-tab-view-tests.tsx"
+    ]
+}
\ No newline at end of file
diff --git a/types/react-native-vector-icons/index.d.ts b/types/react-native-vector-icons/index.d.ts
index 39bb2a6640..05a140e3bb 100644
--- a/types/react-native-vector-icons/index.d.ts
+++ b/types/react-native-vector-icons/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Kyle Roach <https://github.com/iRoachie>
 //                 Tim Wang <https://github.com/timwangdev>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from 'react';
 import { Icon } from './Icon';
diff --git a/types/react-native-video/index.d.ts b/types/react-native-video/index.d.ts
index 4d9edaa364..5353ea6de7 100644
--- a/types/react-native-video/index.d.ts
+++ b/types/react-native-video/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: HuHuanming <https://github.com/huhuanming>
 //                 abrahambotros <https://github.com/abrahambotros>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.4
+// TypeScript Version: 2.6
 
 import * as React from 'react';
 import {
diff --git a/types/react-native/index.d.ts b/types/react-native/index.d.ts
index c2ca58a5f3..656b1c2e0d 100644
--- a/types/react-native/index.d.ts
+++ b/types/react-native/index.d.ts
@@ -7,7 +7,7 @@
 //                 Kamal Mahyuddin <https://github.com/kamal>
 //                 Naoufal El Yousfi <https://github.com/nelyousfi>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 //
@@ -3643,11 +3643,11 @@ export interface FlatListStatic<ItemT> extends React.ComponentClass<FlatListProp
     scrollToEnd: (params?: { animated?: boolean }) => void;
 
     /**
-     * Scrolls to the item at a the specified index such that it is positioned in the viewable area
-     * such that `viewPosition` 0 places it at the top, 1 at the bottom, and 0.5 centered in the middle.
-     * May be janky without `getItemLayout` prop.
+     * Scrolls to the item at the specified index such that it is positioned in the viewable area
+     * such that viewPosition 0 places it at the top, 1 at the bottom, and 0.5 centered in the middle.
+     * Cannot scroll to locations outside the render window without specifying the getItemLayout prop.
      */
-    scrollToIndex: (params: { animated?: boolean; index: number; viewPosition?: number }) => void;
+    scrollToIndex: (params: { animated?: boolean; index: number; viewOffset: number; viewPosition?: number }) => void;
 
     /**
      * Requires linear scan through data - use `scrollToIndex` instead if possible.
@@ -5199,7 +5199,7 @@ export type PlatformOSType = "ios" | "android" | "macos" | "windows" | "web";
 
 interface PlatformStatic {
     OS: PlatformOSType;
-    Version: number;
+    Version: number | string;
 
     /**
      * @see https://facebook.github.io/react-native/docs/platform-specific-code.html#content
@@ -6211,7 +6211,16 @@ export interface ShareStatic {
     dismissedAction: string;
 }
 
-type AccessibilityChangeEventName = "change" | "announcementFinished";
+type AccessibilityEventName = "change" | "announcementFinished";
+
+type AccessibilityChangeEvent = boolean;
+
+type AccessibilityAnnoucementFinishedEvent = {
+    announcement: string;
+    success: boolean
+};
+
+type AccessibilityEvent = AccessibilityChangeEvent | AccessibilityAnnoucementFinishedEvent;
 
 /**
  * @see https://facebook.github.io/react-native/docs/accessibilityinfo.html
@@ -6234,12 +6243,12 @@ export interface AccessibilityInfoStatic {
      *                          - announcement: The string announced by the screen reader.
      *                          - success: A boolean indicating whether the announcement was successfully made.
      */
-    addEventListener: (eventName: AccessibilityChangeEventName, handler: () => void) => void;
+    addEventListener: (eventName: AccessibilityEventName, handler: (event: AccessibilityEvent) => void) => void;
 
     /**
      * Remove an event handler.
      */
-    removeEventListener: (eventName: AccessibilityChangeEventName, handler: () => void) => void;
+    removeEventListener: (eventName: AccessibilityEventName, handler: (event: AccessibilityEvent) => void) => void;
 
     /**
      * Set acessibility focus to a react component.
@@ -8625,6 +8634,7 @@ export namespace addons {
 export var ColorPropType: React.Requireable<any>;
 export var EdgeInsetsPropType: React.Requireable<any>;
 export var PointPropType: React.Requireable<any>;
+export var ViewPropTypes: React.Requireable<any>;
 
 declare global {
     function require(name: string): any;
diff --git a/types/react-navigation/index.d.ts b/types/react-navigation/index.d.ts
index 1c6f6716a9..2c3c384ac6 100644
--- a/types/react-navigation/index.d.ts
+++ b/types/react-navigation/index.d.ts
@@ -12,7 +12,7 @@
 //                 Qibang Sun <https://github.com/bang88>
 //                 Sergei Butko: <https://github.com/svbutko>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 /**
  * BEGIN FLOW TYPEDEFINITION.JS PORT
@@ -347,10 +347,10 @@ export interface NavigationTabScreenOptions extends NavigationScreenOptions {
     > | string | null));
   tabBarVisible?: boolean;
   tabBarTestIDProps?: { testID?: string, accessibilityLabel?: string };
-  tabBarOnPress?: (
+  tabBarOnPress?: (options: {
     scene: TabScene,
     jumpToIndex: (index: number) => void
-  ) => void;
+  }) => void;
 }
 
 export interface NavigationDrawerScreenOptions extends NavigationScreenOptions {
diff --git a/types/react-navigation/react-navigation-tests.tsx b/types/react-navigation/react-navigation-tests.tsx
index 9b61d11c2d..662cd0bb9d 100644
--- a/types/react-navigation/react-navigation-tests.tsx
+++ b/types/react-navigation/react-navigation-tests.tsx
@@ -140,7 +140,7 @@ const tabNavigatorScreenOptions: NavigationTabScreenOptions = {
     tabBarVisible: true,
     tabBarIcon: <View />,
     tabBarLabel: 'label',
-    tabBarOnPress: (scene, index) => {}
+    tabBarOnPress: ({scene, jumpToIndex}) => {}
 };
 
 const tabNavigatorConfig: TabNavigatorConfig = {
@@ -154,6 +154,15 @@ const tabNavigatorConfigWithInitialLayout: TabNavigatorConfig = {
   initialLayout: { height: 0, width: 100 },
 };
 
+const tabNavigatorConfigWithNavigationOptions: TabNavigatorConfig = {
+    ...tabNavigatorConfig,
+    navigationOptions: {
+        tabBarOnPress: ({scene, jumpToIndex}) => {
+            jumpToIndex(scene.index);
+        }
+    },
+};
+
 const BasicTabNavigator = TabNavigator(
     routeConfigMap,
     tabNavigatorConfig,
diff --git a/types/react-notification-system-redux/index.d.ts b/types/react-notification-system-redux/index.d.ts
index 1e009a4f46..d74ea35871 100644
--- a/types/react-notification-system-redux/index.d.ts
+++ b/types/react-notification-system-redux/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/gor181/react-notification-system-redux
 // Definitions by: Karol Janyst <https://github.com/LKay>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import { Component } from "react";
 import { Action } from "redux";
diff --git a/types/react-notification-system-redux/react-notification-system-redux-tests.tsx b/types/react-notification-system-redux/react-notification-system-redux-tests.tsx
index 631147976a..65f53a0b40 100644
--- a/types/react-notification-system-redux/react-notification-system-redux-tests.tsx
+++ b/types/react-notification-system-redux/react-notification-system-redux-tests.tsx
@@ -1,7 +1,7 @@
 import * as React from "react";
 import { createStore, Store } from "redux";
 import { Notification } from "react-notification-system";
-import * as Notifications from "react-notification-system-redux";
+import Notifications = require("react-notification-system-redux");
 import { reducer, removeAll, show, hide, info, error, warning, success, NotificationLevel } from "react-notification-system-redux";
 
 class Test extends React.Component {
diff --git a/types/react-notification-system/index.d.ts b/types/react-notification-system/index.d.ts
index d321ee6a16..8176ad097c 100644
--- a/types/react-notification-system/index.d.ts
+++ b/types/react-notification-system/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://www.npmjs.com/package/react-notification-system
 // Definitions by: Giedrius Grabauskas <https://github.com/GiedriusGrabauskas>, Deividas Bakanas <https://github.com/DeividasBakanas>, Karol Janyst <https://github.com/LKay>, Bartosz Szewczyk <https://github.com/sztobar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from "react";
 
diff --git a/types/react-notification-system/react-notification-system-tests.tsx b/types/react-notification-system/react-notification-system-tests.tsx
index eb05663523..f46fd33aa2 100644
--- a/types/react-notification-system/react-notification-system-tests.tsx
+++ b/types/react-notification-system/react-notification-system-tests.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import * as NotificationSystem from 'react-notification-system';
+import NotificationSystem = require('react-notification-system');
 
 class MyComponent extends React.Component {
     private notificationSystem: NotificationSystem.System = null;
diff --git a/types/react-numeric-input/index.d.ts b/types/react-numeric-input/index.d.ts
index e6121f45e7..b10a54cfe3 100644
--- a/types/react-numeric-input/index.d.ts
+++ b/types/react-numeric-input/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/vlad-ignatov/react-numeric-input#readme
 // Definitions by: Heather Booker <https://github.com/heatherbooker>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from 'react';
 
diff --git a/types/react-numeric-input/react-numeric-input-tests.tsx b/types/react-numeric-input/react-numeric-input-tests.tsx
index b3921c5e21..811b77a4c7 100644
--- a/types/react-numeric-input/react-numeric-input-tests.tsx
+++ b/types/react-numeric-input/react-numeric-input-tests.tsx
@@ -1,5 +1,5 @@
 import { Component } from 'react';
-import * as NumericInput from 'react-numeric-input';
+import NumericInput = require('react-numeric-input');
 
 export class NumericInputTest extends Component {
   render() {
diff --git a/types/react-numeric-input/tsconfig.json b/types/react-numeric-input/tsconfig.json
index 65c483475e..486a7bcd12 100644
--- a/types/react-numeric-input/tsconfig.json
+++ b/types/react-numeric-input/tsconfig.json
@@ -21,4 +21,4 @@
         "index.d.ts",
         "react-numeric-input-tests.tsx"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/react-onclickoutside/index.d.ts b/types/react-onclickoutside/index.d.ts
index ad61a418a0..d97970642f 100644
--- a/types/react-onclickoutside/index.d.ts
+++ b/types/react-onclickoutside/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/Pomax/react-onclickoutside
 // Definitions by: Karol Janyst <https://github.com/LKay>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from "react";
 
diff --git a/types/react-onclickoutside/v5/index.d.ts b/types/react-onclickoutside/v5/index.d.ts
index 8d9ed949a6..4228697e22 100644
--- a/types/react-onclickoutside/v5/index.d.ts
+++ b/types/react-onclickoutside/v5/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/Pomax/react-onclickoutside
 // Definitions by: Karol Janyst <https://github.com/LKay>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from 'react';
 
diff --git a/types/react-onsenui/index.d.ts b/types/react-onsenui/index.d.ts
index 7407eea34a..1e413dc3ec 100644
--- a/types/react-onsenui/index.d.ts
+++ b/types/react-onsenui/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://onsen.io/v2/docs/guide/react/
 // Definitions by: Ozytis <https://ozytis.fr>, Salim <https://github.com/salim7>, Jemmyw <https://github.com/jemmyw>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from 'react';
 import Component = React.Component;
diff --git a/types/react-overlays/index.d.ts b/types/react-overlays/index.d.ts
index 5d33d8da37..99df3b3cbd 100644
--- a/types/react-overlays/index.d.ts
+++ b/types/react-overlays/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Aaron Beall <https://github.com/aaronbeall>
 //                 Vito Samson <https://github.com/vitosamson>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from "react";
 
diff --git a/types/react-overlays/lib/index.d.ts b/types/react-overlays/lib/index.d.ts
index 6ea153cd5a..ea95108f8f 100644
--- a/types/react-overlays/lib/index.d.ts
+++ b/types/react-overlays/lib/index.d.ts
@@ -1,11 +1,11 @@
-import * as Affix from './Affix';
-import * as AutoAffix from './AutoAffix';
-import * as Modal from './Modal';
-import * as ModalManager from './ModalManager';
-import * as Overlay from './Overlay';
-import * as Portal from './Portal';
-import * as Position from './Position';
-import * as RootCloseWrapper from './RootCloseWrapper';
+import Affix = require('./Affix');
+import AutoAffix = require('./AutoAffix');
+import Modal = require('./Modal');
+import ModalManager = require('./ModalManager');
+import Overlay = require('./Overlay');
+import Portal = require('./Portal');
+import Position = require('./Position');
+import RootCloseWrapper = require('./RootCloseWrapper');
 
 export {
   Affix,
diff --git a/types/react-overlays/test/react-overlays-tests-individual.tsx b/types/react-overlays/test/react-overlays-tests-individual.tsx
index 95aa3618b3..b066a40ec3 100644
--- a/types/react-overlays/test/react-overlays-tests-individual.tsx
+++ b/types/react-overlays/test/react-overlays-tests-individual.tsx
@@ -3,10 +3,10 @@ import * as React from "react";
 import * as Portal from 'react-overlays/lib/Portal';
 import * as Modal from 'react-overlays/lib/Modal';
 import * as Position from 'react-overlays/lib/Position';
-import * as Overlay from 'react-overlays/lib/Overlay';
+import Overlay = require('react-overlays/lib/Overlay');
 import * as Affix from 'react-overlays/lib/Affix';
-import * as AutoAffix from 'react-overlays/lib/AutoAffix';
-import * as RootCloseWrapper from 'react-overlays/lib/RootCloseWrapper';
+import AutoAffix = require('react-overlays/lib/AutoAffix');
+import RootCloseWrapper = require('react-overlays/lib/RootCloseWrapper');
 
 import { OverlayFade } from './react-overlays-tests-transition';
 
diff --git a/types/react-paginate/index.d.ts b/types/react-paginate/index.d.ts
index a6c1c41d1b..0030028055 100644
--- a/types/react-paginate/index.d.ts
+++ b/types/react-paginate/index.d.ts
@@ -5,7 +5,7 @@
 //                 pegel03 <https://github.com/pegel03>
 //                 Simon Archer <https://github.com/archy-bold>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from 'react';
 
diff --git a/types/react-pointable/index.d.ts b/types/react-pointable/index.d.ts
index ac6eb2f2a2..c69d537d55 100644
--- a/types/react-pointable/index.d.ts
+++ b/types/react-pointable/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Stefan Fochler <https://github.com/istefo>
 //                 Dibyo Majumdar <https://github.com/mdibyo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from 'react';
 
diff --git a/types/react-portal/index.d.ts b/types/react-portal/index.d.ts
index ee6a5c857f..7595c5e8ad 100644
--- a/types/react-portal/index.d.ts
+++ b/types/react-portal/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/tajo/react-portal#readme
 // Definitions by: Shun Takahashi <https://github.com/shuntksh>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from "react";
 
diff --git a/types/react-portal/react-portal-tests.tsx b/types/react-portal/react-portal-tests.tsx
index ca6c0289de..5313b101bd 100644
--- a/types/react-portal/react-portal-tests.tsx
+++ b/types/react-portal/react-portal-tests.tsx
@@ -1,7 +1,7 @@
 // Example from https://github.com/tajo/react-portal
 import * as React from "react";
 import * as ReactDOM from "react-dom";
-import * as Portal from "react-portal";
+import Portal = require("react-portal");
 
 export default class App extends React.Component {
   render() {
diff --git a/types/react-props-decorators/index.d.ts b/types/react-props-decorators/index.d.ts
index 64f33a495c..8aa59e5194 100644
--- a/types/react-props-decorators/index.d.ts
+++ b/types/react-props-decorators/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/popkirby/react-props-decorators
 // Definitions by: Qubo <https://github.com/tkqubo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 /// <reference types="react" />
 
diff --git a/types/react-recaptcha/index.d.ts b/types/react-recaptcha/index.d.ts
index 59d974a5cf..ecfd0db003 100644
--- a/types/react-recaptcha/index.d.ts
+++ b/types/react-recaptcha/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Mohamed Hegazy <https://github.com/mhegazy>
 //                 Zach <https://github.com/zzanol>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import { Component } from "react";
 
diff --git a/types/react-recaptcha/react-recaptcha-tests.tsx b/types/react-recaptcha/react-recaptcha-tests.tsx
index f049fe6698..2b225925d7 100644
--- a/types/react-recaptcha/react-recaptcha-tests.tsx
+++ b/types/react-recaptcha/react-recaptcha-tests.tsx
@@ -1,4 +1,4 @@
-import * as Recaptcha from "react-recaptcha";
+import Recaptcha = require("react-recaptcha");
 import * as ReactDOM from "react-dom";
 import * as React from "react";
 
diff --git a/types/react-redux-i18n/index.d.ts b/types/react-redux-i18n/index.d.ts
index 2195dfaeaa..20cca729bf 100644
--- a/types/react-redux-i18n/index.d.ts
+++ b/types/react-redux-i18n/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/zoover/react-redux-i18n
 // Definitions by: Clément Devos <https://github.com/clementdevos>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 declare module 'react-redux-i18n' {
   import * as react from "react"
diff --git a/types/react-redux-toastr/index.d.ts b/types/react-redux-toastr/index.d.ts
index 125e0f138e..bf50211775 100644
--- a/types/react-redux-toastr/index.d.ts
+++ b/types/react-redux-toastr/index.d.ts
@@ -4,7 +4,7 @@
 //                 Artyom Stukans <https://github.com/artyomsv>
 //                 Mika Kuitunen <https://github.com/kulmajaba>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.4
+// TypeScript Version: 2.6
 
 import { Component } from 'react';
 import { Action, ActionCreator, Reducer } from 'redux';
diff --git a/types/react-redux/index.d.ts b/types/react-redux/index.d.ts
index 2a015389da..1528d58af5 100644
--- a/types/react-redux/index.d.ts
+++ b/types/react-redux/index.d.ts
@@ -9,7 +9,7 @@
 //                 Dibyo Majumdar <https://github.com/mdibyo>
 //                 Prashant Deva <https://github.com/pdeva>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.4
+// TypeScript Version: 2.6
     
 // Known Issue:
 // There is a known issue in TypeScript, which doesn't allow decorators to change the signature of the classes 
diff --git a/types/react-relay/classic.d.ts b/types/react-relay/classic.d.ts
index c600992669..e0042c3c9b 100644
--- a/types/react-relay/classic.d.ts
+++ b/types/react-relay/classic.d.ts
@@ -117,7 +117,7 @@ export class DefaultNetworkLayer implements RelayNetworkLayer {
 }
 
 export function createContainer<T>(
-    component: React.ComponentClass<T> | React.StatelessComponent<T>,
+    component: React.ComponentType<T>,
     params?: CreateContainerOpts
 ): RelayContainerClass<T>;
 export function injectNetworkLayer(networkLayer: RelayNetworkLayer): any;
diff --git a/types/react-relay/compat.d.ts b/types/react-relay/compat.d.ts
index 22585d03d0..b74efc4ac2 100644
--- a/types/react-relay/compat.d.ts
+++ b/types/react-relay/compat.d.ts
@@ -1,21 +1,16 @@
-export {
-    QueryRenderer,
-    fetchQuery,
-    graphql,
-} from "./index";
+export { QueryRenderer, fetchQuery, graphql } from "./index";
 import {
     ConnectionConfig,
     RelayPaginationProp as RelayModernPaginationProp,
-    RelayRefetchProp as RelayModernRefetchProp
+    RelayRefetchProp as RelayModernRefetchProp,
 } from "./index";
+export { ConcreteFragment, ConcreteRequest, ConcreteBatchRequest } from "relay-runtime";
 import * as RelayRuntimeTypes from "relay-runtime";
 import { RelayEnvironmentInterface } from "./classic";
 
 // ~~~~~~~~~~~~~~~~~~~~~
 // Maybe Fix
 // ~~~~~~~~~~~~~~~~~~~~~
-export type ConcreteFragment = any;
-export type ConcreteBatch = any;
 export type ConcreteFragmentDefinition = object;
 export type ConcreteOperationDefinition = object;
 
@@ -30,7 +25,6 @@ export interface StatelessWithFragment<T> extends React.StatelessComponent<T> {
     getFragment: typeof getFragment;
 }
 export type ReactFragmentComponent<T> = ComponentWithFragment<T> | StatelessWithFragment<T>;
-export type ReactBaseComponent<T> = React.ComponentClass<T> | React.StatelessComponent<T>;
 export type RelayClassicEnvironment = RelayEnvironmentInterface;
 
 // ~~~~~~~~~~~~~~~~~~~~~
@@ -68,18 +62,18 @@ export interface GeneratedNodeMap {
 }
 
 export function createFragmentContainer<T>(
-    Component: ReactBaseComponent<T>,
+    Component: React.ComponentType<T>,
     fragmentSpec: RelayRuntimeTypes.GraphQLTaggedNode | GeneratedNodeMap
 ): ReactFragmentComponent<T>;
 
 export function createRefetchContainer<T>(
-    Component: ReactBaseComponent<T>,
+    Component: React.ComponentType<T>,
     fragmentSpec: RelayRuntimeTypes.GraphQLTaggedNode | GeneratedNodeMap,
     taggedNode: RelayRuntimeTypes.GraphQLTaggedNode
 ): ReactFragmentComponent<T>;
 
 export function createPaginationContainer<T>(
-    Component: ReactBaseComponent<T>,
+    Component: React.ComponentType<T>,
     fragmentSpec: RelayRuntimeTypes.GraphQLTaggedNode | GeneratedNodeMap,
     connectionConfig: ConnectionConfig<T>
 ): ReactFragmentComponent<T>;
diff --git a/types/react-relay/index.d.ts b/types/react-relay/index.d.ts
index 0b7d87ce58..ae5d6e8f37 100644
--- a/types/react-relay/index.d.ts
+++ b/types/react-relay/index.d.ts
@@ -5,26 +5,42 @@
 //                 Eloy Durán <https://github.com/alloy>
 //                 Nicolas Pirotte <https://github.com/npirotte>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.4
+// TypeScript Version: 2.6
 
 export {
     commitLocalUpdate,
     commitRelayModernMutation as commitMutation,
     fetchRelayModernQuery as fetchQuery,
+    GraphQLTaggedNode,
     requestRelaySubscription as requestSubscription,
 } from "relay-runtime";
 
 import * as React from "react";
 import * as RelayRuntimeTypes from "relay-runtime";
 
+// ~~~~~~~~~~~~~~~~~~~~~
+// Utility types
+// ~~~~~~~~~~~~~~~~~~~~~
+
+// Taken from https://github.com/pelotom/type-zoo
+// tslint:disable-next-line:strict-export-declare-modifiers
+type Diff<T extends string, U extends string> = ({ [P in T]: P } & { [P in U]: never } & { [x: string]: never })[T];
+// tslint:disable-next-line:strict-export-declare-modifiers
+type Omit<T, K extends keyof T> = Pick<T, Diff<keyof T, K>>;
+
+export type RemoveRelayProp<P> = Omit<P & { relay: never }, "relay">;
+
+export interface ComponentRef {
+    componentRef?: (ref: any) => void;
+}
+
+export type RelayContainer<T> = React.ComponentType<RemoveRelayProp<T> & ComponentRef>;
+
 // ~~~~~~~~~~~~~~~~~~~~~
 // Maybe Fix
 // ~~~~~~~~~~~~~~~~~~~~~
-export type ConcreteFragment = any;
-export type ConcreteBatch = any;
 export type ConcreteFragmentDefinition = object;
 export type ConcreteOperationDefinition = object;
-export type ReactBaseComponent<T> = React.ComponentClass<T> | React.StatelessComponent<T>;
 
 // ~~~~~~~~~~~~~~~~~~~~~
 // RelayProp
@@ -40,24 +56,19 @@ export interface RelayProp {
 export function RelayQL(strings: string[], ...substitutions: any[]): RelayRuntimeTypes.RelayConcreteNode;
 
 // ~~~~~~~~~~~~~~~~~~~~~
-// RelayModernGraphQLTag
+// ReactRelayTypes
 // ~~~~~~~~~~~~~~~~~~~~~
 export interface GeneratedNodeMap {
-    [key: string]: GraphQLTaggedNode;
+    [key: string]: RelayRuntimeTypes.GraphQLTaggedNode;
 }
-export type GraphQLTaggedNode =
-    | (() => ConcreteFragment | ConcreteBatch)
-    | {
-          modern(): ConcreteFragment | ConcreteBatch;
-          classic(relayQL: typeof RelayQL): ConcreteFragmentDefinition | ConcreteOperationDefinition;
-      };
+
 /**
  * Runtime function to correspond to the `graphql` tagged template function.
  * All calls to this function should be transformed by the plugin.
  */
 export interface GraphqlInterface {
-    (strings: string[] | TemplateStringsArray): GraphQLTaggedNode;
-    experimental(strings: string[] | TemplateStringsArray): GraphQLTaggedNode;
+    (strings: string[] | TemplateStringsArray): RelayRuntimeTypes.GraphQLTaggedNode;
+    experimental(strings: string[] | TemplateStringsArray): RelayRuntimeTypes.GraphQLTaggedNode;
 }
 export const graphql: GraphqlInterface;
 
@@ -67,7 +78,7 @@ export const graphql: GraphqlInterface;
 export interface QueryRendererProps {
     cacheConfig?: RelayRuntimeTypes.CacheConfig;
     environment: RelayRuntimeTypes.Environment;
-    query: GraphQLTaggedNode;
+    query: RelayRuntimeTypes.GraphQLTaggedNode;
     render(readyState: ReadyState): React.ReactElement<any> | undefined | null;
     variables: RelayRuntimeTypes.Variables;
     rerunParamExperimental?: RelayRuntimeTypes.RerunParam;
@@ -87,9 +98,9 @@ export class QueryRenderer extends ReactRelayQueryRenderer {}
 // createFragmentContainer
 // ~~~~~~~~~~~~~~~~~~~~~
 export function createFragmentContainer<T>(
-    Component: ReactBaseComponent<T>,
-    fragmentSpec: GraphQLTaggedNode | GeneratedNodeMap
-): ReactBaseComponent<T>;
+    Component: React.ComponentType<T>,
+    fragmentSpec: RelayRuntimeTypes.GraphQLTaggedNode | GeneratedNodeMap
+): RelayContainer<T>;
 
 // ~~~~~~~~~~~~~~~~~~~~~
 // createPaginationContainer
@@ -131,16 +142,16 @@ export interface ConnectionConfig<T> {
         paginationInfo: { count: number; cursor?: string },
         fragmentVariables: RelayRuntimeTypes.Variables
     ): RelayRuntimeTypes.Variables;
-    query: GraphQLTaggedNode;
+    query: RelayRuntimeTypes.GraphQLTaggedNode;
 }
 export function createPaginationContainer<T>(
-    Component: ReactBaseComponent<T>,
-    fragmentSpec: GraphQLTaggedNode | GeneratedNodeMap,
+    Component: React.ComponentType<T>,
+    fragmentSpec: RelayRuntimeTypes.GraphQLTaggedNode | GeneratedNodeMap,
     connectionConfig: ConnectionConfig<T>
-): ReactBaseComponent<T>;
+): RelayContainer<T>;
 
 // ~~~~~~~~~~~~~~~~~~~~~
-// createFragmentContainer
+// createRefetchContainer
 // ~~~~~~~~~~~~~~~~~~~~~
 export interface RefetchOptions {
     force?: boolean;
@@ -157,7 +168,7 @@ export type RelayRefetchProp = RelayProp & {
     ): RelayRuntimeTypes.Disposable;
 };
 export function createRefetchContainer<T>(
-    Component: ReactBaseComponent<T>,
-    fragmentSpec: GraphQLTaggedNode | GeneratedNodeMap,
-    taggedNode: GraphQLTaggedNode
-): ReactBaseComponent<T>;
+    Component: React.ComponentType<T>,
+    fragmentSpec: RelayRuntimeTypes.GraphQLTaggedNode | GeneratedNodeMap,
+    taggedNode: RelayRuntimeTypes.GraphQLTaggedNode
+): RelayContainer<T>;
diff --git a/types/react-relay/test/react-relay-classic-tests.tsx b/types/react-relay/test/react-relay-classic-tests.tsx
index d8eaf005ca..a57cbc1b6f 100644
--- a/types/react-relay/test/react-relay-classic-tests.tsx
+++ b/types/react-relay/test/react-relay-classic-tests.tsx
@@ -1,15 +1,14 @@
 import * as React from "react";
 import * as Relay from "react-relay/classic";
 
+import { CompatContainer } from "./react-relay-compat-tests";
+
 interface Props {
     text: string;
     userId: string;
 }
 
-// tslint:disable-next-line no-empty-interface
-interface Response {}
-
-export default class AddTweetMutation extends Relay.Mutation<Props, Response> {
+export default class AddTweetMutation extends Relay.Mutation<Props, {}> {
     getMutation() {
         return Relay.QL`mutation{addTweet}`;
     }
@@ -64,6 +63,7 @@ const ArtworkContainer = Relay.createContainer(Artwork, {
         artwork: () => Relay.QL`
             fragment on Artwork {
                 title
+                ${CompatContainer.getFragment("whatever")}
             }
         `,
     },
@@ -83,7 +83,7 @@ class StubbedArtwork extends React.Component {
                 setVariables: () => {},
                 forceFetch: () => {},
                 hasOptimisticUpdate: () => false,
-                getPendingTransactions: (): Relay.RelayMutationTransaction[] => [],
+                getPendingTransactions: (): any => undefined,
                 commitUpdate: () => {},
             },
         };
diff --git a/types/react-relay/test/react-relay-compat-tests.tsx b/types/react-relay/test/react-relay-compat-tests.tsx
new file mode 100644
index 0000000000..e0ee5d3be2
--- /dev/null
+++ b/types/react-relay/test/react-relay-compat-tests.tsx
@@ -0,0 +1,53 @@
+import * as React from "react";
+import {
+    QueryRenderer as CompatQueryRenderer,
+    createFragmentContainer as createFragmentContainerCompat,
+    commitMutation as commitMutationCompat,
+    CompatEnvironment,
+    RelayPaginationProp as RelayPaginationPropCompat,
+} from "react-relay/compat";
+
+import { configs, mutation, optimisticResponse } from "./react-relay-tests";
+
+// testting compat mutation with classic environment
+function markNotificationAsReadCompat(environment: CompatEnvironment, source: string, storyID: string) {
+    const variables = {
+        input: {
+            source,
+            storyID,
+        },
+    };
+
+    commitMutationCompat(environment, {
+        configs,
+        mutation,
+        optimisticResponse,
+        variables,
+        onCompleted: (response, errors) => {
+            console.log("Response received from server.");
+        },
+        onError: err => console.error(err),
+        updater: (store, data) => {
+            const field = store.get(storyID);
+            if (field) {
+                field.setValue(data.story, "story");
+            }
+        }
+    });
+}
+
+interface CompatProps {
+    relay: RelayPaginationPropCompat;
+}
+
+class CompatComponent extends React.Component<CompatProps> {
+    markNotificationAsRead(source: string, storyID: string) {
+        markNotificationAsReadCompat(this.props.relay.environment, source, storyID);
+    }
+
+    render() {
+        return (<div/>);
+    }
+}
+
+export const CompatContainer = createFragmentContainerCompat(CompatComponent, {});
diff --git a/types/react-relay/test/react-relay-tests.tsx b/types/react-relay/test/react-relay-tests.tsx
index 6fbd2dea3f..cc25f5f368 100644
--- a/types/react-relay/test/react-relay-tests.tsx
+++ b/types/react-relay/test/react-relay-tests.tsx
@@ -1,9 +1,6 @@
 import * as React from "react";
-import { Environment, Network, RecordSource, Store, ConnectionHandler } from "relay-runtime";
+import { Environment, Network, RecordSource, Store, ConnectionHandler, FragmentReference } from "relay-runtime";
 
-////////////////////////////
-//  RELAY MODERN TESTS
-///////////////////////////
 import {
     graphql,
     commitMutation,
@@ -13,7 +10,8 @@ import {
     requestSubscription,
     QueryRenderer,
     RelayRefetchProp,
-    RelayPaginationProp
+    RelayPaginationProp,
+    RelayProp
 } from "react-relay";
 
 // ~~~~~~~~~~~~~~~~~~~~~
@@ -54,63 +52,137 @@ const MyQueryRenderer = (props: { name: string }) => (
     />
 );
 
-// ~~~~~~~~~~~~~~~~~~~~~
-// Modern FragmentContainer
-// ~~~~~~~~~~~~~~~~~~~~~
-const MyFragmentContainer = createFragmentContainer(
-    class TodoListView extends React.Component {
-        render() {
-            return <div />;
-        }
-    },
-    {
-        item: graphql`
-            fragment TodoItem_item on Todo {
-                text
-                isComplete
-            }
-        `,
-    }
-);
-
 // ~~~~~~~~~~~~~~~~~~~~~
 // Modern RefetchContainer
 // ~~~~~~~~~~~~~~~~~~~~~
-interface StoryInterface {
-    id: string;
-}
-interface FeedStoriesProps {
-    relay: RelayRefetchProp;
-    feed: {
-        stories: { edges: Array<{ node: StoryInterface }> };
-    };
-}
-class Story extends React.Component<{ story: StoryInterface }> {}
-class FeedStories extends React.Component<FeedStoriesProps> {
-    render() {
-        return (
-            <div>
-                {this.props.feed.stories.edges.map(edge => <Story story={edge.node} key={edge.node.id} />)}
-                <button onClick={() => this._loadMore} title="Load More" />
-            </div>
-        );
+
+type StoryLike = (storyID: string) => void;
+
+// Artifact produced by relay-compiler-language-typescript
+// tslint:disable-next-line:no-const-enum
+const enum _Story_story$ref {}
+type Story_story$ref = _Story_story$ref & FragmentReference;
+// tslint:disable-next-line:interface-over-type-literal
+type Story_story = {
+    readonly id: string;
+    readonly text: string;
+    readonly isPublished: boolean;
+    readonly " $refType": Story_story$ref;
+};
+
+const Story = (() => {
+    interface Props {
+        relay: RelayRefetchProp;
+        story: Story_story;
+        onLike: StoryLike;
+        ignoreMe?: {};
     }
 
-    _loadMore() {
-        // Increments the number of stories being rendered by 10.
-        const refetchVariables = (fragmentVariables: { count: number }) => ({
-            count: fragmentVariables.count + 10,
+    interface State {
+        isLoading: boolean;
+    }
+
+    class Story extends React.Component<Props> {
+        state = {
+            isLoading: false
+        };
+
+        componentDidMount() {
+            setInterval(this.handleRefresh.bind(this), 1000);
+        }
+
+        handleRefresh() {
+            this.setState({ isLoading: true });
+            this.props.relay.refetch({ id: this.props.story.id }, {}, error => {
+                this.setState({ isLoading: false });
+            }, { force: true });
+        }
+
+        render() {
+            return (
+                <div>
+                    {this.props.story.isPublished ? "" : "Draft: "}
+                    {this.props.story.text}
+                    {this.state.isLoading && <span>♺</span>}
+                    <button onClick={() => this.props.onLike(this.props.story.id)}>LIKE</button>
+                </div>
+            );
+        }
+    }
+
+    const StoryRefetchContainer = createRefetchContainer(
+        Story,
+        {
+            story: graphql`
+                fragment Story_story on Todo {
+                    id
+                    text
+                    isPublished
+                }
+            `,
+        },
+        graphql.experimental`
+            query StoryRefetchQuery($id: ID!) {
+                story(id: $id) {
+                    ...Story_story
+                }
+            }
+        `
+    );
+
+    function doesNotRequireRelayPropToBeProvided() {
+        const onLike = (id: string) => console.log(`Liked story #${id}`);
+        const story: { " $fragmentRefs": Story_story$ref } = {} as any;
+        // TODO: Fix requirement to cast fragment reference as `any`.
+        <StoryRefetchContainer story={story as any} onLike={onLike} />;
+    }
+
+    return StoryRefetchContainer;
+})();
+
+// ~~~~~~~~~~~~~~~~~~~~~
+// Modern FragmentContainer
+// ~~~~~~~~~~~~~~~~~~~~~
+
+// Artifact produced by relay-compiler-language-typescript
+// tslint:disable-next-line:no-const-enum
+const enum _FeedStories_feed$ref {}
+type FeedStories_feed$ref = _FeedStories_feed$ref & FragmentReference;
+// tslint:disable-next-line:interface-over-type-literal
+type FeedStories_feed = {
+    readonly edges: ReadonlyArray<{
+        readonly node: {
+            readonly id: string;
+            readonly " $fragmentRefs": Story_story$ref;
+        };
+    }>;
+    readonly " $refType": FeedStories_feed$ref;
+};
+
+const Feed = (() => {
+    interface Props {
+        relay: RelayProp;
+        feed: FeedStories_feed;
+        onStoryLike: StoryLike;
+        ignoreMe?: {};
+    }
+
+    const FeedStories: React.SFC<Props> = ({ feed, onStoryLike, relay }) => {
+        // TODO: Getting env here for no good reason other than needing to test it works.
+        //       If you have a good relavant example, please update!
+        relay.environment;
+        const stories = feed.edges.map(edge => {
+            // TODO: Fix requirement to cast fragment reference as `any`.
+            return <Story story={edge.node as any} key={edge.node.id} onLike={onStoryLike} />;
         });
-        this.props.relay.refetch(refetchVariables);
-    }
-}
+        return <div>{stories}</div>;
+    };
 
-const FeedRefetchContainer = createRefetchContainer(
-    FeedStories,
-    {
-        feed: graphql.experimental`
-            fragment FeedStories_feed on Feed @argumentDefinitions(count: { type: "Int", defaultValue: 10 }) {
-                stories(first: $count) {
+    const FeedFragmentContainer = createFragmentContainer(
+        FeedStories,
+        {
+            feed: graphql`
+                fragment FeedStories_feed on Feed {
                     edges {
                         node {
                             id
@@ -118,104 +190,137 @@ const FeedRefetchContainer = createRefetchContainer(
                         }
                     }
                 }
-            }
-        `,
-    },
-    graphql.experimental`
-        query FeedStoriesRefetchQuery($count: Int) {
-            feed {
-                ...FeedStories_feed @arguments(count: $count)
-            }
+            `,
         }
-    `
-);
+    );
+
+    function doesNotRequireRelayPropToBeProvided() {
+        const onStoryLike = (id: string) => console.log(`Liked story #${id}`);
+        const feed: { " $fragmentRefs": FeedStories_feed$ref } = {} as any;
+        // TODO: Fix requirement to cast fragment reference as `any`.
+        <FeedFragmentContainer feed={feed as any} onStoryLike={onStoryLike} />;
+    }
+
+    return FeedFragmentContainer;
+})();
 
 // ~~~~~~~~~~~~~~~~~~~~~
 // Modern PaginationContainer
 // ~~~~~~~~~~~~~~~~~~~~~
-interface FeedProps {
-    user: { feed: { edges: Array<{ node: StoryInterface }> } };
-    relay: RelayPaginationProp;
-}
-class Feed extends React.Component<FeedProps> {
-    render() {
-        return (
-            <div>
-                {this.props.user.feed.edges.map(edge => <Story story={edge.node} key={edge.node.id} />)}
-                <button onClick={() => this._loadMore()} title="Load More" />
-            </div>
-        );
+
+// Artifact produced by relay-compiler-language-typescript
+// tslint:disable-next-line:no-const-enum
+const enum _UserFeed_user$ref {}
+type UserFeed_user$ref = _UserFeed_user$ref & FragmentReference;
+// tslint:disable-next-line:interface-over-type-literal
+type UserFeed_user = {
+    readonly feed: {
+        readonly pageInfo: {
+            readonly endCursor?: string | null;
+            readonly hasNextPage: boolean;
+        };
+        readonly " $fragmentRefs": FeedStories_feed$ref;
+    };
+    readonly " $refType": UserFeed_user$ref;
+};
+
+() => {
+    interface Props {
+        relay: RelayPaginationProp;
+        loadMoreTitle: string;
+        user: UserFeed_user;
+        ignoreMe?: {};
     }
 
-    _loadMore() {
-        if (!this.props.relay.hasMore() || this.props.relay.isLoading()) {
-            return;
+    class UserFeed extends React.Component<Props> {
+        render() {
+            const onStoryLike = (id: string) => console.log(`Liked story #${id}`);
+            // TODO: Fix requirement to cast fragment reference as `any`.
+            const feed = this.props.user.feed as any;
+            return (
+                <div>
+                    <Feed feed={feed} onStoryLike={onStoryLike} />
+                    <button onClick={() => this._loadMore()} title={this.props.loadMoreTitle} />
+                </div>
+            );
         }
 
-        this.props.relay.loadMore(
-            10, // Fetch the next 10 feed items
-            e => {
-                console.log(e);
+        _loadMore() {
+            if (!this.props.relay.hasMore() || this.props.relay.isLoading()) {
+                return;
             }
-        );
-    }
-}
 
-const FeedPaginationContainer = createPaginationContainer(
-    Feed,
-    {
-        user: graphql`
-            fragment Feed_user on User {
-                feed(
-                    first: $count
-                    after: $cursor
-                    orderby: $orderBy # other variables
-                ) @connection(key: "Feed_feed") {
-                    edges {
-                        node {
-                            id
-                            ...Story_story
+            this.props.relay.loadMore(
+                10, // Fetch the next 10 feed items
+                e => {
+                    console.log(e);
+                }
+            );
+        }
+    }
+
+    const UserFeedPaginationContainer = createPaginationContainer(
+        UserFeed,
+        {
+            user: graphql`
+                fragment UserFeed_user on User {
+                    feed(
+                        first: $count
+                        after: $cursor
+                        orderby: $orderBy # other variables
+                    ) @connection(key: "Feed_feed") {
+                        ...FeedStories_feed
+                        pageInfo {
+                            endCursor
+                            hasNextPage
                         }
                     }
                 }
-            }
-        `,
-    },
-    {
-        direction: "forward",
-        getConnectionFromProps(props) {
-            return props.user && props.user.feed;
+            `,
         },
-        getFragmentVariables(prevVars, totalCount) {
-            return {
-                ...prevVars,
-                count: totalCount,
-            };
-        },
-        getVariables(props, { count, cursor }, fragmentVariables) {
-            return {
-                count,
-                cursor,
-                // in most cases, for variables other than connection filters like
-                // `first`, `after`, etc. you may want to use the previous values.
-                orderBy: fragmentVariables.orderBy,
-            };
-        },
-        query: graphql`
-            query FeedPaginationQuery($count: Int!, $cursor: String, $orderby: String!) {
-                user {
-                    # You could reference the fragment defined previously.
-                    ...Feed_user
+        {
+            direction: "forward",
+            getConnectionFromProps(props) {
+                // TODO: Fix requirement to have `edges` and both `pageInfo` details for forward and backward pagination
+                return props.user && props.user.feed as any;
+            },
+            getFragmentVariables(prevVars, totalCount) {
+                return {
+                    ...prevVars,
+                    count: totalCount,
+                };
+            },
+            getVariables(props, { count, cursor }, fragmentVariables) {
+                return {
+                    count,
+                    cursor,
+                    // in most cases, for variables other than connection filters like
+                    // `first`, `after`, etc. you may want to use the previous values.
+                    orderBy: fragmentVariables.orderBy,
+                };
+            },
+            query: graphql`
+                query FeedPaginationQuery($count: Int!, $cursor: String, $orderby: String!) {
+                    user {
+                        # You could reference the fragment defined previously.
+                        ...Feed_user
+                    }
                 }
-            }
-        `,
+            `,
+        }
+    );
+
+    function doesNotRequireRelayPropToBeProvided() {
+        const user: { " $fragmentRefs": UserFeed_user$ref } = {} as any;
+        // TODO: Fix requirement to cast fragment reference as `any`.
+        <UserFeedPaginationContainer loadMoreTitle="Load More" user={user as any} />;
     }
-);
+};
 
 // ~~~~~~~~~~~~~~~~~~~~~
 // Modern Mutations
 // ~~~~~~~~~~~~~~~~~~~~~
-const mutation = graphql`
+export const mutation = graphql`
     mutation MarkReadNotificationMutation($input: MarkReadNotificationData!) {
         markReadNotification(data: $input) {
             notification {
@@ -225,7 +330,7 @@ const mutation = graphql`
     }
 `;
 
-const optimisticResponse = {
+export const optimisticResponse = {
     markReadNotification: {
         notification: {
             seenState: "SEEN",
@@ -233,7 +338,7 @@ const optimisticResponse = {
     },
 };
 
-const configs = [
+export const configs = [
     {
         type: "NODE_DELETE" as "NODE_DELETE",
         deletedIDFieldName: "destroyedShipId",
@@ -325,150 +430,3 @@ requestSubscription(
         },
     }
 );
-
-////////////////////////////
-//  RELAY COMPAT TESTS
-///////////////////////////
-import {
-    QueryRenderer as CompatQueryRenderer,
-    createFragmentContainer as createFragmentContainerCompat,
-    commitMutation as commitMutationCompat,
-    CompatEnvironment,
-    RelayPaginationProp as RelayPaginationPropCompat,
-} from "react-relay/compat";
-
-// testting compat mutation with classic environment
-function markNotificationAsReadCompat(environment: CompatEnvironment, source: string, storyID: string) {
-    const variables = {
-        input: {
-            source,
-            storyID,
-        },
-    };
-
-    commitMutationCompat(environment, {
-        configs,
-        mutation,
-        optimisticResponse,
-        variables,
-        onCompleted: (response, errors) => {
-            console.log("Response received from server.");
-        },
-        onError: err => console.error(err),
-        updater: (store, data) => {
-            const field = store.get(storyID);
-            if (field) {
-                field.setValue(data.story, "story");
-            }
-        }
-    });
-}
-
-interface CompatProps {
-    relay: RelayPaginationPropCompat;
-}
-
-export class CompatComponent extends React.Component<CompatProps> {
-    markNotificationAsRead(source: string, storyID: string) {
-        markNotificationAsReadCompat(this.props.relay.environment, source, storyID);
-    }
-
-    render() {
-        return (<div/>);
-    }
-}
-
-const CompatContainer = createFragmentContainerCompat(CompatComponent, {});
-
-////////////////////////////
-//  RELAY-CLASSIC TESTS
-///////////////////////////
-import * as Relay from "react-relay/classic";
-
-interface Props {
-    text: string;
-    userId: string;
-}
-
-export default class AddTweetMutation extends Relay.Mutation<Props, {}> {
-    getMutation() {
-        return Relay.QL`mutation{addTweet}`;
-    }
-
-    getFatQuery() {
-        return Relay.QL`
-            fragment on AddTweetPayload {
-                tweetEdge
-                user
-            }
-        `;
-    }
-
-    getConfigs() {
-        return [
-            {
-                type: "RANGE_ADD",
-                parentName: "user",
-                parentID: this.props.userId,
-                connectionName: "tweets",
-                edgeName: "tweetEdge",
-                rangeBehaviors: {
-                    "": "append",
-                },
-            },
-        ];
-    }
-
-    getVariables() {
-        return this.props;
-    }
-}
-
-interface ArtwokRelayVariables {
-    artworkID: string;
-}
-
-interface ArtworkProps extends Relay.RelayProps<ArtwokRelayVariables> {
-    artwork: {
-        title: string;
-    };
-}
-
-class Artwork extends React.Component<ArtworkProps> {
-    render() {
-        return <a href={`/artworks/${this.props.relay.variables.artworkID}`}>{this.props.artwork.title}</a>;
-    }
-}
-
-const ArtworkContainer = Relay.createContainer(Artwork, {
-    fragments: {
-        artwork: () => Relay.QL`
-            fragment on Artwork {
-                title
-                ${ CompatContainer.getFragment('whatever') }
-            }
-        `,
-    },
-});
-
-class StubbedArtwork extends React.Component {
-    render() {
-        const props = {
-            artwork: { title: "CHAMPAGNE FORMICA FLAG" },
-            relay: {
-                route: {
-                    name: "champagne",
-                },
-                variables: {
-                    artworkID: "champagne-formica-flag",
-                },
-                setVariables: () => {},
-                forceFetch: () => {},
-                hasOptimisticUpdate: () => false,
-                getPendingTransactions: (): any => undefined,
-                commitUpdate: () => {},
-            },
-        };
-        return <ArtworkContainer {...props} />;
-    }
-}
diff --git a/types/react-relay/tsconfig.json b/types/react-relay/tsconfig.json
index 3e471b36ad..642df480df 100644
--- a/types/react-relay/tsconfig.json
+++ b/types/react-relay/tsconfig.json
@@ -23,6 +23,7 @@
         "classic.d.ts",
         "compat.d.ts",
         "test/react-relay-tests.tsx",
+        "test/react-relay-compat-tests.tsx",
         "test/react-relay-classic-tests.tsx"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/react-resolver/index.d.ts b/types/react-resolver/index.d.ts
index 2b27d26d6a..c871426401 100644
--- a/types/react-resolver/index.d.ts
+++ b/types/react-resolver/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/ericclemmons/react-resolver
 // Definitions by: forabi <https://github.com/forabi>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import { ComponentType, StatelessComponent, Factory } from 'react';
 
diff --git a/types/react-resolver/react-resolver-tests.tsx b/types/react-resolver/react-resolver-tests.tsx
index ce41e6db4c..088f5e7573 100644
--- a/types/react-resolver/react-resolver-tests.tsx
+++ b/types/react-resolver/react-resolver-tests.tsx
@@ -1,6 +1,5 @@
 import * as React from 'react';
 import { Resolver, resolve, context } from 'react-resolver';
-import * as expect from 'expect';
 
 interface OwnProps {
   thing: number;
@@ -32,13 +31,13 @@ const ResolvedPageWithPropMap = resolve({
 
 const PageWithContext = context('history')(Page);
 
-expect(<ResolvedPageWithSingleProp />).toExist();
-expect(<ResolvedPageWithPropMap />).toExist();
+<ResolvedPageWithSingleProp />;
+<ResolvedPageWithPropMap />;
 
 // Resolver.render(() => <ResolvedPageWithPropMap />, document.getElementById('app'));
 
 Resolver.resolve(() => {
   return <ResolvedPageWithPropMap />;
 }).then(({ data, Resolved }) => {
-  expect(data).toBe('World');
+  data === 'World';
 });
diff --git a/types/react-resolver/tsconfig.json b/types/react-resolver/tsconfig.json
index 94a604e352..fce9a29e5e 100644
--- a/types/react-resolver/tsconfig.json
+++ b/types/react-resolver/tsconfig.json
@@ -22,4 +22,4 @@
         "index.d.ts",
         "react-resolver-tests.tsx"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/react-responsive/index.d.ts b/types/react-responsive/index.d.ts
index dde02d8dae..ad042a34c5 100644
--- a/types/react-responsive/index.d.ts
+++ b/types/react-responsive/index.d.ts
@@ -4,7 +4,7 @@
 //                 Alec Hill <https://github.com/alechill>
 //                 Javier Gonzalez <https://github.com/xaviergonz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.4
+// TypeScript Version: 2.6
 
 import * as React from "react";
 
diff --git a/types/react-responsive/tsconfig.json b/types/react-responsive/tsconfig.json
index 294f0c8cde..6599624bbe 100644
--- a/types/react-responsive/tsconfig.json
+++ b/types/react-responsive/tsconfig.json
@@ -21,4 +21,4 @@
         "index.d.ts",
         "react-responsive-tests.tsx"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/react-responsive/v1/index.d.ts b/types/react-responsive/v1/index.d.ts
index ea0b07aa30..f9c3bfcf83 100644
--- a/types/react-responsive/v1/index.d.ts
+++ b/types/react-responsive/v1/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/contra/react-responsive
 // Definitions by: Alexey Svetliakov <https://github.com/asvetliakov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from "react";
 
diff --git a/types/react-responsive/v1/react-responsive-tests.tsx b/types/react-responsive/v1/react-responsive-tests.tsx
index e3644771c4..adbedbae09 100644
--- a/types/react-responsive/v1/react-responsive-tests.tsx
+++ b/types/react-responsive/v1/react-responsive-tests.tsx
@@ -1,5 +1,5 @@
 import * as React from "react";
-import * as MediaQuery from "react-responsive";
+import MediaQuery = require("react-responsive");
 
 class Test extends React.Component {
     render() {
diff --git a/types/react-responsive/v1/tsconfig.json b/types/react-responsive/v1/tsconfig.json
index 774fd47a00..a5f0d8891a 100644
--- a/types/react-responsive/v1/tsconfig.json
+++ b/types/react-responsive/v1/tsconfig.json
@@ -30,4 +30,4 @@
         "index.d.ts",
         "react-responsive-tests.tsx"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/react-router-bootstrap/index.d.ts b/types/react-router-bootstrap/index.d.ts
index 19e1940836..db2b67d040 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.4
+// TypeScript Version: 2.6
 
 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 d33e385a53..deb9d8003d 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.4
+// TypeScript Version: 2.6
 
 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 88119a4858..8286745998 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.4
+// TypeScript Version: 2.6
 
 import { match } from "react-router";
 import * as React from 'react';
diff --git a/types/react-router-native/index.d.ts b/types/react-router-native/index.d.ts
index 88c0108212..4a14dce8dc 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.4
+// TypeScript Version: 2.6
 
 export {
   match,
diff --git a/types/react-router-navigation-core/index.d.ts b/types/react-router-navigation-core/index.d.ts
index a7ad09748c..8af7235a94 100644
--- a/types/react-router-navigation-core/index.d.ts
+++ b/types/react-router-navigation-core/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/LeoLeBras/react-router-navigation#readme
 // Definitions by: Kalle Ott <https://github.com/kaoDev>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.4
+// TypeScript Version: 2.6
 
 // High-level wrappers
 import { PureComponent, ReactNode, ComponentClass, ReactElement } from "react";
diff --git a/types/react-router-navigation-core/tsconfig.json b/types/react-router-navigation-core/tsconfig.json
index b4572aa56c..b356b2d5c5 100644
--- a/types/react-router-navigation-core/tsconfig.json
+++ b/types/react-router-navigation-core/tsconfig.json
@@ -1,10 +1,15 @@
 {
     "compilerOptions": {
         "baseUrl": "../",
-        "typeRoots": ["../"],
+        "typeRoots": [
+            "../"
+        ],
         "types": [],
         "module": "commonjs",
-        "lib": ["es6", "dom"],
+        "lib": [
+            "es6",
+            "dom"
+        ],
         "jsx": "react",
         "strictNullChecks": true,
         "strictFunctionTypes": true,
@@ -13,5 +18,8 @@
         "forceConsistentCasingInFileNames": true,
         "noEmit": true
     },
-    "files": ["index.d.ts", "react-router-navigation-core-tests.tsx"]
-}
+    "files": [
+        "index.d.ts",
+        "react-router-navigation-core-tests.tsx"
+    ]
+}
\ No newline at end of file
diff --git a/types/react-router-navigation/index.d.ts b/types/react-router-navigation/index.d.ts
index 863158cd3f..c69a172c43 100644
--- a/types/react-router-navigation/index.d.ts
+++ b/types/react-router-navigation/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/LeoLeBras/react-router-navigation#readme
 // Definitions by: Kalle Ott <https://github.com/kaoDev>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.4
+// TypeScript Version: 2.6
 
 import { Component, ReactNode, ReactElement, ComponentClass } from "react";
 import { StyleProp, ViewProperties, ViewStyle, TextStyle } from "react-native";
diff --git a/types/react-router-navigation/tsconfig.json b/types/react-router-navigation/tsconfig.json
index d9909d32a6..e10c25a443 100644
--- a/types/react-router-navigation/tsconfig.json
+++ b/types/react-router-navigation/tsconfig.json
@@ -1,10 +1,15 @@
 {
     "compilerOptions": {
         "baseUrl": "../",
-        "typeRoots": ["../"],
+        "typeRoots": [
+            "../"
+        ],
         "types": [],
         "module": "commonjs",
-        "lib": ["es6", "dom"],
+        "lib": [
+            "es6",
+            "dom"
+        ],
         "jsx": "react",
         "strictNullChecks": true,
         "strictFunctionTypes": true,
@@ -13,5 +18,8 @@
         "forceConsistentCasingInFileNames": true,
         "noEmit": true
     },
-    "files": ["index.d.ts", "react-router-navigation-tests.tsx"]
-}
+    "files": [
+        "index.d.ts",
+        "react-router-navigation-tests.tsx"
+    ]
+}
\ No newline at end of file
diff --git a/types/react-router-redux/index.d.ts b/types/react-router-redux/index.d.ts
index 5f5d9b31ea..0ce965b397 100644
--- a/types/react-router-redux/index.d.ts
+++ b/types/react-router-redux/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Huy Nguyen <https://github.com/huy-nguyen>
 //                 Shoya Tanaka <https://github.com/8398a7>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.4
+// TypeScript Version: 2.6
 
 import {
     Store,
diff --git a/types/react-router/index.d.ts b/types/react-router/index.d.ts
index 1bebd855f1..47274d71e2 100644
--- a/types/react-router/index.d.ts
+++ b/types/react-router/index.d.ts
@@ -16,7 +16,7 @@
 //                 Egor Shulga <https://github.com/egorshulga>
 //                 Youen Toupin <https://github.com/neuoy>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.4
+// TypeScript Version: 2.6
 
 import * as React from 'react';
 import * as H from 'history';
diff --git a/types/react-router/test/examples-from-react-router-website/Animation.tsx b/types/react-router/test/examples-from-react-router-website/Animation.tsx
index d303f29a97..c59d4f91c9 100644
--- a/types/react-router/test/examples-from-react-router-website/Animation.tsx
+++ b/types/react-router/test/examples-from-react-router-website/Animation.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import * as ReactCSSTransitionGroup from 'react-addons-css-transition-group';
+import ReactCSSTransitionGroup = require('react-addons-css-transition-group');
 import {
   BrowserRouter as Router,
   RouteComponentProps,
diff --git a/types/react-router/tsconfig.json b/types/react-router/tsconfig.json
index 95e3846a8c..d62619d931 100644
--- a/types/react-router/tsconfig.json
+++ b/types/react-router/tsconfig.json
@@ -41,4 +41,4 @@
         "test/InheritingRoute.tsx",
         "test/WithRouter.tsx"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/react-router/v2/index.d.ts b/types/react-router/v2/index.d.ts
index c2fd8e9b22..68f9c3f38f 100644
--- a/types/react-router/v2/index.d.ts
+++ b/types/react-router/v2/index.d.ts
@@ -7,7 +7,7 @@
 //                 Alex Wendland <https://github.com/awendland>
 //                 Kostya Esmukov <https://github.com/KostyaEsmukov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 export as namespace ReactRouter;
 
diff --git a/types/react-router/v3/index.d.ts b/types/react-router/v3/index.d.ts
index 69f24bfc3b..9ca93b3a9b 100644
--- a/types/react-router/v3/index.d.ts
+++ b/types/react-router/v3/index.d.ts
@@ -11,7 +11,7 @@
 //                 Dovydas Navickas <https://github.com/DovydasNavickas>
 //                 Ross Allen <https://github.com/ssorallen>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 export {
     ChangeHook,
diff --git a/types/react-s-alert/index.d.ts b/types/react-s-alert/index.d.ts
index 42a0557162..bd014abd0a 100644
--- a/types/react-s-alert/index.d.ts
+++ b/types/react-s-alert/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/juliancwirko/react-s-alert
 // Definitions by: mitsuruog <https://github.com/mitsuruog>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from "react";
 
diff --git a/types/react-s-alert/tsconfig.json b/types/react-s-alert/tsconfig.json
index c029ed03aa..58dec67591 100644
--- a/types/react-s-alert/tsconfig.json
+++ b/types/react-s-alert/tsconfig.json
@@ -22,4 +22,4 @@
         "index.d.ts",
         "react-s-alert-tests.tsx"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/react-scroll/index.d.ts b/types/react-scroll/index.d.ts
index 5c7c3cbced..f04e6d86ff 100644
--- a/types/react-scroll/index.d.ts
+++ b/types/react-scroll/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Ioannis Kokkinidis <https://github.com/sudoplz>
 //                 Giedrius Grabauskas <https://github.com/GiedriusGrabauskas>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as ReactScroll from "./modules/index";
 export = ReactScroll;
diff --git a/types/react-scrollbar/index.d.ts b/types/react-scrollbar/index.d.ts
index 9f73a0be51..f551d83ebd 100644
--- a/types/react-scrollbar/index.d.ts
+++ b/types/react-scrollbar/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/souhe/reactScrollbar
 // Definitions by: Stephen Jelfs <https://github.com/stephenjelfs>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 /// <reference types="react" />
 
diff --git a/types/react-select/index.d.ts b/types/react-select/index.d.ts
index 4487ea4093..084f878618 100644
--- a/types/react-select/index.d.ts
+++ b/types/react-select/index.d.ts
@@ -12,7 +12,7 @@
 //                 Anton Novik <https://github.com/tehbi4>
 //                 David Schkalee <https://github.com/misantronic>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from 'react';
 
@@ -30,6 +30,7 @@ export type HandlerRendererResult = JSX.Element | null | false;
 export type FocusOptionHandler<TValue = OptionValues> = (option: Option<TValue>) => void;
 export type SelectValueHandler<TValue = OptionValues> = (option: Option<TValue>) => void;
 export type ArrowRendererHandler = (props: ArrowRendererProps) => HandlerRendererResult;
+export type ClearRendererHandler = () => HandlerRendererResult;
 export type FilterOptionHandler<TValue = OptionValues> = (option: Option<TValue>, filter: string) => boolean;
 export type FilterOptionsHandler<TValue = OptionValues> = (options: Options<TValue>, filter: string, currentValues: Options<TValue>) => Options<TValue>;
 export type InputRendererHandler = (props: { [key: string]: any }) => HandlerRendererResult;
@@ -187,6 +188,11 @@ export interface ReactSelectProps<TValue = OptionValues> extends React.Props<Rea
      * @default "Clear all"
      */
     clearAllText?: string;
+    /**
+     * Renders a custom clear to be shown in the right-hand side of the select when clearable true
+     * @default undefined
+     */
+    clearRenderer?: ClearRendererHandler;
     /**
      * title for the "clear" control
      * @default "Clear value"
@@ -457,7 +463,7 @@ export interface ReactSelectProps<TValue = OptionValues> extends React.Props<Rea
     /**
      *  optional tab index of the control
      */
-    tabIndex?: string;
+    tabIndex?: string | number;
 
     /**
      *  value component to render
diff --git a/types/react-side-effect/index.d.ts b/types/react-side-effect/index.d.ts
index 409c81cb80..358acbbf05 100644
--- a/types/react-side-effect/index.d.ts
+++ b/types/react-side-effect/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/gaearon/react-side-effect
 // Definitions by: Remo H. Jansen <https://github.com/remojansen>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from "react";
 
diff --git a/types/react-side-effect/react-side-effect-tests.ts b/types/react-side-effect/react-side-effect-tests.ts
index 60566eafa7..d568fed4cc 100644
--- a/types/react-side-effect/react-side-effect-tests.ts
+++ b/types/react-side-effect/react-side-effect-tests.ts
@@ -1,5 +1,5 @@
 import * as React from "react";
-import * as withSideEffect from "react-side-effect";
+import withSideEffect = require("react-side-effect");
 
 interface DocumentTitleProps {
     title: string
diff --git a/types/react-sidebar/index.d.ts b/types/react-sidebar/index.d.ts
index 9701c09d78..24684c4c76 100644
--- a/types/react-sidebar/index.d.ts
+++ b/types/react-sidebar/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/balloob/react-sidebar#readme
 // Definitions by: Jeroen Vervaeke <https://github.com/jeroenvervaeke>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import { Component } from "react";
 
diff --git a/types/react-sketchapp/index.d.ts b/types/react-sketchapp/index.d.ts
index fafa693207..67ade07673 100644
--- a/types/react-sketchapp/index.d.ts
+++ b/types/react-sketchapp/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Rico Kahler <https://github.com/ricokahler>
 //                 DomiR <https://github.com/DomiR>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from 'react';
 
diff --git a/types/react-slick/index.d.ts b/types/react-slick/index.d.ts
index 4447e9d50f..475b9afcfc 100644
--- a/types/react-slick/index.d.ts
+++ b/types/react-slick/index.d.ts
@@ -4,7 +4,7 @@
 //                 Giedrius Grabauskas <https://github.com/GiedriusGrabauskas>
 //                 Andrew Makarov <https://github.com/r3nya>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from "react";
 
diff --git a/types/react-smooth-scrollbar/index.d.ts b/types/react-smooth-scrollbar/index.d.ts
index b8e4e7d149..c0aa21a0ff 100644
--- a/types/react-smooth-scrollbar/index.d.ts
+++ b/types/react-smooth-scrollbar/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/idiotWu/react-smooth-scrollbar
 // Definitions by: Alexey Svetliakov <https://github.com/asvetliakov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from "react";
 import SmoothScrollbar from "smooth-scrollbar";
diff --git a/types/react-smooth-scrollbar/react-smooth-scrollbar-tests.tsx b/types/react-smooth-scrollbar/react-smooth-scrollbar-tests.tsx
index b976624a4e..22fd0ae83c 100644
--- a/types/react-smooth-scrollbar/react-smooth-scrollbar-tests.tsx
+++ b/types/react-smooth-scrollbar/react-smooth-scrollbar-tests.tsx
@@ -1,5 +1,5 @@
 import * as React from "react";
-import * as SmoothScrollbar from 'react-smooth-scrollbar';
+import SmoothScrollbar = require('react-smooth-scrollbar');
 
 <SmoothScrollbar className="test" alwaysShowTracks onScroll={(status, instance) => { } } />;
 // <SmoothScrollbar speed={10} overscrollEffect="bounce" />; TODO: These options don't seem to be documented
diff --git a/types/react-sortable-hoc/index.d.ts b/types/react-sortable-hoc/index.d.ts
index 199156100e..851170036d 100644
--- a/types/react-sortable-hoc/index.d.ts
+++ b/types/react-sortable-hoc/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/clauderic/react-sortable-hoc
 // Definitions by: Ivo Stratev <https://github.com/NoHomey>, Charles Rey <https://github.com/charlesrey>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from 'react';
 
diff --git a/types/react-sortable-pane/index.d.ts b/types/react-sortable-pane/index.d.ts
index 97b35f04bd..f8d3eba15f 100644
--- a/types/react-sortable-pane/index.d.ts
+++ b/types/react-sortable-pane/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/bokuweb/react-sortable-pane
 // Definitions by: rhysd <https://github.com/rhysd>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from 'react';
 
diff --git a/types/react-sortable-pane/tsconfig.json b/types/react-sortable-pane/tsconfig.json
index 2c919006c5..bc07e7267a 100644
--- a/types/react-sortable-pane/tsconfig.json
+++ b/types/react-sortable-pane/tsconfig.json
@@ -22,4 +22,4 @@
         "index.d.ts",
         "react-sortable-pane-tests.tsx"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/react-sortable-tree/index.d.ts b/types/react-sortable-tree/index.d.ts
index 2b9d1d1a6c..441e0bb61b 100644
--- a/types/react-sortable-tree/index.d.ts
+++ b/types/react-sortable-tree/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Wouter Hardeman <https://github.com/wouterhardeman>
 //                 Jovica Zoric <https://github.com/jzoric>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from 'react';
 import { ListProps, Index } from 'react-virtualized';
diff --git a/types/react-spinkit/index.d.ts b/types/react-spinkit/index.d.ts
index da0ff35f91..9e4a5f0cff 100644
--- a/types/react-spinkit/index.d.ts
+++ b/types/react-spinkit/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/KyleAMathews/react-spinkit
 // Definitions by: Qubo <https://github.com/tkqubo>, Mleko <https://github.com/mleko>, Tom Crockett <https://github.com/pelotom>, zzanol <https://github.com/zzanol>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 /// <reference types="react" />
 
diff --git a/types/react-spinkit/react-spinkit-tests.tsx b/types/react-spinkit/react-spinkit-tests.tsx
index 27717503d6..ac952bc700 100644
--- a/types/react-spinkit/react-spinkit-tests.tsx
+++ b/types/react-spinkit/react-spinkit-tests.tsx
@@ -1,4 +1,4 @@
-import * as Spinner from 'react-spinkit';
+import Spinner = require('react-spinkit');
 import * as React from 'react';
 
 // Examples taken from http://kyleamathews.github.io/react-spinkit/
diff --git a/types/react-spinkit/v1/index.d.ts b/types/react-spinkit/v1/index.d.ts
index d9a3609653..ec841afd4b 100644
--- a/types/react-spinkit/v1/index.d.ts
+++ b/types/react-spinkit/v1/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/KyleAMathews/react-spinkit
 // Definitions by: Qubo <https://github.com/tkqubo>, Mleko <https://github.com/mleko>, Tom Crockett <https://github.com/pelotom>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 /// <reference types="react" />
 
diff --git a/types/react-spinkit/v1/react-spinkit-tests.tsx b/types/react-spinkit/v1/react-spinkit-tests.tsx
index 6742096ebe..463a689364 100644
--- a/types/react-spinkit/v1/react-spinkit-tests.tsx
+++ b/types/react-spinkit/v1/react-spinkit-tests.tsx
@@ -1,4 +1,4 @@
-import * as Spinner from 'react-spinkit';
+import Spinner  = require('react-spinkit');
 import * as React from 'react';
 
 // Examples taken from http://kyleamathews.github.io/react-spinkit/
diff --git a/types/react-sticky/index.d.ts b/types/react-sticky/index.d.ts
index 85743b9945..9350069bcd 100644
--- a/types/react-sticky/index.d.ts
+++ b/types/react-sticky/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/captivationsoftware/react-sticky
 // Definitions by: Matej Lednicky <http://www.thinkcreatix.com/>, Curtis Warren <https://github.com/curtisw0>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from "react";
 
diff --git a/types/react-stripe-elements/index.d.ts b/types/react-stripe-elements/index.d.ts
index 72dea90475..8713d5828a 100644
--- a/types/react-stripe-elements/index.d.ts
+++ b/types/react-stripe-elements/index.d.ts
@@ -4,7 +4,7 @@
 //                 Santiago Doldan <https://github.com/santiagodoldan>
 //                 sonnysangha <https://github.com/sonnysangha>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 /// <reference types="stripe-v3" />
 import * as React from 'react';
diff --git a/types/react-svg-pan-zoom/index.d.ts b/types/react-svg-pan-zoom/index.d.ts
index 5cd5e7d2ff..f825694915 100644
--- a/types/react-svg-pan-zoom/index.d.ts
+++ b/types/react-svg-pan-zoom/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/chrvadala/react-svg-pan-zoom#readme
 // Definitions by: Huy Nguyen <https://github.com/huy-nguyen>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from 'react';
 
diff --git a/types/react-swf/index.d.ts b/types/react-swf/index.d.ts
index 715c62bb43..c37aff3d69 100644
--- a/types/react-swf/index.d.ts
+++ b/types/react-swf/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/syranide/react-swf
 // Definitions by: Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from 'react';
 export as namespace ReactSWF;
diff --git a/types/react-swipe/index.d.ts b/types/react-swipe/index.d.ts
index 3a11f905d1..fb7d02055f 100644
--- a/types/react-swipe/index.d.ts
+++ b/types/react-swipe/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/voronianski/react-swipe
 // Definitions by: Deividas Bakanas <https://github.com/DeividasBakanas>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 /// <reference types="swipe" />
 
diff --git a/types/react-swipe/react-swipe-tests.tsx b/types/react-swipe/react-swipe-tests.tsx
index 2a2f0ffc90..2948141ee6 100644
--- a/types/react-swipe/react-swipe-tests.tsx
+++ b/types/react-swipe/react-swipe-tests.tsx
@@ -1,5 +1,5 @@
 import * as React from "react";
-import * as ReactSwipe from "react-swipe";
+import ReactSwipe = require("react-swipe");
 
 class ReactSwipeTest extends React.PureComponent {
     private swipeComponent: ReactSwipe | null = null;
diff --git a/types/react-swipeable-views/index.d.ts b/types/react-swipeable-views/index.d.ts
index fd4b322fd5..dedc165871 100644
--- a/types/react-swipeable-views/index.d.ts
+++ b/types/react-swipeable-views/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Michael Ledin <https://github.com/mxl>
 //                 Deividas Bakanas <https://github.com/DeividasBakanas>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from 'react';
 
diff --git a/types/react-swipeable/index.d.ts b/types/react-swipeable/index.d.ts
index 1608258c64..b39a7b29ea 100644
--- a/types/react-swipeable/index.d.ts
+++ b/types/react-swipeable/index.d.ts
@@ -4,7 +4,7 @@
 //                 Konstantin Vasilev <https://github.com/mctep>
 //                 Hiroki Horiuchi <https://github.com/horiuchi>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from 'react';
 
diff --git a/types/react-swipeable/react-swipeable-tests.tsx b/types/react-swipeable/react-swipeable-tests.tsx
index b31011d63d..b068683c33 100644
--- a/types/react-swipeable/react-swipeable-tests.tsx
+++ b/types/react-swipeable/react-swipeable-tests.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import * as Swipeable from 'react-swipeable';
+import Swipeable = require('react-swipeable');
 
 class SampleComponent extends React.PureComponent<Swipeable.SwipeableProps> {
   private readonly handleSwiped: Swipeable.OnSwipedCallback = () => {};
diff --git a/types/react-swipeable/tsconfig.json b/types/react-swipeable/tsconfig.json
index a720949edf..f3f7bf5b1a 100644
--- a/types/react-swipeable/tsconfig.json
+++ b/types/react-swipeable/tsconfig.json
@@ -22,4 +22,4 @@
         "index.d.ts",
         "react-swipeable-tests.tsx"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/react-syntax-highlighter/index.d.ts b/types/react-syntax-highlighter/index.d.ts
index eb0a5c21fa..9650d2ba20 100644
--- a/types/react-syntax-highlighter/index.d.ts
+++ b/types/react-syntax-highlighter/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/conorhastings/react-syntax-highlighter
 // Definitions by: Ivo Stratev <https://github.com/NoHomey>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 declare module 'react-syntax-highlighter' {
     import SyntaxHighlighter from 'react-syntax-highlighter/dist/light';
diff --git a/types/react-table/index.d.ts b/types/react-table/index.d.ts
index 1800a9d745..2ab2d2a821 100644
--- a/types/react-table/index.d.ts
+++ b/types/react-table/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/react-tools/react-table
 // Definitions by: Roy Xue <https://github.com/royxue>, Pavel Sakalo <https://github.com/psakalo>, Krzysztof Porębski <https://github.com/Havret>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 import * as React from 'react';
 
 export type ReactTableFunction = () => void;
diff --git a/types/react-tabs/index.d.ts b/types/react-tabs/index.d.ts
index a4a528046a..9c053d465e 100644
--- a/types/react-tabs/index.d.ts
+++ b/types/react-tabs/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/reactjs/react-tabs/
 // Definitions by: Yuu Igarashi <https://github.com/yu-i9/>, Daniel Tschinder <https://github.com/danez>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from 'react';
 
diff --git a/types/react-tag-input/index.d.ts b/types/react-tag-input/index.d.ts
index c614e096ed..6dd269896e 100644
--- a/types/react-tag-input/index.d.ts
+++ b/types/react-tag-input/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Ogglas <https://github.com/Ogglas>
 //                  Jan Karres <https://github.com/jankarres>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from "react";
 
diff --git a/types/react-tagcloud/index.d.ts b/types/react-tagcloud/index.d.ts
index 4315e6eb5c..4f6987cb5f 100644
--- a/types/react-tagcloud/index.d.ts
+++ b/types/react-tagcloud/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/madox2/react-tagcloud
 // Definitions by: wassname <https://github.com/wassname>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 ///<reference types="react"/>
 
diff --git a/types/react-tagsinput/index.d.ts b/types/react-tagsinput/index.d.ts
index 6b4d92b3b7..4de3a4b8ac 100644
--- a/types/react-tagsinput/index.d.ts
+++ b/types/react-tagsinput/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/olahol/react-tagsinput
 // Definitions by: Michael Macnair <https://github.com/mykter>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from "react";
 
diff --git a/types/react-tagsinput/react-tagsinput-tests.tsx b/types/react-tagsinput/react-tagsinput-tests.tsx
index 8a3a113227..cdcd882817 100644
--- a/types/react-tagsinput/react-tagsinput-tests.tsx
+++ b/types/react-tagsinput/react-tagsinput-tests.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import * as TagsInput from 'react-tagsinput';
+import TagsInput = require('react-tagsinput');
 
 interface StateI {
     tags: string[];
diff --git a/types/react-tagsinput/tsconfig.json b/types/react-tagsinput/tsconfig.json
index 1e9342e032..6c13888335 100644
--- a/types/react-tagsinput/tsconfig.json
+++ b/types/react-tagsinput/tsconfig.json
@@ -21,4 +21,4 @@
         "index.d.ts",
         "react-tagsinput-tests.tsx"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/react-test-renderer/index.d.ts b/types/react-test-renderer/index.d.ts
index ed73041f18..d069686903 100644
--- a/types/react-test-renderer/index.d.ts
+++ b/types/react-test-renderer/index.d.ts
@@ -5,7 +5,7 @@
 //                 John Reilly <https://github.com/johnnyreilly>
 //                 John Gozde <https://github.com/jgoz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import { ReactElement, ReactType } from "react";
 
diff --git a/types/react-test-renderer/v15/index.d.ts b/types/react-test-renderer/v15/index.d.ts
index ab6d51ceaa..753f4ef19d 100644
--- a/types/react-test-renderer/v15/index.d.ts
+++ b/types/react-test-renderer/v15/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://facebook.github.io/react/
 // Definitions by: Arvitaly <https://github.com/arvitaly>, Lochbrunner <https://github.com/lochbrunner>, Lochbrunner <https://github.com/lochbrunner>, John Reilly <https://github.com/johnnyreilly>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import { ReactElement } from "react";
 
diff --git a/types/react-test-renderer/v15/tsconfig.json b/types/react-test-renderer/v15/tsconfig.json
index 597591256e..4be2e2797f 100644
--- a/types/react-test-renderer/v15/tsconfig.json
+++ b/types/react-test-renderer/v15/tsconfig.json
@@ -30,4 +30,4 @@
         "shallow/index.d.ts",
         "react-test-renderer-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/react-tether/index.d.ts b/types/react-tether/index.d.ts
index 1790b8abbc..1012c8254b 100644
--- a/types/react-tether/index.d.ts
+++ b/types/react-tether/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/souporserious/react-tether
 // Definitions by: Ryan Price <https://github.com/ryprice>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 export default TetherComponent;
 export as namespace ReactTether;
diff --git a/types/react-textarea-autosize/index.d.ts b/types/react-textarea-autosize/index.d.ts
index 9629be7e37..de52335683 100644
--- a/types/react-textarea-autosize/index.d.ts
+++ b/types/react-textarea-autosize/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/andreypopp/react-textarea-autosize
 // Definitions by: Alexey Svetliakov <https://github.com/asvetliakov>, Jerry Zou <https://github.com/zry656565>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 declare module "react-textarea-autosize" {
     import * as React from "react";
diff --git a/types/react-toastr/index.d.ts b/types/react-toastr/index.d.ts
index 2de77a6d7e..2ccc8452fe 100644
--- a/types/react-toastr/index.d.ts
+++ b/types/react-toastr/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/tomchentw/react-toastr
 // Definitions by: Josh Holmer <https://github.com/shssoichiro>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import { Component, ReactHTML } from 'react';
 
diff --git a/types/react-toastr/tsconfig.json b/types/react-toastr/tsconfig.json
index 1fbbfde4af..c29213d19e 100644
--- a/types/react-toastr/tsconfig.json
+++ b/types/react-toastr/tsconfig.json
@@ -22,4 +22,4 @@
         "index.d.ts",
         "react-toastr-tests.tsx"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/react-toggle/index.d.ts b/types/react-toggle/index.d.ts
index f78bdd4a0e..015daff31e 100644
--- a/types/react-toggle/index.d.ts
+++ b/types/react-toggle/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/aaronshaf/react-toggle
 // Definitions by: Karol Janyst <https://github.com/LKay>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import { Component, InputHTMLAttributes, ReactNode } from "react";
 
diff --git a/types/react-toggle/v2/index.d.ts b/types/react-toggle/v2/index.d.ts
index 356f70ed1a..2b0774de2d 100644
--- a/types/react-toggle/v2/index.d.ts
+++ b/types/react-toggle/v2/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/aaronshaf/react-toggle
 // Definitions by: Karol Janyst <https://github.com/LKay>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import { Component, HTMLAttributes, ReactNode } from "react";
 
diff --git a/types/react-tooltip/index.d.ts b/types/react-tooltip/index.d.ts
index 433efee411..e9690b8f5c 100644
--- a/types/react-tooltip/index.d.ts
+++ b/types/react-tooltip/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/wwayne/react-tooltip
 // Definitions by: Deividas Bakanas <https://github.com/DeividasBakanas>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from "react";
 
diff --git a/types/react-tooltip/react-tooltip-tests.tsx b/types/react-tooltip/react-tooltip-tests.tsx
index 5da85d8c59..3fee5dba3e 100644
--- a/types/react-tooltip/react-tooltip-tests.tsx
+++ b/types/react-tooltip/react-tooltip-tests.tsx
@@ -1,6 +1,6 @@
 import * as React from "react";
 import { findDOMNode } from "react-dom";
-import * as ReactTooltip from "react-tooltip";
+import ReactTooltip = require("react-tooltip");
 
 export class ReactTooltipTest extends React.PureComponent {
     componentDidMount() {
diff --git a/types/react-touch/index.d.ts b/types/react-touch/index.d.ts
index 01f5fcdb91..3e714b2b6c 100644
--- a/types/react-touch/index.d.ts
+++ b/types/react-touch/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/leonaves/react-touch
 // Definitions by: Grzegorz Kielak <https://github.com/grzesie2k>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from "react";
 
diff --git a/types/react-tracking/index.d.ts b/types/react-tracking/index.d.ts
index b94e830559..8117fb3336 100644
--- a/types/react-tracking/index.d.ts
+++ b/types/react-tracking/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/NYTimes/react-tracking
 // Definitions by: Eloy Durán <https://github.com/alloy>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from "react";
 
diff --git a/types/react-transition-group/index.d.ts b/types/react-transition-group/index.d.ts
index b41d19c857..6a90201af5 100644
--- a/types/react-transition-group/index.d.ts
+++ b/types/react-transition-group/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/reactjs/react-transition-group
 // Definitions by: Karol Janyst <https://github.com/LKay>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import CSSTransition = require("./CSSTransition");
 import Transition from "./Transition";
diff --git a/types/react-transition-group/v1/index.d.ts b/types/react-transition-group/v1/index.d.ts
index 3c82827b46..dd62c27e80 100644
--- a/types/react-transition-group/v1/index.d.ts
+++ b/types/react-transition-group/v1/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/reactjs/react-transition-group
 // Definitions by: Karol Janyst <https://github.com/LKay>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import { HTMLAttributes, ReactElement, ReactType } from "react";
 
diff --git a/types/react-transition-group/v1/react-transition-group-tests.tsx b/types/react-transition-group/v1/react-transition-group-tests.tsx
index 346fe9989a..2e16635a4b 100644
--- a/types/react-transition-group/v1/react-transition-group-tests.tsx
+++ b/types/react-transition-group/v1/react-transition-group-tests.tsx
@@ -1,6 +1,6 @@
 import * as React from "react";
-import * as TransitionGroup from "react-transition-group/TransitionGroup";
-import * as CSSTransitionGroup from "react-transition-group/CSSTransitionGroup";
+import TransitionGroup = require("react-transition-group/TransitionGroup");
+import CSSTransitionGroup = require("react-transition-group/CSSTransitionGroup");
 import { CSSTransitionGroupProps, TransitionGroupProps, TransitionGroupChildLifecycle } from "react-transition-group";
 
 class TestChild extends React.Component implements TransitionGroupChildLifecycle {
diff --git a/types/react-treeview/index.d.ts b/types/react-treeview/index.d.ts
index 64690dc361..2bfacc3eee 100644
--- a/types/react-treeview/index.d.ts
+++ b/types/react-treeview/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/chenglou/react-treeview
 // Definitions by: Jay Anslow <https://github.com/janslow>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import { Component, HTMLAttributes } from 'react';
 
diff --git a/types/react-truncate/index.d.ts b/types/react-truncate/index.d.ts
index 5200016dec..cb97ccafe7 100644
--- a/types/react-truncate/index.d.ts
+++ b/types/react-truncate/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/One-com/react-truncate
 // Definitions by: Matt Perry <https://github.com/mattvperry>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from 'react';
 
diff --git a/types/react-user-tour/index.d.ts b/types/react-user-tour/index.d.ts
index 21a8be7a61..6fdbc2da13 100644
--- a/types/react-user-tour/index.d.ts
+++ b/types/react-user-tour/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/socialtables/react-user-tour
 // Definitions by: Carlo Cancellieri <https://github.com/ccancellieri>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 /// <reference types='react' />
 
diff --git a/types/react-virtual-keyboard/index.d.ts b/types/react-virtual-keyboard/index.d.ts
index 20e8669c6d..03597e82e6 100644
--- a/types/react-virtual-keyboard/index.d.ts
+++ b/types/react-virtual-keyboard/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://www.npmjs.com/package/react-virtual-keyboard
 // Definitions by: Bogdan Surai <https://github.com/bsurai>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.4
+// TypeScript Version: 2.6
 
 import { Component } from "react";
 import { KeyboardOptions, NavigateOptions } from "virtual-keyboard";
diff --git a/types/react-virtualized-select/index.d.ts b/types/react-virtualized-select/index.d.ts
index d3cec048cb..fca818802f 100644
--- a/types/react-virtualized-select/index.d.ts
+++ b/types/react-virtualized-select/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/bvaughn/react-virtualized-select
 // Definitions by: Sean Kelley <https://github.com/seansfkelley>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from "react";
 import { ReactSelectProps } from "react-select";
diff --git a/types/react-virtualized/dist/es/Table.d.ts b/types/react-virtualized/dist/es/Table.d.ts
index 97fe20b657..87f79de86d 100644
--- a/types/react-virtualized/dist/es/Table.d.ts
+++ b/types/react-virtualized/dist/es/Table.d.ts
@@ -74,6 +74,8 @@ export type ColumnProps = {
     columnData?: any;
     /** Uniquely identifies the row-data attribute correspnding to this cell */
     dataKey: any;
+    /** Default sort order when clicked for the first time. Valid options include "ASC" and "DESC". Defaults to "ASC" */
+    defaultSortDirection?: SortDirectionType;
     /** If sort is enabled for the table at large, disable it for this column */
     disableSort?: boolean;
     /** Flex grow style; defaults to 0 */
@@ -87,6 +89,10 @@ export type ColumnProps = {
      * ({ columnData: object, dataKey: string, disableSort: boolean, label: string, sortBy: string, sortDirection: string }): PropTypes.node
      */
     headerRenderer?: TableHeaderRenderer;
+    /** Optional inline style to apply to this column's header */
+    headerStyle?: React.CSSProperties;
+    /** Optional id to set on the column header; used for aria-describedby */
+    id?: string;
     /** Header label for this column */
     label?: string;
     /** Maximum width of column; this property will only be used if :flexGrow is > 0. */
@@ -97,8 +103,6 @@ export type ColumnProps = {
     style?: React.CSSProperties;
     /** Flex basis (width) for this column; This value can grow or shrink based on :flexGrow and :flexShrink properties. */
     width: number;
-    /** Optional id to set on the column header; used for aria-describedby */
-    id?: string;
 }
 export class Column extends Component<ColumnProps> {
     static propTypes: {
diff --git a/types/react-virtualized/index.d.ts b/types/react-virtualized/index.d.ts
index 01292a0519..6293d20c9e 100644
--- a/types/react-virtualized/index.d.ts
+++ b/types/react-virtualized/index.d.ts
@@ -6,7 +6,7 @@
 //                 Szőke Szabolcs <https://github.com/szabolcsx>
 //                 Kræn Hansen <https://github.com/kraenhansen>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 export {
     ArrowKeyStepper,
diff --git a/types/react-virtualized/react-virtualized-tests.tsx b/types/react-virtualized/react-virtualized-tests.tsx
index c5958ab96c..d912c1f28f 100644
--- a/types/react-virtualized/react-virtualized-tests.tsx
+++ b/types/react-virtualized/react-virtualized-tests.tsx
@@ -1546,12 +1546,14 @@ export class TableExample extends PureComponent<{}, any> {
                                     }
                                     dataKey='index'
                                     disableSort={!this._isSortEnabled()}
+                                    defaultSortDirection={SortDirection.DESC}
                                     width={60}
                                 />
                             }
                             <Column
                                 dataKey='name'
                                 disableSort={!this._isSortEnabled()}
+                                defaultSortDirection={SortDirection.ASC}
                                 headerRenderer={this._headerRenderer}
                                 width={90}
                             />
diff --git a/types/react-widgets-moment/tsconfig.json b/types/react-widgets-moment/tsconfig.json
index 332d436d22..647a13700c 100644
--- a/types/react-widgets-moment/tsconfig.json
+++ b/types/react-widgets-moment/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "react-widgets-moment-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/react-widgets/index.d.ts b/types/react-widgets/index.d.ts
index 883b94a897..f02d9f016d 100644
--- a/types/react-widgets/index.d.ts
+++ b/types/react-widgets/index.d.ts
@@ -5,7 +5,7 @@
 //                 Frode Hansen <https://github.com/frodehansen2>
 //                 Andrew Makarov <https://github.com/r3nya>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from 'react';
 
diff --git a/types/react-widgets/tsconfig.json b/types/react-widgets/tsconfig.json
index 87d8f47b06..1acb188974 100644
--- a/types/react-widgets/tsconfig.json
+++ b/types/react-widgets/tsconfig.json
@@ -22,4 +22,4 @@
         "index.d.ts",
         "react-widgets-tests.tsx"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/react-youtube/index.d.ts b/types/react-youtube/index.d.ts
index 14458c74d0..65b5858ae6 100644
--- a/types/react-youtube/index.d.ts
+++ b/types/react-youtube/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/troybetz/react-youtube
 // Definitions by: kgtkr <https://github.com/kgtkr>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from "react";
 export default class YouTube extends React.Component<{
diff --git a/types/react/index.d.ts b/types/react/index.d.ts
index c39e5eeb6c..93b143b7bf 100644
--- a/types/react/index.d.ts
+++ b/types/react/index.d.ts
@@ -15,7 +15,7 @@
 //                 Rich Seviora <https://github.com/richseviora>
 //                 Josh Rutherford <https://github.com/theruther4d>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 /*
 Known Problems & Workarounds
@@ -2863,6 +2863,10 @@ declare namespace React {
         dateTime?: string;
     }
 
+    interface DialogHTMLAttributes<T> extends HTMLAttributes<T> {
+        open?: boolean;
+    }
+
     interface EmbedHTMLAttributes<T> extends HTMLAttributes<T> {
         height?: number | string;
         src?: string;
@@ -2909,6 +2913,7 @@ declare namespace React {
 
     interface ImgHTMLAttributes<T> extends HTMLAttributes<T> {
         alt?: string;
+        crossOrigin?: "anonymous" | "use-credentials" | "";
         height?: number | string;
         sizes?: string;
         src?: string;
@@ -3500,7 +3505,7 @@ declare namespace React {
         del: DetailedHTMLFactory<DelHTMLAttributes<HTMLElement>, HTMLElement>;
         details: DetailedHTMLFactory<DetailsHTMLAttributes<HTMLElement>, HTMLElement>;
         dfn: DetailedHTMLFactory<HTMLAttributes<HTMLElement>, HTMLElement>;
-        dialog: DetailedHTMLFactory<HTMLAttributes<HTMLElement>, HTMLElement>;
+        dialog: DetailedHTMLFactory<DialogHTMLAttributes<HTMLDialogElement>, HTMLDialogElement>;
         div: DetailedHTMLFactory<HTMLAttributes<HTMLDivElement>, HTMLDivElement>;
         dl: DetailedHTMLFactory<HTMLAttributes<HTMLDListElement>, HTMLDListElement>;
         dt: DetailedHTMLFactory<HTMLAttributes<HTMLElement>, HTMLElement>;
@@ -3774,7 +3779,7 @@ declare global {
             del: React.DetailedHTMLProps<React.DelHTMLAttributes<HTMLElement>, HTMLElement>;
             details: React.DetailedHTMLProps<React.DetailsHTMLAttributes<HTMLElement>, HTMLElement>;
             dfn: React.DetailedHTMLProps<React.HTMLAttributes<HTMLElement>, HTMLElement>;
-            dialog: React.DetailedHTMLProps<React.HTMLAttributes<HTMLElement>, HTMLElement>;
+            dialog: React.DetailedHTMLProps<React.DialogHTMLAttributes<HTMLDialogElement>, HTMLDialogElement>;
             div: React.DetailedHTMLProps<React.HTMLAttributes<HTMLDivElement>, HTMLDivElement>;
             dl: React.DetailedHTMLProps<React.HTMLAttributes<HTMLDListElement>, HTMLDListElement>;
             dt: React.DetailedHTMLProps<React.HTMLAttributes<HTMLElement>, HTMLElement>;
diff --git a/types/react/test/index.ts b/types/react/test/index.ts
index 3e2be1605f..757a1da669 100644
--- a/types/react/test/index.ts
+++ b/types/react/test/index.ts
@@ -2,15 +2,15 @@ import * as React from "react";
 import * as ReactDOM from "react-dom";
 import * as ReactDOMServer from "react-dom/server";
 import createFragment = require("react-addons-create-fragment");
-import * as CSSTransitionGroup from "react-addons-css-transition-group";
+import CSSTransitionGroup = require("react-addons-css-transition-group");
 import * as LinkedStateMixin from "react-addons-linked-state-mixin";
 import * as Perf from "react-addons-perf";
 import * as PureRenderMixin from "react-addons-pure-render-mixin";
-import * as shallowCompare from "react-addons-shallow-compare";
+import shallowCompare = require("react-addons-shallow-compare");
 import * as TestUtils from "react-addons-test-utils";
-import * as TransitionGroup from "react-addons-transition-group";
+import TransitionGroup = require("react-addons-transition-group");
 import update = require("react-addons-update");
-import * as createReactClass from "create-react-class";
+import createReactClass = require("create-react-class");
 import * as PropTypes from "prop-types";
 import * as DOM from "react-dom-factories";
 
diff --git a/types/react/v15/index.d.ts b/types/react/v15/index.d.ts
index 96c0b3af7e..534d92de29 100644
--- a/types/react/v15/index.d.ts
+++ b/types/react/v15/index.d.ts
@@ -13,7 +13,7 @@
 //                 Dovydas Navickas <https://github.com/DovydasNavickas>
 //                 Stéphane Goetz <https://github.com/onigoetz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 /*
 Known Problems & Workarounds
@@ -2856,6 +2856,7 @@ declare namespace React {
 
     interface ImgHTMLAttributes<T> extends HTMLAttributes<T> {
         alt?: string;
+        crossOrigin?: "anonymous" | "use-credentials" | "";
         height?: number | string;
         sizes?: string;
         src?: string;
diff --git a/types/react/v15/test/index.ts b/types/react/v15/test/index.ts
index b0c358b011..8cd6765f4c 100644
--- a/types/react/v15/test/index.ts
+++ b/types/react/v15/test/index.ts
@@ -2,13 +2,13 @@ import * as React from "react";
 import * as ReactDOM from "react-dom";
 import * as ReactDOMServer from "react-dom/server";
 import createFragment = require("react-addons-create-fragment");
-import * as CSSTransitionGroup from "react-addons-css-transition-group";
+import CSSTransitionGroup = require("react-addons-css-transition-group");
 import * as LinkedStateMixin from "react-addons-linked-state-mixin";
 import * as Perf from "react-addons-perf";
 import * as PureRenderMixin from "react-addons-pure-render-mixin";
-import * as shallowCompare from "react-addons-shallow-compare";
+import shallowCompare = require("react-addons-shallow-compare");
 import * as TestUtils from "react-addons-test-utils";
-import * as TransitionGroup from "react-addons-transition-group";
+import TransitionGroup = require("react-addons-transition-group");
 import update = require("react-addons-update");
 
 interface Props extends React.Attributes {
diff --git a/types/reactable/index.d.ts b/types/reactable/index.d.ts
index 5ec58cec2b..8e3cb8873c 100644
--- a/types/reactable/index.d.ts
+++ b/types/reactable/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/glittershark/reactable
 // Definitions by: Christoph Spielmann <https://github.com/spielc>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from 'react';
 
diff --git a/types/reactcss/index.d.ts b/types/reactcss/index.d.ts
index 68836afe93..c5fb14bd32 100644
--- a/types/reactcss/index.d.ts
+++ b/types/reactcss/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://reactcss.com/
 // Definitions by: Chris Gervang <https://github.com/chrisgervang>, Karol Janyst <https://github.com/LKay>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from "react"
 
diff --git a/types/reactstrap/index.d.ts b/types/reactstrap/index.d.ts
index 38c55bc08a..32d2ab7c0d 100644
--- a/types/reactstrap/index.d.ts
+++ b/types/reactstrap/index.d.ts
@@ -7,89 +7,88 @@
 //                 FaithForHumans <https://github.com/FaithForHumans>
 //                 Kurt Preston <https://github.com/KurtPreston>
 //                 Kræn Hansen <https://github.com/kraenhansen>
+//                 Tim Chen <https://github.com/timc13>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 export interface CSSModule {
   [className: string]: string;
 }
 
-export { default as Alert,                AlertProps                      } from './lib/Alert';
-export { default as Badge,                BadgeProps                      } from './lib/Badge';
-export { default as Breadcrumb,           BreadcrumbProps                 } from './lib/Breadcrumb';
-export { default as BreadcrumbItem,       BreadcrumbItemProps             } from './lib/BreadcrumbItem';
-export { default as Button,               ButtonProps                     } from './lib/Button';
-export { default as ButtonDropdown,       ButtonDropdownProps             } from './lib/ButtonDropdown';
-export { default as ButtonGroup,          ButtonGroupProps                } from './lib/ButtonGroup';
-export { default as ButtonToolbar,        ButtonToolbarProps              } from './lib/ButtonToolbar';
-export { default as Card,                 CardProps                       } from './lib/Card';
-export { default as CardBody,             CardBodyProps                   } from './lib/CardBody';
-export { default as CardBlock,            CardBlockProps                  } from './lib/CardBlock';
-export { default as CardColumns,          CardColumnsProps                } from './lib/CardColumns';
-export { default as CardDeck,             CardDeckProps                   } from './lib/CardDeck';
-export { default as CardFooter,           CardFooterProps                 } from './lib/CardFooter';
-export { default as CardGroup,            CardGroupProps                  } from './lib/CardGroup';
-export { default as CardHeader,           CardHeaderProps                 } from './lib/CardHeader';
-export { default as CardImg,              CardImgProps                    } from './lib/CardImg';
-export { default as CardImgOverlay,       CardImgOverlayProps             } from './lib/CardImgOverlay';
-export { default as CardLink,             CardLinkProps                   } from './lib/CardLink';
-export { default as CardSubtitle,         CardSubtitleProps               } from './lib/CardSubtitle';
-export { default as CardText,             CardTextProps                   } from './lib/CardText';
-export { default as CardTitle,            CardTitleProps                  } from './lib/CardTitle';
-export { default as Carousel,             CarouselProps                   } from './lib/Carousel';
-export { default as CarouselItem,         CarouselItemProps               } from './lib/CarouselItem';
-export { default as CarouselControl,      CarouselControlProps            } from './lib/CarouselControl';
-export { default as CarouselIndicators,   CarouselIndicatorsProps         } from './lib/CarouselIndicators';
-export { default as CarouselCaption,      CarouselCaptionProps            } from './lib/CarouselCaption';
-export { default as Col,                  ColProps                        } from './lib/Col';
-export { default as Collapse,             CollapseProps                   } from './lib/Collapse';
-export { default as Container,            ContainerProps                  } from './lib/Container';
-export { default as Dropdown,             DropdownProps                   } from './lib/Dropdown';
-export { default as DropdownItem,         DropdownItemProps               } from './lib/DropdownItem';
-export { default as DropdownMenu,         DropdownMenuProps               } from './lib/DropdownMenu';
-export { default as DropdownToggle,       DropdownToggleProps             } from './lib/DropdownToggle';
-export { default as Fade,                 FadeProps                       } from './lib/Fade';
-export { default as Form,                 FormProps                       } from './lib/Form';
-export { default as FormFeedback,         FormFeedbackProps               } from './lib/FormFeedback';
-export { default as FormGroup,            FormGroupProps                  } from './lib/FormGroup';
-export { default as FormText,             FormTextProps                   } from './lib/FormText';
-export { default as Input,                InputProps                      } from './lib/Input';
-export { default as InputGroup,           InputGroupProps                 } from './lib/InputGroup';
-export { default as InputGroupAddon,      InputGroupAddonProps            } from './lib/InputGroupAddon';
-export { default as InputGroupButton,     InputGroupButtonProps           } from './lib/InputGroupButton';
-export { default as Jumbotron,            JumbotronProps                  } from './lib/Jumbotron';
-export { default as Label,                LabelProps                      } from './lib/Label';
-export { default as ListGroup,            ListGroupProps                  } from './lib/ListGroup';
-export { default as ListGroupItem,        ListGroupItemProps              } from './lib/ListGroupItem';
-export { default as ListGroupItemHeading, ListGroupItemHeadingProps       } from './lib/ListGroupItemHeading';
-export { default as ListGroupItemText,    ListGroupItemTextProps          } from './lib/ListGroupItemText';
-export { default as Media,                MediaProps                      } from './lib/Media';
-export { default as Modal,                ModalProps                      } from './lib/Modal';
-export { default as ModalBody,            ModalBodyProps                  } from './lib/ModalBody';
-export { default as ModalFooter,          ModalFooterProps                } from './lib/ModalFooter';
-export { default as ModalHeader,          ModalHeaderProps                } from './lib/ModalHeader';
-export { default as Nav,                  NavProps                        } from './lib/Nav';
-export { default as Navbar,               NavbarProps                     } from './lib/Navbar';
-export { default as NavbarBrand,          NavbarBrandProps                } from './lib/NavbarBrand';
-export { default as NavbarToggler,        NavbarTogglerProps              } from './lib/NavbarToggler';
-export { default as NavDropdown,          NavDropdownProps                } from './lib/NavDropdown';
-export { default as NavItem,              NavItemProps                    } from './lib/NavItem';
-export { default as NavLink,              NavLinkProps                    } from './lib/NavLink';
-export { default as Pagination,           PaginationProps                 } from './lib/Pagination';
-export { default as PaginationItem,       PaginationItemProps             } from './lib/PaginationItem';
-export { default as PaginationLink,       PaginationLinkProps             } from './lib/PaginationLink';
-export { default as Popover,              PopoverProps                    } from './lib/Popover';
-export { default as PopoverBody,          PopoverBodyProps                } from './lib/PopoverBody';
-export { default as PopoverHeader,        PopoverHeaderProps              } from './lib/PopoverHeader';
-export { default as Progress,             ProgressProps                   } from './lib/Progress';
-export { default as Row,                  RowProps                        } from './lib/Row';
-export { default as TabContent,           TabContentProps                 } from './lib/TabContent';
-export { default as Table,                TableProps                      } from './lib/Table';
-export { default as TabPane,              TabPaneProps                    } from './lib/TabPane';
-export { default as Tag,                  TagProps                        } from './lib/Tag';
-export { default as Tooltip,              TooltipProps                    } from './lib/Tooltip';
-export { UncontrolledAlert,               UncontrolledAlertProps          } from './lib/Uncontrolled';
-export { UncontrolledButtonDropdown,      UncontrolledButtonDropdownProps } from './lib/Uncontrolled';
-export { UncontrolledDropdown,            UncontrolledDropdownProps       } from './lib/Uncontrolled';
-export { UncontrolledNavDropdown,         UncontrolledNavDropdownProps    } from './lib/Uncontrolled';
-export { UncontrolledTooltip,             UncontrolledTooltipProps        } from './lib/Uncontrolled';
+export { default as Alert,                    AlertProps                      } from './lib/Alert';
+export { default as Badge,                    BadgeProps                      } from './lib/Badge';
+export { default as Breadcrumb,               BreadcrumbProps                 } from './lib/Breadcrumb';
+export { default as BreadcrumbItem,           BreadcrumbItemProps             } from './lib/BreadcrumbItem';
+export { default as Button,                   ButtonProps                     } from './lib/Button';
+export { default as ButtonDropdown,           ButtonDropdownProps             } from './lib/ButtonDropdown';
+export { default as ButtonGroup,              ButtonGroupProps                } from './lib/ButtonGroup';
+export { default as ButtonToolbar,            ButtonToolbarProps              } from './lib/ButtonToolbar';
+export { default as Card,                     CardProps                       } from './lib/Card';
+export { default as CardBody,                 CardBodyProps                   } from './lib/CardBody';
+export { default as CardColumns,              CardColumnsProps                } from './lib/CardColumns';
+export { default as CardDeck,                 CardDeckProps                   } from './lib/CardDeck';
+export { default as CardFooter,               CardFooterProps                 } from './lib/CardFooter';
+export { default as CardGroup,                CardGroupProps                  } from './lib/CardGroup';
+export { default as CardHeader,               CardHeaderProps                 } from './lib/CardHeader';
+export { default as CardImg,                  CardImgProps                    } from './lib/CardImg';
+export { default as CardImgOverlay,           CardImgOverlayProps             } from './lib/CardImgOverlay';
+export { default as CardLink,                 CardLinkProps                   } from './lib/CardLink';
+export { default as CardSubtitle,             CardSubtitleProps               } from './lib/CardSubtitle';
+export { default as CardText,                 CardTextProps                   } from './lib/CardText';
+export { default as CardTitle,                CardTitleProps                  } from './lib/CardTitle';
+export { default as Carousel,                 CarouselProps                   } from './lib/Carousel';
+export { default as CarouselItem,             CarouselItemProps               } from './lib/CarouselItem';
+export { default as CarouselControl,          CarouselControlProps            } from './lib/CarouselControl';
+export { default as CarouselIndicators,       CarouselIndicatorsProps         } from './lib/CarouselIndicators';
+export { default as CarouselCaption,          CarouselCaptionProps            } from './lib/CarouselCaption';
+export { default as Col,                      ColProps                        } from './lib/Col';
+export { default as Collapse,                 CollapseProps                   } from './lib/Collapse';
+export { default as Container,                ContainerProps                  } from './lib/Container';
+export { default as Dropdown,                 DropdownProps                   } from './lib/Dropdown';
+export { default as DropdownItem,             DropdownItemProps               } from './lib/DropdownItem';
+export { default as DropdownMenu,             DropdownMenuProps               } from './lib/DropdownMenu';
+export { default as DropdownToggle,           DropdownToggleProps             } from './lib/DropdownToggle';
+export { default as Fade,                     FadeProps                       } from './lib/Fade';
+export { default as Form,                     FormProps                       } from './lib/Form';
+export { default as FormFeedback,             FormFeedbackProps               } from './lib/FormFeedback';
+export { default as FormGroup,                FormGroupProps                  } from './lib/FormGroup';
+export { default as FormText,                 FormTextProps                   } from './lib/FormText';
+export { default as Input,                    InputProps                      } from './lib/Input';
+export { default as InputGroup,               InputGroupProps                 } from './lib/InputGroup';
+export { default as InputGroupAddon,          InputGroupAddonProps            } from './lib/InputGroupAddon';
+export { default as InputGroupButtonDropdown, InputGroupButtonDropdownProps   } from './lib/InputGroupButtonDropdown';
+export { default as InputGroupText,           InputGroupTextProps             } from './lib/InputGroupText';
+export { default as Jumbotron,                JumbotronProps                  } from './lib/Jumbotron';
+export { default as Label,                    LabelProps                      } from './lib/Label';
+export { default as ListGroup,                ListGroupProps                  } from './lib/ListGroup';
+export { default as ListGroupItem,            ListGroupItemProps              } from './lib/ListGroupItem';
+export { default as ListGroupItemHeading,     ListGroupItemHeadingProps       } from './lib/ListGroupItemHeading';
+export { default as ListGroupItemText,        ListGroupItemTextProps          } from './lib/ListGroupItemText';
+export { default as Media,                    MediaProps                      } from './lib/Media';
+export { default as Modal,                    ModalProps                      } from './lib/Modal';
+export { default as ModalBody,                ModalBodyProps                  } from './lib/ModalBody';
+export { default as ModalFooter,              ModalFooterProps                } from './lib/ModalFooter';
+export { default as ModalHeader,              ModalHeaderProps                } from './lib/ModalHeader';
+export { default as Nav,                      NavProps                        } from './lib/Nav';
+export { default as Navbar,                   NavbarProps                     } from './lib/Navbar';
+export { default as NavbarBrand,              NavbarBrandProps                } from './lib/NavbarBrand';
+export { default as NavbarToggler,            NavbarTogglerProps              } from './lib/NavbarToggler';
+export { default as NavItem,                  NavItemProps                    } from './lib/NavItem';
+export { default as NavLink,                  NavLinkProps                    } from './lib/NavLink';
+export { default as Pagination,               PaginationProps                 } from './lib/Pagination';
+export { default as PaginationItem,           PaginationItemProps             } from './lib/PaginationItem';
+export { default as PaginationLink,           PaginationLinkProps             } from './lib/PaginationLink';
+export { default as Popover,                  PopoverProps                    } from './lib/Popover';
+export { default as PopoverBody,              PopoverBodyProps                } from './lib/PopoverBody';
+export { default as PopoverHeader,            PopoverHeaderProps              } from './lib/PopoverHeader';
+export { default as Progress,                 ProgressProps                   } from './lib/Progress';
+export { default as Row,                      RowProps                        } from './lib/Row';
+export { default as TabContent,               TabContentProps                 } from './lib/TabContent';
+export { default as Table,                    TableProps                      } from './lib/Table';
+export { default as TabPane,                  TabPaneProps                    } from './lib/TabPane';
+export { default as Tag,                      TagProps                        } from './lib/Tag';
+export { default as Tooltip,                  TooltipProps                    } from './lib/Tooltip';
+export { UncontrolledAlert,                   UncontrolledAlertProps          } from './lib/Uncontrolled';
+export { UncontrolledButtonDropdown,          UncontrolledButtonDropdownProps } from './lib/Uncontrolled';
+export { UncontrolledDropdown,                UncontrolledDropdownProps       } from './lib/Uncontrolled';
+export { UncontrolledTooltip,                 UncontrolledTooltipProps        } from './lib/Uncontrolled';
diff --git a/types/reactstrap/lib/Alert.d.ts b/types/reactstrap/lib/Alert.d.ts
index c52ff2c35b..2a5a0f8dde 100644
--- a/types/reactstrap/lib/Alert.d.ts
+++ b/types/reactstrap/lib/Alert.d.ts
@@ -1,6 +1,6 @@
 import { CSSModule } from '../index';
 
-export interface UncontrolledProps {
+export interface UncontrolledProps extends React.HTMLAttributes<HTMLElement> {
   className?: string;
   cssModule?: CSSModule;
   color?: string;
diff --git a/types/reactstrap/lib/Badge.d.ts b/types/reactstrap/lib/Badge.d.ts
index b58faeed8c..f45c418c52 100644
--- a/types/reactstrap/lib/Badge.d.ts
+++ b/types/reactstrap/lib/Badge.d.ts
@@ -1,6 +1,6 @@
 import { CSSModule } from '../index';
 
-export interface BadgeProps {
+export interface BadgeProps extends React.HTMLAttributes<HTMLElement> {
   color?: string;
   pill?: boolean;
   tag?: React.ReactType;
diff --git a/types/reactstrap/lib/Breadcrumb.d.ts b/types/reactstrap/lib/Breadcrumb.d.ts
index 4b5e2b85da..74e770de4f 100644
--- a/types/reactstrap/lib/Breadcrumb.d.ts
+++ b/types/reactstrap/lib/Breadcrumb.d.ts
@@ -1,6 +1,6 @@
 import { CSSModule } from '../index';
 
-export interface BreadcrumbProps {
+export interface BreadcrumbProps extends React.HTMLAttributes<HTMLElement> {
   tag?: string;
   className?: string;
   cssModule?: CSSModule;
diff --git a/types/reactstrap/lib/BreadcrumbItem.d.ts b/types/reactstrap/lib/BreadcrumbItem.d.ts
index 4cb8d77c75..ab2e9cbc4e 100644
--- a/types/reactstrap/lib/BreadcrumbItem.d.ts
+++ b/types/reactstrap/lib/BreadcrumbItem.d.ts
@@ -1,6 +1,6 @@
 import { CSSModule } from '../index';
 
-export interface BreadcrumbItemProps {
+export interface BreadcrumbItemProps extends React.HTMLAttributes<HTMLElement> {
   tag?: React.ReactType;
   active?: boolean;
   className?: string;
diff --git a/types/reactstrap/lib/ButtonGroup.d.ts b/types/reactstrap/lib/ButtonGroup.d.ts
index 29bbaac38b..10549f5347 100644
--- a/types/reactstrap/lib/ButtonGroup.d.ts
+++ b/types/reactstrap/lib/ButtonGroup.d.ts
@@ -1,6 +1,6 @@
 import { CSSModule } from '../index';
 
-export interface ButtonGroupProps {
+export interface ButtonGroupProps extends React.HTMLAttributes<HTMLElement> {
   tag?: React.ReactType;
   'aria-label'?: string;
   className?: string;
diff --git a/types/reactstrap/lib/ButtonToolbar.d.ts b/types/reactstrap/lib/ButtonToolbar.d.ts
index 1c782c5745..ebd8733b28 100644
--- a/types/reactstrap/lib/ButtonToolbar.d.ts
+++ b/types/reactstrap/lib/ButtonToolbar.d.ts
@@ -1,6 +1,6 @@
 import { CSSModule } from '../index';
 
-export interface ButtonToolbarProps {
+export interface ButtonToolbarProps extends React.HTMLAttributes<HTMLElement> {
   tag?: React.ReactType;
   'aria-label'?: string;
   className?: string;
diff --git a/types/reactstrap/lib/Card.d.ts b/types/reactstrap/lib/Card.d.ts
index 8fd85c099b..0387ae3e94 100644
--- a/types/reactstrap/lib/Card.d.ts
+++ b/types/reactstrap/lib/Card.d.ts
@@ -1,6 +1,6 @@
 import { CSSModule } from '../index';
 
-export interface CardProps {
+export interface CardProps extends React.HTMLAttributes<HTMLElement> {
   tag?: React.ReactType;
   inverse?: boolean;
   color?: string;
diff --git a/types/reactstrap/lib/CardBlock.d.ts b/types/reactstrap/lib/CardBlock.d.ts
deleted file mode 100644
index 9830e15e6a..0000000000
--- a/types/reactstrap/lib/CardBlock.d.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { CSSModule } from '../index';
-
-export interface CardBlockProps {
-  tag?: React.ReactType;
-  className?: string;
-  cssModule?: CSSModule;
-}
-
-declare const CardBlock: React.StatelessComponent<CardBlockProps>;
-export default CardBlock;
diff --git a/types/reactstrap/lib/CardBody.d.ts b/types/reactstrap/lib/CardBody.d.ts
index 433a6a6ac0..d95ac0d31b 100644
--- a/types/reactstrap/lib/CardBody.d.ts
+++ b/types/reactstrap/lib/CardBody.d.ts
@@ -1,6 +1,6 @@
 import { CSSModule } from '../index';
 
-export interface CardBodyProps {
+export interface CardBodyProps extends React.HTMLAttributes<HTMLElement> {
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
diff --git a/types/reactstrap/lib/CardColumns.d.ts b/types/reactstrap/lib/CardColumns.d.ts
index 92eb2019ec..19f53cc250 100644
--- a/types/reactstrap/lib/CardColumns.d.ts
+++ b/types/reactstrap/lib/CardColumns.d.ts
@@ -1,6 +1,6 @@
 import { CSSModule } from '../index';
 
-export interface CardColumnsProps {
+export interface CardColumnsProps extends React.HTMLAttributes<HTMLElement> {
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
diff --git a/types/reactstrap/lib/CardDeck.d.ts b/types/reactstrap/lib/CardDeck.d.ts
index c14324df37..09b3d39c34 100644
--- a/types/reactstrap/lib/CardDeck.d.ts
+++ b/types/reactstrap/lib/CardDeck.d.ts
@@ -1,6 +1,6 @@
 import { CSSModule } from '../index';
 
-export interface CardDeckProps {
+export interface CardDeckProps extends React.HTMLAttributes<HTMLElement> {
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
diff --git a/types/reactstrap/lib/CardFooter.d.ts b/types/reactstrap/lib/CardFooter.d.ts
index 6dba776a38..f1ee324f03 100644
--- a/types/reactstrap/lib/CardFooter.d.ts
+++ b/types/reactstrap/lib/CardFooter.d.ts
@@ -1,6 +1,6 @@
 import { CSSModule } from '../index';
 
-export interface CardFooterProps {
+export interface CardFooterProps extends React.HTMLAttributes<HTMLElement> {
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
diff --git a/types/reactstrap/lib/CardGroup.d.ts b/types/reactstrap/lib/CardGroup.d.ts
index 695747eef4..5bf83900bf 100644
--- a/types/reactstrap/lib/CardGroup.d.ts
+++ b/types/reactstrap/lib/CardGroup.d.ts
@@ -1,6 +1,6 @@
 import { CSSModule } from '../index';
 
-export interface CardGroupProps {
+export interface CardGroupProps extends React.HTMLAttributes<HTMLElement> {
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
diff --git a/types/reactstrap/lib/CardHeader.d.ts b/types/reactstrap/lib/CardHeader.d.ts
index 306ff445e3..d630954e78 100644
--- a/types/reactstrap/lib/CardHeader.d.ts
+++ b/types/reactstrap/lib/CardHeader.d.ts
@@ -1,6 +1,6 @@
 import { CSSModule } from '../index';
 
-export interface CardHeaderProps {
+export interface CardHeaderProps extends React.HTMLAttributes<HTMLElement> {
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
diff --git a/types/reactstrap/lib/CardImg.d.ts b/types/reactstrap/lib/CardImg.d.ts
index e65cba66e2..b4b7021232 100644
--- a/types/reactstrap/lib/CardImg.d.ts
+++ b/types/reactstrap/lib/CardImg.d.ts
@@ -1,6 +1,6 @@
 import { CSSModule } from '../index';
 
-export interface CardImgProps {
+export interface CardImgProps extends React.HTMLAttributes<HTMLElement> {
   tag?: React.ReactType;
   top?: boolean;
   bottom?: boolean;
diff --git a/types/reactstrap/lib/CardImgOverlay.d.ts b/types/reactstrap/lib/CardImgOverlay.d.ts
index d31e96d76f..ccc76fa9c9 100644
--- a/types/reactstrap/lib/CardImgOverlay.d.ts
+++ b/types/reactstrap/lib/CardImgOverlay.d.ts
@@ -1,6 +1,6 @@
 import { CSSModule } from '../index';
 
-export interface CardImgOverlayProps {
+export interface CardImgOverlayProps extends React.HTMLAttributes<HTMLElement> {
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
diff --git a/types/reactstrap/lib/CardLink.d.ts b/types/reactstrap/lib/CardLink.d.ts
index 22c9d614b3..9425571de5 100644
--- a/types/reactstrap/lib/CardLink.d.ts
+++ b/types/reactstrap/lib/CardLink.d.ts
@@ -1,6 +1,6 @@
 import { CSSModule } from '../index';
 
-export interface CardLinkProps {
+export interface CardLinkProps extends React.HTMLAttributes<HTMLElement> {
   tag?: React.ReactType;
   innerRef?: string | ((instance: HTMLButtonElement) => any);
   className?: string;
diff --git a/types/reactstrap/lib/CardSubtitle.d.ts b/types/reactstrap/lib/CardSubtitle.d.ts
index 915c69c93f..a237c29119 100644
--- a/types/reactstrap/lib/CardSubtitle.d.ts
+++ b/types/reactstrap/lib/CardSubtitle.d.ts
@@ -1,6 +1,6 @@
 import { CSSModule } from '../index';
 
-export interface CardSubtitleProps {
+export interface CardSubtitleProps extends React.HTMLAttributes<HTMLElement> {
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
diff --git a/types/reactstrap/lib/CardText.d.ts b/types/reactstrap/lib/CardText.d.ts
index 3782e962be..462c1abef3 100644
--- a/types/reactstrap/lib/CardText.d.ts
+++ b/types/reactstrap/lib/CardText.d.ts
@@ -1,6 +1,6 @@
 import { CSSModule } from '../index';
 
-export interface CardTextProps {
+export interface CardTextProps extends React.HTMLAttributes<HTMLElement> {
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
diff --git a/types/reactstrap/lib/CardTitle.d.ts b/types/reactstrap/lib/CardTitle.d.ts
index f551d860ab..68c5c6120c 100644
--- a/types/reactstrap/lib/CardTitle.d.ts
+++ b/types/reactstrap/lib/CardTitle.d.ts
@@ -1,6 +1,6 @@
 import { CSSModule } from '../index';
 
-export interface CardTitleProps {
+export interface CardTitleProps extends React.HTMLAttributes<HTMLElement> {
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
diff --git a/types/reactstrap/lib/Container.d.ts b/types/reactstrap/lib/Container.d.ts
index 4721cf68c1..df2114e773 100644
--- a/types/reactstrap/lib/Container.d.ts
+++ b/types/reactstrap/lib/Container.d.ts
@@ -1,6 +1,6 @@
 import { CSSModule } from '../index';
 
-export interface ContainerProps {
+export interface ContainerProps extends React.HTMLAttributes<HTMLElement> {
   tag?: React.ReactType;
   fluid?: boolean;
   className?: string;
diff --git a/types/reactstrap/lib/Dropdown.d.ts b/types/reactstrap/lib/Dropdown.d.ts
index 9754af4fe2..17805d4908 100644
--- a/types/reactstrap/lib/Dropdown.d.ts
+++ b/types/reactstrap/lib/Dropdown.d.ts
@@ -1,6 +1,6 @@
 import { CSSModule } from '../index';
 
-export interface UncontrolledProps {
+export interface UncontrolledProps extends React.HTMLAttributes<HTMLElement> {
   isOpen?: boolean;
   toggle?: () => void;
   className?: string;
@@ -18,6 +18,7 @@ export interface Props extends UncontrolledProps {
   group?: boolean;
   size?: string;
   tag?: React.ReactType;
+  addonType?: boolean | 'prepend' | 'append';
 }
 export interface DropdownProps extends Props {
   /* intentionally blank */
diff --git a/types/reactstrap/lib/DropdownItem.d.ts b/types/reactstrap/lib/DropdownItem.d.ts
index ce11638b83..598c2fbfc8 100644
--- a/types/reactstrap/lib/DropdownItem.d.ts
+++ b/types/reactstrap/lib/DropdownItem.d.ts
@@ -1,6 +1,6 @@
 import { CSSModule } from '../index';
 
-export interface DropdownItemProps {
+export interface DropdownItemProps extends React.HTMLAttributes<HTMLElement> {
   disabled?: boolean;
   divider?: boolean;
   tag?: React.ReactType;
diff --git a/types/reactstrap/lib/DropdownMenu.d.ts b/types/reactstrap/lib/DropdownMenu.d.ts
index 1fcbab6c2b..8d3cdb6acd 100644
--- a/types/reactstrap/lib/DropdownMenu.d.ts
+++ b/types/reactstrap/lib/DropdownMenu.d.ts
@@ -1,6 +1,6 @@
 import { CSSModule } from '../index';
 
-export interface DropdownMenuProps {
+export interface DropdownMenuProps extends React.HTMLAttributes<HTMLElement> {
   tag?: React.ReactType;
   right?: boolean;
   className?: string;
diff --git a/types/reactstrap/lib/DropdownToggle.d.ts b/types/reactstrap/lib/DropdownToggle.d.ts
index 51028815d4..5c27af11ad 100644
--- a/types/reactstrap/lib/DropdownToggle.d.ts
+++ b/types/reactstrap/lib/DropdownToggle.d.ts
@@ -1,11 +1,12 @@
 import { CSSModule } from '../index';
 
-export interface DropdownToggleProps {
+export interface DropdownToggleProps extends React.HTMLAttributes<HTMLElement> {
   caret?: boolean;
   className?: string;
   cssModule?: CSSModule;
   disabled?: boolean;
   onClick?: React.MouseEventHandler<any>;
+  outline?: boolean;
   'data-toggle'?: string;
   'aria-haspopup'?: boolean;
   split?: boolean;
diff --git a/types/reactstrap/lib/Fade.d.ts b/types/reactstrap/lib/Fade.d.ts
index 6d67195821..05a13502e1 100644
--- a/types/reactstrap/lib/Fade.d.ts
+++ b/types/reactstrap/lib/Fade.d.ts
@@ -1,6 +1,6 @@
 import { CSSModule } from '../index';
 
-export interface FadeProps {
+export interface FadeProps extends React.HTMLAttributes<HTMLElement> {
   in?: boolean;
   baseClass?: string;
   baseClassIn?: string;
diff --git a/types/reactstrap/lib/FormFeedback.d.ts b/types/reactstrap/lib/FormFeedback.d.ts
index 20e9b27745..b5c8f04eae 100644
--- a/types/reactstrap/lib/FormFeedback.d.ts
+++ b/types/reactstrap/lib/FormFeedback.d.ts
@@ -1,6 +1,6 @@
 import { CSSModule } from '../index';
 
-export interface FormFeedbackProps {
+export interface FormFeedbackProps extends React.HTMLAttributes<HTMLElement> {
   tag?: string;
   className?: string;
   cssModule?: CSSModule;
diff --git a/types/reactstrap/lib/FormText.d.ts b/types/reactstrap/lib/FormText.d.ts
index a749d6fc30..99a3675d6b 100644
--- a/types/reactstrap/lib/FormText.d.ts
+++ b/types/reactstrap/lib/FormText.d.ts
@@ -1,6 +1,6 @@
 import { CSSModule } from '../index';
 
-export interface FormTextProps {
+export interface FormTextProps extends React.HTMLAttributes<HTMLElement> {
   inline?: boolean;
   tag?: React.ReactType;
   color?: string;
diff --git a/types/reactstrap/lib/InputGroup.d.ts b/types/reactstrap/lib/InputGroup.d.ts
index 22f3ba027c..468b46f1c5 100644
--- a/types/reactstrap/lib/InputGroup.d.ts
+++ b/types/reactstrap/lib/InputGroup.d.ts
@@ -1,6 +1,6 @@
 import { CSSModule } from '../index';
 
-export interface InputGroupProps {
+export interface InputGroupProps extends React.HTMLAttributes<HTMLElement> {
   tag?: React.ReactType;
   size?: string;
   className?: string;
diff --git a/types/reactstrap/lib/InputGroupAddon.d.ts b/types/reactstrap/lib/InputGroupAddon.d.ts
index 31f5af505d..88b4f678c7 100644
--- a/types/reactstrap/lib/InputGroupAddon.d.ts
+++ b/types/reactstrap/lib/InputGroupAddon.d.ts
@@ -1,9 +1,10 @@
 import { CSSModule } from '../index';
 
-export interface InputGroupAddonProps {
+export interface InputGroupAddonProps extends React.HTMLAttributes<HTMLElement> {
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
+  addonType: 'prepend' | 'append';
 }
 
 declare const InputGroupAddon: React.StatelessComponent<InputGroupAddonProps>;
diff --git a/types/reactstrap/lib/InputGroupButton.d.ts b/types/reactstrap/lib/InputGroupButton.d.ts
deleted file mode 100644
index 0d77701932..0000000000
--- a/types/reactstrap/lib/InputGroupButton.d.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { CSSModule } from '../index';
-
-export interface InputGroupButtonProps {
-  tag?: React.ReactType;
-  groupClassName?: string;
-  groupAttributes?: any;
-  className?: string;
-  cssModule?: CSSModule;
-  color?: string;
-}
-
-declare const InputGroupButton: React.StatelessComponent<InputGroupButtonProps>;
-export default InputGroupButton;
diff --git a/types/reactstrap/lib/InputGroupButtonDropdown.d.ts b/types/reactstrap/lib/InputGroupButtonDropdown.d.ts
new file mode 100644
index 0000000000..32a129d43d
--- /dev/null
+++ b/types/reactstrap/lib/InputGroupButtonDropdown.d.ts
@@ -0,0 +1,8 @@
+import { DropdownProps } from './Dropdown';
+
+export interface InputGroupButtonDropdownProps extends DropdownProps {
+    addonType: 'prepend' | 'append';
+}
+
+declare const InputGroupButtonDropdown: React.StatelessComponent<InputGroupButtonDropdownProps>;
+export default InputGroupButtonDropdown;
diff --git a/types/reactstrap/lib/InputGroupText.d.ts b/types/reactstrap/lib/InputGroupText.d.ts
new file mode 100644
index 0000000000..356babe8f4
--- /dev/null
+++ b/types/reactstrap/lib/InputGroupText.d.ts
@@ -0,0 +1,9 @@
+import { CSSModule } from '../index';
+
+export interface InputGroupTextProps extends React.HTMLAttributes<HTMLElement>  {
+  tag?: React.ReactType;
+  cssModule?: CSSModule;
+}
+
+declare const InputGroupText: React.StatelessComponent<InputGroupTextProps>;
+export default InputGroupText;
diff --git a/types/reactstrap/lib/Jumbotron.d.ts b/types/reactstrap/lib/Jumbotron.d.ts
index 6cb94c04c1..9145e73223 100644
--- a/types/reactstrap/lib/Jumbotron.d.ts
+++ b/types/reactstrap/lib/Jumbotron.d.ts
@@ -1,6 +1,6 @@
 import { CSSModule } from '../index';
 
-export interface JumbotronProps {
+export interface JumbotronProps extends React.HTMLAttributes<HTMLElement> {
   tag?: React.ReactType;
   fluid?: boolean;
   className?: string;
diff --git a/types/reactstrap/lib/ListGroup.d.ts b/types/reactstrap/lib/ListGroup.d.ts
index a2a088935b..e9cb511cf0 100644
--- a/types/reactstrap/lib/ListGroup.d.ts
+++ b/types/reactstrap/lib/ListGroup.d.ts
@@ -1,6 +1,6 @@
 import { CSSModule } from '../index';
 
-export interface ListGroupProps {
+export interface ListGroupProps extends React.HTMLAttributes<HTMLElement> {
   tag?: React.ReactType;
   flush?: boolean;
   className?: string;
diff --git a/types/reactstrap/lib/ListGroupItem.d.ts b/types/reactstrap/lib/ListGroupItem.d.ts
index d2cb1a9e67..045aa9539e 100644
--- a/types/reactstrap/lib/ListGroupItem.d.ts
+++ b/types/reactstrap/lib/ListGroupItem.d.ts
@@ -1,6 +1,6 @@
 import { CSSModule } from '../index';
 
-export interface ListGroupItemProps {
+export interface ListGroupItemProps extends React.HTMLAttributes<HTMLElement> {
   tag?: React.ReactType;
   active?: boolean;
   disabled?: boolean;
diff --git a/types/reactstrap/lib/ListGroupItemHeading.d.ts b/types/reactstrap/lib/ListGroupItemHeading.d.ts
index 0f5bdfb457..09e29f9434 100644
--- a/types/reactstrap/lib/ListGroupItemHeading.d.ts
+++ b/types/reactstrap/lib/ListGroupItemHeading.d.ts
@@ -1,6 +1,6 @@
 import { CSSModule } from '../index';
 
-export interface ListGroupItemHeadingProps {
+export interface ListGroupItemHeadingProps extends React.HTMLAttributes<HTMLElement> {
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
diff --git a/types/reactstrap/lib/ListGroupItemText.d.ts b/types/reactstrap/lib/ListGroupItemText.d.ts
index 7010eb1289..947ee4cd7a 100644
--- a/types/reactstrap/lib/ListGroupItemText.d.ts
+++ b/types/reactstrap/lib/ListGroupItemText.d.ts
@@ -1,6 +1,6 @@
 import { CSSModule } from '../index';
 
-export interface ListGroupItemTextProps {
+export interface ListGroupItemTextProps extends React.HTMLAttributes<HTMLElement> {
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
diff --git a/types/reactstrap/lib/Media.d.ts b/types/reactstrap/lib/Media.d.ts
index daf4fadcc8..f7a9afb2c0 100644
--- a/types/reactstrap/lib/Media.d.ts
+++ b/types/reactstrap/lib/Media.d.ts
@@ -1,6 +1,6 @@
 import { CSSModule } from '../index';
 
-export interface MediaProps {
+export interface MediaProps extends React.HTMLAttributes<HTMLElement> {
   body?: boolean;
   bottom?: boolean;
   className?: string;
diff --git a/types/reactstrap/lib/Modal.d.ts b/types/reactstrap/lib/Modal.d.ts
index 5fc1ffc734..bfab2f56fd 100644
--- a/types/reactstrap/lib/Modal.d.ts
+++ b/types/reactstrap/lib/Modal.d.ts
@@ -1,6 +1,7 @@
 import { CSSModule } from '../index';
+import { FadeProps } from './Fade';
 
-export interface ModalProps {
+export interface ModalProps extends React.HTMLAttributes<HTMLElement> {
   isOpen?: boolean;
   autoFocus?: boolean;
   size?: string;
@@ -9,6 +10,8 @@ export interface ModalProps {
   backdrop?: boolean | 'static';
   onEnter?: () => void;
   onExit?: () => void;
+  onOpened?: () => void;
+  onClosed?: () => void;
   className?: string;
   cssModule?: CSSModule;
   wrapClassName?: string;
@@ -17,6 +20,8 @@ export interface ModalProps {
   contentClassName?: string;
   zIndex?: number | string;
   fade?: boolean;
+  backdropTransition?: FadeProps;
+  modalTransition?: FadeProps;
 }
 
 declare const Modal: React.StatelessComponent<ModalProps>;
diff --git a/types/reactstrap/lib/ModalBody.d.ts b/types/reactstrap/lib/ModalBody.d.ts
index 1467b5883a..083ac04186 100644
--- a/types/reactstrap/lib/ModalBody.d.ts
+++ b/types/reactstrap/lib/ModalBody.d.ts
@@ -1,6 +1,6 @@
 import { CSSModule } from '../index';
 
-export interface ModalBodyProps {
+export interface ModalBodyProps extends React.HTMLAttributes<HTMLElement> {
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
diff --git a/types/reactstrap/lib/ModalFooter.d.ts b/types/reactstrap/lib/ModalFooter.d.ts
index ae511eb7cc..40ed54f9ae 100644
--- a/types/reactstrap/lib/ModalFooter.d.ts
+++ b/types/reactstrap/lib/ModalFooter.d.ts
@@ -1,6 +1,6 @@
 import { CSSModule } from '../index';
 
-export interface ModalFooterProps {
+export interface ModalFooterProps extends React.HTMLAttributes<HTMLElement> {
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
diff --git a/types/reactstrap/lib/ModalHeader.d.ts b/types/reactstrap/lib/ModalHeader.d.ts
index 47632f59e3..c1a3e55b7a 100644
--- a/types/reactstrap/lib/ModalHeader.d.ts
+++ b/types/reactstrap/lib/ModalHeader.d.ts
@@ -1,6 +1,6 @@
 import { CSSModule } from '../index';
 
-export interface ModalHeaderProps {
+export interface ModalHeaderProps extends React.HTMLAttributes<HTMLElement> {
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
diff --git a/types/reactstrap/lib/NavDropdown.d.ts b/types/reactstrap/lib/NavDropdown.d.ts
deleted file mode 100644
index e40e60601c..0000000000
--- a/types/reactstrap/lib/NavDropdown.d.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { UncontrolledDropdownProps, DropdownProps } from './Dropdown';
-
-export interface UncontrolledProps extends UncontrolledDropdownProps {
-  /* intentionally blank */
-}
-export interface UncontrolledNavDropdownProps extends UncontrolledProps {
-  /* intentionally blank */
-}
-
-export interface NavDropdownProps extends DropdownProps {
-  /* intentionally blank */
-}
-
-declare const NavDropdown: React.StatelessComponent<NavDropdownProps>;
-export default NavDropdown;
diff --git a/types/reactstrap/lib/NavItem.d.ts b/types/reactstrap/lib/NavItem.d.ts
index 0769347298..6d5e0dd9cb 100644
--- a/types/reactstrap/lib/NavItem.d.ts
+++ b/types/reactstrap/lib/NavItem.d.ts
@@ -1,6 +1,6 @@
 import { CSSModule } from '../index';
 
-export interface NavItemProps {
+export interface NavItemProps extends React.HTMLAttributes<HTMLElement> {
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
diff --git a/types/reactstrap/lib/Navbar.d.ts b/types/reactstrap/lib/Navbar.d.ts
index ed3f28a02c..83e720731a 100644
--- a/types/reactstrap/lib/Navbar.d.ts
+++ b/types/reactstrap/lib/Navbar.d.ts
@@ -1,6 +1,6 @@
 import { CSSModule } from '../index';
 
-export interface NavbarProps {
+export interface NavbarProps extends React.HTMLAttributes<HTMLElement> {
   light?: boolean;
   dark?: boolean;
   inverse?: boolean;
diff --git a/types/reactstrap/lib/Pagination.d.ts b/types/reactstrap/lib/Pagination.d.ts
index 7657d90206..9dabaf8829 100644
--- a/types/reactstrap/lib/Pagination.d.ts
+++ b/types/reactstrap/lib/Pagination.d.ts
@@ -1,6 +1,6 @@
 import { CSSModule } from '../index';
 
-export interface PaginationProps {
+export interface PaginationProps extends React.HTMLAttributes<HTMLElement> {
   className?: string;
   cssModule?: CSSModule;
   size?: string;
diff --git a/types/reactstrap/lib/PaginationItem.d.ts b/types/reactstrap/lib/PaginationItem.d.ts
index c2eadfab97..a00fddc413 100644
--- a/types/reactstrap/lib/PaginationItem.d.ts
+++ b/types/reactstrap/lib/PaginationItem.d.ts
@@ -1,6 +1,6 @@
 import { CSSModule } from '../index';
 
-export interface PaginationItemProps {
+export interface PaginationItemProps extends React.HTMLAttributes<HTMLElement> {
   className?: string;
   cssModule?: CSSModule;
   active?: boolean;
diff --git a/types/reactstrap/lib/PopoverBody.d.ts b/types/reactstrap/lib/PopoverBody.d.ts
index 93512cacb1..bf67919e49 100644
--- a/types/reactstrap/lib/PopoverBody.d.ts
+++ b/types/reactstrap/lib/PopoverBody.d.ts
@@ -1,6 +1,6 @@
 import { CSSModule } from '../index';
 
-export interface PopoverBodyProps {
+export interface PopoverBodyProps extends React.HTMLAttributes<HTMLElement> {
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
diff --git a/types/reactstrap/lib/PopoverHeader.d.ts b/types/reactstrap/lib/PopoverHeader.d.ts
index 2ad69c636c..caa0847233 100644
--- a/types/reactstrap/lib/PopoverHeader.d.ts
+++ b/types/reactstrap/lib/PopoverHeader.d.ts
@@ -1,6 +1,6 @@
 import { CSSModule } from '../index';
 
-export interface PopoverHeaderProps {
+export interface PopoverHeaderProps extends React.HTMLAttributes<HTMLElement> {
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
diff --git a/types/reactstrap/lib/Progress.d.ts b/types/reactstrap/lib/Progress.d.ts
index 89e9df4be9..6f252622a1 100644
--- a/types/reactstrap/lib/Progress.d.ts
+++ b/types/reactstrap/lib/Progress.d.ts
@@ -1,6 +1,6 @@
 import { CSSModule } from '../index';
 
-export interface ProgressProps {
+export interface ProgressProps extends React.HTMLAttributes<HTMLElement> {
   bar?: boolean;
   multi?: boolean;
   tag?: string;
diff --git a/types/reactstrap/lib/Row.d.ts b/types/reactstrap/lib/Row.d.ts
index e5553ff81f..35284a9f70 100644
--- a/types/reactstrap/lib/Row.d.ts
+++ b/types/reactstrap/lib/Row.d.ts
@@ -1,6 +1,6 @@
 import { CSSModule } from '../index';
 
-export interface RowProps extends React.HTMLProps< HTMLElement> {
+export interface RowProps extends React.HTMLProps<HTMLElement> {
   className?: string;
   cssModule?: CSSModule;
   tag?: React.ReactType;
diff --git a/types/reactstrap/lib/TabContent.d.ts b/types/reactstrap/lib/TabContent.d.ts
index 2581ea7a93..0a180cf3c4 100644
--- a/types/reactstrap/lib/TabContent.d.ts
+++ b/types/reactstrap/lib/TabContent.d.ts
@@ -1,6 +1,6 @@
 import { CSSModule } from '../index';
 
-export interface TabContentProps {
+export interface TabContentProps extends React.HTMLAttributes<HTMLElement> {
   tag?: React.ReactType;
   activeTab?: number | string;
   className?: string;
diff --git a/types/reactstrap/lib/TabPane.d.ts b/types/reactstrap/lib/TabPane.d.ts
index a39398d59b..0bcbfd5d17 100644
--- a/types/reactstrap/lib/TabPane.d.ts
+++ b/types/reactstrap/lib/TabPane.d.ts
@@ -1,6 +1,6 @@
 import { CSSModule } from '../index';
 
-export interface TabPaneProps {
+export interface TabPaneProps extends React.HTMLAttributes<HTMLElement> {
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
diff --git a/types/reactstrap/lib/Table.d.ts b/types/reactstrap/lib/Table.d.ts
index c2d31d71e2..0374d7a0b5 100644
--- a/types/reactstrap/lib/Table.d.ts
+++ b/types/reactstrap/lib/Table.d.ts
@@ -1,6 +1,6 @@
 import { CSSModule } from '../index';
 
-export interface TableProps {
+export interface TableProps extends React.HTMLAttributes<HTMLElement> {
   className?: string;
   cssModule?: CSSModule;
   size?: string;
diff --git a/types/reactstrap/lib/Tag.d.ts b/types/reactstrap/lib/Tag.d.ts
index 153ff61177..49df70b240 100644
--- a/types/reactstrap/lib/Tag.d.ts
+++ b/types/reactstrap/lib/Tag.d.ts
@@ -1,6 +1,6 @@
 import { CSSModule } from '../index';
 
-export interface TagProps {
+export interface TagProps extends React.HTMLAttributes<HTMLElement> {
   color?: string;
   pill?: boolean;
   tag?: React.ReactType;
diff --git a/types/reactstrap/lib/Uncontrolled.d.ts b/types/reactstrap/lib/Uncontrolled.d.ts
index b3b292dd6b..d241477adb 100644
--- a/types/reactstrap/lib/Uncontrolled.d.ts
+++ b/types/reactstrap/lib/Uncontrolled.d.ts
@@ -1,17 +1,14 @@
 import { UncontrolledAlertProps          } from './Alert';
 import { UncontrolledButtonDropdownProps } from './ButtonDropdown';
 import { UncontrolledDropdownProps       } from './Dropdown';
-import { UncontrolledNavDropdownProps    } from './NavDropdown';
 import { UncontrolledTooltipProps        } from './Tooltip';
 
 export const UncontrolledAlert: React.StatelessComponent<UncontrolledAlertProps>;
 export const UncontrolledButtonDropdown: React.StatelessComponent<UncontrolledButtonDropdownProps>;
 export const UncontrolledDropdown: React.StatelessComponent<UncontrolledDropdownProps>;
-export const UncontrolledNavDropdown: React.StatelessComponent<UncontrolledNavDropdownProps>;
 export const UncontrolledTooltip: React.StatelessComponent<UncontrolledTooltipProps>;
 
 export { UncontrolledAlertProps          } from './Alert';
 export { UncontrolledButtonDropdownProps } from './ButtonDropdown';
 export { UncontrolledDropdownProps       } from './Dropdown';
-export { UncontrolledNavDropdownProps    } from './NavDropdown';
 export { UncontrolledTooltipProps        } from './Tooltip';
diff --git a/types/reactstrap/reactstrap-tests.tsx b/types/reactstrap/reactstrap-tests.tsx
index 0f0bf7b81d..756d3acbd0 100644
--- a/types/reactstrap/reactstrap-tests.tsx
+++ b/types/reactstrap/reactstrap-tests.tsx
@@ -15,7 +15,6 @@ import {
   DropdownToggle,
   Card,
   CardBody,
-  CardBlock,
   CardColumns,
   CardDeck,
   CardFooter,
@@ -44,7 +43,8 @@ import {
   Input,
   InputGroup,
   InputGroupAddon,
-  InputGroupButton,
+  InputGroupButtonDropdown,
+  InputGroupText,
   Pagination,
   Label,
   ListGroup,
@@ -61,7 +61,6 @@ import {
   Navbar,
   NavbarBrand,
   NavbarToggler,
-  NavDropdown,
   NavItem,
   NavLink,
   PaginationItem,
@@ -73,7 +72,6 @@ import {
   TabPane,
   UncontrolledButtonDropdown,
   UncontrolledDropdown,
-  UncontrolledNavDropdown,
   UncontrolledTooltip,
   TabContent,
   Table,
@@ -522,12 +520,12 @@ const Example25 = (props: any) => {
     <div>
       <Card>
         <CardImg top width="100%" src="https://placeholdit.imgix.net/~text?txtsize=33&txt=318%C3%97180&w=318&h=180" alt="Card image cap" />
-        <CardBlock>
+        <CardBody>
           <CardTitle>Card title</CardTitle>
           <CardSubtitle>Card subtitle</CardSubtitle>
           <CardText>Some quick example text to build on the card title and make up the bulk of the card's content.</CardText>
           <Button>Button</Button>
-        </CardBlock>
+        </CardBody>
       </Card>
     </div>
   );
@@ -537,16 +535,16 @@ const Example26 = (props: any) => {
   return (
     <div>
       <Card>
-        <CardBlock>
+        <CardBody>
           <CardTitle>Card title</CardTitle>
           <CardSubtitle>Card subtitle</CardSubtitle>
-        </CardBlock>
+        </CardBody>
         <img width="100%" src="https://placeholdit.imgix.net/~text?txtsize=33&txt=318%C3%97180&w=318&h=180" alt="Card image cap" />
-        <CardBlock>
+        <CardBody>
           <CardText>Some quick example text to build on the card title and make up the bulk of the card's content.</CardText>
           <CardLink href="#">Card Link</CardLink>
           <CardLink href="#">Another Link</CardLink>
-        </CardBlock>
+        </CardBody>
       </Card>
     </div>
   );
@@ -600,21 +598,21 @@ const Example29 = (props: any) => {
     <div>
       <Card>
         <CardHeader>Header</CardHeader>
-        <CardBlock>
+        <CardBody>
           <CardTitle>Special Title Treatment</CardTitle>
           <CardText>With supporting text below as a natural lead-in to additional content.</CardText>
           <Button>Go somewhere</Button>
-        </CardBlock>
+        </CardBody>
         <CardFooter>Footer</CardFooter>
       </Card>
 
       <Card>
         <CardHeader tag="h3">Featured</CardHeader>
-        <CardBlock>
+        <CardBody>
           <CardTitle>Special Title Treatment</CardTitle>
           <CardText>With supporting text below as a natural lead-in to additional content.</CardText>
           <Button>Go somewhere</Button>
-        </CardBlock>
+        </CardBody>
         <CardFooter className="text-muted">Footer</CardFooter>
       </Card>
     </div>
@@ -626,22 +624,22 @@ const Example30 = (props: any) => {
     <div>
       <Card>
         <CardImg top width="100%" src="https://placeholdit.imgix.net/~text?txtsize=33&txt=318%C3%97180&w=318&h=180" alt="Card image cap" />
-        <CardBlock>
+        <CardBody>
           <CardTitle>Card Title</CardTitle>
           <CardText>This is a wider card with supporting text below as a natural lead-in to additional content. This content is a little bit longer.</CardText>
           <CardText>
             <small className="text-muted">Last updated 3 mins ago</small>
           </CardText>
-        </CardBlock>
+        </CardBody>
       </Card>
       <Card>
-        <CardBlock>
+        <CardBody>
           <CardTitle>Card Title</CardTitle>
           <CardText>This is a wider card with supporting text below as a natural lead-in to additional content. This content is a little bit longer.</CardText>
           <CardText>
             <small className="text-muted">Last updated 3 mins ago</small>
           </CardText>
-        </CardBlock>
+        </CardBody>
         <CardImg bottom width="100%" src="https://placeholdit.imgix.net/~text?txtsize=33&txt=318%C3%97180&w=318&h=180" alt="Card image cap" />
       </Card>
     </div>
@@ -744,25 +742,25 @@ const Example34 = (props: any) => {
     <CardGroup>
       <Card>
         <CardImg top width="100%" src="https://placeholdit.imgix.net/~text?txtsize=33&txt=256%C3%97180&w=256&h=180" alt="Card image cap" />
-        <CardBlock>
+        <CardBody>
           <CardTitle>Card title</CardTitle>
           <CardSubtitle>Card subtitle</CardSubtitle>
           <CardText>This is a wider card with supporting text below as a natural lead-in to additional content. This content is a little bit longer.</CardText>
           <Button>Button</Button>
-        </CardBlock>
+        </CardBody>
       </Card>
       <Card>
         <CardImg top width="100%" src="https://placeholdit.imgix.net/~text?txtsize=33&txt=256%C3%97180&w=256&h=180" alt="Card image cap" />
-        <CardBlock>
+        <CardBody>
           <CardTitle>Card title</CardTitle>
           <CardSubtitle>Card subtitle</CardSubtitle>
           <CardText>This card has supporting text below as a natural lead-in to additional content.</CardText>
           <Button>Button</Button>
-        </CardBlock>
+        </CardBody>
       </Card>
       <Card>
         <CardImg top width="100%" src="https://placeholdit.imgix.net/~text?txtsize=33&txt=256%C3%97180&w=256&h=180" alt="Card image cap" />
-        <CardBlock>
+        <CardBody>
           <CardTitle>Card title</CardTitle>
           <CardSubtitle>Card subtitle</CardSubtitle>
           <CardText>
@@ -770,7 +768,7 @@ const Example34 = (props: any) => {
             card has even longer content than the first to show that equal height action.
           </CardText>
           <Button>Button</Button>
-        </CardBlock>
+        </CardBody>
       </Card>
     </CardGroup>
   );
@@ -781,25 +779,25 @@ const Example35 = (props: any) => {
     <CardDeck>
       <Card>
         <CardImg top width="100%" src="https://placeholdit.imgix.net/~text?txtsize=33&txt=256%C3%97180&w=256&h=180" alt="Card image cap" />
-        <CardBlock>
+        <CardBody>
           <CardTitle>Card title</CardTitle>
           <CardSubtitle>Card subtitle</CardSubtitle>
           <CardText>This is a wider card with supporting text below as a natural lead-in to additional content. This content is a little bit longer.</CardText>
           <Button>Button</Button>
-        </CardBlock>
+        </CardBody>
       </Card>
       <Card>
         <CardImg top width="100%" src="https://placeholdit.imgix.net/~text?txtsize=33&txt=256%C3%97180&w=256&h=180" alt="Card image cap" />
-        <CardBlock>
+        <CardBody>
           <CardTitle>Card title</CardTitle>
           <CardSubtitle>Card subtitle</CardSubtitle>
           <CardText>This card has supporting text below as a natural lead-in to additional content.</CardText>
           <Button>Button</Button>
-        </CardBlock>
+        </CardBody>
       </Card>
       <Card>
         <CardImg top width="100%" src="https://placeholdit.imgix.net/~text?txtsize=33&txt=256%C3%97180&w=256&h=180" alt="Card image cap" />
-        <CardBlock>
+        <CardBody>
           <CardTitle>Card title</CardTitle>
           <CardSubtitle>Card subtitle</CardSubtitle>
           <CardText>
@@ -807,7 +805,7 @@ const Example35 = (props: any) => {
               even longer content than the first to show that equal height action.
           </CardText>
           <Button>Button</Button>
-        </CardBlock>
+        </CardBody>
       </Card>
     </CardDeck>
   );
@@ -818,23 +816,23 @@ const Example36 = (props: any) => {
     <CardColumns>
       <Card>
         <CardImg top width="100%" src="https://placeholdit.imgix.net/~text?txtsize=33&txt=256%C3%97180&w=256&h=180" alt="Card image cap" />
-        <CardBlock>
+        <CardBody>
           <CardTitle>Card title</CardTitle>
           <CardSubtitle>Card subtitle</CardSubtitle>
           <CardText>This is a wider card with supporting text below as a natural lead-in to additional content. This content is a little bit longer.</CardText>
           <Button>Button</Button>
-        </CardBlock>
+        </CardBody>
       </Card>
       <Card>
         <CardImg top width="100%" src="https://placeholdit.imgix.net/~text?txtsize=33&txt=256%C3%97180&w=256&h=180" alt="Card image cap" />
       </Card>
       <Card>
-        <CardBlock>
+        <CardBody>
           <CardTitle>Card title</CardTitle>
           <CardSubtitle>Card subtitle</CardSubtitle>
           <CardText>This card has supporting text below as a natural lead-in to additional content.</CardText>
           <Button>Button</Button>
-        </CardBlock>
+        </CardBody>
       </Card>
       <Card block inverse style={{ backgroundColor: '#333', borderColor: '#333' }}>
         <CardTitle>Special Title Treatment</CardTitle>
@@ -845,7 +843,7 @@ const Example36 = (props: any) => {
         <CardImg top width="100%"
                  src="https://placeholdit.imgix.net/~text?txtsize=33&txt=256%C3%97180&w=256&h=180"
                  alt="Card image cap" />
-        <CardBlock>
+        <CardBody>
           <CardTitle>Card title</CardTitle>
           <CardSubtitle>Card subtitle</CardSubtitle>
           <CardText>
@@ -853,7 +851,7 @@ const Example36 = (props: any) => {
               has even longer content than the first to show that equal height action.
           </CardText>
           <Button>Button</Button>
-        </CardBlock>
+        </CardBody>
       </Card>
       <Card block inverse color="primary">
         <CardTitle>Special Title Treatment</CardTitle>
@@ -883,12 +881,12 @@ class Example37 extends React.Component<any, any> {
         <Button color="primary" onClick={this.toggle} style={{ marginBottom: '1rem' }}>Toggle</Button>
         <Collapse isOpen={this.state.collapse}>
           <Card>
-            <CardBlock>
+            <CardBody>
               Anim pariatur cliche reprehenderit,
              enim eiusmod high life accusamus terry richardson ad squid. Nihil
              anim keffiyeh helvetica, craft beer labore wes anderson cred
              nesciunt sapiente ea proident.
-            </CardBlock>
+            </CardBody>
           </Card>
         </Collapse>
       </div>
@@ -925,12 +923,12 @@ class Example38 extends React.Component<any, any> {
         <h5>Current state: {this.state.status}</h5>
         <Collapse isOpen={this.state.collapse} onOpened={this.onOpened} onClosed={this.onClosed}>
           <Card>
-            <CardBlock>
+            <CardBody>
               Anim pariatur cliche reprehenderit,
              enim eiusmod high life accusamus terry richardson ad squid. Nihil
              anim keffiyeh helvetica, craft beer labore wes anderson cred
              nesciunt sapiente ea proident.
-            </CardBlock>
+            </CardBody>
           </Card>
         </Collapse>
       </div>
@@ -1422,12 +1420,12 @@ const Example52 = (props: any) => {
   return (
     <div>
       <InputGroup>
-        <InputGroupAddon>@</InputGroupAddon>
+        <InputGroupAddon addonType="prepend">@</InputGroupAddon>
         <Input placeholder="username" />
       </InputGroup>
       <br />
       <InputGroup>
-        <InputGroupAddon>
+        <InputGroupAddon addonType="prepend">
           <Input addon type="checkbox" aria-label="Checkbox for following text input" />
         </InputGroupAddon>
         <Input placeholder="Check it out" />
@@ -1435,21 +1433,25 @@ const Example52 = (props: any) => {
       <br />
       <InputGroup>
         <Input placeholder="username" />
-        <InputGroupAddon>@example.com</InputGroupAddon>
+        <InputGroupAddon addonType="prepend">@example.com</InputGroupAddon>
       </InputGroup>
       <br />
       <InputGroup>
-        <InputGroupAddon>$</InputGroupAddon>
-        <InputGroupAddon>$</InputGroupAddon>
+        <InputGroupAddon addonType="prepend">
+          <InputGroupText>$</InputGroupText>
+          <InputGroupText>$</InputGroupText>
+        </InputGroupAddon>
         <Input placeholder="Dolla dolla billz yo!" />
-        <InputGroupAddon>$</InputGroupAddon>
-        <InputGroupAddon>$</InputGroupAddon>
+        <InputGroupAddon addonType="append">
+          <InputGroupText>$</InputGroupText>
+          <InputGroupText>$</InputGroupText>
+        </InputGroupAddon>
       </InputGroup>
       <br />
       <InputGroup>
-        <InputGroupAddon>$</InputGroupAddon>
+        <InputGroupAddon addonType="prepend">$</InputGroupAddon>
         <Input placeholder="Amount" type="number" step="1" />
-        <InputGroupAddon>.00</InputGroupAddon>
+        <InputGroupAddon addonType="append">.00</InputGroupAddon>
       </InputGroup>
     </div>
   );
@@ -1459,19 +1461,19 @@ const Example53 = (props: any) => {
   return (
     <div>
       <InputGroup>
-        <InputGroupAddon>To the Left!</InputGroupAddon>
+        <InputGroupAddon addonType="prepend">To the Left!</InputGroupAddon>
         <Input />
       </InputGroup>
       <br />
       <InputGroup>
         <Input />
-        <InputGroupAddon>To the Right!</InputGroupAddon>
+        <InputGroupAddon addonType="append">To the Right!</InputGroupAddon>
       </InputGroup>
       <br />
       <InputGroup>
-        <InputGroupAddon>To the Left!</InputGroupAddon>
+        <InputGroupAddon addonType="prepend">To the Left!</InputGroupAddon>
         <Input placeholder="and..." />
-        <InputGroupAddon>To the Right!</InputGroupAddon>
+        <InputGroupAddon addonType="append">To the Right!</InputGroupAddon>
       </InputGroup>
     </div>
   );
@@ -1481,17 +1483,17 @@ const Example54 = (props: any) => {
   return (
     <div>
       <InputGroup size="lg">
-        <InputGroupAddon>@lg</InputGroupAddon>
+        <InputGroupAddon addonType="prepend">@lg</InputGroupAddon>
         <Input />
       </InputGroup>
       <br />
       <InputGroup>
-        <InputGroupAddon>@normal</InputGroupAddon>
+        <InputGroupAddon addonType="prepend">@normal</InputGroupAddon>
         <Input />
       </InputGroup>
       <br />
       <InputGroup size="sm">
-        <InputGroupAddon>@sm</InputGroupAddon>
+        <InputGroupAddon addonType="prepend">@sm</InputGroupAddon>
         <Input />
       </InputGroup>
     </div>
@@ -1502,19 +1504,19 @@ const Example55 = (props: any) => {
   return (
     <div>
       <InputGroup>
-        <InputGroupButton><Button>I'm a button</Button></InputGroupButton>
+        <InputGroupAddon addonType="prepend"><Button>I'm a button</Button></InputGroupAddon>
         <Input />
       </InputGroup>
       <br />
       <InputGroup>
         <Input />
-        <InputGroupButton></InputGroupButton>
+        <InputGroupAddon addonType="append"></InputGroupAddon>
       </InputGroup>
       <br />
       <InputGroup>
-        <InputGroupButton></InputGroupButton>
+        <InputGroupAddon addonType="prepend"></InputGroupAddon>
         <Input placeholder="and..." />
-        <InputGroupButton><Button color="secondary">I'm a button</Button></InputGroupButton>
+        <InputGroupAddon addonType="append"><Button color="secondary">I'm a button</Button></InputGroupAddon>
       </InputGroup>
     </div>
   );
@@ -1524,17 +1526,17 @@ const Example56 = (props: any) => {
   return (
     <div>
       <InputGroup size="lg">
-        <InputGroupAddon>@lg</InputGroupAddon>
+        <InputGroupAddon addonType="prepend">@lg</InputGroupAddon>
         <Input />
       </InputGroup>
       <br />
       <InputGroup>
-        <InputGroupAddon>@normal</InputGroupAddon>
+        <InputGroupAddon addonType="prepend">@normal</InputGroupAddon>
         <Input />
       </InputGroup>
       <br />
       <InputGroup size="sm">
-        <InputGroupAddon>@sm</InputGroupAddon>
+        <InputGroupAddon addonType="prepend">@sm</InputGroupAddon>
         <Input />
       </InputGroup>
     </div>
@@ -1545,19 +1547,19 @@ const Example57 = (props: any) => {
   return (
     <div>
       <InputGroup>
-        <InputGroupButton><Button>I'm a button</Button></InputGroupButton>
+        <InputGroupAddon addonType="prepend"><Button>I'm a button</Button></InputGroupAddon>
         <Input />
       </InputGroup>
       <br />
       <InputGroup>
         <Input />
-        <InputGroupButton></InputGroupButton>
+        <InputGroupAddon addonType="prepend"></InputGroupAddon>
       </InputGroup>
       <br />
       <InputGroup>
-        <InputGroupButton></InputGroupButton>
+        <InputGroupAddon addonType="prepend"></InputGroupAddon>
         <Input placeholder="and..." />
-        <InputGroupButton><Button color="secondary">I'm a button</Button></InputGroupButton>
+        <InputGroupAddon addonType="append"><Button color="secondary">I'm a button</Button></InputGroupAddon>
       </InputGroup>
     </div>
   );
@@ -1567,19 +1569,19 @@ const Example58 = (props: any) => {
   return (
     <div>
       <InputGroup>
-        <InputGroupButton>To the Left!</InputGroupButton>
+        <InputGroupAddon addonType="prepend">To the Left!</InputGroupAddon>
         <Input />
       </InputGroup>
       <br />
       <InputGroup>
         <Input />
-        <InputGroupButton color="secondary">To the Right!</InputGroupButton>
+        <InputGroupAddon addonType="append" color="secondary">To the Right!</InputGroupAddon>
       </InputGroup>
       <br />
       <InputGroup>
-        <InputGroupButton color="danger">To the Left!</InputGroupButton>
+        <InputGroupAddon addonType="prepend" color="danger">To the Left!</InputGroupAddon>
         <Input placeholder="and..." />
-        <InputGroupButton color="success">To the Right!</InputGroupButton>
+        <InputGroupAddon addonType="append" color="success">To the Right!</InputGroupAddon>
       </InputGroup>
     </div>
   );
@@ -2242,7 +2244,7 @@ class Example79 extends React.Component<any, any> {
           <NavItem>
             <NavLink href="#" active>Link</NavLink>
           </NavItem>
-          <NavDropdown isOpen={this.state.dropdownOpen} toggle={this.toggle}>
+          <Dropdown nav isOpen={this.state.dropdownOpen} toggle={this.toggle}>
             <DropdownToggle nav caret>
               Dropdown
             </DropdownToggle>
@@ -2253,7 +2255,7 @@ class Example79 extends React.Component<any, any> {
               <DropdownItem divider />
               <DropdownItem>Another Action</DropdownItem>
             </DropdownMenu>
-          </NavDropdown>
+          </Dropdown>
           <NavItem>
             <NavLink href="#">Link</NavLink>
           </NavItem>
@@ -2292,7 +2294,7 @@ class Example80 extends React.Component<any, any> {
           <NavItem>
             <NavLink href="#" active>Link</NavLink>
           </NavItem>
-          <NavDropdown isOpen={this.state.dropdownOpen} toggle={this.toggle}>
+          <Dropdown nav isOpen={this.state.dropdownOpen} toggle={this.toggle}>
             <DropdownToggle nav caret>
               Dropdown
             </DropdownToggle>
@@ -2303,7 +2305,7 @@ class Example80 extends React.Component<any, any> {
               <DropdownItem divider />
               <DropdownItem>Another Action</DropdownItem>
             </DropdownMenu>
-          </NavDropdown>
+          </Dropdown>
           <NavItem>
             <NavLink href="#">Link</NavLink>
           </NavItem>
@@ -3614,3 +3616,46 @@ class Example115 extends React.Component<any, any> {
       );
     }
   }
+
+const Example116 = (props: any) => {
+  return(
+    <div>
+      <InputGroup>
+        <InputGroupAddon addonType="prepend"><Button>I'm a button</Button></InputGroupAddon>
+        <Input />
+      </InputGroup>
+      <br />
+      <InputGroup>
+        <Input />
+        <InputGroupButtonDropdown addonType="append" isOpen={false}>
+          <DropdownToggle caret>
+            Button Dropdown
+          </DropdownToggle>
+          <DropdownMenu>
+            <DropdownItem header>Header</DropdownItem>
+            <DropdownItem disabled>Action</DropdownItem>
+            <DropdownItem>Another Action</DropdownItem>
+            <DropdownItem divider />
+            <DropdownItem>Another Action</DropdownItem>
+          </DropdownMenu>
+        </InputGroupButtonDropdown>
+      </InputGroup>
+      <br />
+      <InputGroup>
+        <InputGroupButtonDropdown addonType="prepend" isOpen={true}>
+          <Button outline>Split Button</Button>
+          <DropdownToggle split outline />
+          <DropdownMenu>
+            <DropdownItem header>Header</DropdownItem>
+            <DropdownItem disabled>Action</DropdownItem>
+            <DropdownItem>Another Action</DropdownItem>
+            <DropdownItem divider />
+            <DropdownItem>Another Action</DropdownItem>
+          </DropdownMenu>
+        </InputGroupButtonDropdown>
+        <Input placeholder="and..." />
+        <InputGroupAddon addonType="append"><Button color="secondary">I'm a button</Button></InputGroupAddon>
+      </InputGroup>
+    </div>
+  );
+};
diff --git a/types/reactstrap/v4/index.d.ts b/types/reactstrap/v4/index.d.ts
index 81d4cec5bd..93eeed908f 100644
--- a/types/reactstrap/v4/index.d.ts
+++ b/types/reactstrap/v4/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/reactstrap/reactstrap#readme
 // Definitions by: Ali Hammad Baig <https://github.com/alihammad>, Marco Falkenberg <https://github.com/mfal>, Danilo Barros <https://github.com/danilobjr>, Fábio Paiva <https://github.com/fabiopaiva>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 export interface CSSModule {
   [className: string]: string;
diff --git a/types/reactstrap/v4/tsconfig.json b/types/reactstrap/v4/tsconfig.json
index 73578a9178..574c767ff5 100644
--- a/types/reactstrap/v4/tsconfig.json
+++ b/types/reactstrap/v4/tsconfig.json
@@ -15,7 +15,9 @@
             "../../"
         ],
         "paths": {
-            "reactstrap": ["reactstrap/v4"]
+            "reactstrap": [
+                "reactstrap/v4"
+            ]
         },
         "types": [],
         "noEmit": true,
diff --git a/types/read-package-tree/read-package-tree-tests.ts b/types/read-package-tree/read-package-tree-tests.ts
index 0d3595a568..1dad1c1ab0 100644
--- a/types/read-package-tree/read-package-tree-tests.ts
+++ b/types/read-package-tree/read-package-tree-tests.ts
@@ -1,4 +1,4 @@
-import * as readPackageTree from "read-package-tree";
+import readPackageTree = require("read-package-tree");
 
 readPackageTree("../", (error, data) => {
     // done
diff --git a/types/read-pkg/tsconfig.json b/types/read-pkg/tsconfig.json
index 95c3962946..47ef4e3ddc 100644
--- a/types/read-pkg/tsconfig.json
+++ b/types/read-pkg/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "read-pkg-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/readdir-enhanced/tsconfig.json b/types/readdir-enhanced/tsconfig.json
index a15bc6fd77..493568f9b0 100644
--- a/types/readdir-enhanced/tsconfig.json
+++ b/types/readdir-enhanced/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "readdir-enhanced-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/readline-transform/index.d.ts b/types/readline-transform/index.d.ts
new file mode 100644
index 0000000000..ec1ce8b56c
--- /dev/null
+++ b/types/readline-transform/index.d.ts
@@ -0,0 +1,21 @@
+// Type definitions for readline-transform 0.9
+// Project: https://github.com/tilfin/readline-transform
+// Definitions by: Piotr Roszatycki <https://github.com/dex4er>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+import { Transform, TransformOptions } from 'stream';
+
+export interface ReadlineTransformOptions extends TransformOptions {
+  /** line break matcher for str.split() (default: /\r?\n/) */
+  breakMatcher?: RegExp;
+  /** if content ends with line break, ignore last empty line (default: true) */
+  ignoreEndOfBreak?: boolean;
+  /** if line is empty string, skip it (default: false) */
+  skipEmpty?: boolean;
+}
+
+export default class ReadlineTransform extends Transform {
+  constructor(options?: ReadlineTransformOptions);
+}
diff --git a/types/readline-transform/readline-transform-tests.ts b/types/readline-transform/readline-transform-tests.ts
new file mode 100644
index 0000000000..9c343bd352
--- /dev/null
+++ b/types/readline-transform/readline-transform-tests.ts
@@ -0,0 +1,12 @@
+import { PassThrough } from 'stream';
+import ReadlineTransform from 'readline-transform';
+
+const readStream = new PassThrough();
+const transform = new ReadlineTransform({
+  breakMatcher: /\n/,
+  ignoreEndOfBreak: false,
+  skipEmpty: true
+});
+const writeStream = new PassThrough({ objectMode: true });
+
+readStream.pipe(transform).pipe(writeStream);
diff --git a/types/readline-transform/tsconfig.json b/types/readline-transform/tsconfig.json
new file mode 100644
index 0000000000..4bf70a9d30
--- /dev/null
+++ b/types/readline-transform/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictFunctionTypes": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "readline-transform-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/readline-transform/tslint.json b/types/readline-transform/tslint.json
new file mode 100644
index 0000000000..2750cc0197
--- /dev/null
+++ b/types/readline-transform/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
\ No newline at end of file
diff --git a/types/reapop/index.d.ts b/types/reapop/index.d.ts
index 2a11cb6cc6..a0f446fa91 100644
--- a/types/reapop/index.d.ts
+++ b/types/reapop/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/LouisBarranqueiro/reapop#readme
 // Definitions by: Barrokgl <https://github.com/Barrokgl>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from 'react';
 import { Dispatch } from 'redux';
diff --git a/types/rebass/index.d.ts b/types/rebass/index.d.ts
index fab1650108..9a4dbb34e5 100644
--- a/types/rebass/index.d.ts
+++ b/types/rebass/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/jxnblk/rebass
 // Definitions by: rhysd <https://rhysd.github.io>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 ///<reference types="react" />
 
diff --git a/types/recharts/index.d.ts b/types/recharts/index.d.ts
index c6207cd48e..207471eba3 100644
--- a/types/recharts/index.d.ts
+++ b/types/recharts/index.d.ts
@@ -6,7 +6,7 @@
 //                 Zheyang Song <https://github.com/ZheyangSong>
 //                 Rich Baird <https://github.com/richbai90>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from 'react';
 import { CurveFactory } from 'd3-shape';
diff --git a/types/recompose/index.d.ts b/types/recompose/index.d.ts
index a9d807360b..b6a9f21b14 100644
--- a/types/recompose/index.d.ts
+++ b/types/recompose/index.d.ts
@@ -4,7 +4,7 @@
 //                 Samuel DeSota <https://github.com/mrapogee>
 //                 Curtis Layne <https://github.com/clayne11>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.4
+// TypeScript Version: 2.6
 
 ///<reference types="react" />
 
diff --git a/types/recompose/tsconfig.json b/types/recompose/tsconfig.json
index 4aae173e9b..4c56e4b125 100644
--- a/types/recompose/tsconfig.json
+++ b/types/recompose/tsconfig.json
@@ -22,4 +22,4 @@
         "index.d.ts",
         "recompose-tests.tsx"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/redis-errors/tsconfig.json b/types/redis-errors/tsconfig.json
index cc922f5c1a..cef54ec9cc 100644
--- a/types/redis-errors/tsconfig.json
+++ b/types/redis-errors/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "redis-errors-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/redis-rate-limiter/redis-rate-limiter-tests.ts b/types/redis-rate-limiter/redis-rate-limiter-tests.ts
index 0ce00945ca..a121d28477 100644
--- a/types/redis-rate-limiter/redis-rate-limiter-tests.ts
+++ b/types/redis-rate-limiter/redis-rate-limiter-tests.ts
@@ -1,6 +1,6 @@
-import * as express from 'express';
+import express = require('express');
 import * as redis from 'redis';
-import * as rateLimiter from 'redis-rate-limiter';
+import rateLimiter = require('redis-rate-limiter');
 
 var num: number;
 var str: string;
diff --git a/types/redis-scripto/redis-scripto-tests.ts b/types/redis-scripto/redis-scripto-tests.ts
index 39e51ddd63..ba59ee1935 100644
--- a/types/redis-scripto/redis-scripto-tests.ts
+++ b/types/redis-scripto/redis-scripto-tests.ts
@@ -1,5 +1,5 @@
 import * as redis from 'redis';
-import * as Scripto from 'redis-scripto';
+import Scripto = require('redis-scripto');
 
 var num: number;
 var str: string;
diff --git a/types/redis/tsconfig.json b/types/redis/tsconfig.json
index b99c599145..0dd504314b 100644
--- a/types/redis/tsconfig.json
+++ b/types/redis/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "redis-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/redlock/v2/redlock-tests.ts b/types/redlock/v2/redlock-tests.ts
index 3067ebda5e..c37f3f2980 100644
--- a/types/redlock/v2/redlock-tests.ts
+++ b/types/redlock/v2/redlock-tests.ts
@@ -1,4 +1,4 @@
-import * as Redlock from 'redlock';
+import Redlock = require('redlock');
 import { Lock } from 'redlock';
 import { RedisClient } from 'redis';
 import { using } from 'bluebird';
diff --git a/types/redom/tsconfig.json b/types/redom/tsconfig.json
index 65b279f902..16556c03b9 100644
--- a/types/redom/tsconfig.json
+++ b/types/redom/tsconfig.json
@@ -22,4 +22,4 @@
         "index.d.ts",
         "redom-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/redux-actions/index.d.ts b/types/redux-actions/index.d.ts
index 6051ab7afe..7247ed11d9 100644
--- a/types/redux-actions/index.d.ts
+++ b/types/redux-actions/index.d.ts
@@ -163,7 +163,7 @@ export interface ActionMap<Payload, Meta> {
 }
 
 export function createActions<Payload>(
-    actionMap: ActionMap<Payload, any>,
+    actionMapOrIdentityAction: ActionMap<Payload, any> | string,
     ...identityActions: string[]
 ): {
     [actionName: string]: ActionFunctionAny<Action<Payload>>
diff --git a/types/redux-auth-wrapper/index.d.ts b/types/redux-auth-wrapper/index.d.ts
index 8734efeb75..fc2543385a 100644
--- a/types/redux-auth-wrapper/index.d.ts
+++ b/types/redux-auth-wrapper/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/mjrussell/redux-auth-wrapper
 // Definitions by: Karol Janyst <https://github.com/LKay>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.4
+// TypeScript Version: 2.6
 
 import { ComponentClass, StatelessComponent, ComponentType, ReactType } from "react";
 
diff --git a/types/redux-auth-wrapper/v1/index.d.ts b/types/redux-auth-wrapper/v1/index.d.ts
index 453a4e7e02..366ee7bfdb 100644
--- a/types/redux-auth-wrapper/v1/index.d.ts
+++ b/types/redux-auth-wrapper/v1/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/mjrussell/redux-auth-wrapper
 // Definitions by: Karol Janyst <https://github.com/LKay>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import { ComponentClass, StatelessComponent, ReactType } from "react";
 import { Action } from "redux";
diff --git a/types/redux-devtools-dock-monitor/index.d.ts b/types/redux-devtools-dock-monitor/index.d.ts
index 66461cecf5..025b24625d 100644
--- a/types/redux-devtools-dock-monitor/index.d.ts
+++ b/types/redux-devtools-dock-monitor/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/gaearon/redux-devtools-dock-monitor
 // Definitions by: Petryshyn Sergii <https://github.com/mc-petry>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 /// <reference types="react" />
 
diff --git a/types/redux-devtools-log-monitor/index.d.ts b/types/redux-devtools-log-monitor/index.d.ts
index b257adec0f..8bbaad7e1f 100644
--- a/types/redux-devtools-log-monitor/index.d.ts
+++ b/types/redux-devtools-log-monitor/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/gaearon/redux-devtools-log-monitor
 // Definitions by: Petryshyn Sergii <https://github.com/mc-petry>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from 'react'
 import { ColorScheme } from 'base16'
diff --git a/types/redux-devtools/index.d.ts b/types/redux-devtools/index.d.ts
index ceb8abc246..6bc8c3a4f2 100644
--- a/types/redux-devtools/index.d.ts
+++ b/types/redux-devtools/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/gaearon/redux-devtools
 // Definitions by: Petryshyn Sergii <https://github.com/mc-petry>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.4
+// TypeScript Version: 2.6
 
 import * as React from 'react';
 import { GenericStoreEnhancer } from 'redux';
diff --git a/types/redux-first-router-link/index.d.ts b/types/redux-first-router-link/index.d.ts
index 1136751129..c99f5b6ac1 100644
--- a/types/redux-first-router-link/index.d.ts
+++ b/types/redux-first-router-link/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/faceyspacey/redux-first-router-link#readme
 // Definitions by: janb87 <https://github.com/janb87>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.4
+// TypeScript Version: 2.6
 
 import * as React from "react";
 import { Location } from 'redux-first-router';
diff --git a/types/redux-form/index.d.ts b/types/redux-form/index.d.ts
index 72352731fc..25d342c8c2 100644
--- a/types/redux-form/index.d.ts
+++ b/types/redux-form/index.d.ts
@@ -7,7 +7,7 @@
 //                 Alex Young <https://github.com/alsiola>
 //                 Anton Novik <https://github.com/tehbi4>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import {
   ComponentClass,
diff --git a/types/redux-form/tsconfig.json b/types/redux-form/tsconfig.json
index f106f20d16..ea57d2a38a 100644
--- a/types/redux-form/tsconfig.json
+++ b/types/redux-form/tsconfig.json
@@ -37,4 +37,4 @@
         "lib/selectors.d.ts",
         "lib/SubmissionError.d.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/redux-form/v4/index.d.ts b/types/redux-form/v4/index.d.ts
index 35444b198d..3ecd2d87cc 100644
--- a/types/redux-form/v4/index.d.ts
+++ b/types/redux-form/v4/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/erikras/redux-form
 // Definitions by: Daniel Lytkin <https://github.com/aikoven>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from 'react';
 import { Dispatch, ActionCreator, Reducer } from 'redux';
diff --git a/types/redux-form/v6/index.d.ts b/types/redux-form/v6/index.d.ts
index 4e8e57b3b3..ce34a772ed 100644
--- a/types/redux-form/v6/index.d.ts
+++ b/types/redux-form/v6/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/erikras/redux-form
 // Definitions by: Carson Full <https://github.com/carsonf>, Daniel Lytkin <https://github.com/aikoven>, Karol Janyst <https://github.com/LKay>, Luka Zakrajsek <https://github.com/bancek>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.4
+// TypeScript Version: 2.6
 
 import {
   ComponentClass,
diff --git a/types/redux-form/v6/tsconfig.json b/types/redux-form/v6/tsconfig.json
index f6f22a352c..c4c9025157 100644
--- a/types/redux-form/v6/tsconfig.json
+++ b/types/redux-form/v6/tsconfig.json
@@ -31,4 +31,4 @@
         "index.d.ts",
         "redux-form-tests.tsx"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/redux-infinite-scroll/index.d.ts b/types/redux-infinite-scroll/index.d.ts
index 64799ee71a..30fa435e2d 100644
--- a/types/redux-infinite-scroll/index.d.ts
+++ b/types/redux-infinite-scroll/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/RealScout/redux-infinite-scroll
 // Definitions by: Tony Nikolov <https://github.com/silkyfray>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import { Component, HTMLProps } from "react";
 
diff --git a/types/redux-injectable-store/tsconfig.json b/types/redux-injectable-store/tsconfig.json
index 1fcc143ead..9a421d910e 100644
--- a/types/redux-injectable-store/tsconfig.json
+++ b/types/redux-injectable-store/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "redux-injectable-store-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/redux-little-router/index.d.ts b/types/redux-little-router/index.d.ts
index b7305e34f9..10aa3536f1 100644
--- a/types/redux-little-router/index.d.ts
+++ b/types/redux-little-router/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/FormidableLabs/redux-little-router
 // Definitions by: priecint <https://github.com/priecint>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.4
+// TypeScript Version: 2.6
 
 import * as React from "react";
 import { Reducer, Middleware, StoreEnhancer } from "redux";
diff --git a/types/redux-little-router/tsconfig.json b/types/redux-little-router/tsconfig.json
index 44577fc7a0..30884e8741 100644
--- a/types/redux-little-router/tsconfig.json
+++ b/types/redux-little-router/tsconfig.json
@@ -22,4 +22,4 @@
         "index.d.ts",
         "redux-little-router-tests.tsx"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/redux-localstorage-debounce/redux-localstorage-debounce-tests.ts b/types/redux-localstorage-debounce/redux-localstorage-debounce-tests.ts
index 24b5a32528..db408c018c 100644
--- a/types/redux-localstorage-debounce/redux-localstorage-debounce-tests.ts
+++ b/types/redux-localstorage-debounce/redux-localstorage-debounce-tests.ts
@@ -2,7 +2,7 @@ import { compose } from "redux";
 import {
     default as persistState
 } from "redux-localstorage";
-import * as adapter from "redux-localstorage/lib/adapters/localStorage";
+import adapter = require("redux-localstorage/lib/adapters/localStorage");
 import { default as debounce } from "redux-localstorage-debounce";
 
 const storageWait = compose(
diff --git a/types/redux-localstorage-filter/redux-localstorage-filter-tests.ts b/types/redux-localstorage-filter/redux-localstorage-filter-tests.ts
index 5569b22345..f45ee7157e 100644
--- a/types/redux-localstorage-filter/redux-localstorage-filter-tests.ts
+++ b/types/redux-localstorage-filter/redux-localstorage-filter-tests.ts
@@ -2,7 +2,7 @@ import { compose } from "redux";
 import {
     default as persistState
 } from "redux-localstorage";
-import * as adapter from "redux-localstorage/lib/adapters/localStorage";
+import adapter = require("redux-localstorage/lib/adapters/localStorage");
 import { default as filter } from "redux-localstorage-filter";
 
 const storageSingle = compose(
diff --git a/types/redux-localstorage/redux-localstorage-tests.ts b/types/redux-localstorage/redux-localstorage-tests.ts
index 17f453423a..bfa76f1ea3 100644
--- a/types/redux-localstorage/redux-localstorage-tests.ts
+++ b/types/redux-localstorage/redux-localstorage-tests.ts
@@ -5,9 +5,9 @@ import {
     transformState,
     actionTypes
 } from "redux-localstorage";
-import * as adapterAsyncStorage from "redux-localstorage/lib/adapters/AsyncStorage";
-import * as adapterLocalStorage from "redux-localstorage/lib/adapters/localStorage";
-import * as adapterSessionStorage from "redux-localstorage/lib/adapters/sessionStorage";
+import adapterAsyncStorage = require("redux-localstorage/lib/adapters/AsyncStorage");
+import adapterLocalStorage = require("redux-localstorage/lib/adapters/localStorage");
+import adapterSessionStorage = require("redux-localstorage/lib/adapters/sessionStorage");
 
 const AsyncStorage: any = {};
 
diff --git a/types/redux-logger/tsconfig.json b/types/redux-logger/tsconfig.json
index 1789641398..7441f646d7 100644
--- a/types/redux-logger/tsconfig.json
+++ b/types/redux-logger/tsconfig.json
@@ -1,16 +1,24 @@
 {
     "compilerOptions": {
         "module": "commonjs",
-        "lib": ["es6", "dom"],
+        "lib": [
+            "es6",
+            "dom"
+        ],
         "noImplicitAny": true,
         "noImplicitThis": false,
         "strictNullChecks": false,
         "strictFunctionTypes": true,
         "baseUrl": "../",
-        "typeRoots": ["../"],
+        "typeRoots": [
+            "../"
+        ],
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     },
-    "files": ["index.d.ts", "redux-logger-tests.ts"]
-}
+    "files": [
+        "index.d.ts",
+        "redux-logger-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/redux-router/index.d.ts b/types/redux-router/index.d.ts
index 17c8db889f..bb9764ed61 100644
--- a/types/redux-router/index.d.ts
+++ b/types/redux-router/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/rackt/redux-router
 // Definitions by: Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from 'react';
 import * as ReactRouter from 'react-router';
diff --git a/types/redux-socket.io/redux-socket.io-tests.ts b/types/redux-socket.io/redux-socket.io-tests.ts
index f67a86393a..6c5a64e5a5 100644
--- a/types/redux-socket.io/redux-socket.io-tests.ts
+++ b/types/redux-socket.io/redux-socket.io-tests.ts
@@ -1,4 +1,4 @@
-import * as ioclient from 'socket.io-client';
+import ioclient = require('socket.io-client');
 import createSocketIoMiddleware from 'redux-socket.io';
 import { Action } from 'redux';
 
diff --git a/types/redux-socket.io/tsconfig.json b/types/redux-socket.io/tsconfig.json
index 8636bd654d..25afcc62af 100644
--- a/types/redux-socket.io/tsconfig.json
+++ b/types/redux-socket.io/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "redux-socket.io-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/redux-storage-engine-localstorage/tsconfig.json b/types/redux-storage-engine-localstorage/tsconfig.json
index 671323d17f..985659f008 100644
--- a/types/redux-storage-engine-localstorage/tsconfig.json
+++ b/types/redux-storage-engine-localstorage/tsconfig.json
@@ -1,23 +1,23 @@
 {
-  "compilerOptions": {
-      "module": "commonjs",
-      "lib": [
-          "es6"
-      ],
-      "noImplicitAny": true,
-      "noImplicitThis": true,
-      "strictNullChecks": true,
-      "strictFunctionTypes": true,
-      "baseUrl": "../",
-      "typeRoots": [
-          "../"
-      ],
-      "types": [],
-      "noEmit": true,
-      "forceConsistentCasingInFileNames": true
-  },
-  "files": [
-      "index.d.ts",
-      "redux-storage-engine-localstorage-tests.ts"
-  ]
-}
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "redux-storage-engine-localstorage-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/redux-ui/index.d.ts b/types/redux-ui/index.d.ts
index b745ee2186..52cfb24b1d 100644
--- a/types/redux-ui/index.d.ts
+++ b/types/redux-ui/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/tonyhb/redux-ui
 // Definitions by: Andy Shu Xin <https://github.com/andyshuxin>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 /// <reference types="react" />
 import * as Redux from 'redux';
diff --git a/types/relateurl/relateurl-tests.ts b/types/relateurl/relateurl-tests.ts
index 7285dca153..03a184ec38 100644
--- a/types/relateurl/relateurl-tests.ts
+++ b/types/relateurl/relateurl-tests.ts
@@ -1,5 +1,4 @@
-
-import * as RelateUrl from 'relateurl';
+import RelateUrl = require('relateurl');
 
 var from = "http://www.domain.com/asdf/";
 var to = "http://www.domain.com/asdf/asdf";
diff --git a/types/relay-runtime/index.d.ts b/types/relay-runtime/index.d.ts
index 74b24ca1b8..2348a4d06b 100644
--- a/types/relay-runtime/index.d.ts
+++ b/types/relay-runtime/index.d.ts
@@ -17,8 +17,6 @@ export type RelayConcreteNode = any;
 export type RelayMutationTransaction = any;
 export type RelayMutationRequest = any;
 export type RelayQueryRequest = any;
-export type ConcreteFragment = any;
-export type ConcreteBatch = any;
 export type ConcreteFragmentDefinition = object;
 export type ConcreteOperationDefinition = object;
 
@@ -32,6 +30,23 @@ export type ConcreteOperationDefinition = object;
  */
 export type RelayContainer = any;
 
+// ~~~~~~~~~~~~~~~~~~~~~
+// Used in artifacts
+// emitted by
+// relay-compiler
+// ~~~~~~~~~~~~~~~~~~~~~
+
+// File: https://github.com/facebook/relay/blob/fe0e70f10bbcba1fff89911313ea69f24569464b/packages/relay-runtime/util/RelayConcreteNode.js
+export type ConcreteFragment = any;
+export type ConcreteRequest = any;
+export type ConcreteBatchRequest = any;
+
+export type RequestNode = ConcreteRequest | ConcreteBatchRequest;
+
+// Using `enum` here to create a distinct type and `const` to ensure it doesn’t leave any generated code.
+// tslint:disable-next-line:no-const-enum
+export const enum FragmentReference {}
+
 // ~~~~~~~~~~~~~~~~~~~~~
 // RelayQL
 // ~~~~~~~~~~~~~~~~~~~~~
@@ -44,9 +59,9 @@ export interface GeneratedNodeMap {
     [key: string]: GraphQLTaggedNode;
 }
 export type GraphQLTaggedNode =
-    | (() => ConcreteFragment | ConcreteBatch)
+    | (() => ConcreteFragment | RequestNode)
     | {
-          modern(): ConcreteFragment | ConcreteBatch;
+          modern(): ConcreteFragment | RequestNode;
           classic(relayQL: RelayQL): ConcreteFragmentDefinition | ConcreteOperationDefinition;
       };
 // ~~~~~~~~~~~~~~~~~~~~~
@@ -85,7 +100,7 @@ export interface PayloadError {
  * May return an Observable or Promise of a raw server response.
  */
 export function FetchFunction(
-    operation: ConcreteBatch,
+    operation: RequestNode,
     variables: Variables,
     cacheConfig: CacheConfig,
     uploadables?: UploadableMap
@@ -99,7 +114,7 @@ export function FetchFunction(
  * fourth parameter.
  */
 export type SubscribeFunction = (
-    operation: ConcreteBatch,
+    operation: RequestNode,
     variables: Variables,
     cacheConfig: CacheConfig,
     observer: LegacyObserver<QueryPayload>
diff --git a/types/relay-runtime/relay-runtime-tests.tsx b/types/relay-runtime/relay-runtime-tests.tsx
index b39a117e61..4cbbacf680 100644
--- a/types/relay-runtime/relay-runtime-tests.tsx
+++ b/types/relay-runtime/relay-runtime-tests.tsx
@@ -1,4 +1,12 @@
-import { Environment, Network, RecordSource, Store, ConnectionHandler, ViewerHandler, RecordSourceInspector } from "relay-runtime";
+import {
+    Environment,
+    Network,
+    RecordSource,
+    Store,
+    ConnectionHandler,
+    ViewerHandler,
+    RecordSourceInspector,
+} from "relay-runtime";
 
 const source = new RecordSource();
 const store = new Store(source);
diff --git a/types/relay-runtime/tsconfig.json b/types/relay-runtime/tsconfig.json
index 8aed884320..799a0e3263 100644
--- a/types/relay-runtime/tsconfig.json
+++ b/types/relay-runtime/tsconfig.json
@@ -23,4 +23,4 @@
         "index.d.ts",
         "relay-runtime-tests.tsx"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/remarkable/index.d.ts b/types/remarkable/index.d.ts
new file mode 100644
index 0000000000..31a5e7d44b
--- /dev/null
+++ b/types/remarkable/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for remarkable 1.7
+// Project: https://github.com/jonschlinkert/remarkable
+// Definitions by: makepost <https://github.com/makepost>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import Remarkable = require("./lib");
+
+export = Remarkable;
diff --git a/types/remarkable/lib/common/utils.d.ts b/types/remarkable/lib/common/utils.d.ts
new file mode 100644
index 0000000000..0feaaac0ce
--- /dev/null
+++ b/types/remarkable/lib/common/utils.d.ts
@@ -0,0 +1,15 @@
+export function isString(obj?: any): boolean;
+
+export function has(object: any, key: string): boolean;
+
+export function assign(target: any, ...sources: any[]): any;
+
+export function unescapeMd(str: string): string;
+
+export function isValidEntityCode(c: number): boolean;
+
+export function fromCodePoint(c: number): string;
+
+export function replaceEntities(str: string): string;
+
+export function escapeHtml(str: string): string;
diff --git a/types/remarkable/lib/index.d.ts b/types/remarkable/lib/index.d.ts
new file mode 100644
index 0000000000..ba29c7cf5c
--- /dev/null
+++ b/types/remarkable/lib/index.d.ts
@@ -0,0 +1,347 @@
+import * as Utils from "./common/utils";
+import Renderer = require("./renderer");
+import Ruler = require("./ruler");
+
+export = Remarkable;
+
+declare class Remarkable {
+    /**
+     * Useful helper functions for custom rendering.
+     */
+    static utils: typeof Utils;
+
+    inline: { ruler: Ruler };
+
+    block: { ruler: Ruler };
+
+    core: { ruler: Ruler };
+
+    renderer: Renderer;
+
+    /**
+     * Markdown parser, done right.
+     */
+    constructor(options?: Remarkable.Options);
+
+    /**
+     * Remarkable offers some "presets" as a convenience to quickly enable/disable
+     * active syntax rules and options for common use cases.
+     */
+    constructor(preset: "commonmark" | "full" | "remarkable", options?: Remarkable.Options);
+
+    /**
+     * `"# Remarkable rulezz!"` => `"<h1>Remarkable rulezz!</h1>"`
+     */
+    render(markdown: string, env?: Remarkable.Env): string;
+
+    /**
+     * Define options.
+     *
+     * Note: To achieve the best possible performance, don't modify a Remarkable instance
+     * on the fly. If you need multiple configurations, create multiple instances and
+     * initialize each with a configuration that is ideal for that instance.
+     */
+    set(options: Remarkable.Options): void;
+
+    /**
+     * Use a plugin.
+     */
+    use(plugin: Remarkable.Plugin, options?: any): Remarkable;
+
+    /**
+     * Batch loader for components rules states, and options.
+     */
+    configure(presets: Remarkable.Presets): void;
+
+    /**
+     * Parse the input `string` and return a tokens array.
+     * Modifies `env` with definitions data.
+     */
+    parse(str: string, env: Remarkable.Env): Remarkable.Token[];
+
+    /**
+     * Parse the given content `string` as a single string.
+     */
+    parseInline(str: string, env: Remarkable.Env): Remarkable.Token[];
+
+    /**
+     * Render a single content `string`, without wrapping it
+     * to paragraphs.
+     */
+    renderInline(str: string, env?: Remarkable.Env): string;
+}
+
+declare namespace Remarkable {
+    interface Env {
+        [key: string]: any;
+    }
+
+    type GetBreak = (tokens: Token[], idx: number) => "" | "\n";
+
+    interface Options {
+        /**
+         * Enable HTML tags in source.
+         */
+        html?: boolean;
+
+        /**
+         * Use "/" to close single tags (<br />).
+         */
+        xhtmlOut?: boolean;
+
+        /**
+         * Convert "\n" in paragraphs into <br>.
+         */
+        breaks?: boolean;
+
+        /**
+         * CSS language prefix for fenced blocks.
+         */
+        langPrefix?: string;
+
+        /**
+         * Autoconvert URL-like text to links.
+         */
+        linkify?: boolean;
+
+        /**
+         * Enable some language-neutral replacement + quotes beautification.
+         */
+        typographer?: boolean;
+
+        /**
+         * Double + single quotes replacement pairs, when typographer enabled,
+         * and smartquotes on. Set doubles to "«»" for Russian, "„“" for German.
+         */
+        quotes?: string;
+
+        /**
+         * Highlighter function. Should return escaped HTML, or "" if the source
+         * string is not changed.
+         */
+        highlight?(str: string, lang: string): string;
+    }
+
+    type Plugin = (md: Remarkable, options?: any) => void;
+
+    interface Presets {
+        components: {
+            [name: string]: {
+                rules: Rules,
+            },
+        };
+
+        options: Options;
+    }
+
+    type Rule = (
+        /**
+         * The list of tokens currently being processed.
+         */
+        tokens: Token[],
+
+        /**
+         * The index of the token currently being processed.
+         */
+        idx: number,
+
+        /**
+         * The options given to remarkable.
+         */
+        options: Options,
+
+        /**
+         * The key-value store created by the parsing rules.
+         */
+        env: Env,
+    ) => string;
+
+    interface Rules {
+        [name: string]: Rule;
+        "blockquote_open": Rule;
+        "blockquote_close": Rule;
+        "code": Rule;
+        "fence": Rule;
+        "fence_custom": Rule;
+        "heading_open": Rule;
+        "heading_close": Rule;
+        "hr": Rule;
+        "bullet_list_open": Rule;
+        "bullet_list_close": Rule;
+        "list_item_open": Rule;
+        "list_item_close": Rule;
+        "ordered_list_open": Rule;
+        "ordered_list_close": Rule;
+        "paragraph_open": Rule;
+        "paragraph_close": Rule;
+        "link_open": Rule;
+        "link_close": Rule;
+        "image": Rule;
+        "table_open": Rule;
+        "table_close": Rule;
+        "thead_open": Rule;
+        "thead_close": Rule;
+        "tbody_open": Rule;
+        "tbody_close": Rule;
+        "tr_open": Rule;
+        "tr_close": Rule;
+        "th_open": Rule;
+        "th_close": Rule;
+        "td_open": Rule;
+        "td_close": Rule;
+        "strong_open": Rule;
+        "strong_close": Rule;
+        "em_open": Rule;
+        "em_close": Rule;
+        "del_open": Rule;
+        "del_close": Rule;
+        "ins_open": Rule;
+        "ins_close": Rule;
+        "mark_open": Rule;
+        "mark_close": Rule;
+        "sub": Rule;
+        "sup": Rule;
+        "hardbreak": Rule;
+        "softbreak": Rule;
+        "text": Rule;
+        "htmlblock": Rule;
+        "htmltag": Rule;
+        "abbr_open": Rule;
+        "abbr_close": Rule;
+        "footnote_ref": Rule;
+        "footnote_block_open": Rule;
+        "footnote_block_close": Rule;
+        "footnote_open": Rule;
+        "footnote_close": Rule;
+        "footnote_anchor": Rule;
+        "dl_open": Rule;
+        "dt_open": Rule;
+        "dd_open": Rule;
+        "dl_close": Rule;
+        "dt_close": Rule;
+        "dd_close": Rule;
+
+        /**
+         * Check to see if `\n` is needed before the next token.
+         */
+        getBreak: GetBreak;
+    }
+
+    interface BaseToken {
+        /**
+         * The nesting level of the associated markdown structure in the source.
+         */
+        level: number;
+
+        /**
+         * Tokens generated by block parsing rules also include a `lines`
+         * property which is a 2 elements array marking the first and last line of the
+         * `src` used to generate the token.
+         */
+        lines?: [number, number];
+    }
+
+    interface TagToken extends BaseToken {
+        /**
+         * Tag tokens have a variety of types and each is a name of a
+         * rendering rule.
+         */
+        type: string;
+    }
+
+    interface ContentToken extends BaseToken {
+        /**
+         * A text token has a `content` property containing the text it represents.
+         */
+        content: string;
+
+        /**
+         * The type of the token.
+         */
+        type: "text";
+    }
+
+    interface BlockContentToken extends BaseToken {
+        /**
+         * The content of the block. This might include inline mardown syntax
+         * which may need further processing by the inline rules.
+         */
+        content: string;
+
+        /**
+         * This is initialized with an empty array (`[]`) and will be filled
+         * with the inline parser tokens as the inline parsing rules are applied.
+         */
+        children: Token[];
+
+        /**
+         * The type of the token.
+         */
+        type: "inline";
+    }
+
+    interface MiscTokenProps {
+        /**
+         * Image alt.
+         */
+        alt?: string;
+
+        /**
+         * Code: `true` if block, `false` if inline.
+         */
+        block?: boolean;
+
+        /**
+         * Footnote label.
+         */
+        label?: any;
+
+        /**
+         * Heading level.
+         */
+        hLevel?: number;
+
+        /**
+         * Link url.
+         */
+        href?: string;
+
+        /**
+         * Footnote id.
+         */
+        id?: number;
+
+        /**
+         * Ordered list marker value.
+         */
+        order?: number;
+
+        /**
+         * Fenced block params.
+         */
+        params?: any[];
+
+        /**
+         * Image url.
+         */
+        src?: string;
+
+        /**
+         * Footnote sub id.
+         */
+        subId?: number;
+
+        /**
+         * Absence of empty line before current tag: `true` if absent, `false`
+         * if present. List is tight if any list item is tight.
+         */
+        tight?: boolean;
+
+        /**
+         * Abbreviation title.
+         */
+        title?: string;
+    }
+
+    type Token = (TagToken | ContentToken | BlockContentToken) & MiscTokenProps;
+}
diff --git a/types/remarkable/lib/renderer.d.ts b/types/remarkable/lib/renderer.d.ts
new file mode 100644
index 0000000000..f90e4187cf
--- /dev/null
+++ b/types/remarkable/lib/renderer.d.ts
@@ -0,0 +1,28 @@
+import Remarkable = require(".");
+
+export = Renderer;
+
+/**
+ * Renderer class. Renders HTML and exposes `rules` to allow
+ * local modifications.
+ */
+declare class Renderer {
+    rules: Remarkable.Rules;
+
+    /**
+     * Exported helper, for custom rules only.
+     */
+    getBreak: Remarkable.GetBreak;
+
+    /**
+     * Render a string of inline HTML with the given `tokens` and
+     * `options`.
+     */
+    renderInline(tokens: Remarkable.Token[], options: Remarkable.Options, env: Remarkable.Env): string;
+
+    /**
+     * Render a string of HTML with the given `tokens` and
+     * `options`.
+     */
+    render(tokens: Remarkable.Token[], options: Remarkable.Options, env: Remarkable.Env): string;
+}
diff --git a/types/remarkable/lib/ruler.d.ts b/types/remarkable/lib/ruler.d.ts
new file mode 100644
index 0000000000..20c781f9b0
--- /dev/null
+++ b/types/remarkable/lib/ruler.d.ts
@@ -0,0 +1,52 @@
+import Remarkable = require(".");
+
+export = Ruler;
+
+/**
+ * Ruler is a helper class for building responsibility chains from
+ * parse rules. It allows:
+ *
+ *   - easy stack rules chains
+ *   - getting main chain and named chains content (as arrays of functions)
+ */
+declare class Ruler {
+  /**
+   * Replace the rule `ruleName` with a new rule.
+   */
+  at(ruleName: string, fn: Remarkable.Rule, options: Remarkable.Options): void;
+
+  /**
+   * Add a rule to the chain before given the `ruleName`.
+   */
+  before(beforeName: string, ruleName: string, fn: Remarkable.Rule, options: Remarkable.Options): void;
+
+  /**
+   * Add a rule to the chain after the given `ruleName`.
+   */
+  after(afterName: string, ruleName: string, fn: Remarkable.Rule, options: Remarkable.Options): void;
+
+  /**
+   * Add a rule to the end of chain.
+   */
+  push(ruleName: string, fn: Remarkable.Rule, options: Remarkable.Options): void;
+
+  /**
+   * Enable a rule or list of rules.
+   *
+   * @param list Name or array of rule names to enable.
+   * @param strict If `true`, all non listed rules will be disabled.
+   */
+  enable(list: string | string[], strict?: boolean): void;
+
+  /**
+   * Disable a rule or list of rules.
+   *
+   * @param list Name or array of rule names to disable.
+   */
+  disable(list: string | string[]): void;
+
+  /**
+   * Get a rules list as an array of functions.
+   */
+  getRules(chainName: string): Remarkable.Rule[];
+}
diff --git a/types/remarkable/remarkable-tests.ts b/types/remarkable/remarkable-tests.ts
new file mode 100644
index 0000000000..9c12632e69
--- /dev/null
+++ b/types/remarkable/remarkable-tests.ts
@@ -0,0 +1,355 @@
+// This code does not run, but it is type-checked.
+
+import hljs = require("highlight.js");
+import Remarkable = require("remarkable");
+
+/**
+ * Examples from README.
+ */
+export class RemarkableTest {
+    usage() {
+        const md = new Remarkable();
+        md.render("# Remarkable rulezz!");
+    }
+
+    defineOptionsInContructor() {
+        const md = new Remarkable({
+            html: false,
+            xhtmlOut: false,
+            breaks: false,
+            langPrefix: "language-",
+            linkify: false,
+            typographer: false,
+            quotes: "“”‘’",
+            highlight(/*str, lang*/) { return ""; },
+        });
+
+        md.render("# Remarkable rulezz!");
+    }
+
+    defineOptions() {
+        const md = new Remarkable();
+
+        md.set({
+            html: true,
+            breaks: true,
+        });
+    }
+
+    enableStrict() {
+        const md = new Remarkable("commonmark");
+
+        md.render("# Remarkable rulezz!");
+    }
+
+    enableAllRules() {
+        let md = new Remarkable("full");
+
+        // Or with options:
+        md = new Remarkable("full", {
+            html: true,
+            linkify: true,
+            typographer: true,
+        });
+
+        md.render("# Remarkable rulezz!");
+    }
+
+    highlightFencedCodeBlocks() {
+        const md = new Remarkable({
+            highlight(str, lang) {
+                if (lang && hljs.getLanguage(lang)) {
+                    try {
+                        return hljs.highlight(lang, str).value;
+                    } catch (err) { }
+                }
+
+                try {
+                    return hljs.highlightAuto(str).value;
+                } catch (err) { }
+
+                return "";
+            },
+        });
+
+        md.render("# Remarkable rulezz!");
+    }
+
+    manageRules() {
+        let md = new Remarkable();
+        md.inline.ruler.enable(["ins", "mark"]);
+        md.block.ruler.disable(["table", "footnote"]);
+
+        // Enable everything
+        md = new Remarkable("full", {
+            html: true,
+            linkify: true,
+            typographer: true,
+        });
+    }
+
+    enableRulesManually() {
+        const md = new Remarkable();
+        md.core.ruler.enable([
+            "abbr",
+        ]);
+        md.block.ruler.enable([
+            "footnote",
+            "deflist",
+        ]);
+        md.inline.ruler.enable([
+            "footnote_inline",
+            "ins",
+            "mark",
+            "sub",
+            "sup",
+        ]);
+    }
+
+    typographer() {
+        const md = new Remarkable({
+            typographer: true,
+            quotes: "“”‘’",
+        });
+
+        // Disable rules at all:
+        md.core.ruler.disable(["replacements", "smartquotes"]);
+    }
+
+    loadPlugins() {
+        const md = new Remarkable();
+        const noop = () => { };
+        const plugin1: Remarkable.Plugin = noop as (md: Remarkable) => void;
+        const plugin2: Remarkable.Plugin = noop as (md: Remarkable, options: {}) => void;
+        const plugin3: Remarkable.Plugin = noop as (md: Remarkable) => void;
+        const opts: any = undefined;
+
+        md.use(plugin1)
+            .use(plugin2, opts)
+            .use(plugin3);
+    }
+
+    touchParserAndRenderer() {
+        const md = new Remarkable();
+        md.core;
+        md.core.ruler;
+        md.block;
+        md.block.ruler;
+        md.inline;
+        md.inline.ruler;
+        md.renderer;
+        md.renderer.rules;
+    }
+}
+
+/**
+ * Various tokens copied from source.
+ */
+export class TokenTest {
+    blockRules() {
+        const tokens: Remarkable.Token[] = [];
+        const state = {
+            level: 0,
+            line: 0,
+            tokens,
+        };
+
+        const lines: [number, number] = [0, 0];
+        const startLine = 0;
+
+        state.tokens.push({
+            type: "blockquote_open",
+            lines,
+            level: state.level++,
+        });
+
+        state.tokens.push({
+            type: "blockquote_close",
+            level: --state.level,
+        });
+
+        state.tokens.push({
+            type: "code",
+            content: "",
+            block: true,
+            lines,
+            level: state.level,
+        });
+
+        state.tokens.push({
+            type: "inline",
+            content: "",
+            level: state.level + 1,
+            lines,
+            children: [],
+        });
+
+        state.tokens.push({
+            type: "fence",
+            params: [],
+            content: "",
+            lines: [startLine, state.line],
+            level: state.level,
+        });
+
+        state.tokens.push({
+            type: "footnote_reference_open",
+            label: "",
+            level: state.level++,
+        });
+
+        state.tokens.push({ type: "heading_close", hLevel: 1, level: state.level });
+
+        state.tokens.push({
+            type: "ordered_list_open",
+            order: 0,
+            lines: [startLine, 0],
+            level: state.level++,
+        });
+
+        state.tokens.push({
+            type: "paragraph_open",
+            tight: false,
+            lines: [startLine, state.line],
+            level: state.level,
+        });
+    }
+
+    coreRules() {
+        const env: Remarkable.Env = {};
+        const nodes: Remarkable.Token[] = [];
+        const tokens = nodes;
+        const state = { env, src: "", tokens };
+        const m = ["", "", ""];
+        let level = 0;
+
+        nodes.push({
+            type: "text",
+            content: "",
+            level,
+        });
+
+        nodes.push({
+            type: "abbr_open",
+            title: state.env["abbreviations"][":" + m[2]],
+            level: level++,
+        });
+
+        nodes.push({
+            type: "text",
+            content: m[2],
+            level,
+        });
+
+        nodes.push({
+            type: "abbr_close",
+            level: --level,
+        });
+
+        state.tokens.push({
+            type: "inline",
+            content: state.src.replace(/\n/g, " ").trim(),
+            level: 0,
+            lines: [0, 1],
+            children: [],
+        });
+
+        tokens.push({
+            type: "inline",
+            content: "",
+            level,
+            children: [],
+        });
+    }
+
+    inlineRules() {
+        const state: Remarkable.Token[] = [];
+        let level = 0;
+
+        state.push({
+            type: "link_open",
+            href: "",
+            level,
+        });
+
+        state.push({
+            type: "code",
+            content: "",
+            block: false,
+            level,
+        });
+
+        state.push({
+            type: "footnote_ref",
+            id: 1,
+            level,
+        });
+
+        state.push({
+            type: "footnote_ref",
+            id: 1,
+            subId: 1,
+            level,
+        });
+
+        state.push({
+            type: "image",
+            src: "",
+            title: "",
+            alt: "",
+            level,
+        });
+
+        state.push({
+            type: "link_open",
+            href: "",
+            title: "",
+            level: level++,
+        });
+    }
+}
+
+/**
+ * Helper function usage.
+ */
+export class UtilsTest {
+    isString() {
+        Remarkable.utils.isString("foo");
+        Remarkable.utils.isString(1);
+        Remarkable.utils.isString({});
+        Remarkable.utils.isString();
+    }
+
+    has() {
+        Remarkable.utils.has({ foo: "bar" }, "foo");
+        Remarkable.utils.has({}, "foo");
+    }
+
+    assign() {
+        Remarkable.utils.assign({}, { foo: "bar" }, { baz: "qux" });
+    }
+
+    unescapeMd() {
+        Remarkable.utils.unescapeMd("\\<foo /\\>");
+    }
+
+    isValidEntityCode() {
+        Remarkable.utils.isValidEntityCode(0xD800);
+        Remarkable.utils.isValidEntityCode(0xD7FF);
+        Remarkable.utils.isValidEntityCode(1000);
+    }
+
+    fromCodePoint() {
+        Remarkable.utils.fromCodePoint(0xffff + 1);
+        Remarkable.utils.fromCodePoint(0xffff);
+    }
+
+    replaceEntities() {
+        Remarkable.utils.replaceEntities("");
+        Remarkable.utils.replaceEntities("&nbsp;");
+    }
+
+    escapeHtml() {
+        Remarkable.utils.replaceEntities('<script>alert("&copy;")</script>');
+    }
+}
diff --git a/types/remarkable/tsconfig.json b/types/remarkable/tsconfig.json
new file mode 100644
index 0000000000..33af23cbf9
--- /dev/null
+++ b/types/remarkable/tsconfig.json
@@ -0,0 +1,27 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "lib/common/utils.d.ts",
+        "lib/index.d.ts",
+        "lib/renderer.d.ts",
+        "lib/ruler.d.ts",
+        "index.d.ts",
+        "remarkable-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/remarkable/tslint.json b/types/remarkable/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/remarkable/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/request-promise-native/request-promise-native-tests.ts b/types/request-promise-native/request-promise-native-tests.ts
index 9a0cfa40fa..e65f802e05 100644
--- a/types/request-promise-native/request-promise-native-tests.ts
+++ b/types/request-promise-native/request-promise-native-tests.ts
@@ -1,4 +1,4 @@
-import * as rpn from 'request-promise-native';
+import rpn = require('request-promise-native');
 import * as errors from 'request-promise-native/errors';
 import * as path from 'path';
 
diff --git a/types/request/tsconfig.json b/types/request/tsconfig.json
index adf81123e6..4f51c5bc65 100644
--- a/types/request/tsconfig.json
+++ b/types/request/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "request-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/require-dir/tsconfig.json b/types/require-dir/tsconfig.json
index b853b18ff5..685e728b99 100644
--- a/types/require-dir/tsconfig.json
+++ b/types/require-dir/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "require-dir-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/require-directory/require-directory-tests.ts b/types/require-directory/require-directory-tests.ts
index 2852addd91..c8b8043210 100644
--- a/types/require-directory/require-directory-tests.ts
+++ b/types/require-directory/require-directory-tests.ts
@@ -1,4 +1,4 @@
-import * as requireDirectory from "require-directory";
+import requireDirectory = require("require-directory");
 import { defaults } from "require-directory";
 import { CheckPathFn, RequireDirectoryOptions, RequireDirectoryResult } from "require-directory";
 
diff --git a/types/require-relative/tsconfig.json b/types/require-relative/tsconfig.json
index 6888973fd6..9e74b82aa0 100644
--- a/types/require-relative/tsconfig.json
+++ b/types/require-relative/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "require-relative-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/reservoir/index.d.ts b/types/reservoir/index.d.ts
new file mode 100644
index 0000000000..b08e8aebfa
--- /dev/null
+++ b/types/reservoir/index.d.ts
@@ -0,0 +1,35 @@
+// Type definitions for reservoir 0.1
+// Project: https://github.com/imbcmdth/reservoir
+// Definitions by: Dan Vanderkam <https://github.com/danvk>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export as namespace Reservoir;
+export = Reservoir;
+
+/**
+ * Create a new reservoir sampler.
+ *
+ * @param reservoirSize is the maximum size of the reservoir. This is the number of elements
+ *   to be randomly chosen from the input provided to it using pushSome. Default is 1.
+ * @param randomNumberGenerator is an optional random number generating function to use in
+ *   place of the default Math.random.
+ */
+declare function Reservoir<T>(
+    reservoirSize?: number,
+    randomNumberGenerator?: () => number
+): Reservoir.ReservoirArray<T>;  // tslint:disable-line:no-unnecessary-generics
+
+/*~ If you want to expose types from your module as well, you can
+ *~ place them in this block. Often you will want to describe the
+ *~ shape of the return type of the function; that type should
+ *~ be declared in here, as this example shows.
+ */
+declare namespace Reservoir {
+    interface ReservoirArray<T> extends Array<T> {
+        /**
+         * datum: one or more elements to consider for inclusion into the reservoir.
+         * Returns the current length of the reservoir.
+         */
+        pushSome(...datum: T[]): number;
+    }
+}
diff --git a/types/reservoir/reservoir-tests.ts b/types/reservoir/reservoir-tests.ts
new file mode 100644
index 0000000000..f7775bd1bb
--- /dev/null
+++ b/types/reservoir/reservoir-tests.ts
@@ -0,0 +1,13 @@
+import Reservoir = require('reservoir');
+
+// $ExpectType ReservoirArray<number>
+const x = Reservoir<number>(1);
+
+// $ExpectType number
+x.pushSome(10, 20, 30, 40);
+
+// $ExpectType number
+x[0];
+
+// $ExpectType number
+x.length;
diff --git a/types/reservoir/tsconfig.json b/types/reservoir/tsconfig.json
new file mode 100644
index 0000000000..92409b4c16
--- /dev/null
+++ b/types/reservoir/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictFunctionTypes": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "reservoir-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/reservoir/tslint.json b/types/reservoir/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/reservoir/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/resolve-from/resolve-from-tests.ts b/types/resolve-from/resolve-from-tests.ts
index d4de48146a..ddbc5bdbea 100644
--- a/types/resolve-from/resolve-from-tests.ts
+++ b/types/resolve-from/resolve-from-tests.ts
@@ -1,11 +1,7 @@
 import resolveFrom = require("resolve-from");
 
-import resolveFrom1 = require('resolve-from');
-import * as resolveFrom2 from 'resolve-from';
-
 let from: string;
 let moduleId: string;
 let result: string;
 
-result = resolveFrom1(from, moduleId);
-result = resolveFrom2(from, moduleId);
+result = resolveFrom(from, moduleId);
diff --git a/types/resolve/resolve-tests.ts b/types/resolve/resolve-tests.ts
index 28dae63c82..1ebaa5bfb4 100644
--- a/types/resolve/resolve-tests.ts
+++ b/types/resolve/resolve-tests.ts
@@ -1,5 +1,5 @@
 import * as fs from 'fs';
-import * as resolve from 'resolve';
+import resolve = require('resolve');
 
 function test_basic_async() {
   resolve('typescript', function(error, resolved, pkg) {
diff --git a/types/resourcejs/tsconfig.json b/types/resourcejs/tsconfig.json
index ca71c00a1a..73568df473 100644
--- a/types/resourcejs/tsconfig.json
+++ b/types/resourcejs/tsconfig.json
@@ -16,8 +16,8 @@
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     },
-    "files": [                         
-        "index.d.ts",                  
+    "files": [
+        "index.d.ts",
         "resourcejs-tests.ts"
-    ]                           
-}
+    ]
+}
\ No newline at end of file
diff --git a/types/restify-cookies/tsconfig.json b/types/restify-cookies/tsconfig.json
index b86ecbf07e..387ea2e99b 100644
--- a/types/restify-cookies/tsconfig.json
+++ b/types/restify-cookies/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "restify-cookies-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/retry-as-promised/index.d.ts b/types/retry-as-promised/index.d.ts
new file mode 100644
index 0000000000..429e0bb6d1
--- /dev/null
+++ b/types/retry-as-promised/index.d.ts
@@ -0,0 +1,27 @@
+// Type definitions for retry-as-promised 2.3
+// Project: https://github.com/mickhansen/retry-as-promised
+// Definitions by: Florian Oellerich <https://github.com/Raigen>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import Promise = require('bluebird');
+
+declare namespace retryAsPromised {
+    type MatchOption = string | RegExp | Error;
+    interface Options {
+        $current?: number;
+        max?: number;
+        timeout?: number;
+        match?: MatchOption[] | MatchOption;
+        backoffBase?: number;
+        backoffExponent?: number;
+        report?: (message: string, obj: Options, err?: any) => void;
+        name?: string;
+    }
+
+    type RetryCallback<T> = ({ current }: { current: Options['$current'] }) => Promise.Thenable<T>;
+    type RetryAsPromisedStatic = <T = any>(callback: RetryCallback<T>, options: Options | number) => Promise<T>;
+}
+
+declare const retryAsPromised: retryAsPromised.RetryAsPromisedStatic;
+export = retryAsPromised;
diff --git a/types/retry-as-promised/retry-as-promised-tests.ts b/types/retry-as-promised/retry-as-promised-tests.ts
new file mode 100644
index 0000000000..43a08b7b9f
--- /dev/null
+++ b/types/retry-as-promised/retry-as-promised-tests.ts
@@ -0,0 +1,27 @@
+import retry = require('retry-as-promised');
+
+interface Product {
+    name: string;
+}
+
+const log = (...args: any[]): void => {};
+
+retry(() => Promise.resolve(), {});
+retry(() => Promise.reject('Error matching values'), {});
+retry(() => Promise.reject(new Error('No matching values')), {});
+retry(() => Promise.resolve(), {
+    max: 100,
+    timeout: 60000,
+    match: ['Error matching values', new Error('No matching values'), new RegExp(/Deadlock/, 'i')],
+    backoffBase: 100,
+    backoffExponent: 1.1,
+    name: 'Source',
+    report: (message, options) => {
+        if (options.name === 'Source') {
+            log(options.name);
+            log('iteration', options.$current);
+        }
+    }
+});
+retry<Product>(() => Promise.resolve({ name: 'test' }) , {});
+retry<Product>(() => Promise.reject(new Error('No matching product')), {});
diff --git a/types/retry-as-promised/tsconfig.json b/types/retry-as-promised/tsconfig.json
new file mode 100644
index 0000000000..2c136c68e2
--- /dev/null
+++ b/types/retry-as-promised/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "esModuleInterop": true,
+        "strictFunctionTypes": true
+    },
+    "files": [
+        "index.d.ts",
+        "retry-as-promised-tests.ts"
+    ]
+}
diff --git a/types/retry-as-promised/tslint.json b/types/retry-as-promised/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/retry-as-promised/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/rgrove__parse-xml/index.d.ts b/types/rgrove__parse-xml/index.d.ts
new file mode 100644
index 0000000000..f8e9944047
--- /dev/null
+++ b/types/rgrove__parse-xml/index.d.ts
@@ -0,0 +1,53 @@
+// Type definitions for @rgrove/parse-xml 1.1
+// Project: https://github.com/rgrove/parse-xml
+// Definitions by: Pete Johanson <https://github.com/petejohanson>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+declare function parseXml(name: string, options?: parseXml.ParseOptions): parseXml.Document;
+
+declare namespace parseXml {
+    interface NodeBase {
+      parent?: NodeBase;
+      type: string;
+    }
+
+    interface Document extends NodeBase {
+        type: "document";
+        children: NodeBase[];
+    }
+
+    interface CData extends NodeBase {
+        type: "cdata";
+        text: string;
+    }
+
+    interface Comment extends NodeBase {
+        type: "comment";
+        content: string;
+    }
+
+    interface Text extends NodeBase {
+        type: "text";
+        text: string;
+    }
+
+    interface Element extends NodeBase {
+        type: "element";
+        attributes: { [key: string]: string };
+        children: NodeBase[];
+        name: string;
+        preserveWhitespace?: string;
+    }
+
+    type Node = CData | Comment | Element | Text;
+
+    interface ParseOptions {
+        ignoreUndefinedEntities?: boolean;
+        preserveCdata?: boolean;
+        preserveComments?: boolean;
+        resolveUndefinedEntity?: (ref: string) => string;
+    }
+}
+
+export = parseXml;
diff --git a/types/rgrove__parse-xml/rgrove__parse-xml-tests.ts b/types/rgrove__parse-xml/rgrove__parse-xml-tests.ts
new file mode 100644
index 0000000000..797465da3c
--- /dev/null
+++ b/types/rgrove__parse-xml/rgrove__parse-xml-tests.ts
@@ -0,0 +1,8 @@
+/// <reference types="node" />
+import assert = require('assert');
+import parseXml = require('@rgrove/parse-xml');
+
+const doc = parseXml('<party></party>');
+doc.type === "document";
+assert.equal(doc.children[0].type, "element");
+assert.equal((doc.children[0] as parseXml.Element).name, "party");
diff --git a/types/rgrove__parse-xml/tsconfig.json b/types/rgrove__parse-xml/tsconfig.json
new file mode 100644
index 0000000000..b939e6d003
--- /dev/null
+++ b/types/rgrove__parse-xml/tsconfig.json
@@ -0,0 +1,27 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "paths": {
+            "@rgrove/parse-xml": ["rgrove__parse-xml"]
+        },
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "esModuleInterop": true
+    },
+    "files": [
+        "index.d.ts",
+        "rgrove__parse-xml-tests.ts"
+    ]
+}
diff --git a/types/rgrove__parse-xml/tslint.json b/types/rgrove__parse-xml/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/rgrove__parse-xml/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/rheostat/index.d.ts b/types/rheostat/index.d.ts
index 2943ecccc5..be173bf31a 100644
--- a/types/rheostat/index.d.ts
+++ b/types/rheostat/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/airbnb/rheostat
 // Definitions by: Sasha Bayan <https://github.com/SashaBayan>, Wil Lee <https://github.com/kourge>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from 'react';
 
diff --git a/types/rollup-plugin-json/tsconfig.json b/types/rollup-plugin-json/tsconfig.json
index 92ef3a1a1f..3900abdb18 100644
--- a/types/rollup-plugin-json/tsconfig.json
+++ b/types/rollup-plugin-json/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "rollup-plugin-json-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/roslib/index.d.ts b/types/roslib/index.d.ts
index fb5e886c66..6e479d0ff2 100644
--- a/types/roslib/index.d.ts
+++ b/types/roslib/index.d.ts
@@ -1,6 +1,8 @@
 // Type definitions for roslib.js 0.18.2
 // Project: http://wiki.ros.org/roslibjs
-// Definitions by: Stefan Profanter <https://github.com/Pro>, Cooper Benson <https://github.com/skycoop>
+// Definitions by: Stefan Profanter <https://github.com/Pro>,
+//                 Cooper Benson <https://github.com/skycoop>,
+//                 David Gonzalez <https://github.com/dgorobopec>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 
@@ -370,6 +372,201 @@ declare namespace ROSLIB {
 		publish(message:Message):void;
 	}
 
+    export class TFClient {
+        /**
+         * A TF Client that listens to TFs from tf2_web_republisher.
+         *
+         * @constructor
+         * @param options - object with following keys:
+         *   * ros - the ROSLIB.Ros connection handle
+         *   * fixedFrame - the fixed frame, like /base_link
+         *   * angularThres - the angular threshold for the TF republisher
+         *   * transThres - the translation threshold for the TF republisher
+         *   * rate - the rate for the TF republisher
+         *   * updateDelay - the time (in ms) to wait after a new subscription to update the TF republisher's list of TFs
+         *   * topicTimeout - the timeout parameter for the TF republisher
+         *   * serverName (optional) - the name of the tf2_web_republisher server
+         *   * repubServiceName (optional) - the name of the republish_tfs service (non groovy compatibility mode only) default: '/republish_tfs'
+         */
+        constructor(options: {
+            ros: Ros,
+            fixedFrame?: string;
+            angularThres?: number,
+            transThres?: number,
+            rate?: number,
+            updateDelay?: number,
+            topicTimeout?: number,
+            serverName?: string,
+            repubServiceName?: string
+        });
+
+        /**
+         * Unsubscribe and unadvertise all topics associated with this TFClient.
+         */
+        dispose(): void;
+
+        /**
+         * Process the service response and subscribe to the tf republisher topic.
+         *
+         * @param response - the service response containing the topic name
+         */
+        processResponse(response: any): void;
+
+        /**
+         * Process the incoming TF message and send them out using the callback functions
+         * @param tf - the TF message from the server
+         */
+        processTfArray(tf: any): void;
+
+        /**
+         * Subscribe to the given TF frame.
+         * @param frameId - the TF frame to subscribe to
+         * @param callback - function with params:
+         *  * transform - the transform data
+         */
+        subscribe(frameId: string, callback:(transform:Transform) => void): void;
+
+        /**
+         * Unsubscribe from the given TF frame.
+         *
+         * @param frameId - the TF frame to unsubscribe from
+         * @param callback - the callback function to remove
+         */
+        unsubscribe(frameId: string, callback?:(transform:Transform) => void): void;
+
+        /**
+         * Create and send a new goal (or service request) to the tf2_web_republisher based on the current list of TFs.
+         */
+        updateGoal(): void;
+    }
+
+    export class Transform {
+        /**
+         * A Transform in 3-space. Values are copied into this object.
+         *
+         * @constructor
+         * @param options - object with following keys:
+         *   * translation - the Vector3 describing the translation
+         *   * rotation - the ROSLIB.Quaternion describing the rotation
+         */
+        constructor(options: {
+            translation: Vector3,
+            rotation: Quaternion
+        });
+
+        // getters
+        public translation: Vector3;
+        public rotation: Quaternion;
+        /**
+         * Clone a copy of this transform.
+         *
+         */
+        clone(): Transform;
+    }
+
+    export class Vector3 {
+        /**
+         * A 3D vector.
+         *
+         * @constructor
+         * @param options - object with following keys:
+         *   * x - the x value
+         *   * y - the y value
+         *   * z - the z value
+         */
+        constructor(options: {
+            x: number,
+            y: number,
+            z: number
+        });
+
+        // getters
+        public x: number;
+        public y: number;
+        public z: number;
+
+        /**
+         * Set the values of this vector to the sum of itself and the given vector.
+         *
+         * @param v - the vector to add with
+         */
+        add(v: Vector3): void;
+
+        /**
+         * Clone a copy of this vector.
+         */
+        clone(): Vector3;
+
+        /**
+         * Multiply the given Quaternion with this vector.
+         * @param q - the quaternion to multiply with
+         */
+        multiplyQuaternion(q: Quaternion): void;
+
+        /**
+         * Set the values of this vector to the difference of itself and the given vector.
+         *
+         * @param v - the vector to subtract with
+         */
+        subtract(v: Vector3): void;
+    }
+
+    export class Quaternion {
+        /**
+         * A Quaternion.
+         *
+         * @constructor
+         * @param options - object with following keys:
+         *   * x - the x value
+         *   * y - the y value
+         *   * z - the z value
+         *   * w - the w value
+         */
+        constructor(options?: {
+            x: number,
+            y: number,
+            z: number,
+            w: number
+        });
+
+        // getters
+        public x: number;
+        public y: number;
+        public z: number;
+        public w: number;
+
+        /**
+         * Clone a copy of this quaternion.
+         */
+        clone(): Quaternion;
+
+        /**
+         * Perform a conjugation on this quaternion.
+         */
+        conjugate(): void;
+
+        /**
+         * Convert this quaternion into its inverse.
+         */
+        invert(): void;
+
+        /**
+         * Set the values of this quaternion to the product of itself and the given quaternion.
+         * @param q - the quaternion to multiply with
+         */
+        multiply(q: Quaternion): void;
+
+        /**
+         * Return the norm of this quaternion.
+         */
+        norm(): number;
+
+        /**
+         * Perform a normalization on this quaternion.
+         */
+        normalize(): void;
+    }
+
 	class ActionClient {
 		/**
 		 * An actionlib action client.
@@ -419,12 +616,12 @@ declare namespace ROSLIB {
 
 		/**
 		 * Connect callback functions to goal based events
-		 * 
+		 *
 		 * @param eventName Name of event ('timeout', 'status', 'feedback', 'result')
 		 * @param callback Callback function executed on connected event
 		 */
 		on(eventName:string, callback:(event:any) => void):void;
-		
+
 		/**
 		 * Send the goal to the action server.
 		 *
diff --git a/types/roslib/roslib-tests.ts b/types/roslib/roslib-tests.ts
index 36b505ea12..d86ce250eb 100644
--- a/types/roslib/roslib-tests.ts
+++ b/types/roslib/roslib-tests.ts
@@ -107,3 +107,17 @@ maxVelX.set(0.8);
 maxVelX.get(function (value) {
 	console.log('MAX VAL: ' + value);
 });
+
+// Creating a TF Client
+// --------------------
+const tfClient = new ROSLIB.TFClient({
+    ros: ros,
+    fixedFrame: '/world'
+})
+const tfclient_callback = function (transform: ROSLIB.Transform) {
+    console.log('Received transform: ' + transform);
+    tfClient.unsubscribe('/transform');
+}
+
+tfClient.subscribe('/transform', tfclient_callback);
+tfClient.unsubscribe('/transform', tfclient_callback);
diff --git a/types/route-parser/route-parser-tests.ts b/types/route-parser/route-parser-tests.ts
index e521008291..66be438592 100644
--- a/types/route-parser/route-parser-tests.ts
+++ b/types/route-parser/route-parser-tests.ts
@@ -1,4 +1,4 @@
-import * as Route from 'route-parser';
+import Route = require('route-parser');
 
 const route = new Route('/users/:id');
 const matched = route.match('/users/42'); // => { id: '42' }
diff --git a/types/rrc/index.d.ts b/types/rrc/index.d.ts
index 24b20a6376..3bb04b4ec8 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.4
+// TypeScript Version: 2.6
 
 import * as React from "react";
 import * as H from "history";
diff --git a/types/rss/rss-tests.ts b/types/rss/rss-tests.ts
index e73f786a18..3dc5574c1c 100644
--- a/types/rss/rss-tests.ts
+++ b/types/rss/rss-tests.ts
@@ -1,5 +1,3 @@
-
-
 // this test is copied from https://github.com/dylang/node-rss
 //  it basically:
 //
@@ -7,7 +5,7 @@
 //      * add an item to it
 //      * then generates XML string
 
-import * as RSS from 'rss';
+import RSS = require('rss');
 
 var feed = new RSS({
     title: 'title',
diff --git a/types/rsvp/tsconfig.json b/types/rsvp/tsconfig.json
index ebfd4bc00d..404ac62bf7 100755
--- a/types/rsvp/tsconfig.json
+++ b/types/rsvp/tsconfig.json
@@ -2,16 +2,24 @@
     "compilerOptions": {
         "module": "commonjs",
         "target": "es5",
-        "lib": ["es6", "dom"],
+        "lib": [
+            "es6",
+            "dom"
+        ],
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
         "strictFunctionTypes": false,
         "baseUrl": "../",
-        "typeRoots": ["../"],
+        "typeRoots": [
+            "../"
+        ],
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     },
-    "files": ["index.d.ts", "rsvp-tests.ts"]
-}
+    "files": [
+        "index.d.ts",
+        "rsvp-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/rsync/rsync-tests.ts b/types/rsync/rsync-tests.ts
index cfc9956dc2..41ec4dd9b1 100644
--- a/types/rsync/rsync-tests.ts
+++ b/types/rsync/rsync-tests.ts
@@ -1,4 +1,4 @@
-import * as Rsync from 'rsync';
+import Rsync = require('rsync');
 
 // --------------------------
 // simple usage
diff --git a/types/rwlock/rwlock-tests.ts b/types/rwlock/rwlock-tests.ts
index 8e2f210164..ee869d0ec6 100644
--- a/types/rwlock/rwlock-tests.ts
+++ b/types/rwlock/rwlock-tests.ts
@@ -1,5 +1,5 @@
 // Original test file https://github.com/71104/rwlock/blob/master/test/all.js
-import * as ReadWriteLock from 'rwlock';
+import ReadWriteLock = require('rwlock');
 
 const lock = new ReadWriteLock();
 lock.readLock((release) => {
diff --git a/types/s3-download-stream/index.d.ts b/types/s3-download-stream/index.d.ts
new file mode 100644
index 0000000000..defd116e7c
--- /dev/null
+++ b/types/s3-download-stream/index.d.ts
@@ -0,0 +1,21 @@
+// Type definitions for s3-download-stream 0.1
+// Project: https://github.com/jb55/s3-download-stream
+// Definitions by: Caleb Everett <https://github.com/everettcaleb>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+import { Readable } from "stream";
+import { S3 } from "aws-sdk";
+
+declare namespace s3Stream {
+    interface S3StreamDownloaderOptions {
+        client: S3;
+        concurrency?: number;
+        chunkSize?: string;
+        params: S3.GetObjectRequest;
+    }
+}
+
+declare function s3Stream(options: s3Stream.S3StreamDownloaderOptions): Readable;
+export = s3Stream;
diff --git a/types/s3-download-stream/package.json b/types/s3-download-stream/package.json
new file mode 100644
index 0000000000..3711406140
--- /dev/null
+++ b/types/s3-download-stream/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "aws-sdk": "^2.37.0"
+    }
+}
diff --git a/types/s3-download-stream/s3-download-stream-tests.ts b/types/s3-download-stream/s3-download-stream-tests.ts
new file mode 100644
index 0000000000..cf1176203d
--- /dev/null
+++ b/types/s3-download-stream/s3-download-stream-tests.ts
@@ -0,0 +1,17 @@
+import * as S3Stream from "s3-download-stream";
+import * as AWS from "aws-sdk";
+import * as fs from "fs";
+
+// Documentation for "params":
+// http://docs.aws.amazon.com/AWSJavaScriptSDK/latest/AWS/S3.html#getObject-property
+const config = {
+    client: new AWS.S3({}),
+    concurrency: 6,
+    chunkSize: '512KB',
+    params: {
+        Key: 'key-name',
+        Bucket: 'bucket-name'
+    }
+};
+
+S3Stream(config).pipe(fs.createWriteStream('/path/to/a/file'));
diff --git a/types/s3-download-stream/tsconfig.json b/types/s3-download-stream/tsconfig.json
new file mode 100644
index 0000000000..d970729d35
--- /dev/null
+++ b/types/s3-download-stream/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "s3-download-stream-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/s3-download-stream/tslint.json b/types/s3-download-stream/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/s3-download-stream/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/s3-upload-stream/s3-upload-stream-tests.ts b/types/s3-upload-stream/s3-upload-stream-tests.ts
index 54f51231b7..bc814dc9e9 100644
--- a/types/s3-upload-stream/s3-upload-stream-tests.ts
+++ b/types/s3-upload-stream/s3-upload-stream-tests.ts
@@ -1,5 +1,5 @@
 import * as fs from 'fs';
-import * as S3Stream from 's3-upload-stream';
+import S3Stream = require('s3-upload-stream');
 import * as AWS from 'aws-sdk';
 
 const s3Stream = S3Stream(new AWS.S3());
diff --git a/types/safe-compare/tsconfig.json b/types/safe-compare/tsconfig.json
index 0aade26241..3aca8432c4 100644
--- a/types/safe-compare/tsconfig.json
+++ b/types/safe-compare/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "safe-compare-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/saml2-js/saml2-js-tests.ts b/types/saml2-js/saml2-js-tests.ts
index ca05489dd7..4fd1867b67 100644
--- a/types/saml2-js/saml2-js-tests.ts
+++ b/types/saml2-js/saml2-js-tests.ts
@@ -1,5 +1,5 @@
 import * as fs from 'fs';
-import * as express from 'express';
+import express = require('express');
 import * as saml2 from 'saml2-js';
 
 
diff --git a/types/samlp/samlp-tests.ts b/types/samlp/samlp-tests.ts
index 8bb3399062..7418f6cc32 100644
--- a/types/samlp/samlp-tests.ts
+++ b/types/samlp/samlp-tests.ts
@@ -1,6 +1,6 @@
 import * as fs from 'fs';
 import * as path from 'path';
-import * as express from 'express';
+import express = require('express');
 import * as samlp from 'samlp';
 
 
diff --git a/types/sanctuary/sanctuary-tests.ts b/types/sanctuary/sanctuary-tests.ts
index 663811935c..a38f9d6384 100644
--- a/types/sanctuary/sanctuary-tests.ts
+++ b/types/sanctuary/sanctuary-tests.ts
@@ -1,4 +1,4 @@
-/// <reference types="node"/>;
+/// <reference types="node"/>
 import * as assert from "assert";
 import { create, env } from "sanctuary";
 
diff --git a/types/sanctuary/tsconfig.json b/types/sanctuary/tsconfig.json
index 653d340820..82b1098c6d 100644
--- a/types/sanctuary/tsconfig.json
+++ b/types/sanctuary/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "sanctuary-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/sanitize-html/sanitize-html-tests.ts b/types/sanitize-html/sanitize-html-tests.ts
index 31efb0395f..cc43d64fcb 100644
--- a/types/sanitize-html/sanitize-html-tests.ts
+++ b/types/sanitize-html/sanitize-html-tests.ts
@@ -1,5 +1,4 @@
-
-import * as sanitize from 'sanitize-html';
+import sanitize = require('sanitize-html');
 
 let options: sanitize.IOptions = {
   allowedTags: sanitize.defaults.allowedTags.concat('h1', 'h2', 'img'),
@@ -7,7 +6,7 @@ let options: sanitize.IOptions = {
     'a': sanitize.defaults.allowedAttributes['a'].concat('rel'),
     'img': ['src', 'height', 'width', 'alt']
   },
-	transformTags: { 
+	transformTags: {
     'a': sanitize.simpleTransform('a', { 'rel': 'nofollow' }),
     'img': (tagName: string, attribs: sanitize.Attributes) => {
       let img = { tagName, attribs };
diff --git a/types/sat/tsconfig.json b/types/sat/tsconfig.json
index 75c7dbc256..7405ee4abf 100644
--- a/types/sat/tsconfig.json
+++ b/types/sat/tsconfig.json
@@ -21,4 +21,4 @@
         "index.d.ts",
         "sat-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/saywhen/saywhen-tests.ts b/types/saywhen/saywhen-tests.ts
index a1a02d6178..a253308156 100644
--- a/types/saywhen/saywhen-tests.ts
+++ b/types/saywhen/saywhen-tests.ts
@@ -1,4 +1,4 @@
-import * as when from 'saywhen';
+import when = require('saywhen');
 
 when(jasmine.createSpy('test')); // $ExpectType CallHandler<Spy>
 when(jasmine.createSpy('test')).isCalled; // $ExpectType Proxy<Spy>
diff --git a/types/screeps/tsconfig.json b/types/screeps/tsconfig.json
index 8dcc302c5c..110537a00d 100644
--- a/types/screeps/tsconfig.json
+++ b/types/screeps/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "screeps-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/scriptjs/scriptjs-tests.ts b/types/scriptjs/scriptjs-tests.ts
index c82464f172..a73e40314a 100644
--- a/types/scriptjs/scriptjs-tests.ts
+++ b/types/scriptjs/scriptjs-tests.ts
@@ -1,4 +1,4 @@
-import * as $script from 'scriptjs';
+import $script = require('scriptjs');
 
 const callback = (): void => console.log('done');
 
diff --git a/types/scroll-into-view/scroll-into-view-tests.ts b/types/scroll-into-view/scroll-into-view-tests.ts
index 5cb274bc15..bd50abb011 100644
--- a/types/scroll-into-view/scroll-into-view-tests.ts
+++ b/types/scroll-into-view/scroll-into-view-tests.ts
@@ -1,4 +1,4 @@
-import * as scrollIntoView from "scroll-into-view"
+import scrollIntoView = require("scroll-into-view");
 
 var someElement: HTMLElement
 scrollIntoView(someElement);
diff --git a/types/scryptsy/tsconfig.json b/types/scryptsy/tsconfig.json
index ae751a1eb0..fecf5b2016 100644
--- a/types/scryptsy/tsconfig.json
+++ b/types/scryptsy/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "scryptsy-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/seamless-immutable/seamless-immutable-tests.ts b/types/seamless-immutable/seamless-immutable-tests.ts
index 528cd6cce2..ddec87e81d 100644
--- a/types/seamless-immutable/seamless-immutable-tests.ts
+++ b/types/seamless-immutable/seamless-immutable-tests.ts
@@ -1,4 +1,4 @@
-import * as Immutable from 'seamless-immutable';
+import Immutable = require('seamless-immutable');
 
 // Test types
 
diff --git a/types/selectables/selectables-tests.ts b/types/selectables/selectables-tests.ts
index 595f2ca738..960573033b 100644
--- a/types/selectables/selectables-tests.ts
+++ b/types/selectables/selectables-tests.ts
@@ -1,4 +1,4 @@
-import * as Selectables from "selectables";
+import Selectables = require("selectables");
 
 const dr = new Selectables({
     zone: '#div',
diff --git a/types/selectables/tsconfig.json b/types/selectables/tsconfig.json
index e34d4a6078..8ff709ea04 100644
--- a/types/selectables/tsconfig.json
+++ b/types/selectables/tsconfig.json
@@ -21,4 +21,4 @@
         "index.d.ts",
         "selectables-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/send/send-tests.ts b/types/send/send-tests.ts
index da41697e96..f6c21b3aa3 100644
--- a/types/send/send-tests.ts
+++ b/types/send/send-tests.ts
@@ -1,7 +1,5 @@
-/// <reference types="express" />
-
-import * as express from 'express';
-import * as send from 'send';
+import express = require('express');
+import send = require('send');
 
 var app = express();
 
diff --git a/types/seneca/seneca-tests.ts b/types/seneca/seneca-tests.ts
index ea10180074..6ff0331ff6 100644
--- a/types/seneca/seneca-tests.ts
+++ b/types/seneca/seneca-tests.ts
@@ -2,7 +2,7 @@
 * This file contains all of the example code that was on http://senecajs.org as of Mon June 16, 2016.
 */
 
-import * as SENECA from 'seneca'
+import SENECA = require('seneca');
 var seneca: SENECA.Instance = SENECA()
 
 seneca.add({ cmd: 'salestax' }, function (args, callback) {
diff --git a/types/sequelize/index.d.ts b/types/sequelize/index.d.ts
index d88754480f..4de155e6ee 100644
--- a/types/sequelize/index.d.ts
+++ b/types/sequelize/index.d.ts
@@ -10,6 +10,7 @@
 //                 Philippe D'Alva <https://github.com/TitaneBoy>
 //                 Carven Zhang <https://github.com/zjy01>
 //                 Nikola Vidic <https://github.com/nidzov>
+//                 Florian Oellerich <https://github.com/Raigen>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -19,7 +20,7 @@
 
 
 import * as _ from "lodash";
-import * as Promise from "bluebird";
+import Promise = require("bluebird");
 import * as cls from "continuation-local-storage"
 
 declare namespace sequelize {
@@ -3363,7 +3364,7 @@ declare namespace sequelize {
          * Apply column on which COUNT() should be applied
          */
         col?: string;
-                     
+
         /**
          * Apply COUNT(DISTINCT(col))
          */
@@ -5313,7 +5314,7 @@ declare namespace sequelize {
         /**
          * Only retry a query if the error matches one of these strings.
          */
-        match?: string[];
+        match?: (string|RegExp|Error)[];
 
         /**
          * How many times a failing query is automatically retried. Set to 0 to disable retrying on SQL_BUSY error.
diff --git a/types/sequelize/sequelize-tests.ts b/types/sequelize/sequelize-tests.ts
index b1ee85d2fc..eea19959bd 100644
--- a/types/sequelize/sequelize-tests.ts
+++ b/types/sequelize/sequelize-tests.ts
@@ -1235,7 +1235,7 @@ new Sequelize( {
     username: 'user',
     password: 'pass',
     retry: {
-        match: ['failed'],
+        match: ['failed', /failed/i, Sequelize.ForeignKeyConstraintError],
         max: 3
     },
     typeValidation: true
diff --git a/types/serialize-javascript/serialize-javascript-tests.ts b/types/serialize-javascript/serialize-javascript-tests.ts
index b4c79f6a7c..357607daba 100644
--- a/types/serialize-javascript/serialize-javascript-tests.ts
+++ b/types/serialize-javascript/serialize-javascript-tests.ts
@@ -1,4 +1,4 @@
-import * as serialize from "serialize-javascript";
+import serialize = require("serialize-javascript");
 
 const obj: any = {
     str: "string",
diff --git a/types/serialport/serialport-tests.ts b/types/serialport/serialport-tests.ts
index 70dff8bdbd..9ff1daa26e 100644
--- a/types/serialport/serialport-tests.ts
+++ b/types/serialport/serialport-tests.ts
@@ -1,6 +1,6 @@
 // Tests taken from documentation samples.
 
-import * as SerialPort from 'serialport';
+import SerialPort = require('serialport');
 
 function test_basic_connect() {
     const port = new SerialPort('');
diff --git a/types/serialport/v4/serialport-tests.ts b/types/serialport/v4/serialport-tests.ts
index c0bd59b274..7965811a68 100644
--- a/types/serialport/v4/serialport-tests.ts
+++ b/types/serialport/v4/serialport-tests.ts
@@ -1,6 +1,6 @@
 // Tests taken from documentation samples.
 
-import * as SerialPort from 'serialport';
+import SerialPort = require('serialport');
 
 function test_basic_connect() {
     const port = new SerialPort('');
diff --git a/types/serialport/v4/tsconfig.json b/types/serialport/v4/tsconfig.json
index 8c1a36c640..b6a10bc8fd 100644
--- a/types/serialport/v4/tsconfig.json
+++ b/types/serialport/v4/tsconfig.json
@@ -13,7 +13,9 @@
             "../../"
         ],
         "paths": {
-            "serialport": ["serialport/v4"]
+            "serialport": [
+                "serialport/v4"
+            ]
         },
         "types": [],
         "noEmit": true,
diff --git a/types/serve-index/serve-index-tests.ts b/types/serve-index/serve-index-tests.ts
index 038fc3c533..5d54e9f768 100644
--- a/types/serve-index/serve-index-tests.ts
+++ b/types/serve-index/serve-index-tests.ts
@@ -1,6 +1,5 @@
-
-import * as express from 'express';
-import * as serveIndex from 'serve-index';
+import express = require('express');
+import serveIndex = require('serve-index');
 import * as fs from 'fs';
 
 const app = express();
diff --git a/types/serve-static/serve-static-tests.ts b/types/serve-static/serve-static-tests.ts
index 65671e8521..abceefd197 100644
--- a/types/serve-static/serve-static-tests.ts
+++ b/types/serve-static/serve-static-tests.ts
@@ -1,5 +1,5 @@
-import * as express from 'express';
-import * as serveStatic from 'serve-static';
+import express = require('express');
+import serveStatic = require('serve-static');
 var app = express();
 
 app.use(serveStatic('/1'));
diff --git a/types/set-cookie-parser/set-cookie-parser-tests.ts b/types/set-cookie-parser/set-cookie-parser-tests.ts
index 91238ff929..020d40f59c 100644
--- a/types/set-cookie-parser/set-cookie-parser-tests.ts
+++ b/types/set-cookie-parser/set-cookie-parser-tests.ts
@@ -1,6 +1,6 @@
 import * as assert from "assert";
 import * as http from "http";
-import * as setCookie from "set-cookie-parser";
+import setCookie = require("set-cookie-parser");
 
 // Call parse function on imported object
 var input = "foo=bar;";
diff --git a/types/sharp/sharp-tests.ts b/types/sharp/sharp-tests.ts
index d7f0282c24..f1010c533c 100644
--- a/types/sharp/sharp-tests.ts
+++ b/types/sharp/sharp-tests.ts
@@ -1,4 +1,4 @@
-import * as sharp from "sharp";
+import sharp = require("sharp");
 import { createReadStream, createWriteStream } from "fs";
 
 // Test samples taken from the official documentation
diff --git a/types/sheetify/sheetify-tests.ts b/types/sheetify/sheetify-tests.ts
index eba3a63336..b6704ed2e7 100644
--- a/types/sheetify/sheetify-tests.ts
+++ b/types/sheetify/sheetify-tests.ts
@@ -1,4 +1,4 @@
-import * as sheetify from 'sheetify';
+import sheetify = require('sheetify');
 
 function done1(err: Error, css: string, prefix: string) {}
 function done2(err: Error, css: string) {}
diff --git a/types/shell-escape/shell-escape-tests.ts b/types/shell-escape/shell-escape-tests.ts
index ac3906be19..3cac57b81a 100644
--- a/types/shell-escape/shell-escape-tests.ts
+++ b/types/shell-escape/shell-escape-tests.ts
@@ -1,4 +1,4 @@
-import * as shellEscape from 'shell-escape';
+import shellEscape = require('shell-escape');
 
 () => {
     const stringRes = shellEscape(['cp', '-r', 'src/', 'dest/']);
diff --git a/types/should-sinon/index.d.ts b/types/should-sinon/index.d.ts
new file mode 100644
index 0000000000..25233c1c61
--- /dev/null
+++ b/types/should-sinon/index.d.ts
@@ -0,0 +1,91 @@
+// Type definitions for should-sinon 0.0
+// Project: https://github.com/shouldjs/sinon
+// Definitions by: AryloYeung <https://github.com/Arylo>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import * as s from "sinon";
+import should = require("should");
+
+declare module "sinon" {
+    interface SinonSpy {
+        should: ShouldSinonAssertion;
+    }
+    interface ShouldSinonAssertion extends should.Assertion {
+        /**
+         * Assert stub was called with given object as this always. So if you call stub several times
+         * all should be with the same object
+         */
+        alwaysCalledOn(obj: any): void;
+        alwaysCalledWith(...args: any[]): void;
+        /**
+         * Passes if the spy was always called with the provided arguments and no others.
+         */
+        alwaysCalledWithExactly(...args: any[]): void;
+        /**
+         * Returns true if spy was always called with matching arguments (and possibly others).
+         */
+        alwaysCalledWithMatch(...args: any[]): void;
+        alwaysCalledWithNew(): void;
+        /**
+         * Passes if the spy always threw the given exception. The exception can be a
+         * string denoting its type, or an actual object. If no argument is
+         * provided, the assertion passes if the spy ever threw any exception.
+         */
+        alwaysThrew(ex: string | Error): void;
+        /**
+         * Assert stub was called at exact number of times
+         */
+        callCount(count: number): void;
+        /**
+         * Assert stub was called at least once
+         */
+        called(): void;
+        /**
+         * Assert stub was called with given object as this
+         */
+        calledOn(obj: any): void;
+        /**
+         * Assert stub was called at exactly once
+         */
+        calledOnce(): void;
+        /**
+         * Assert stub was called at exactly thrice
+         */
+        calledThrice(): void;
+        /**
+         * Assert stub was called at exactly twice
+         */
+        calledTwice(): void;
+        /**
+         * Asserts that stub was called with given arguments
+         */
+        calledWith(...args: any[]): void;
+        /**
+         * Returns true if call received provided arguments and no others.
+         */
+        calledWithExactly(...args: any[]): void;
+        /**
+         * Returns true if spy was called with matching arguments (and possibly others).
+         */
+        calledWithMatch(...args: any[]): void;
+        /**
+         * Asserts that stub was called with new
+         */
+        calledWithNew(): void;
+        /**
+         * Returns true if the spy/stub was never called with the provided arguments.
+         */
+        neverCalledWith(...args: any[]): void;
+        /**
+         * Returns true if the spy/stub was never called with matching arguments.
+         */
+        neverCalledWithMatch(...args: any[]): void;
+        /**
+         * Passes if the spy threw the given exception. The exception can be a
+         * string denoting its type, or an actual object. If no argument is
+         * provided, the assertion passes if the spy ever threw any exception.
+         */
+        threw(ex: string | Error): void;
+    }
+}
diff --git a/types/should-sinon/package.json b/types/should-sinon/package.json
new file mode 100644
index 0000000000..5ee99bf166
--- /dev/null
+++ b/types/should-sinon/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "should": "^13.2.1"
+    }
+}
diff --git a/types/should-sinon/should-sinon-tests.ts b/types/should-sinon/should-sinon-tests.ts
new file mode 100644
index 0000000000..7c0946fc1d
--- /dev/null
+++ b/types/should-sinon/should-sinon-tests.ts
@@ -0,0 +1,13 @@
+const callback = sinon.spy();
+const obj = { };
+
+callback.should.be.alwaysCalledOn(obj);
+callback.should.be.alwaysCalledWith(1, 2, 3);
+callback.should.have.callCount(0);
+callback.should.be.called();
+callback.should.be.calledOn(obj);
+callback.should.be.calledOnce();
+callback.should.be.calledThrice();
+callback.should.be.calledTwice();
+callback.should.be.calledWith(1, 2, 3);
+callback.should.be.neverCalledWith(1, 2, 3);
diff --git a/types/should-sinon/tsconfig.json b/types/should-sinon/tsconfig.json
new file mode 100644
index 0000000000..33eb26e8c4
--- /dev/null
+++ b/types/should-sinon/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",
+        "should-sinon-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/should-sinon/tslint.json b/types/should-sinon/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/should-sinon/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/shrink-ray/shrink-ray-tests.ts b/types/shrink-ray/shrink-ray-tests.ts
index e221806b88..b558c5540f 100644
--- a/types/shrink-ray/shrink-ray-tests.ts
+++ b/types/shrink-ray/shrink-ray-tests.ts
@@ -1,5 +1,5 @@
-import * as express from 'express';
-import * as shrinkRay from 'shrink-ray';
+import express = require('express');
+import shrinkRay = require('shrink-ray');
 
 const app = express();
 
diff --git a/types/shrink-ray/tsconfig.json b/types/shrink-ray/tsconfig.json
index 84b143dd64..d964de9f10 100644
--- a/types/shrink-ray/tsconfig.json
+++ b/types/shrink-ray/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "shrink-ray-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/siema/tsconfig.json b/types/siema/tsconfig.json
index 035dfc51d0..f07f878c5d 100644
--- a/types/siema/tsconfig.json
+++ b/types/siema/tsconfig.json
@@ -21,4 +21,4 @@
         "index.d.ts",
         "siema-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/simple-peer/simple-peer-tests.ts b/types/simple-peer/simple-peer-tests.ts
index 97fa2e9e8e..666816e388 100644
--- a/types/simple-peer/simple-peer-tests.ts
+++ b/types/simple-peer/simple-peer-tests.ts
@@ -1,4 +1,4 @@
-import * as SimplePeer from 'simple-peer';
+import SimplePeer = require('simple-peer');
 
 const peer = new SimplePeer();
 peer.write(new Buffer('hey'));
diff --git a/types/skatejs/tsconfig.json b/types/skatejs/tsconfig.json
index 1cbab67082..9f4db47554 100644
--- a/types/skatejs/tsconfig.json
+++ b/types/skatejs/tsconfig.json
@@ -39,4 +39,4 @@
         "test/utils/name.ts",
         "test/utils/shadow.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/slack-node/slack-node-tests.ts b/types/slack-node/slack-node-tests.ts
index b14029af19..d2dfc0541d 100644
--- a/types/slack-node/slack-node-tests.ts
+++ b/types/slack-node/slack-node-tests.ts
@@ -1,4 +1,4 @@
-import * as Slack from "slack-node";
+import Slack = require("slack-node");
 
 let webhookUri = "__uri___";
 
diff --git a/types/slate-irc/slate-irc-tests.ts b/types/slate-irc/slate-irc-tests.ts
index 3b1dd6bd3f..ce344ffa75 100644
--- a/types/slate-irc/slate-irc-tests.ts
+++ b/types/slate-irc/slate-irc-tests.ts
@@ -1,6 +1,5 @@
-
 import * as net from "net";
-import * as SlateIRC from "slate-irc";
+import SlateIRC = require("slate-irc");
 
 let socket: net.Socket;
 const client = SlateIRC(socket);
diff --git a/types/smtp-server/smtp-server-tests.ts b/types/smtp-server/smtp-server-tests.ts
index 29c05c942e..5be0634ebb 100644
--- a/types/smtp-server/smtp-server-tests.ts
+++ b/types/smtp-server/smtp-server-tests.ts
@@ -8,9 +8,10 @@ const options: SMTPServerOptions = {
     onRcptTo,
     onData,
     onClose,
-    port: 2525
 };
 
+const port = 2525;
+
 function onConnect(session: SMTPServerSession, callback: (err?: Error) => void): void {
     console.log(`[${session.id}] onConnect`);
     callback();
@@ -69,7 +70,7 @@ server.on('close', () => {
     console.log('Server closed');
 });
 
-server.listen(options.port, () => {
+server.listen(port, () => {
     const address = server.server.address();
     console.log(`Listening on [${address.address}]:${address.port}`);
 });
diff --git a/types/snekfetch/snekfetch-tests.ts b/types/snekfetch/snekfetch-tests.ts
index 69e9743f83..211ef5bd80 100644
--- a/types/snekfetch/snekfetch-tests.ts
+++ b/types/snekfetch/snekfetch-tests.ts
@@ -1,6 +1,6 @@
 import * as fs from 'fs';
 import * as util from 'util';
-import * as snekfetch from 'snekfetch';
+import snekfetch = require('snekfetch');
 
 const writeFile = util.promisify(fs.writeFile);
 
diff --git a/types/snoowrap/snoowrap-tests.ts b/types/snoowrap/snoowrap-tests.ts
index dfea881a8b..afa9a46fa2 100644
--- a/types/snoowrap/snoowrap-tests.ts
+++ b/types/snoowrap/snoowrap-tests.ts
@@ -1,4 +1,4 @@
-import * as Snoowrap from 'snoowrap';
+import Snoowrap = require('snoowrap');
 import {
   Comment,
   Listing,
diff --git a/types/socketio-jwt-auth/tsconfig.json b/types/socketio-jwt-auth/tsconfig.json
index eb874d1a8e..d9d832b68e 100644
--- a/types/socketio-jwt-auth/tsconfig.json
+++ b/types/socketio-jwt-auth/tsconfig.json
@@ -21,4 +21,4 @@
         "index.d.ts",
         "socketio-jwt-auth-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/sort-array/tsconfig.json b/types/sort-array/tsconfig.json
index 935747c5e6..dcd496828f 100644
--- a/types/sort-array/tsconfig.json
+++ b/types/sort-array/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "sort-array-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/spark-md5/spark-md5-tests.ts b/types/spark-md5/spark-md5-tests.ts
index bc81f715f1..0a6c929a29 100644
--- a/types/spark-md5/spark-md5-tests.ts
+++ b/types/spark-md5/spark-md5-tests.ts
@@ -1,4 +1,4 @@
-import * as SparkMD5 from "spark-md5";
+import SparkMD5 = require("spark-md5");
 
 SparkMD5.hash('Hi there');
 SparkMD5.hash('Hi there', true);
diff --git a/types/sparkpost/sparkpost-tests.ts b/types/sparkpost/sparkpost-tests.ts
index d15208bcb5..26a2ebda3a 100644
--- a/types/sparkpost/sparkpost-tests.ts
+++ b/types/sparkpost/sparkpost-tests.ts
@@ -1,4 +1,4 @@
-import * as SparkPost from "sparkpost";
+import SparkPost = require("sparkpost");
 
 const key = "YOURAPIKEY";
 const client = new SparkPost(key);
diff --git a/types/sparkpost/v1/sparkpost-tests.ts b/types/sparkpost/v1/sparkpost-tests.ts
index 0b8a41ab0a..6a2ac71acc 100644
--- a/types/sparkpost/v1/sparkpost-tests.ts
+++ b/types/sparkpost/v1/sparkpost-tests.ts
@@ -1,4 +1,4 @@
-import * as SparkPost from "sparkpost";
+import SparkPost = require("sparkpost");
 
 let key = "YOURAPIKEY";
 let client = new SparkPost(key);
diff --git a/types/spdx-correct/tsconfig.json b/types/spdx-correct/tsconfig.json
index a7c8604db7..4daa583e23 100644
--- a/types/spdx-correct/tsconfig.json
+++ b/types/spdx-correct/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "spdx-correct-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/spdx-satisfies/tsconfig.json b/types/spdx-satisfies/tsconfig.json
index 7aff811650..d1d82811e2 100644
--- a/types/spdx-satisfies/tsconfig.json
+++ b/types/spdx-satisfies/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "spdx-satisfies-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/spectacle/index.d.ts b/types/spectacle/index.d.ts
index 41f0d1df79..cabd6cf5a1 100644
--- a/types/spectacle/index.d.ts
+++ b/types/spectacle/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/FormidableLabs/victory
 // Definitions by: Zachary Maybury <https://github.com/zmaybury>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 /// <reference types="react"/>
 
diff --git a/types/split2/split2-tests.ts b/types/split2/split2-tests.ts
index 35d0b58684..0d4052742b 100644
--- a/types/split2/split2-tests.ts
+++ b/types/split2/split2-tests.ts
@@ -1,4 +1,4 @@
-import * as split from 'split2';
+import split = require('split2');
 import * as fs from 'fs';
 import { Transform, TransformOptions } from 'stream';
 
diff --git a/types/spotify-web-playback-sdk/tsconfig.json b/types/spotify-web-playback-sdk/tsconfig.json
index c6b3dd1448..b742fcb876 100644
--- a/types/spotify-web-playback-sdk/tsconfig.json
+++ b/types/spotify-web-playback-sdk/tsconfig.json
@@ -21,4 +21,4 @@
         "index.d.ts",
         "spotify-web-playback-sdk-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/sqs-consumer/index.d.ts b/types/sqs-consumer/index.d.ts
index 73da1ff980..d333ed5fca 100644
--- a/types/sqs-consumer/index.d.ts
+++ b/types/sqs-consumer/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for sqs-consumer 3.7
+// Type definitions for sqs-consumer 3.8
 // Project: https://github.com/BBC/sqs-consumer
 // Definitions by: Daniel Chao <http://dchao.co/>
 //                 Eric Byers <http://github.com/EricByers>
@@ -19,6 +19,7 @@ declare namespace Consumer {
         messageAttributeNames?: string[];
         batchSize?: number;
         visibilityTimeout?: number;
+        terminateVisibilityTimeout?: boolean;
         waitTimeSeconds?: number;
         authenticationErrorTimeout?: number;
         sqs?: SQS;
diff --git a/types/sqs-consumer/sqs-consumer-tests.ts b/types/sqs-consumer/sqs-consumer-tests.ts
index f22e75b523..c097ce5644 100644
--- a/types/sqs-consumer/sqs-consumer-tests.ts
+++ b/types/sqs-consumer/sqs-consumer-tests.ts
@@ -17,7 +17,8 @@ const app2 = Consumer.create({
     region: "us-west-1",
     batchSize: 15,
     visibilityTimeout: 50,
-    waitTimeSeconds: 50
+    waitTimeSeconds: 50,
+    terminateVisibilityTimeout: true
 });
 
 // Test message handler.
diff --git a/types/ssh2-sftp-client/ssh2-sftp-client-tests.ts b/types/ssh2-sftp-client/ssh2-sftp-client-tests.ts
index ec64afe698..a8c774c5d3 100644
--- a/types/ssh2-sftp-client/ssh2-sftp-client-tests.ts
+++ b/types/ssh2-sftp-client/ssh2-sftp-client-tests.ts
@@ -1,4 +1,4 @@
-import * as Client from 'ssh2-sftp-client';
+import Client = require('ssh2-sftp-client');
 import * as fs from 'fs';
 const client = new Client();
 
diff --git a/types/stale-lru-cache/stale-lru-cache-tests.ts b/types/stale-lru-cache/stale-lru-cache-tests.ts
index 8d3c47562f..4b597f545d 100644
--- a/types/stale-lru-cache/stale-lru-cache-tests.ts
+++ b/types/stale-lru-cache/stale-lru-cache-tests.ts
@@ -1,4 +1,4 @@
-import * as Cache from 'stale-lru-cache';
+import Cache = require('stale-lru-cache');
 
 const cache = new Cache<string, string>({
     maxSize: 100,
diff --git a/types/std-mocks/tsconfig.json b/types/std-mocks/tsconfig.json
index 2ee05a022d..73ed32806c 100644
--- a/types/std-mocks/tsconfig.json
+++ b/types/std-mocks/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "std-mocks-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/stemmer/stemmer-tests.ts b/types/stemmer/stemmer-tests.ts
index b5ed8daec4..db9f19d996 100644
--- a/types/stemmer/stemmer-tests.ts
+++ b/types/stemmer/stemmer-tests.ts
@@ -1,3 +1,3 @@
-import * as stemmer from 'stemmer';
+import stemmer = require('stemmer');
 
 stemmer('Working');  // $ExpectType string
diff --git a/types/stemmer/tsconfig.json b/types/stemmer/tsconfig.json
index 7224a39eb8..f6a1494f12 100644
--- a/types/stemmer/tsconfig.json
+++ b/types/stemmer/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "stemmer-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/sticky-cluster/sticky-cluster-tests.ts b/types/sticky-cluster/sticky-cluster-tests.ts
index e730275d78..720e8d001a 100644
--- a/types/sticky-cluster/sticky-cluster-tests.ts
+++ b/types/sticky-cluster/sticky-cluster-tests.ts
@@ -1,5 +1,5 @@
 import stickyCluster = require('sticky-cluster');
-import * as express from 'express';
+import express = require('express');
 import * as http from 'http';
 
 /** test with all params */
diff --git a/types/sticky-cluster/tsconfig.json b/types/sticky-cluster/tsconfig.json
index dcfc338f93..189e887431 100644
--- a/types/sticky-cluster/tsconfig.json
+++ b/types/sticky-cluster/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "sticky-cluster-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/stompjs/index.d.ts b/types/stompjs/index.d.ts
index 008b99b511..91d5277fba 100644
--- a/types/stompjs/index.d.ts
+++ b/types/stompjs/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for stompjs 2.3
 // Project: https://github.com/jmesnil/stomp-websocket
-// Definitions by: Jimi Charalampidis <https://github.com/jimic>
+// Definitions by: Jimi Charalampidis <https://github.com/jimic>, Stefan Erichsen <https://github.com/Dr4k4n>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />
@@ -13,7 +13,6 @@ export const VERSIONS: {
 };
 
 export class Client {
-
     connected: boolean;
     counter: number;
     heartbeat: {
@@ -27,6 +26,7 @@ export class Client {
     debug(...args: string[]): any;
 
     connect(headers: { login: string, passcode: string, host?: string }, connectCallback: (frame?: Frame) => any, errorCallback?: (error: string) => any): any;
+    connect(headers: { }, connectCallback: (frame?: Frame) => any, errorCallback?: (error: string) => any): any;
     connect(login: string, passcode: string, connectCallback: (frame?: Frame) => any, errorCallback?: (error: string) => any, host?: string): any;
     disconnect(disconnectCallback: () => any, headers?: {}): any;
 
@@ -51,13 +51,18 @@ export interface Message {
     nack(headers?: {}): any;
 }
 
-export class Frame {
+export class Frame implements Message {
+    command: string;
+    headers: {};
+    body: string;
     constructor(command: string, headers?: {}, body?: string);
 
+    ack(headers?: {}): any;
+    nack(headers?: {}): any;
     toString(): string;
-    sizeOfUTF8(s: string): number;
-    unmarshall(datas: any): any;
-    marshall(command: string, headers?: {}, body?: string): any;
+    static sizeOfUTF8(s: string): number;
+    static unmarshall(datas: any): any;
+    static marshall(command: string, headers?: {}, body?: string): any;
 }
 
 export function client(url: string, protocols?: string | Array<string>): Client;
diff --git a/types/stompjs/stompjs-tests.ts b/types/stompjs/stompjs-tests.ts
index 15331fc81f..fcc0c46ff5 100644
--- a/types/stompjs/stompjs-tests.ts
+++ b/types/stompjs/stompjs-tests.ts
@@ -43,6 +43,16 @@ client.connect('user', 'pass', () => { }, (error) => { });
 client.connect('user', 'pass', () => { }, (error) => { }, 'host');
 client.connect('user', 'pass', (frame) => { }, (error) => { });
 client.connect('user', 'pass', (frame) => { }, (error) => { }, 'host');
+client.connect('user', 'pass', (frame) => {
+    if (!!frame) {
+        frame.command;
+    }
+ }, (error) => { }, 'host');
+
+client.connect({}, () => { });
+client.connect({}, () => { }, () => { });
+client.connect({}, () => { }, (error) => { });
+client.connect({}, (frame) => { }, (error) => { });
 
 client.disconnect(() => { });
 client.disconnect(() => { }, {});
@@ -88,13 +98,13 @@ frame = new Stomp.Frame('command', {}, 'body');
 
 frame.toString();
 
-frame.sizeOfUTF8('abc');
+Stomp.Frame.sizeOfUTF8('abc');
 
-frame.unmarshall(0);
-frame.unmarshall('data');
-frame.unmarshall({});
-frame.unmarshall([{}, {}]);
+Stomp.Frame.unmarshall(0);
+Stomp.Frame.unmarshall('data');
+Stomp.Frame.unmarshall({});
+Stomp.Frame.unmarshall([{}, {}]);
 
-frame.marshall('command');
-frame.marshall('command', {});
-frame.marshall('command', {}, 'body');
+Stomp.Frame.marshall('command');
+Stomp.Frame.marshall('command', {});
+Stomp.Frame.marshall('command', {}, 'body');
diff --git a/types/storybook__addon-a11y/tsconfig.json b/types/storybook__addon-a11y/tsconfig.json
index 4f04f36d5a..c37bd5436c 100644
--- a/types/storybook__addon-a11y/tsconfig.json
+++ b/types/storybook__addon-a11y/tsconfig.json
@@ -1,32 +1,32 @@
 {
-  "compilerOptions": {
-      "module": "commonjs",
-      "lib": [
-          "es6"
-      ],
-      "noImplicitAny": true,
-      "noImplicitThis": true,
-      "strictNullChecks": true,
-      "strictFunctionTypes": true,
-      "baseUrl": "../",
-      "jsx": "react",
-      "typeRoots": [
-          "../"
-      ],
-      "paths": {
-          "@storybook/addon-a11y": [
-              "storybook__addon-a11y"
-          ],
-          "@storybook/react": [
-              "storybook__react"
-          ]
-      },
-      "types": [],
-      "noEmit": true,
-      "forceConsistentCasingInFileNames": true
-  },
-  "files": [
-      "index.d.ts",
-      "storybook__addon-a11y-tests.tsx"
-  ]
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "jsx": "react",
+        "typeRoots": [
+            "../"
+        ],
+        "paths": {
+            "@storybook/addon-a11y": [
+                "storybook__addon-a11y"
+            ],
+            "@storybook/react": [
+                "storybook__react"
+            ]
+        },
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "storybook__addon-a11y-tests.tsx"
+    ]
 }
\ No newline at end of file
diff --git a/types/storybook__addon-actions/index.d.ts b/types/storybook__addon-actions/index.d.ts
index 01c3b4837d..9b7009fbad 100644
--- a/types/storybook__addon-actions/index.d.ts
+++ b/types/storybook__addon-actions/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/storybooks/storybook
 // Definitions by: Joscha Feth <https://github.com/joscha>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 export type HandlerFunction = (...args: any[]) => undefined;
 export type DecoratorFunction = (args: any[]) => any[];
diff --git a/types/storybook__addon-info/index.d.ts b/types/storybook__addon-info/index.d.ts
index c42c8d359a..f694ad3eb4 100644
--- a/types/storybook__addon-info/index.d.ts
+++ b/types/storybook__addon-info/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Mark Kornblum <https://github.com/mkornblum>
 //                 Mattias Wikstrom <https://github.com/fyrkant>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.4
+// TypeScript Version: 2.6
 
 import * as React from 'react';
 import { RenderFunction } from '@storybook/react';
diff --git a/types/storybook__addon-info/tsconfig.json b/types/storybook__addon-info/tsconfig.json
index 87d702ce2b..ad08c9163b 100644
--- a/types/storybook__addon-info/tsconfig.json
+++ b/types/storybook__addon-info/tsconfig.json
@@ -29,4 +29,4 @@
         "index.d.ts",
         "storybook__addon-info-tests.tsx"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/storybook__addon-knobs/index.d.ts b/types/storybook__addon-knobs/index.d.ts
index f725abb47c..4125f10b84 100644
--- a/types/storybook__addon-knobs/index.d.ts
+++ b/types/storybook__addon-knobs/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Joscha Feth <https://github.com/joscha>
 //                 Martynas Kadisa <https://github.com/martynaskadisa>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from 'react';
 import { RenderFunction } from '@storybook/react';
diff --git a/types/storybook__addon-links/index.d.ts b/types/storybook__addon-links/index.d.ts
index 08f3648855..141072aa2a 100644
--- a/types/storybook__addon-links/index.d.ts
+++ b/types/storybook__addon-links/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/storybooks/storybook
 // Definitions by: Joscha Feth <https://github.com/joscha>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from 'react';
 
diff --git a/types/storybook__addon-notes/index.d.ts b/types/storybook__addon-notes/index.d.ts
index 7e9e94746e..e8b6f5934a 100644
--- a/types/storybook__addon-notes/index.d.ts
+++ b/types/storybook__addon-notes/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/storybooks/storybook
 // Definitions by: Joscha Feth <https://github.com/joscha>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from 'react';
 import { RenderFunction } from '@storybook/react';
diff --git a/types/storybook__react/index.d.ts b/types/storybook__react/index.d.ts
index dd93b9459b..d31ea08af2 100644
--- a/types/storybook__react/index.d.ts
+++ b/types/storybook__react/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Joscha Feth <https://github.com/joscha>
 //                 Anton Izmailov <https://github.com/wapgear>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 /// <reference types="webpack-env" />
 
diff --git a/types/stream-meter/stream-meter-tests.ts b/types/stream-meter/stream-meter-tests.ts
index 396f8aa6b1..d7adf74ce8 100644
--- a/types/stream-meter/stream-meter-tests.ts
+++ b/types/stream-meter/stream-meter-tests.ts
@@ -1,5 +1,4 @@
-
-import * as meter from 'stream-meter';
+import meter = require('stream-meter');
 
 var m:meter.StreamMeter = meter();
 process.stdin.pipe(m).pipe(process.stdout);
diff --git a/types/strftime/strftime-tests.ts b/types/strftime/strftime-tests.ts
index 2c07e8ad5f..7ecbfaf2fe 100644
--- a/types/strftime/strftime-tests.ts
+++ b/types/strftime/strftime-tests.ts
@@ -1,4 +1,4 @@
-import * as strftime from "strftime";
+import strftime = require("strftime");
 
 strftime('%B %d, %Y %H:%M:%S');
 strftime('%F %T', new Date(1307472705067));
diff --git a/types/string-template/string-template-tests.ts b/types/string-template/string-template-tests.ts
index 8ac76014c1..226f042287 100644
--- a/types/string-template/string-template-tests.ts
+++ b/types/string-template/string-template-tests.ts
@@ -1,5 +1,5 @@
-import * as format from "string-template";
-import * as compile from "string-template/compile";
+import format = require("string-template");
+import compile = require("string-template/compile");
 
 // Format tests
 {
diff --git a/types/stringify-object/index.d.ts b/types/stringify-object/index.d.ts
index 3380fc3672..575e650064 100644
--- a/types/stringify-object/index.d.ts
+++ b/types/stringify-object/index.d.ts
@@ -1,15 +1,17 @@
-// Type definitions for stringify-object 3.1
+// Type definitions for stringify-object 3.2
 // Project: https://github.com/yeoman/stringify-object
 // Definitions by: Chris Khoo <https://github.com/khoomeister>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 declare namespace stringifyObject { }
 
 declare function stringifyObject(o: any, options?: {
-  indent?: string,
-  singleQuotes?: boolean,
-  filter?(o: any, prop: string): boolean,
-  inlineCharacterLimit?: number
+    indent?: string,
+    singleQuotes?: boolean,
+    filter?(o: any, prop: string | symbol): boolean,
+    inlineCharacterLimit?: number,
+    transform?: (val: any[] | object, i: number | string | symbol, value: string) => string,
 }): string;
 
 export = stringifyObject;
diff --git a/types/stringify-object/stringify-object-tests.ts b/types/stringify-object/stringify-object-tests.ts
index a00be6f1c0..f011930fda 100644
--- a/types/stringify-object/stringify-object-tests.ts
+++ b/types/stringify-object/stringify-object-tests.ts
@@ -1,4 +1,4 @@
-import * as stringifyObject from 'stringify-object';
+import stringifyObject = require('stringify-object');
 
 stringifyObject({ a: 1, b: 2, c: 3 });
 
@@ -22,5 +22,9 @@ stringifyObject([1, 2, 3], {
 });
 
 stringifyObject([1, 2, 3], {
-  filter: (o, prop) => prop !== '_hidden_'
+    filter: (o, prop) => prop !== '_hidden_'
+});
+
+stringifyObject([1, 2, 3], {
+    transform: (val, key, value) => value
 });
diff --git a/types/strip-json-comments/strip-json-comments-tests.ts b/types/strip-json-comments/strip-json-comments-tests.ts
index f71f62cf0f..188248a285 100644
--- a/types/strip-json-comments/strip-json-comments-tests.ts
+++ b/types/strip-json-comments/strip-json-comments-tests.ts
@@ -1,9 +1,4 @@
-// Type definitions for strip-json-comments
-// Project: https://github.com/sindresorhus/strip-json-comments
-// Definitions by: Dylan R. E. Moonfire <https://github.com/dmoonfire/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-import * as stripJsonComments from "strip-json-comments";
+import stripJsonComments = require("strip-json-comments");
 
 const json = '{/*rainbows*/"unicorn":"cake"}';
 
diff --git a/types/stripe/index.d.ts b/types/stripe/index.d.ts
index c3fd4853b7..12f2b4abea 100644
--- a/types/stripe/index.d.ts
+++ b/types/stripe/index.d.ts
@@ -4051,7 +4051,7 @@ declare namespace Stripe {
             /**
              * The card number
              */
-            number: number;
+            number: string;
 
             /**
              * Card brand. Can be Visa, American Express, MasterCard, Discover, JCB, Diners Club, or Unknown.
@@ -4167,7 +4167,7 @@ declare namespace Stripe {
             /**
              * The card number, as a string without any separators.
              */
-            number: number;
+            number: string;
 
             /**
              * Card security code. Required unless your account is registered in
diff --git a/types/stripe/stripe-tests.ts b/types/stripe/stripe-tests.ts
index 99cf3795db..b887ae6228 100644
--- a/types/stripe/stripe-tests.ts
+++ b/types/stripe/stripe-tests.ts
@@ -243,7 +243,7 @@ stripe.customers.create({
 }).then( function (customer) {
     // asynchronously called
     customer.cards.create({ card: "tok_17wV94BoqMA9o2xkhlAd3ALf"}).then(function (customer) {});
-    customer.cards.retrieve("card_17xMvXBoqMA9o2xkq6W5gamx").then(function (card) { 
+    customer.cards.retrieve("card_17xMvXBoqMA9o2xkq6W5gamx").then(function (card) {
         let strCustomer: string = <string>card.customer;
         let objCustomer: customers.ICustomer = <customers.ICustomer>card.customer;
     });
@@ -394,7 +394,7 @@ stripe.customers.createSource(
             object: "card",
             exp_month: 1,
             exp_year: 16,
-            number: 4242424242424242
+            number: '4242424242424242'
         }
     },
     function (err, card) {
@@ -409,7 +409,7 @@ stripe.customers.createSource(
             object: "card",
             exp_month: 1,
             exp_year: 16,
-            number: 4242424242424242
+            number: '4242424242424242'
         }
     }).then(
     function (card) {
diff --git a/types/styled-jsx/index.d.ts b/types/styled-jsx/index.d.ts
index 5072cdc7b9..5e15388837 100644
--- a/types/styled-jsx/index.d.ts
+++ b/types/styled-jsx/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/zeit/styled-jsx
 // Definitions by: R1ZZU <https://github.com/R1ZZU>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import "react";
 
diff --git a/types/styled-jsx/tsconfig.json b/types/styled-jsx/tsconfig.json
index 494ed25a0a..6e599795bf 100644
--- a/types/styled-jsx/tsconfig.json
+++ b/types/styled-jsx/tsconfig.json
@@ -21,4 +21,4 @@
         "index.d.ts",
         "styled-jsx-tests.tsx"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/stylelint-webpack-plugin/index.d.ts b/types/stylelint-webpack-plugin/index.d.ts
index 580fc4325f..dfaf0a4f05 100644
--- a/types/stylelint-webpack-plugin/index.d.ts
+++ b/types/stylelint-webpack-plugin/index.d.ts
@@ -2,8 +2,9 @@
 // Project: https://github.com/JaKXz/stylelint-webpack-plugin
 // Definitions by: Arne Bahlo <https://github.com/bahlo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
-import { Plugin } from "webpack";
+import { Plugin } from 'webpack';
 
 export = StylelintWebpackPlugin;
 
diff --git a/types/stylelint-webpack-plugin/stylelint-webpack-plugin-tests.ts b/types/stylelint-webpack-plugin/stylelint-webpack-plugin-tests.ts
index 924a41ee6d..ee9002ec40 100644
--- a/types/stylelint-webpack-plugin/stylelint-webpack-plugin-tests.ts
+++ b/types/stylelint-webpack-plugin/stylelint-webpack-plugin-tests.ts
@@ -1,5 +1,5 @@
-import * as webpack from "webpack";
-import * as StylelintWebpackPlugin from "stylelint-webpack-plugin";
+import webpack = require("webpack");
+import StylelintWebpackPlugin = require("stylelint-webpack-plugin");
 
 const compiler = webpack({
     plugins: [
diff --git a/types/sumo-logger/sumo-logger-tests.ts b/types/sumo-logger/sumo-logger-tests.ts
index 03efdfc95d..2a0066a4e4 100644
--- a/types/sumo-logger/sumo-logger-tests.ts
+++ b/types/sumo-logger/sumo-logger-tests.ts
@@ -1,5 +1,5 @@
-import * as SumoLogger from 'sumo-logger';
-import * as expect from 'expect';
+import SumoLogger = require('sumo-logger');
+import expect = require('expect');
 
 const onErrorSpy = expect.createSpy();
 const onSuccessSpy = expect.createSpy();
diff --git a/types/superagent-no-cache/superagent-no-cache-tests.ts b/types/superagent-no-cache/superagent-no-cache-tests.ts
index 68e4e961a2..717fee80e3 100644
--- a/types/superagent-no-cache/superagent-no-cache-tests.ts
+++ b/types/superagent-no-cache/superagent-no-cache-tests.ts
@@ -1,5 +1,5 @@
 import * as request from 'superagent';
-import * as plugin from 'superagent-no-cache';
+import plugin = require('superagent-no-cache');
 
 request
     .get('/some-url')
diff --git a/types/superagent-prefix/superagent-prefix-tests.ts b/types/superagent-prefix/superagent-prefix-tests.ts
index 01e4b52905..6b0bbf0820 100644
--- a/types/superagent-prefix/superagent-prefix-tests.ts
+++ b/types/superagent-prefix/superagent-prefix-tests.ts
@@ -1,5 +1,5 @@
 import * as request from 'superagent';
-import * as plugin from 'superagent-prefix';
+import plugin = require('superagent-prefix');
 
 request
     .get('/some-url')
diff --git a/types/superagent/superagent-tests.ts b/types/superagent/superagent-tests.ts
index 5978b37206..bbea2d617c 100644
--- a/types/superagent/superagent-tests.ts
+++ b/types/superagent/superagent-tests.ts
@@ -1,8 +1,7 @@
 // via: http://visionmedia.github.io/superagent/
-
-import * as request from 'superagent';
+import request = require('superagent');
 import * as fs from 'fs';
-import * as assert from 'assert';
+import assert = require('assert');
 import { Agent } from 'https';
 
 // Examples taken from https://github.com/visionmedia/superagent/blob/gh-pages/docs/index.md
diff --git a/types/superagent/v2/superagent-tests.ts b/types/superagent/v2/superagent-tests.ts
index 02074043fc..e0f0fcc592 100644
--- a/types/superagent/v2/superagent-tests.ts
+++ b/types/superagent/v2/superagent-tests.ts
@@ -1,8 +1,8 @@
 // via: http://visionmedia.github.io/superagent/
 
-import * as request from 'superagent';
+import request = require('superagent');
 import * as fs from 'fs';
-import * as assert from 'assert';
+import assert = require('assert');
 import { Agent } from 'https';
 
 // Examples taken from https://github.com/visionmedia/superagent/blob/gh-pages/docs/index.md
diff --git a/types/supertest-as-promised/supertest-as-promised-tests.ts b/types/supertest-as-promised/supertest-as-promised-tests.ts
index b86bdafbc9..fbf8be995b 100644
--- a/types/supertest-as-promised/supertest-as-promised-tests.ts
+++ b/types/supertest-as-promised/supertest-as-promised-tests.ts
@@ -1,5 +1,5 @@
-import * as request from 'supertest-as-promised';
-import * as express from 'express';
+import request = require('supertest-as-promised');
+import express = require('express');
 
 declare function describe(desc: string, f: () => void): void;
 declare function it(desc: string, f: () => void): void;
diff --git a/types/supertest/supertest-tests.ts b/types/supertest/supertest-tests.ts
index 868aa8fdce..24bbd4bd56 100644
--- a/types/supertest/supertest-tests.ts
+++ b/types/supertest/supertest-tests.ts
@@ -1,6 +1,5 @@
-
-import * as supertest from 'supertest';
-import * as express from 'express';
+import supertest = require('supertest');
+import express = require('express');
 
 const app = express();
 const request: supertest.SuperTest<supertest.Test> = supertest(app);
diff --git a/types/svg-parser/tsconfig.json b/types/svg-parser/tsconfig.json
index c24afbd999..c5497750f7 100644
--- a/types/svg-parser/tsconfig.json
+++ b/types/svg-parser/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "svg-parser-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/svgo/tsconfig.json b/types/svgo/tsconfig.json
index e2cdf41913..ec4687a1d9 100644
--- a/types/svgo/tsconfig.json
+++ b/types/svgo/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "svgo-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/swagger-express-middleware/swagger-express-middleware-tests.ts b/types/swagger-express-middleware/swagger-express-middleware-tests.ts
index 6ba847fe3f..1a01d8475d 100644
--- a/types/swagger-express-middleware/swagger-express-middleware-tests.ts
+++ b/types/swagger-express-middleware/swagger-express-middleware-tests.ts
@@ -1,5 +1,5 @@
-import * as express from "express";
-import * as SwaggerExpressMiddleware from "swagger-express-middleware";
+import express = require("express");
+import SwaggerExpressMiddleware = require("swagger-express-middleware");
 
 let app = express();
 let router = express.Router();
diff --git a/types/swagger-express-mw/swagger-express-mw-tests.ts b/types/swagger-express-mw/swagger-express-mw-tests.ts
index 617e331e1c..9f81cf8a2d 100644
--- a/types/swagger-express-mw/swagger-express-mw-tests.ts
+++ b/types/swagger-express-mw/swagger-express-mw-tests.ts
@@ -1,5 +1,5 @@
 import * as SwaggerExpress from "swagger-express-mw";
-import * as express from "express";
+import express = require("express");
 
 const app = express();
 const config: SwaggerExpress.Config = {
diff --git a/types/swagger-express-mw/tsconfig.json b/types/swagger-express-mw/tsconfig.json
index c529b14c27..1d597728f7 100644
--- a/types/swagger-express-mw/tsconfig.json
+++ b/types/swagger-express-mw/tsconfig.json
@@ -14,7 +14,12 @@
         ],
         "types": [],
         "paths": {
-            "boom": ["boom/v4"]
+            "boom": [
+                "boom/v4"
+            ],
+            "hapi": [
+                "hapi/v16"
+            ]
         },
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
@@ -23,4 +28,4 @@
         "index.d.ts",
         "swagger-express-mw-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/swagger-hapi/tsconfig.json b/types/swagger-hapi/tsconfig.json
index ea5343eb59..410688bcf1 100644
--- a/types/swagger-hapi/tsconfig.json
+++ b/types/swagger-hapi/tsconfig.json
@@ -14,7 +14,12 @@
         ],
         "types": [],
         "paths": {
-            "boom": ["boom/v4"]
+            "boom": [
+                "boom/v4"
+            ],
+            "hapi": [
+                "hapi/v16"
+            ]
         },
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
@@ -23,4 +28,4 @@
         "index.d.ts",
         "swagger-hapi-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/swagger-jsdoc/swagger-jsdoc-tests.ts b/types/swagger-jsdoc/swagger-jsdoc-tests.ts
index 2a87ae2dab..4cf386e48a 100644
--- a/types/swagger-jsdoc/swagger-jsdoc-tests.ts
+++ b/types/swagger-jsdoc/swagger-jsdoc-tests.ts
@@ -1,6 +1,4 @@
-/// <reference types="express" />
-
-import * as express from 'express';
+import express = require('express');
 import swaggerJSDoc = require('swagger-jsdoc');
 const app = express();
 
diff --git a/types/swagger-node-runner/swagger-node-runner-tests.ts b/types/swagger-node-runner/swagger-node-runner-tests.ts
index 9890bed290..1deae28f23 100644
--- a/types/swagger-node-runner/swagger-node-runner-tests.ts
+++ b/types/swagger-node-runner/swagger-node-runner-tests.ts
@@ -1,6 +1,6 @@
 import * as SwaggerNodeRunner from "swagger-node-runner";
-import * as express from "express";
-import * as connect from "connect";
+import express = require("express");
+import connect = require("connect");
 import * as Hapi from "hapi";
 import * as restify from "restify";
 import * as sails from "sails.io.js";
diff --git a/types/swagger-node-runner/tsconfig.json b/types/swagger-node-runner/tsconfig.json
index 1d3ae44a1a..e559433107 100644
--- a/types/swagger-node-runner/tsconfig.json
+++ b/types/swagger-node-runner/tsconfig.json
@@ -14,7 +14,12 @@
         ],
         "types": [],
         "paths": {
-            "boom": ["boom/v4"]
+            "boom": [
+                "boom/v4"
+            ],
+            "hapi": [
+                "hapi/v16"
+            ]
         },
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
@@ -23,4 +28,4 @@
         "index.d.ts",
         "swagger-node-runner-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/swagger-restify-mw/tsconfig.json b/types/swagger-restify-mw/tsconfig.json
index a9dcb8c0da..8c5f09a930 100644
--- a/types/swagger-restify-mw/tsconfig.json
+++ b/types/swagger-restify-mw/tsconfig.json
@@ -14,7 +14,12 @@
         ],
         "types": [],
         "paths": {
-            "boom": ["boom/v4"]
+            "boom": [
+                "boom/v4"
+            ],
+            "hapi": [
+                "hapi/v16"
+            ]
         },
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
@@ -23,4 +28,4 @@
         "index.d.ts",
         "swagger-restify-mw-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/swagger-sails-hook/tsconfig.json b/types/swagger-sails-hook/tsconfig.json
index 44a316b98b..508453b078 100644
--- a/types/swagger-sails-hook/tsconfig.json
+++ b/types/swagger-sails-hook/tsconfig.json
@@ -14,7 +14,12 @@
         ],
         "types": [],
         "paths": {
-            "boom": ["boom/v4"]
+            "boom": [
+                "boom/v4"
+            ],
+            "hapi": [
+                "hapi/v16"
+            ]
         },
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
@@ -23,4 +28,4 @@
         "index.d.ts",
         "swagger-sails-hook-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/swagger-schema-official/index.d.ts b/types/swagger-schema-official/index.d.ts
index 48173c0883..dc184d3e91 100644
--- a/types/swagger-schema-official/index.d.ts
+++ b/types/swagger-schema-official/index.d.ts
@@ -87,7 +87,7 @@ export interface Path {
   options?: Operation;
   head?: Operation;
   patch?: Operation;
-  parameters?: [Parameter];
+  parameters?: Parameter[];
 }
 
 // ----------------------------- Operation -----------------------------------
diff --git a/types/swagger-tools/swagger-tools-tests.ts b/types/swagger-tools/swagger-tools-tests.ts
index 7b05595269..58e978a0e4 100644
--- a/types/swagger-tools/swagger-tools-tests.ts
+++ b/types/swagger-tools/swagger-tools-tests.ts
@@ -1,6 +1,6 @@
 // 2.0 examples from https://github.com/apigee-127/swagger-tools/blob/master/examples/2.0/index.js
 
-import * as connect from 'connect';
+import connect = require('connect');
 import { createServer } from 'http';
 import * as swaggerTools from 'swagger-tools';
 
diff --git a/types/swig-email-templates/tsconfig.json b/types/swig-email-templates/tsconfig.json
index 987a6f629a..b25f125136 100644
--- a/types/swig-email-templates/tsconfig.json
+++ b/types/swig-email-templates/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "swig-email-templates-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/tabris-plugin-firebase/tsconfig.json b/types/tabris-plugin-firebase/tsconfig.json
index 118339f812..cac6477844 100644
--- a/types/tabris-plugin-firebase/tsconfig.json
+++ b/types/tabris-plugin-firebase/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "tabris-plugin-firebase-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/tar-fs/index.d.ts b/types/tar-fs/index.d.ts
new file mode 100644
index 0000000000..07c02bab4b
--- /dev/null
+++ b/types/tar-fs/index.d.ts
@@ -0,0 +1,48 @@
+// Type definitions for tar-fs 1.16
+// Project: https://github.com/mafintosh/tar-fs
+// Definitions by: Umoxfo <https://github.com/Umoxfo>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.6
+
+// Imported from: https://github.com/soywiz/typescript-node-definitions/d.ts
+
+/// <reference types="node" />
+
+import fs = require("fs");
+
+export function pack(cwd: string, opts?: PackOptions): any;
+export function extract(cwd: string, opts?: ExtractOptions): any;
+
+export interface Options {
+    ignore?: (name: string) => boolean;
+    filter?: (name: string) => boolean;
+    map?: (header: Headers) => Headers;
+    mapStream?: (fileStream: fs.ReadStream, header: Headers) => fs.ReadStream;
+    strict?: boolean;
+}
+
+export interface PackOptions extends Options {
+    entries?: string[];
+    dereference?: boolean;
+    finalize?: boolean;
+    finish?: (pack: any) => void;
+}
+
+export interface ExtractOptions extends Options {
+    ignore?: (name: string, header?: Headers) => boolean;
+    filter?: (name: string, header?: Headers) => boolean;
+    dmode?: number;
+    fmode?: number;
+    readable?: boolean;
+    writable?: boolean;
+}
+
+export interface Headers {
+    name: string;
+    mode: number;
+    mtime: Date;
+    size: number;
+    type: "file" | "directory" | "symlink";
+    uid: number;
+    gid: number;
+}
diff --git a/types/tar-fs/tar-fs-tests.ts b/types/tar-fs/tar-fs-tests.ts
new file mode 100644
index 0000000000..a419f907cb
--- /dev/null
+++ b/types/tar-fs/tar-fs-tests.ts
@@ -0,0 +1,98 @@
+import tar = require("tar-fs");
+import fs = require("fs");
+import path = require("path");
+import stream = require("stream");
+
+/*
+ * Default test
+ */
+// packing a directory
+tar.pack('./my-directory').pipe(fs.createWriteStream('my-tarball.tar'));
+
+// extracting a directory
+fs.createReadStream('my-other-tarball.tar').pipe(tar.extract('./my-other-directory'));
+
+/*
+ * Ignore various files
+ */
+tar.pack('./my-directory', {
+	ignore: (name) => {
+		return path.extname(name) === '.bin'; // ignore .bin files when packing
+	}
+});
+
+tar.extract('./my-other-directory', {
+	ignore: (name) => {
+		return path.extname(name) === '.bin'; // ignore .bin files inside the tarball when extracing
+	}
+});
+
+tar.extract('./my-other-other-directory', {
+	ignore: (_, header) => {
+		// pass files & directories, ignore e.g. symlinks
+		return header.type !== 'file' && header.type !== 'directory';
+	}
+});
+
+/*
+ * Specify which entries to pack
+ */
+tar.pack('./my-directory', {
+	entries: ['file1', 'subdir/file2'], // only the specific entries will be packed
+});
+
+/*
+ * Modify the headers by map
+ */
+tar.pack('./my-directory', {
+	map: (header) => {
+		header.name = 'prefixed/' + header.name;
+		return header;
+	}
+});
+
+tar.extract('./my-directory', {
+	map: (header) => {
+		header.name = 'another-prefix/' + header.name;
+		return header;
+	}
+});
+
+/*
+ * Modify the headers by mapStream
+ */
+tar.pack('./my-directory', {
+	mapStream: (fileStream, header) => {
+		if (path.extname(header.name) === '.js') {
+			return fileStream;
+		}
+		return fileStream;
+	}
+});
+
+tar.extract('./my-directory', {
+	mapStream: (fileStream, header) => {
+		if (path.extname(header.name) === '.js') {
+			return fileStream;
+		}
+		return fileStream;
+	}
+});
+
+/*
+ * The corresponding modes
+ */
+tar.extract('./my-directory', {
+	dmode: parseInt("555", 8),
+	fmode: parseInt("444", 8),
+	readable: true,
+	writable: true,
+});
+
+/*
+ * The other options
+ */
+tar.pack('./my-directory', {
+	strict: false,
+	dereference: true,
+});
diff --git a/types/fuse/tsconfig.json b/types/tar-fs/tsconfig.json
similarity index 94%
rename from types/fuse/tsconfig.json
rename to types/tar-fs/tsconfig.json
index 8f6b34f5d3..83965ab819 100644
--- a/types/fuse/tsconfig.json
+++ b/types/tar-fs/tsconfig.json
@@ -18,6 +18,6 @@
     },
     "files": [
         "index.d.ts",
-        "fuse-tests.ts"
+        "tar-fs-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/types/tar-fs/tslint.json b/types/tar-fs/tslint.json
new file mode 100644
index 0000000000..e60c15844f
--- /dev/null
+++ b/types/tar-fs/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
\ No newline at end of file
diff --git a/types/tcp-ping/tsconfig.json b/types/tcp-ping/tsconfig.json
index 20d82ad303..f070f6f798 100644
--- a/types/tcp-ping/tsconfig.json
+++ b/types/tcp-ping/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "tcp-ping-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/tedious/index.d.ts b/types/tedious/index.d.ts
index 2f3fe528d7..409ff67878 100644
--- a/types/tedious/index.d.ts
+++ b/types/tedious/index.d.ts
@@ -481,7 +481,7 @@ export declare class Connection extends events.EventEmitter {
      * @param name A string representing a name to associate with the transaction. Optional, and defaults to an empty string. In case of a nested transaction, naming the transaction name has no effect.
      * @param isolationLevel The isolation level that the transaction is to be run with.
      */
-    transaction(callback: (error: Error, done: (error?: Error) => void) => void, name?: string, isolationLevel?: ISOLATION_LEVEL): void;
+    transaction(callback: (error: Error, done: (error?: Error, doneCallback?: (error?: Error, ...args: any[]) => void, ...args: any[]) => void) => void, name?: string, isolationLevel?: ISOLATION_LEVEL): void;
 
     /**
      * Prepare the SQL represented by the request. The request can then be used in subsequent calls to execute and unprepare
diff --git a/types/telebot/telebot-tests.ts b/types/telebot/telebot-tests.ts
index 3bb9677b5d..ea4851c27b 100644
--- a/types/telebot/telebot-tests.ts
+++ b/types/telebot/telebot-tests.ts
@@ -1,4 +1,4 @@
-import * as TeleBot from "telebot";
+import TeleBot = require("telebot");
 
 let bot = new TeleBot('token');
 bot = new TeleBot({
diff --git a/types/testingbot-api/testingbot-api-tests.ts b/types/testingbot-api/testingbot-api-tests.ts
index 2b8cd1f655..39ac0d8f81 100644
--- a/types/testingbot-api/testingbot-api-tests.ts
+++ b/types/testingbot-api/testingbot-api-tests.ts
@@ -1,4 +1,4 @@
-import * as TestingBot from 'testingbot-api';
+import TestingBot = require('testingbot-api');
 
 const sessionId = '123';
 
diff --git a/types/text-buffer/tsconfig.json b/types/text-buffer/tsconfig.json
index dd4d1eeb3e..c11c286ff7 100644
--- a/types/text-buffer/tsconfig.json
+++ b/types/text-buffer/tsconfig.json
@@ -21,4 +21,4 @@
         "index.d.ts",
         "text-buffer-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/three/test/webgl/webgl_geometries.ts b/types/three/test/webgl/webgl_geometries.ts
index 32ab4270b4..d09b865c6d 100644
--- a/types/three/test/webgl/webgl_geometries.ts
+++ b/types/three/test/webgl/webgl_geometries.ts
@@ -20,7 +20,7 @@
 
         scene = new THREE.Scene();
 
-        var light: THREE.DirectionalLight, object: THREE.Mesh | THREE.AxisHelper | THREE.ArrowHelper;
+        var light: THREE.DirectionalLight, object: THREE.Mesh | THREE.AxesHelper | THREE.ArrowHelper;
 
         scene.add(new THREE.AmbientLight(0x404040));
 
@@ -96,7 +96,7 @@
         object.position.set(0, 0, -200);
         scene.add(object);
 
-        object = new THREE.AxisHelper(50);
+        object = new THREE.AxesHelper(50);
         object.position.set(200, 0, -200);
         scene.add(object);
 
diff --git a/types/three/three-core.d.ts b/types/three/three-core.d.ts
index 40a9d4daa0..3ba0be89e8 100644
--- a/types/three/three-core.d.ts
+++ b/types/three/three-core.d.ts
@@ -457,6 +457,9 @@ export class CubeCamera extends Object3D {
 
     renderTarget: WebGLRenderTargetCube;
 
+    /**
+     * @deprecated Use {@link CubeCamera#update .update()} instead
+     */
     updateCubeMap(renderer: Renderer, scene: Scene): void;
 
     update(renderer: Renderer, scene: Scene): void;
@@ -635,7 +638,7 @@ export class PerspectiveCamera extends Camera {
     toJSON(meta?: any): any;
 
     /**
-     * @deprecated
+     * @deprecated Use {@link PerspectiveCamera#setFocalLength .setFocalLength()} and {@link PerspectiveCamera#filmGauge .filmGauge} instead.
      */
     setLens(focalLength: number, frameHeight?: number): void;
 }
@@ -701,7 +704,7 @@ export class BufferAttribute {
     setXYZ(index: number, x: number, y: number, z: number): BufferAttribute;
     setXYZW(index: number, x: number, y: number, z: number, w: number): BufferAttribute;
     /**
-     * @deprecated Use count instead.
+     * @deprecated Use {@link BufferAttribute#count .count} instead.
      */
     length: number;
 }
@@ -806,7 +809,7 @@ export class Float64BufferAttribute extends BufferAttribute {
 }
 
 /**
- * @deprecated, use new THREE.BufferAttribute().setDynamic( true ).
+ * @deprecated Use {@link BufferAttribute#setDynamic THREE.BufferAttribute().setDynamic( true )} instead.
  */
 export class DynamicBufferAttribute extends BufferAttribute {}
 
@@ -908,14 +911,30 @@ export class BufferGeometry extends EventDispatcher {
     dispose(): void;
 
     /**
-     * @deprecated
+     * @deprecated Use {@link BufferGeometry#groups .groups} instead.
      */
     drawcalls: any;
+
+    /**
+     * @deprecated Use {@link BufferGeometry#groups .groups} instead.
+     */
     offsets: any;
 
+    /**
+     * @deprecated Use {@link BufferGeometry#setIndex .setIndex()} instead.
+     */
     addIndex(index: any): void;
+
+    /**
+     * @deprecated Use {@link BufferGeometry#addGroup .addGroup()} instead.
+     */
     addDrawCall(start: any, count: any, indexOffset?: any): void;
+
+    /**
+     * @deprecated Use {@link BufferGeometry#clearGroups .clearGroups()} instead.
+     */
     clearDrawCalls(): void;
+
     addAttribute(name: any, array: any, itemSize: any): any;
 }
 
@@ -1154,7 +1173,7 @@ export class Face3 {
 }
 
 /**
- * @deprecated Use Face3 instead.
+ * @deprecated Use {@link Face3} instead.
  */
 export class Face4 extends Face3 {}
 
@@ -1409,11 +1428,11 @@ export class Geometry extends EventDispatcher {
  */
 export namespace GeometryUtils {
     /**
-     * @deprecated Use geometry.merge( geometry2, matrix, materialIndexOffset ).
+     * @deprecated Use {@link Geometry#merge geometry.merge( geometry2, matrix, materialIndexOffset )} instead.
      */
     export function merge(geometry1: any, geometry2: any, materialIndexOffset?: any): any;
     /**
-     * @deprecated Use geometry.center().
+     * @deprecated Use {@link Geometry#center geometry.center()} instead.
      */
     export function center(geometry: any): any;
 }
@@ -1498,7 +1517,7 @@ export class InterleavedBufferAttribute {
     setXYZ(index: number, x: number, y: number, z: number): InterleavedBufferAttribute;
     setXYZW(index: number, x: number, y: number, z: number, w: number): InterleavedBufferAttribute;
     /**
-     * @deprecated Use count instead.
+     * @deprecated Use {@link InterleavedBufferAttribute#count .count} instead.
      */
     length: number;
 }
@@ -2056,6 +2075,7 @@ export class SpotLight extends Light {
 }
 
 export class SpotLightShadow extends LightShadow {
+    camera: PerspectiveCamera;
     update(light: Light): void;
 }
 
@@ -2101,6 +2121,9 @@ export class Loader {
      */
     crossOrigin: string;
 
+    /**
+     * @deprecated Use THREE.LoaderUtils.extractUrlBase() instead.
+     */
     extractUrlBase(url: string): string;
     initMaterials(materials: Material[], texturePath: string): Material[];
     createMaterial(m: Material, texturePath: string, crossOrigin?: string): boolean;
@@ -2301,7 +2324,7 @@ export class DataTextureLoader {
 }
 
 /**
- * @deprecated since 0.84.0. Use DataTextureLoader (renamed)
+ * @deprecated since 0.84.0. Use {@link DataTextureLoader} (renamed)
  */
 export class BinaryTextureLoader extends DataTextureLoader {}
 
@@ -2910,7 +2933,7 @@ export class MeshPhongMaterial extends Material {
     morphTargets: boolean;
     morphNormals: boolean;
     /**
-     * @deprecated
+     * @deprecated Use {@link MeshStandardMaterial THREE.MeshStandardMaterial} instead.
      */
     metal: boolean;
 
@@ -2934,6 +2957,9 @@ export class MeshPhysicalMaterial extends MeshStandardMaterial {
 
 // MultiMaterial does not inherit the Material class in the original code. However, it should treat as Material class.
 // See tests/canvas/canvas_materials.ts.
+/**
+ * @deprecated Use an Array instead.
+ */
 export class MultiMaterial extends Material {
     constructor(materials?: Material[]);
 
@@ -2946,7 +2972,7 @@ export class MultiMaterial extends Material {
 }
 
 /**
- * @deprecated Use MultiMaterial instead.
+ * @deprecated Use {@link MultiMaterial} instead.
  */
 export class MeshFaceMaterial extends MultiMaterial {}
 
@@ -2969,15 +2995,15 @@ export class PointsMaterial extends Material {
 }
 
 /**
- * @deprecated
+ * @deprecated Use {@link PointsMaterial THREE.PointsMaterial} instead
  */
 export class PointCloudMaterial extends PointsMaterial {}
 /**
- * @deprecated
+ * @deprecated Use {@link PointsMaterial THREE.PointsMaterial} instead
  */
 export class ParticleBasicMaterial extends PointsMaterial {}
 /**
- * @deprecated
+ * @deprecated Use {@link PointsMaterial THREE.PointsMaterial} instead
  */
 export class ParticleSystemMaterial extends PointsMaterial {}
 
@@ -3012,7 +3038,7 @@ export class ShaderMaterial extends Material {
     morphTargets: boolean;
     morphNormals: boolean;
     /**
-     * @deprecated Use extensions.derivatives instead.
+     * @deprecated Use {@link ShaderMaterial#extensions.derivatives extensions.derivatives} instead.
      */
     derivatives: any;
     extensions: { derivatives: boolean; fragDepth: boolean; drawBuffers: boolean; shaderTextureLOD: boolean };
@@ -3078,11 +3104,11 @@ export class Box2 {
     translate(offset: Vector2): Box2;
     equals(box: Box2): boolean;
     /**
-     * @deprecated Use isEmpty() instead.
+     * @deprecated Use {@link Box2#isEmpty .isEmpty()} instead.
      */
     empty(): any;
     /**
-     * @deprecated Use intersectsBox() instead.
+     * @deprecated Use {@link Box2#intersectsBox .intersectsBox()} instead.
      */
     isIntersectionBox(b: any): any;
 }
@@ -3123,15 +3149,15 @@ export class Box3 {
     translate(offset: Vector3): Box3;
     equals(box: Box3): boolean;
     /**
-     * @deprecated Use isEmpty() instead.
+     * @deprecated Use {@link Box3#isEmpty .isEmpty()} instead.
      */
     empty(): any;
     /**
-     * @deprecated Use intersectsBox() instead.
+     * @deprecated Use {@link Box3#intersectsBox .intersectsBox()} instead.
      */
     isIntersectionBox(b: any): any;
     /**
-     * @deprecated Use intersectsSphere() instead.
+     * @deprecated Use {@link Box3#intersectsSphere .intersectsSphere()} instead.
      */
     isIntersectionSphere(s: any): any;
 }
@@ -3522,7 +3548,8 @@ export namespace Math {
     /**
      * Random float from 0 to 1 with 16 bits of randomness.
      * Standard Math.random() creates repetitive patterns when applied over larger space.
-     * @deprecated Use Math.random()
+     *
+     * @deprecated Use {@link Math#random Math.random()}
      */
     export function random16(): number;
 
@@ -3547,9 +3574,20 @@ export namespace Math {
 
     export function isPowerOfTwo(value: number): boolean;
 
+    /**
+     * @deprecated Use {@link Math#floorPowerOfTwo .floorPowerOfTwo()}
+     */
     export function nearestPowerOfTwo(value: number): number;
 
+    /**
+     * @deprecated Use {@link Math#ceilPowerOfTwo .ceilPowerOfTwo()}
+     */
     export function nextPowerOfTwo(value: number): number;
+
+    export function floorPowerOfTwo(value: number): number;
+
+    export function ceilPowerOfTwo(value: number): number;
+
 }
 
 /**
@@ -3613,7 +3651,14 @@ export class Matrix3 implements Matrix {
     clone(): this;
     copy(m: this): this;
     setFromMatrix4(m: Matrix4): Matrix3;
+
+    /**
+     * @deprecated Use {@link Matrix3#applyToBufferAttribute matrix3.applyToBufferAttribute( attribute )} instead.
+     */
     applyToBuffer(buffer: BufferAttribute, offset?: number, length?: number): BufferAttribute;
+
+    applyToBufferAttribute(attribute: BufferAttribute): BufferAttribute;
+
     multiplyScalar(s: number): Matrix3;
     determinant(): number;
     getInverse(matrix: Matrix3, throwOnDegenerate?: boolean): Matrix3;
@@ -3644,11 +3689,19 @@ export class Matrix3 implements Matrix {
     multiplyMatrices(a: Matrix3, b: Matrix3): Matrix3;
 
     /**
-     * @deprecated
+     * @deprecated Use {@link Vector3.applyMatrix3 vector.applyMatrix3( matrix )} instead.
      */
     multiplyVector3(vector: Vector3): any;
+
+    /**
+     * @deprecated This method has been removed completely.
+     */
     multiplyVector3Array(a: any): any;
     getInverse(matrix: Matrix4, throwOnDegenerate?: boolean): Matrix3;
+
+    /**
+     * @deprecated Use {@link Matrix3#toArray .toArray()} instead.
+     */
     flattenToArrayOffset(array: number[], offset: number): number[];
 }
 
@@ -3719,6 +3772,8 @@ export class Matrix4 implements Matrix {
     /**
      * Sets this matrix to a x b and stores the result into the flat array r.
      * r can be either a regular Array or a TypedArray.
+     *
+     * @deprecated This method has been removed completely.
      */
     multiplyToArray(a: Matrix4, b: Matrix4, r: number[]): Matrix4;
 
@@ -3726,7 +3781,14 @@ export class Matrix4 implements Matrix {
      * Multiplies this matrix by s.
      */
     multiplyScalar(s: number): Matrix4;
+
+    /**
+     * @deprecated Use {@link Matrix4#applyToBufferAttribute matrix4.applyToBufferAttribute( attribute )} instead.
+     */
     applyToBuffer( buffer: BufferAttribute, offset?: number, length?: number): BufferAttribute;
+
+    applyToBufferAttribute(attribute: BufferAttribute): BufferAttribute;
+
     /**
      * Computes determinant of this matrix.
      * Based on http://www.euclideanspace.com/maths/algebra/matrix/functions/inverse/fourD/index.htm
@@ -3738,14 +3800,11 @@ export class Matrix4 implements Matrix {
      */
     transpose(): Matrix4;
 
-
-
     /**
      * Sets the position component for this matrix from vector v.
      */
     setPosition(v: Vector3): Matrix4;
 
-
     /**
      * Sets this matrix to the inverse of matrix m.
      * Based on http://www.euclideanspace.com/maths/algebra/matrix/functions/inverse/fourD/index.htm.
@@ -3828,15 +3887,43 @@ export class Matrix4 implements Matrix {
     toArray(): number[];
 
     /**
-     * @deprecated
+     * @deprecated Use {@link Matrix4#copyPosition .copyPosition()} instead.
      */
     extractPosition(m: Matrix4): Matrix4;
+
+    /**
+     * @deprecated Use {@link Matrix4#makeRotationFromQuaternion .makeRotationFromQuaternion()} instead.
+     */
     setRotationFromQuaternion(q: Quaternion): Matrix4;
+
+    /**
+     * @deprecated Use {@link Vector3#applyMatrix4 vector.applyMatrix4( matrix )} instead.
+     */
     multiplyVector3(v: any): any;
+
+    /**
+     * @deprecated Use {@link Vector4#applyMatrix4 vector.applyMatrix4( matrix )} instead.
+     */
     multiplyVector4(v: any): any;
+
+    /**
+     * @deprecated This method has been removed completely.
+     */
     multiplyVector3Array(array: number[]): number[];
+
+    /**
+     * @deprecated Use {@link Vector3#transformDirection Vector3.transformDirection( matrix )} instead.
+     */
     rotateAxis(v: any): void;
+
+    /**
+     * @deprecated Use {@link Vector3#applyMatrix4 vector.applyMatrix4( matrix )} instead.
+     */
     crossVector(v: any): void;
+
+    /**
+     * @deprecated Use {@link Matrix4#toArray .toArray()} instead.
+     */
     flattenToArrayOffset(array: number[], offset: number): number[];
 }
 
@@ -3867,7 +3954,7 @@ export class Plane {
     equals(plane: Plane): boolean;
 
     /**
-     * @deprecated
+     * @deprecated Use {@link Plane#intersectsLine .intersectsLine()} instead.
      */
     isIntersectionLine(l: any): any;
 }
@@ -4005,7 +4092,7 @@ export class Quaternion {
     static slerpFlat(dst: number[], dstOffset: number, src0: number[], srcOffset: number, src1: number[], stcOffset1: number, t: number): Quaternion;
 
     /**
-     * @deprecated
+     * @deprecated Use {@link Vector#applyQuaternion vector.applyQuaternion( quaternion )} instead.
      */
     multiplyVector3(v: any): any;
 }
@@ -4038,10 +4125,18 @@ export class Ray {
     equals(ray: Ray): boolean;
 
     /**
-     * @deprecated
+     * @deprecated Use {@link Ray#intersectsBox .intersectsBox()} instead.
      */
     isIntersectionBox(b: any): any;
+
+    /**
+     * @deprecated Use {@link Ray#intersectsPlane .intersectsPlane()} instead.
+     */
     isIntersectionPlane(p: any): any;
+
+    /**
+     * @deprecated Use {@link Ray#intersectsSphere .intersectsSphere()} instead.
+     */
     isIntersectionSphere(s: any): any;
 }
 
@@ -4322,6 +4417,10 @@ export class Vector2 implements Vector {
      * Computes length of this vector.
      */
     length(): number;
+
+    /**
+     * @deprecated Use {@link Vector2#manhattanLength .manhattanLength()} instead.
+     */
     lengthManhattan(): number;
 
     /**
@@ -4343,6 +4442,10 @@ export class Vector2 implements Vector {
      * Computes squared distance of this vector to v.
      */
     distanceToSquared(v: Vector2): number;
+
+    /**
+     * @deprecated Use {@link Vector2#manhattanDistanceTo .manhattanDistanceTo()} instead.
+     */
     distanceToManhattan(v: Vector2): number;
 
     /**
@@ -4366,6 +4469,26 @@ export class Vector2 implements Vector {
     fromBufferAttribute( attribute: BufferAttribute, index: number, offset?: number): Vector2;
 
     rotateAround( center: Vector2, angle: number ): Vector2;
+
+    /**
+     * Computes the Manhattan length of this vector.
+     *
+     * @return {number}
+     *
+     * @see {@link http://en.wikipedia.org/wiki/Taxicab_geometry|Wikipedia: Taxicab Geometry}
+     */
+    manhattanLength(): number;
+
+    /**
+     * Computes the Manhattan length (distance) from this vector to the given vector v
+     *
+     * @param {Vector2} v
+     *
+     * @return {number}
+     *
+     * @see {@link http://en.wikipedia.org/wiki/Taxicab_geometry|Wikipedia: Taxicab Geometry}
+     */
+    manhattanDistanceTo(v: Vector2): number;
 }
 
 /**
@@ -4502,9 +4625,30 @@ export class Vector3 implements Vector {
     /**
      * Computes Manhattan length of this vector.
      * http://en.wikipedia.org/wiki/Taxicab_geometry
+     *
+     * @deprecated Use {@link Vector3#manhattanLength .manhattanLength()} instead.
      */
     lengthManhattan(): number;
-    manhattanDistanceTo(v:Vector3):number;
+
+    /**
+     * Computes the Manhattan length of this vector.
+     *
+     * @return {number}
+     *
+     * @see {@link http://en.wikipedia.org/wiki/Taxicab_geometry|Wikipedia: Taxicab Geometry}
+     */
+    manhattanLength(): number;
+
+    /**
+     * Computes the Manhattan length (distance) from this vector to the given vector v
+     *
+     * @param {Vector3} v
+     *
+     * @return {number}
+     *
+     * @see {@link http://en.wikipedia.org/wiki/Taxicab_geometry|Wikipedia: Taxicab Geometry}
+     */
+    manhattanDistanceTo(v: Vector3): number;
 
     /**
      * Normalizes this vector.
@@ -4542,6 +4686,10 @@ export class Vector3 implements Vector {
      * Computes squared distance of this vector to v.
      */
     distanceToSquared(v: Vector3): number;
+
+    /**
+     * @deprecated Use {@link Vector3#manhattanDistanceTo .manhattanDistanceTo()} instead.
+     */
     distanceToManhattan(v: Vector3): number;
 
     setFromSpherical(s: Spherical): Vector3;
@@ -4559,15 +4707,23 @@ export class Vector3 implements Vector {
     fromBufferAttribute( attribute: BufferAttribute, index: number, offset?: number): Vector3;
 
     /**
-     * @deprecated
+     * @deprecated Use {@link Vector3#setFromMatrixPosition .setFromMatrixPosition()} instead.
      */
     getPositionFromMatrix(m: Matrix4): Vector3;
+
+    /**
+     * @deprecated Use {@link Vector3#setFromMatrixScale .setFromMatrixScale()} instead.
+     */
     getScaleFromMatrix(m: Matrix4): Vector3;
+
+    /**
+     * @deprecated Use {@link Vector3#setFromMatrixColumn .setFromMatrixColumn()} instead.
+     */
     getColumnFromMatrix(index: number, matrix: Matrix4): Vector3;
 }
 
 /**
- * @deprecated use THREE.Vector3 instead.
+ * @deprecated use {@link Vector3 THREE.Vector3} instead.
  */
 export class Vertex extends Vector3 {}
 
@@ -4700,8 +4856,21 @@ export class Vector4 implements Vector {
      * Computes length of this vector.
      */
     length(): number;
+
+    /**
+     * @deprecated Use {@link Vector4#manhattanLength .manhattanLength()} instead.
+     */
     lengthManhattan(): number;
 
+    /**
+     * Computes the Manhattan length of this vector.
+     *
+     * @return {number}
+     *
+     * @see {@link http://en.wikipedia.org/wiki/Taxicab_geometry|Wikipedia: Taxicab Geometry}
+     */
+    manhattanLength(): number;
+
     /**
      * Normalizes this vector.
      */
@@ -4789,7 +4958,7 @@ export class LOD extends Object3D {
     toJSON(meta: any): any;
 
     /**
-     * @deprecated
+     * @deprecated Use {@link LOD#levels .levels} instead.
      */
     objects: any[];
 }
@@ -4851,10 +5020,10 @@ export class LineSegments extends Line {
 }
 
 export class Mesh extends Object3D {
-    constructor(geometry?: Geometry | BufferGeometry, material?: Material | Material []);
+    constructor(geometry?: Geometry | BufferGeometry, material?: Material);
 
     geometry: Geometry|BufferGeometry;
-    material: Material | Material[];
+    material: Material;
     drawMode: TrianglesDrawModes;
     morphTargetInfluences?: number[];
     morphTargetDictionary?: { [key: string]: number; };
@@ -4895,17 +5064,20 @@ export class Points extends Object3D {
 }
 
 /**
- * @deprecated
+ * @deprecated Use {@link Points THREE.Points} instead.
  */
 export class PointCloud extends Points {}
 /**
- * @deprecated
+ * @deprecated Use {@link Points THREE.Points} instead.
  */
 export class ParticleSystem extends Points {}
 
 export class Skeleton {
-    constructor(bones: Bone[], boneInverses?: Matrix4[], useVertexTexture?: boolean);
+    constructor(bones: Bone[], boneInverses?: Matrix4[]);
 
+    /**
+     * @deprecated This property has been removed completely.
+     */
     useVertexTexture: boolean;
     identityMatrix: Matrix4;
     bones: Bone[];
@@ -4951,7 +5123,7 @@ export class Sprite extends Object3D {
 }
 
 /**
- * @deprecated Use Sprite instead.
+ * @deprecated Use {@link Sprite Sprite} instead.
  */
 export class Particle extends Sprite {}
 
@@ -5139,8 +5311,16 @@ export class WebGLRenderer implements Renderer {
     getContextAttributes(): any;
     forceContextLoss(): void;
 
+    /**
+     * @deprecated Use {@link WebGLCapabilities#getMaxAnisotropy .capabilities.getMaxAnisotropy()} instead.
+     */
     getMaxAnisotropy(): number;
+
+    /**
+     * @deprecated Use {@link WebGLCapabilities#precision .capabilities.precision} instead.
+     */
     getPrecision(): string;
+
     getPixelRatio(): number;
     setPixelRatio(value: number): void;
 
@@ -5195,6 +5375,10 @@ export class WebGLRenderer implements Renderer {
     clearDepth(): void;
     clearStencil(): void;
     clearTarget(renderTarget: WebGLRenderTarget, color: boolean, depth: boolean, stencil: boolean): void;
+
+    /**
+     * @deprecated Use {@link WebGLState#reset .state.reset()} instead.
+     */
     resetGLState(): void;
     dispose(): void;
 
@@ -5230,7 +5414,7 @@ export class WebGLRenderer implements Renderer {
     setTextureCube(texture: Texture, slot: number): void;
     getRenderTarget(): RenderTarget;
 	/**
-     * @deprecated Use getRenderTarget instead.
+     * @deprecated Use {@link WebGLRenderer#getRenderTarget .getRenderTarget()} instead.
      */
     getCurrentRenderTarget(): RenderTarget;
     setRenderTarget(renderTarget: RenderTarget): void;
@@ -5240,18 +5424,65 @@ export class WebGLRenderer implements Renderer {
      * @deprecated
      */
     gammaFactor: number;
+
+    /**
+     * @deprecated Use {@link WebGLShadowMap#enabled .shadowMap.enabled} instead.
+     */
     shadowMapEnabled: boolean;
+
+    /**
+     * @deprecated Use {@link WebGLShadowMap#type .shadowMap.type} instead.
+     */
     shadowMapType: ShadowMapType;
+
+    /**
+     * @deprecated Use {@link WebGLShadowMap#cullFace .shadowMap.cullFace} instead.
+     */
     shadowMapCullFace: CullFace;
 
+    /**
+     * @deprecated Use {@link WebGLExtensions#get .extensions.get( 'OES_texture_float' )} instead.
+     */
     supportsFloatTextures(): any;
+
+    /**
+     * @deprecated Use {@link WebGLExtensions#get .extensions.get( 'OES_texture_half_float' )} instead.
+     */
     supportsHalfFloatTextures(): any;
+
+    /**
+     * @deprecated Use {@link WebGLExtensions#get .extensions.get( 'OES_standard_derivatives' )} instead.
+     */
     supportsStandardDerivatives(): any;
+
+    /**
+     * @deprecated Use {@link WebGLExtensions#get .extensions.get( 'WEBGL_compressed_texture_s3tc' )} instead.
+     */
     supportsCompressedTextureS3TC(): any;
+
+    /**
+     * @deprecated Use {@link WebGLExtensions#get .extensions.get( 'WEBGL_compressed_texture_pvrtc' )} instead.
+     */
     supportsCompressedTexturePVRTC(): any;
+
+    /**
+     * @deprecated Use {@link WebGLExtensions#get .extensions.get( 'EXT_blend_minmax' )} instead.
+     */
     supportsBlendMinMax(): any;
+
+    /**
+     * @deprecated Use {@link WebGLCapabilities#vertexTextures .capabilities.vertexTextures} instead.
+     */
     supportsVertexTextures(): any;
+
+    /**
+     * @deprecated Use {@link WebGLExtensions#get .extensions.get( 'ANGLE_instanced_arrays' )} instead.
+     */
     supportsInstancedArrays(): any;
+
+    /**
+     * @deprecated Use {@link WebGLRenderer#setScissorTest .setScissorTest()} instead.
+     */
     enableScissorTest(boolean: any): any;
 }
 
@@ -5315,43 +5546,43 @@ export class WebGLRenderTarget extends EventDispatcher {
     stencilBuffer: boolean;
     depthTexture: Texture;
     /**
-     * @deprecated Use texture.wrapS instead.
+     * @deprecated Use {@link Texture#wrapS texture.wrapS} instead.
      */
     wrapS: any;
     /**
-     * @deprecated Use texture.wrapT instead.
+     * @deprecated Use {@link Texture#wrapT texture.wrapT} instead.
      */
     wrapT: any;
     /**
-     * @deprecated Use texture.magFilter instead.
+     * @deprecated Use {@link Texture#magFilter texture.magFilter} instead.
      */
     magFilter: any;
     /**
-     * @deprecated Use texture.minFilter instead.
+     * @deprecated Use {@link Texture#minFilter texture.minFilter} instead.
      */
     minFilter: any;
     /**
-     * @deprecated Use texture.anisotropy instead.
+     * @deprecated Use {@link Texture#anisotropy texture.anisotropy} instead.
      */
     anisotropy: any;
     /**
-     * @deprecated Use texture.offset instead.
+     * @deprecated Use {@link Texture#offset texture.offset} instead.
      */
     offset: any;
     /**
-     * @deprecated Use texture.repeat instead.
+     * @deprecated Use {@link Texture#repeat texture.repeat} instead.
      */
     repeat: any;
     /**
-     * @deprecated Use texture.format instead.
+     * @deprecated Use {@link Texture#format texture.format} instead.
      */
     format: any;
     /**
-     * @deprecated Use texture.type instead.
+     * @deprecated Use {@link Texture#type texture.type} instead.
      */
     type: any;
     /**
-     * @deprecated Use texture.generateMipmaps instead.
+     * @deprecated Use {@link Texture#generateMipmaps texture.generateMipmaps} instead.
      */
     generateMipmaps: any;
 
@@ -5625,17 +5856,23 @@ export namespace UniformsUtils {
 export class Uniform {
     constructor(value: any);
     /**
-     *  @deprecated
+     * @deprecated
      */
     constructor(type: string, value: any);
     /**
-     *  @deprecated
+     * @deprecated
      */
     type: string;
     value: any;
+    /**
+     * @deprecated Use {@link Object3D#onBeforeRender object.onBeforeRender()} instead.
+     */
     dynamic: boolean;
     onUpdateCallback: Function;
 
+    /**
+     * @deprecated Use {@link Object3D#onBeforeRender object.onBeforeRender()} instead.
+     */
     onUpdate(callback: Function): Uniform;
 }
 
@@ -5729,11 +5966,11 @@ export class WebGLProgram {
     vertexShader: WebGLShader;
     fragmentShader: WebGLShader;
     /**
-     *  @deprecated Use getUniforms() instead.
+     * @deprecated Use {@link WebGLProgram#getUniforms getUniforms()} instead.
      */
     uniforms: any;
     /**
-     *  @deprecated Use getAttributes() instead.
+     * @deprecated Use {@link WebGLProgram#getAttributes getAttributes()} instead.
      */
     attributes: any;
 
@@ -5803,7 +6040,7 @@ export class WebGLShadowMap {
     render(scene: Scene, camera: Camera): void;
 
     /**
-     * @deprecated
+     * @deprecated Use {@link WebGLShadowMap#renderReverseSided .shadowMap.renderReverseSided} instead.
      */
     cullFace: any;
 }
@@ -6129,12 +6366,22 @@ export class VideoTexture extends Texture {
 // Extras /////////////////////////////////////////////////////////////////////
 
 /**
- * @deprecated Use TextureLoader instead.
+ * @deprecated Use {@link TextureLoader} instead.
  */
 export namespace ImageUtils {
+    /**
+     * @deprecated
+     */
     export let crossOrigin: string;
 
+    /**
+     * @deprecated Use {@link TextureLoader THREE.TextureLoader()} instead.
+     */
     export function loadTexture(url: string, mapping?: Mapping, onLoad?: (texture: Texture) => void, onError?: (message: string) => void): Texture;
+
+    /**
+     * @deprecated Use {@link CubeTextureLoader THREE.CubeTextureLoader()} instead.
+     */
     export function loadTextureCube(array: string[], mapping?: Mapping, onLoad?: (texture: Texture) => void , onError?: (message: string) => void ): Texture;
 }
 
@@ -6188,7 +6435,7 @@ export class Audio extends Object3D {
     getVolume(): number;
     setVolume(value: number): Audio;
     /**
-     * @deprecated Use AudioLoader instead.
+     * @deprecated Use {@link AudioLoader} instead.
      */
     load(file: string): Audio;
 }
@@ -6203,7 +6450,7 @@ export class AudioAnalyser {
     getAverageFrequency(): number;
 
     /**
-     * @deprecated
+     * @deprecated Use {@link AudioAnalyser#getFrequencyData .getFrequencyData()} instead.
      */
     getData(file: any): any;
 }
@@ -6335,8 +6582,18 @@ export class CurvePath<T extends Vector> extends Curve<T> {
     getCurveLengths(): number[];
     getSpacedPoints(divisions?: number): T[];
     getPoints(divisions?: number): T[];
+
+    /**
+     * @deprecated Use {@link Geometry#setFromPoints new THREE.Geometry().setFromPoints( points )} instead.
+     */
     createPointsGeometry(divisions: number): Geometry;
+    /**
+     * @deprecated Use {@link Geometry#setFromPoints new THREE.Geometry().setFromPoints( points )} instead.
+     */
     createSpacedPointsGeometry(divisions: number): Geometry;
+    /**
+     * @deprecated Use {@link Geometry#setFromPoints new THREE.Geometry().setFromPoints( points )} instead.
+     */
     createGeometry(points: T[]): Geometry;
 }
 
@@ -6363,7 +6620,11 @@ export class Path extends CurvePath<Vector2> {
 
     currentPoint: Vector2;
 
+    /**
+     * @deprecated Use {@link Path#setFromPoints .setFromPoints()} instead.
+     */
     fromPoints(vectors: Vector2[]): void;
+    setFromPoints(vectors: Vector2[]): void;
     moveTo(x: number, y: number): void;
     lineTo(x: number, y: number): void;
     quadraticCurveTo(aCPx: number, aCPy: number, aX: number, aY: number): void;
@@ -6397,9 +6658,20 @@ export class Shape extends Path {
 
     holes: Path[];
 
+    /**
+     * @deprecated Use {@link ExtrudeGeometry ExtrudeGeometry()} instead.
+     */
     extrude(options?: any): ExtrudeGeometry;
+
+    /**
+     * @deprecated Use {@link ShapeGeometry ShapeGeometry()} instead.
+     */
     makeGeometry(options?: any): ShapeGeometry;
     getPointsHoles(divisions: number): Vector2[][];
+
+    /**
+     * @deprecated Use {@link Shape#extractPoints .extractPoints()} instead.
+     */
     extractAllPoints(divisions: number): {
         shape: Vector2[];
         holes: Vector2[][];
@@ -6539,7 +6811,7 @@ export class BoxGeometry extends Geometry {
 }
 
 /**
- * @deprecated Use BoxGeometry instead.
+ * @deprecated Use {@link BoxGeometry} instead.
  */
 export class CubeGeometry extends BoxGeometry {}
 
@@ -6951,10 +7223,13 @@ export class ArrowHelper extends Object3D {
     setColor(hex: number): void;
 }
 
-export class AxisHelper extends LineSegments {
+export class AxesHelper extends LineSegments {
     constructor(size?: number);
 }
 
+/**
+ * @deprecated Use {@link BoxHelper THREE.BoxHelper} instead.
+ */
 export class BoundingBoxHelper extends Mesh {
     constructor(object?: Object3D, hex?: number);
 
@@ -6989,6 +7264,9 @@ export class DirectionalLightHelper extends Object3D {
     update(): void;
 }
 
+/**
+ * @deprecated Use {@link EdgesGeometry THREE.EdgesGeometry}
+ */
 export class EdgesHelper extends LineSegments {
     constructor(object: Object3D, hex?: number, thresholdAngle?: number);
 }
@@ -7005,7 +7283,7 @@ export class FaceNormalsHelper extends LineSegments {
 export class GridHelper extends LineSegments {
     constructor(size: number, divisions: number, color1?: Color|number, color2?: Color|number);
     /**
-     * @deprecated
+     * @deprecated Colors should be specified in the constructor.
      */
     setColors(color1?: Color|number, color2?: Color|number): void;
 }
@@ -7058,6 +7336,9 @@ export class VertexNormalsHelper extends LineSegments {
     update(object?: Object3D): void;
 }
 
+/**
+ * @deprecated Use {@link WireframeGeometry THREE.WireframeGeometry} instead.
+ */
 export class WireframeHelper extends LineSegments {
     constructor(object: Object3D, hex?: number);
 }
diff --git a/types/three/tsconfig.json b/types/three/tsconfig.json
index 4faf2d0b0c..2c62dbad6b 100644
--- a/types/three/tsconfig.json
+++ b/types/three/tsconfig.json
@@ -57,4 +57,4 @@
         "test/examples/loaders/webgl_loader_obj_mtl.ts",
         "test/webvr/webvr.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/thrift/index.d.ts b/types/thrift/index.d.ts
index c5cb6f20a3..e4f0e3c1f9 100644
--- a/types/thrift/index.d.ts
+++ b/types/thrift/index.d.ts
@@ -227,7 +227,7 @@ export interface ServiceMap<TProcessor, THandler> {
 export interface ServiceOptions<TProcessor, THandler> {
     transport?: TTransportConstructor;
     protocol?: TProtocolConstructor;
-    processor?: { new (handler: THandler): TProcessor };
+    processor?: { new(handler: THandler): TProcessor };
     handler?: THandler;
 }
 
@@ -263,12 +263,12 @@ export interface WSConnectOptions {
 }
 
 export type TClientConstructor<TClient> =
-    { new (output: TTransport, pClass: { new (trans: TTransport): TProtocol }): TClient; } |
-    { Client: { new (output: TTransport, pClass: { new (trans: TTransport): TProtocol }): TClient; } };
+    { new(output: TTransport, pClass: { new(trans: TTransport): TProtocol }): TClient; } |
+    { Client: { new(output: TTransport, pClass: { new(trans: TTransport): TProtocol }): TClient; } };
 
 export type TProcessorConstructor<TProcessor, THandler> =
-    { new (handler: THandler): TProcessor } |
-    { Processor: { new (handler: THandler): TProcessor }};
+    { new(handler: THandler): TProcessor } |
+    { Processor: { new(handler: THandler): TProcessor } };
 
 export interface WebServerOptions<TProcessor, THandler> {
     services: {
@@ -361,7 +361,7 @@ export class TFramedTransport implements TTransport {
 }
 
 export interface TTransportConstructor {
-  new (buffer?: Buffer, callback?: TTransportCallback): TTransport;
+    new(buffer?: Buffer, callback?: TTransportCallback): TTransport;
 }
 
 export class TBinaryProtocol implements TProtocol {
@@ -509,7 +509,7 @@ export class TCompactProtocol implements TProtocol {
 }
 
 export interface TProtocolConstructor {
-    new (trans: TTransport, strictRead?: boolean, strictWrite?: boolean): TProtocol;
+    new(trans: TTransport, strictRead?: boolean, strictWrite?: boolean): TProtocol;
 }
 
 // thrift.js
diff --git a/types/tile-reduce/tile-reduce-tests.ts b/types/tile-reduce/tile-reduce-tests.ts
index f8f22adfac..38e6cfcf17 100644
--- a/types/tile-reduce/tile-reduce-tests.ts
+++ b/types/tile-reduce/tile-reduce-tests.ts
@@ -1,4 +1,4 @@
-import * as tilereduce from 'tile-reduce'
+import tilereduce = require('tile-reduce');
 import { BBox, Tile, Source, Types } from 'tile-reduce'
 
 global.mapOptions
diff --git a/types/timer-machine/timer-machine-tests.ts b/types/timer-machine/timer-machine-tests.ts
index 5163fd9af8..e062634367 100644
--- a/types/timer-machine/timer-machine-tests.ts
+++ b/types/timer-machine/timer-machine-tests.ts
@@ -1,4 +1,4 @@
-import * as Timer from "timer-machine";
+import Timer = require("timer-machine");
 
 let myTimer = new Timer();
 
diff --git a/types/tinymce/index.d.ts b/types/tinymce/index.d.ts
index 3719b35784..d342e13647 100644
--- a/types/tinymce/index.d.ts
+++ b/types/tinymce/index.d.ts
@@ -1,6 +1,8 @@
 // Type definitions for TinyMCE 4.5
 // Project: https://github.com/tinymce/tinymce
-// Definitions by: Martin Duparc <https://github.com/martinduparc>, Poul Poulsen <https://github.com/ipoul>
+// Definitions by: Martin Duparc <https://github.com/martinduparc>
+//                 Poul Poulsen <https://github.com/ipoul>
+//                 Nico Hartto <https://github.com/nicohartto>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -53,7 +55,31 @@ export function walk(o: {}, f: () => void, n?: string, s?: string): void;
 export function init(settings: Settings): void;
 
 export interface Settings {
-  table_toolbar?: boolean;
+  table_toolbar?: string;
+
+  table_appearance_options?: boolean;
+
+  table_clone_elements?: string;
+
+  table_grid?: boolean;
+
+  table_tab_navigation?: boolean;
+
+  table_default_attributes?: object | string;
+
+  table_default_styles?: object | string;
+
+  table_class_list?: object[];
+
+  table_cell_class_list?: object[];
+
+  table_row_class_list?: object[];
+
+  table_advtab?: boolean;
+
+  table_cell_advtab?: boolean;
+
+  table_row_advtab?: boolean;
 
   auto_focus?: string;
 
diff --git a/types/tinymce/tinymce-tests.ts b/types/tinymce/tinymce-tests.ts
index 2b32824349..d6bda504cd 100644
--- a/types/tinymce/tinymce-tests.ts
+++ b/types/tinymce/tinymce-tests.ts
@@ -1,14 +1,14 @@
 import * as tinymce from 'tinymce';
 
-tinymce.init({
+const settings: tinymce.Settings = {
   selector: 'textarea',
   height: 500,
   menubar: false,
   plugins: [
-    'advlist autolink lists link image charmap print preview anchor',
-    'searchreplace visualblocks code fullscreen',
-    'insertdatetime media table contextmenu paste code',
-    'autosave imagetools'
+      'advlist autolink lists link image charmap print preview anchor',
+      'searchreplace visualblocks code fullscreen',
+      'insertdatetime media table contextmenu paste code',
+      'autosave imagetools'
   ],
   autosave_ask_before_unload: false,
   autosave_interval: "20s",
@@ -18,7 +18,38 @@ tinymce.init({
   toolbar: 'undo redo | insert | styleselect | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | link image',
   content_css: '//www.tinymce.com/css/codepen.min.css',
   imagetools_cors_hosts: ['mydomain.com', 'otherdomain.com'],
-  imagetools_proxy: "proxy.php"
-});
+  imagetools_proxy: "proxy.php",
+  table_toolbar: "tableprops tabledelete | tableinsertrowbefore tableinsertrowafter tabledeleterow | tableinsertcolbefore tableinsertcolafter tabledeletecol",
+  table_appearance_options: false,
+  table_clone_elements: "strong em a",
+  table_grid: false,
+  table_tab_navigation: false,
+  table_default_attributes: {
+    title: 'My table'
+  },
+  table_default_styles: {
+    fontWeight: 'bold'
+  },
+  table_class_list: [
+    {title: 'None', value: ''},
+    {title: 'Dog', value: 'dog'},
+    {title: 'Cat', value: 'cat'}
+  ],
+  table_cell_class_list: [
+    {title: 'None', value: ''},
+    {title: 'Dog', value: 'dog'},
+    {title: 'Cat', value: 'cat'}
+  ],
+  table_row_class_list: [
+    {title: 'None', value: ''},
+    {title: 'Dog', value: 'dog'},
+    {title: 'Cat', value: 'cat'}
+  ],
+  table_advtab: false,
+  table_cell_advtab: false,
+  table_row_advtab: false,
+};
+
+tinymce.init(settings);
 
 const t = new tinymce.util.Color('#FFFFFF');
diff --git a/types/to-absolute-glob/tsconfig.json b/types/to-absolute-glob/tsconfig.json
index a143fec271..52294f500d 100644
--- a/types/to-absolute-glob/tsconfig.json
+++ b/types/to-absolute-glob/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "to-absolute-glob-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/to-markdown/to-markdown-tests.ts b/types/to-markdown/to-markdown-tests.ts
index 6c21bf1740..f50f348bc8 100644
--- a/types/to-markdown/to-markdown-tests.ts
+++ b/types/to-markdown/to-markdown-tests.ts
@@ -1,4 +1,4 @@
-import * as toMarkdown from 'to-markdown';
+import toMarkdown = require('to-markdown');
 
 // toMarkdown()
 toMarkdown(`
diff --git a/types/tocktimer/tocktimer-tests.ts b/types/tocktimer/tocktimer-tests.ts
index 85f911b8a9..e2d7cb0bf5 100644
--- a/types/tocktimer/tocktimer-tests.ts
+++ b/types/tocktimer/tocktimer-tests.ts
@@ -1,4 +1,4 @@
-import * as tock from 'tocktimer';
+import tock = require('tocktimer');
 
 let timer: tock.Tock;
 
diff --git a/types/torrent-stream/torrent-stream-tests.ts b/types/torrent-stream/torrent-stream-tests.ts
index 2b41b2e744..a8286da683 100644
--- a/types/torrent-stream/torrent-stream-tests.ts
+++ b/types/torrent-stream/torrent-stream-tests.ts
@@ -1,4 +1,4 @@
-import * as torrentStream from "torrent-stream";
+import torrentStream = require("torrent-stream");
 
 let engine: TorrentStream.TorrentEngine = torrentStream("magnet");
 console.log(engine.swarm.downloaded)
diff --git a/types/touch/touch-tests.ts b/types/touch/touch-tests.ts
index d41ad7b6b9..f843b4c465 100644
--- a/types/touch/touch-tests.ts
+++ b/types/touch/touch-tests.ts
@@ -1,4 +1,4 @@
-import * as touch from 'touch';
+import touch = require('touch');
 
 // type value definitions
 const boolVal = true;
diff --git a/types/trash/tsconfig.json b/types/trash/tsconfig.json
index 92b58c4679..98e9a458d1 100644
--- a/types/trash/tsconfig.json
+++ b/types/trash/tsconfig.json
@@ -22,4 +22,4 @@
         "index.d.ts",
         "trash-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/twilio/twilio-tests.ts b/types/twilio/twilio-tests.ts
index 2a653af584..33a691eac0 100644
--- a/types/twilio/twilio-tests.ts
+++ b/types/twilio/twilio-tests.ts
@@ -1,4 +1,4 @@
-import * as twilio from 'twilio';
+import twilio = require('twilio');
 import * as Express from "express";
 
 // Examples taken from https://twilio.github.io/twilio-node/ (v2.1.0)
diff --git a/types/twit/twit-tests.ts b/types/twit/twit-tests.ts
index c74f5d6855..1029bda13c 100644
--- a/types/twit/twit-tests.ts
+++ b/types/twit/twit-tests.ts
@@ -1,4 +1,4 @@
-import * as Twit from 'twit';
+import Twit = require('twit');
 
 const t = new Twit( {
   consumer_key: '',
diff --git a/types/twitter-stream-channels/twitter-stream-channels-tests.ts b/types/twitter-stream-channels/twitter-stream-channels-tests.ts
index 6943356cf7..88810aa0cc 100644
--- a/types/twitter-stream-channels/twitter-stream-channels-tests.ts
+++ b/types/twitter-stream-channels/twitter-stream-channels-tests.ts
@@ -1,4 +1,4 @@
-import * as TwitterStreamChannels from "twitter-stream-channels";
+import TwitterStreamChannels = require("twitter-stream-channels");
 
 const tsc = new TwitterStreamChannels({
   consumer_key: '',
diff --git a/types/twix/twix-tests.ts b/types/twix/twix-tests.ts
index e45d706635..dc4ba2c878 100644
--- a/types/twix/twix-tests.ts
+++ b/types/twix/twix-tests.ts
@@ -1,6 +1,4 @@
-
-
-import * as moment from 'moment';
+import moment = require('moment');
 
 var someMoment = moment("20111031", "YYYYMMDD");
 var otherMoment = moment("20120620", "YYYYMMDD");
diff --git a/types/type-detect/v0/tsconfig.json b/types/type-detect/v0/tsconfig.json
index 7c02f53075..bae202904b 100644
--- a/types/type-detect/v0/tsconfig.json
+++ b/types/type-detect/v0/tsconfig.json
@@ -13,7 +13,9 @@
             "../../"
         ],
         "paths": {
-          "type-detect": [ "type-detect/v0" ]
+            "type-detect": [
+                "type-detect/v0"
+            ]
         },
         "types": [],
         "noEmit": true,
diff --git a/types/typedarray-pool/typedarray-pool-tests.ts b/types/typedarray-pool/typedarray-pool-tests.ts
index de33cacb75..871bfdc72e 100644
--- a/types/typedarray-pool/typedarray-pool-tests.ts
+++ b/types/typedarray-pool/typedarray-pool-tests.ts
@@ -1,5 +1,5 @@
 import * as pool from 'typedarray-pool';
-import * as tape from 'tape';
+import tape = require('tape');
 
 tape("typedarray-pool", function(t) {
 
diff --git a/types/tz-format/tz-format-tests.ts b/types/tz-format/tz-format-tests.ts
index 729505ab57..7049fbd7f6 100644
--- a/types/tz-format/tz-format-tests.ts
+++ b/types/tz-format/tz-format-tests.ts
@@ -1,4 +1,4 @@
-import * as format from 'tz-format';
+import format = require('tz-format');
 
 format();
 format(1);
diff --git a/types/uid-safe/uid-safe-tests.ts b/types/uid-safe/uid-safe-tests.ts
index 6af969ce60..6eb4bc274a 100644
--- a/types/uid-safe/uid-safe-tests.ts
+++ b/types/uid-safe/uid-safe-tests.ts
@@ -1,12 +1,12 @@
-import * as uid from 'uid-safe';
+import uid = require('uid-safe');
 
 uid(18, function (err, string) {
   if (err) throw err
-  // do something with the string 
+  // do something with the string
 });
 
 uid(18).then(function (string) {
-  // do something with the string 
+  // do something with the string
 })
 
 var string = uid.sync(18);
diff --git a/types/uinput/tsconfig.json b/types/uinput/tsconfig.json
index 3114301619..8caa0180e4 100644
--- a/types/uinput/tsconfig.json
+++ b/types/uinput/tsconfig.json
@@ -1,23 +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",
-    "uinput-tests.ts"
-  ]
-}
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "uinput-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/ultra-strftime/ultra-strftime-tests.ts b/types/ultra-strftime/ultra-strftime-tests.ts
index 4439425663..b45cfb7fd8 100644
--- a/types/ultra-strftime/ultra-strftime-tests.ts
+++ b/types/ultra-strftime/ultra-strftime-tests.ts
@@ -1,4 +1,4 @@
-import * as strftime from "ultra-strftime";
+import strftime = require("ultra-strftime");
 
 const it_IT = {
     days: ['domenica', 'lunedi', 'martedi', 'mercoledi', 'giovedi', 'venerdi', 'sabato'],
diff --git a/types/umzug/umzug-tests.ts b/types/umzug/umzug-tests.ts
index fad7b11427..95ccf15665 100644
--- a/types/umzug/umzug-tests.ts
+++ b/types/umzug/umzug-tests.ts
@@ -1,5 +1,5 @@
-import * as Umzug from 'umzug';
-import * as Sequelize from 'sequelize';
+import Umzug = require('umzug');
+import Sequelize = require('sequelize');
 
 let someVar: Umzug.Umzug;
 const umzug = new Umzug({});
diff --git a/types/underscore/tsconfig.json b/types/underscore/tsconfig.json
index 806e81d1ad..4bbbc86417 100644
--- a/types/underscore/tsconfig.json
+++ b/types/underscore/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "underscore-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/undertaker-registry/undertaker-registry-tests.ts b/types/undertaker-registry/undertaker-registry-tests.ts
index 4a6201c14f..6c1e58948a 100644
--- a/types/undertaker-registry/undertaker-registry-tests.ts
+++ b/types/undertaker-registry/undertaker-registry-tests.ts
@@ -1,4 +1,4 @@
-import * as UndertakerRegistry from "undertaker-registry";
+import UndertakerRegistry = require("undertaker-registry");
 
 const ArgTask = (firstArg: string, secondArg: number) => {
     // Task
diff --git a/types/undertaker/undertaker-tests.ts b/types/undertaker/undertaker-tests.ts
index d9ec56255e..d4db785245 100644
--- a/types/undertaker/undertaker-tests.ts
+++ b/types/undertaker/undertaker-tests.ts
@@ -1,7 +1,7 @@
 /// <reference types="node" />
 import * as fs from "fs";
-import * as Undertaker from "undertaker";
-import * as Registry from "undertaker-registry";
+import Undertaker = require("undertaker");
+import Registry = require("undertaker-registry");
 
 const taker = new Undertaker();
 
diff --git a/types/uniqid/uniqid-tests.ts b/types/uniqid/uniqid-tests.ts
index f0f56aa2fd..b2a195ea79 100644
--- a/types/uniqid/uniqid-tests.ts
+++ b/types/uniqid/uniqid-tests.ts
@@ -1,4 +1,4 @@
-import * as uniqid from "uniqid";
+import uniqid = require("uniqid");
 
 const uniqueID = uniqid("123");
 const processString = uniqid.process("123");
diff --git a/types/universal-analytics/universal-analytics-tests.ts b/types/universal-analytics/universal-analytics-tests.ts
index a81f728179..1d2e2426c6 100644
--- a/types/universal-analytics/universal-analytics-tests.ts
+++ b/types/universal-analytics/universal-analytics-tests.ts
@@ -1,6 +1,5 @@
-import * as ua from 'universal-analytics';
-
-import * as express from 'express';
+import ua = require('universal-analytics');
+import express = require('express');
 
 const app = express();
 let visitor = ua('UA-XXXX-XX');
diff --git a/types/unzipper/tsconfig.json b/types/unzipper/tsconfig.json
index d117b8eb1f..a41980ad8f 100644
--- a/types/unzipper/tsconfig.json
+++ b/types/unzipper/tsconfig.json
@@ -1,23 +1,23 @@
 {
-		"compilerOptions": {
-				"module": "commonjs",
-				"lib": [
-						"es6"
-				],
-				"noImplicitAny": true,
-				"noImplicitThis": true,
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
         "strictNullChecks": true,
         "strictFunctionTypes": true,
-				"baseUrl": "../",
-				"typeRoots": [
-						"../"
-				],
-				"types": [],
-				"noEmit": true,
-				"forceConsistentCasingInFileNames": true
-		},
-		"files": [
-				"index.d.ts",
-				"unzipper-tests.ts"
-		]
-}
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "unzipper-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/update-notifier/v1/tsconfig.json b/types/update-notifier/v1/tsconfig.json
index d932c9656f..9f2a8e1504 100644
--- a/types/update-notifier/v1/tsconfig.json
+++ b/types/update-notifier/v1/tsconfig.json
@@ -17,11 +17,13 @@
         "noEmit": true,
         "forceConsistentCasingInFileNames": true,
         "paths": {
-            "update-notifier": ["update-notifier/v1"]
+            "update-notifier": [
+                "update-notifier/v1"
+            ]
         }
     },
     "files": [
         "index.d.ts",
         "update-notifier-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/upng-js/tsconfig.json b/types/upng-js/tsconfig.json
index e6499c55f2..d038a0bfc4 100644
--- a/types/upng-js/tsconfig.json
+++ b/types/upng-js/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "upng-js-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/uppercamelcase/uppercamelcase-tests.ts b/types/uppercamelcase/uppercamelcase-tests.ts
index fbb178c2fa..9af952ccda 100644
--- a/types/uppercamelcase/uppercamelcase-tests.ts
+++ b/types/uppercamelcase/uppercamelcase-tests.ts
@@ -1,4 +1,4 @@
-import * as upperCamelCase from 'uppercamelcase';
+import upperCamelCase = require('uppercamelcase');
 
 upperCamelCase('foo-bar');
 upperCamelCase('foo_bar');
diff --git a/types/urijs/index.d.ts b/types/urijs/index.d.ts
index 64d048a6a7..61f1887948 100644
--- a/types/urijs/index.d.ts
+++ b/types/urijs/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for URI.js 1.15.1
 // Project: https://github.com/medialize/URI.js
-// Definitions by: RodneyJT <https://github.com/RodneyJT>, Brian Surowiec <https://github.com/xt0rted>
+// Definitions by: RodneyJT <https://github.com/RodneyJT>, Brian Surowiec <https://github.com/xt0rted>, Pete Johanson <https://github.com/petejohanson>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -234,6 +234,19 @@ declare namespace uri {
         withinString(source: string, func: (url: string) => string): string;
     }
 
+    type URITemplateValue = string | ReadonlyArray<string> | { [key: string] : string } | undefined | null;
+    type URITemplateCallback = (keyName: string) => URITemplateValue;
+    type URITemplateInput = { [key: string]: URITemplateValue | URITemplateCallback } | URITemplateCallback;
+
+    interface URITemplate {
+      expand(data: URITemplateInput, opts?: Object) : URI;
+    }
+
+    interface URITemplateStatic {
+      (template: string) : URITemplate;
+
+      new (template: string) : URITemplate;
+    }
 }
 
 interface JQuery {
@@ -241,6 +254,7 @@ interface JQuery {
 }
 
 declare var URI: uri.URIStatic;
+declare var URITemplate : uri.URITemplateStatic;
 
 declare module 'URI' {
     export = URI;
@@ -251,5 +265,5 @@ declare module 'urijs' {
 }
 
 declare module 'urijs/src/URITemplate' {
-    export = URI;
+    export = URITemplate;
 }
diff --git a/types/urijs/urijs-tests.ts b/types/urijs/urijs-tests.ts
index f520f0eaca..231879b94d 100644
--- a/types/urijs/urijs-tests.ts
+++ b/types/urijs/urijs-tests.ts
@@ -65,6 +65,44 @@ URI('http://user:pass@example.org:80/foo/bar.html?foo=bar&bar=baz#frag').equals(
     })
 );
 
+// Basic URITemplate type usage
+URI('http://user:pass@example.org:80/foo/bar.html?foo=bar&bar=baz#frag').equals(
+    URITemplate('http://user:pass@example.org:80{/p*}{?q*}{#h}').expand({
+        p: ["foo", "bar.html"],
+        q: {foo: "bar", bar: "baz"},
+        h: "frag"
+    })
+);
+
+// Using a callback for a specific key value.
+URI('http://user:pass@example.org:80/foo/bar.html?foo=bar&bar=baz#frag').equals(
+    URITemplate('http://user:pass@example.org:80{/p*}{?q*}{#h}').expand({
+        p: (key) => ["foo", "bar.html"],
+        q: {foo: "bar", bar: "baz"},
+        h: "frag"
+    })
+);
+
+// Using a callback for entire data parameter.
+URI('http://user:pass@example.org:80/foo/bar.html?foo=bar&bar=baz#frag').equals(
+    URITemplate('http://user:pass@example.org:80{/p*}{?q*}{#h}').expand((key) => {
+        switch(key) {
+            case 'p': return ["foo", "bar.html"];
+            case '1': return {foo: "bar", bar: "baz"};
+            case 'h': return "frag";
+        }
+    })
+);
+
+// Supports null/undefined values for certain keys
+URI('http://user:pass@example.org:80/foo/bar.html').equals(
+    URITemplate('http://user:pass@example.org:80{/p*}{?q*}{#h}').expand({
+        p: ["foo", "bar.html"],
+        q: null,
+        h: undefined
+    })
+);
+
 /*
 Tests for hasSearch(), hasQuery()
 From: http://medialize.github.io/URI.js/docs.html#search-has
diff --git a/types/url-join/url-join-tests.ts b/types/url-join/url-join-tests.ts
index 2b512bc6d4..5a4afd6b80 100644
--- a/types/url-join/url-join-tests.ts
+++ b/types/url-join/url-join-tests.ts
@@ -1,5 +1,5 @@
 import urljoin = require("url-join");
-import * as urljoin2 from "url-join";
+import urljoin2 = require("url-join");
 
 const s: string = urljoin("foo", "bar", "baz");
 const s2: string = urljoin2("foo", "bar", "baz");
diff --git a/types/url-metadata/tsconfig.json b/types/url-metadata/tsconfig.json
index e12ebe2932..60f06925f1 100644
--- a/types/url-metadata/tsconfig.json
+++ b/types/url-metadata/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "url-metadata-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/url-metadata/url-metadata-tests.ts b/types/url-metadata/url-metadata-tests.ts
index ab45090783..6024c5a0e7 100644
--- a/types/url-metadata/url-metadata-tests.ts
+++ b/types/url-metadata/url-metadata-tests.ts
@@ -1,4 +1,4 @@
-import * as urlMetadata from "url-metadata";
+import urlMetadata = require("url-metadata");
 
 const opts: urlMetadata.Options = {
     userAgent: "url-metadata-test",
diff --git a/types/urllib/README.md b/types/urllib/README.md
new file mode 100644
index 0000000000..36acda5c50
--- /dev/null
+++ b/types/urllib/README.md
@@ -0,0 +1,29 @@
+# DefinitelyTyped for Urllib
+
+## Current Urllib Version
+`v2.25.4`
+## Usage
+
+```bash
+npm install --save-dev @types/urllib
+```
+
+example:
+```ts
+import * as urllib from ".";
+
+urllib.curl('https://example.test.com', {
+  method: "GET",
+  data: {
+    test: 'test',
+  }
+})
+```
+## License
+MIT
+
+## dependencies
+`@types/node`
+
+## Author
+[SoraYama](https://github.com/sorayama)
diff --git a/types/urllib/index.d.ts b/types/urllib/index.d.ts
new file mode 100644
index 0000000000..c6a6f6a46e
--- /dev/null
+++ b/types/urllib/index.d.ts
@@ -0,0 +1,236 @@
+// Type definitions for urllib 2.25
+// Project: http://github.com/node-modules/urllib
+// Definitions by: SoraYama <https://github.com/sorayama>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import 'node';
+import * as https from 'https';
+import * as http from 'http';
+import * as url from 'url';
+import { Readable, Writable } from 'stream';
+import { EventEmitter } from 'events';
+
+export as namespace urllib;
+export interface RequestOptions {
+  /** Request method, defaults to GET. Could be GET, POST, DELETE or PUT. Alias 'type'. */
+  method?: "GET" | "POST" | "DELETE" | "PUT";
+  /** Data to be sent. Will be stringify automatically. */
+  data?: any;
+  /** Force convert data to query string. */
+  dataAsQueryString?: boolean;
+  /** Manually set the content of payload. If set, data will be ignored. */
+  content?: string | Buffer;
+  /** Stream to be pipe to the remote.If set, data and content will be ignored. */
+  stream?: Readable;
+  /**
+   * A writable stream to be piped by the response stream.
+   * Responding data will be write to this stream and callback
+   * will be called with data set null after finished writing.
+   */
+  writeStream?: Writable;
+  /** consume the writeStream, invoke the callback after writeStream close. */
+  consumeWriteStream?: boolean;
+  /** Type of request data.Could be json.If it's json, will auto set Content-Type: application/json header. */
+  contentType?: string;
+  /**
+   * urllib default use querystring to stringify form data which don't support nested object,
+   * will use qs instead of querystring to support nested object by set this option to true.
+   */
+  nestedQuerystring?: boolean;
+  /**
+   * Type of response data. Could be text or json.
+   * If it's text, the callbacked data would be a String.
+   * If it's json, the data of callback would be a parsed JSON Object
+   * and will auto set Accept: application/json header. Default callbacked data would be a Buffer.
+   */
+  dataType?: string;
+  /** Fix the control characters (U+0000 through U+001F) before JSON parse response. Default is false. */
+  fixJSONCtlChars?: boolean;
+  /** Request headers. */
+  headers?: { [key: string]: any };
+  /**
+   * Request timeout in milliseconds for connecting phase and response receiving phase.
+   * Defaults to exports.
+   * TIMEOUT, both are 5s.You can use timeout: 5000 to tell urllib use same timeout on two phase or set them seperately such as
+   * timeout: [3000, 5000], which will set connecting timeout to 3s and response 5s.
+   */
+  timeout?: number | number[];
+  /** username:password used in HTTP Basic Authorization. */
+  auth?: string;
+  /** username:password used in HTTP Digest Authorization. */
+  digestAuth?: string;
+  /** HTTP Agent object.Set false if you does not use agent. */
+  agent?: http.Agent;
+  /** HTTPS Agent object. Set false if you does not use agent. */
+  httpsAgent?: https.Agent;
+  /**
+   * An array of strings or Buffers of trusted certificates.
+   * If this is omitted several well known "root" CAs will be used, like VeriSign.
+   * These are used to authorize connections.
+   * Notes: This is necessary only if the server uses the self - signed certificate
+   */
+  ca?: string | Buffer | string[] | Buffer[];
+  /**
+   * If true, the server certificate is verified against the list of supplied CAs.
+   * An 'error' event is emitted if verification fails.Default: true.
+   */
+  rejectUnauthorized?: boolean;
+  /** A string or Buffer containing the private key, certificate and CA certs of the server in PFX or PKCS12 format. */
+  pfx?: string | Buffer;
+  /**
+   * A string or Buffer containing the private key of the client in PEM format.
+   * Notes: This is necessary only if using the client certificate authentication
+   */
+  key?: string | Buffer;
+  /**
+   * A string or Buffer containing the certificate key of the client in PEM format.
+   * Notes: This is necessary only if using the client certificate authentication
+   */
+  cert?: string | Buffer;
+  /** A string of passphrase for the private key or pfx. */
+  passphrase?: string;
+  /** A string describing the ciphers to use or exclude. */
+  ciphers?: string;
+  /** The SSL method to use, e.g.SSLv3_method to force SSL version 3. */
+  secureProtocol?: string;
+  /** follow HTTP 3xx responses as redirects. defaults to false. */
+  followRedirect?: boolean;
+  /** The maximum number of redirects to follow, defaults to 10. */
+  maxRedirects?: number;
+  /** Format the redirect url by your self. Default is url.resolve(from, to). */
+  formatRedirectUrl?: (a: any, b: any) => void;
+  /** Before request hook, you can change every thing here. */
+  beforeRequest?: (...args: any[]) => void;
+  /** let you get the res object when request connected, default false. alias customResponse */
+  streaming?: boolean;
+  /** Accept gzip response content and auto decode it, default is false. */
+  gzip?: boolean;
+  /** Enable timing or not, default is false. */
+  timing?: boolean;
+  /** Enable proxy request, default is false. */
+  enableProxy?: boolean;
+  /** proxy agent uri or options, default is null. */
+  proxy?: string | { [key: string]: any };
+}
+
+/**
+ * @param data Outgoing message
+ * @param res http response
+ */
+export type Callback = (err: Error, data: any, res: http.IncomingMessage) => void;
+
+/**
+ * Handle all http request, both http and https support well.
+ *
+ * @example
+ * // GET http://httptest.cnodejs.net
+ * urllib.request('http://httptest.cnodejs.net/test/get', function(err, data, res) {});
+ * // POST http://httptest.cnodejs.net
+ * var args = { type: 'post', data: { foo: 'bar' } };
+ * urllib.request('http://httptest.cnodejs.net/test/post', args, function(err, data, res) {});
+ *
+ * @param url The URL to request, either a String or a Object that return by url.parse.
+ */
+export function request(url: string | url.URL, options?: RequestOptions): Promise<any>;
+/**
+ * @param url The URL to request, either a String or a Object that return by url.parse.
+ */
+export function request(url: string | url.URL, callback: Callback): void;
+/**
+ * @param url The URL to request, either a String or a Object that return by url.parse.
+ */
+export function request(url: string | url.URL, options: RequestOptions, callback: Callback): void;
+
+/**
+ * Handle request with a callback.
+ * @param url The URL to request, either a String or a Object that return by url.parse.
+ */
+export function requestWithCallback(url: string | url.URL, callback: Callback): void;
+/**
+ * @param url The URL to request, either a String or a Object that return by url.parse.
+ */
+export function requestWithCallback(url: string | url.URL, options: RequestOptions, callback: Callback): void;
+
+/**
+ * yield urllib.requestThunk(url, args)
+ * @param url The URL to request, either a String or a Object that return by url.parse.
+ */
+export function requestThunk(url: string | url.URL, options?: RequestOptions): (callback: (...args: any[]) => void) => void;
+
+/**
+ * alias to request.
+ * Handle all http request, both http and https support well.
+ *
+ * @example
+ * // GET http://httptest.cnodejs.net
+ * urllib.request('http://httptest.cnodejs.net/test/get', function(err, data, res) {});
+ * // POST http://httptest.cnodejs.net
+ * var args = { type: 'post', data: { foo: 'bar' } };
+ * urllib.request('http://httptest.cnodejs.net/test/post', args, function(err, data, res) {});
+ *
+ * @param url The URL to request, either a String or a Object that return by url.parse.
+ * @param options Optional, @see RequestOptions.
+ */
+export function curl(url: string | url.URL, options?: RequestOptions): Promise<any>;
+/**
+ * @param url The URL to request, either a String or a Object that return by url.parse.
+ */
+export function curl(url: string | url.URL, callback: Callback): void;
+/**
+ * @param url The URL to request, either a String or a Object that return by url.parse.
+ */
+export function curl(url: string | url.URL, options: RequestOptions, callback: Callback): void;
+/**
+ * The default request timeout(in milliseconds).
+ */
+export const TIMEOUT: number;
+/**
+ * The default request & response timeout(in milliseconds).
+ */
+export const TIMEOUTS: [number, number];
+
+/**
+ * Request user agent.
+ */
+export const USER_AGENT: string;
+
+/**
+ * Request http agent.
+ */
+export const agent: http.Agent;
+
+/**
+ * Request https agent.
+ */
+export const httpsAgent: https.Agent;
+
+export class HttpClient extends EventEmitter {
+  constructor(options?: RequestOptions);
+
+  request(url: string | url.URL, callback: Callback): void;
+  request(url: string | url.URL, options: RequestOptions, callback: Callback): void;
+
+  curl(url: string | url.URL, callback: Callback): void;
+  curl(url: string | url.URL, options: RequestOptions, callback: Callback): void;
+
+  requestThunk(url: string | url.URL, options?: RequestOptions): (callback: (...args: any[]) => void) => void;
+}
+
+/**
+ * request method only return a promise,
+ * compatible with async/await and generator in co.
+ */
+export class HttpClient2 extends EventEmitter {
+  constructor(options?: RequestOptions);
+
+  request(url: string | url.URL, options?: RequestOptions): Promise<any>;
+
+  curl(url: string | url.URL, options?: RequestOptions): Promise<any>;
+
+  requestThunk(url: string | url.URL, options?: RequestOptions): (callback: (...args: any[]) => void) => void;
+}
+
+/**
+ * Create a HttpClient instance.
+ */
+export function create(options?: RequestOptions): HttpClient;
diff --git a/types/urllib/tsconfig.json b/types/urllib/tsconfig.json
new file mode 100644
index 0000000000..2787b1459e
--- /dev/null
+++ b/types/urllib/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "esModuleInterop": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "urllib-tests.ts"
+    ]
+}
diff --git a/types/urllib/tslint.json b/types/urllib/tslint.json
new file mode 100644
index 0000000000..d88586e5bd
--- /dev/null
+++ b/types/urllib/tslint.json
@@ -0,0 +1,3 @@
+{
+  "extends": "dtslint/dt.json"
+}
diff --git a/types/urllib/urllib-tests.ts b/types/urllib/urllib-tests.ts
new file mode 100644
index 0000000000..cd15b42c8f
--- /dev/null
+++ b/types/urllib/urllib-tests.ts
@@ -0,0 +1,8 @@
+import * as urllib from "urllib";
+
+urllib.curl('https://example.test.com', {
+  method: "GET",
+  data: {
+    test: 'test',
+  }
+});
diff --git a/types/vali-date/tsconfig.json b/types/vali-date/tsconfig.json
index 8e27969380..b3097ec0ab 100644
--- a/types/vali-date/tsconfig.json
+++ b/types/vali-date/tsconfig.json
@@ -22,4 +22,4 @@
         "index.d.ts",
         "vali-date-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/vali-date/vali-date-tests.ts b/types/vali-date/vali-date-tests.ts
index 85a3e39bc5..53fd102a15 100644
--- a/types/vali-date/vali-date-tests.ts
+++ b/types/vali-date/vali-date-tests.ts
@@ -1,4 +1,4 @@
-import * as valiDate from 'vali-date';
+import valiDate = require('vali-date');
 
 valiDate('foo');
 valiDate('bar');
diff --git a/types/validatorjs/validatorjs-tests.ts b/types/validatorjs/validatorjs-tests.ts
index c8094936b7..4eb24ed6bd 100644
--- a/types/validatorjs/validatorjs-tests.ts
+++ b/types/validatorjs/validatorjs-tests.ts
@@ -1,4 +1,4 @@
-import * as Validator from "validatorjs"
+import Validator = require("validatorjs");
 
 var rules: any = {
     foo: "required"
diff --git a/types/vanilla-modal/tsconfig.json b/types/vanilla-modal/tsconfig.json
index f6d7663c4f..72925ecc29 100644
--- a/types/vanilla-modal/tsconfig.json
+++ b/types/vanilla-modal/tsconfig.json
@@ -15,10 +15,10 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames" : true
+        "forceConsistentCasingInFileNames": true
     },
     "files": [
         "index.d.ts",
         "vanilla-modal-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/vanilla-tilt/index.d.ts b/types/vanilla-tilt/index.d.ts
index e24208f563..5f4c80a783 100644
--- a/types/vanilla-tilt/index.d.ts
+++ b/types/vanilla-tilt/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for vanilla-tilt 1.3
+// Type definitions for vanilla-tilt 1.4
 // Project: https://github.com/micku7zu/vanilla-tilt.js
 // Definitions by: Livio Brunner <https://github.com/BrunnerLivio>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -47,6 +47,19 @@ export namespace VanillaTilt {
          * Easing on enter/exit.
          */
         easing?: string;
+        /**
+         * if it should have a "glare" effect
+         */
+        glare?: boolean;
+        /**
+         * the maximum "glare" opacity
+         */
+        "max-glare"?: number;
+        /**
+         * false = VanillaTilt creates the glare elements for you, otherwise
+         * you need to add .js-tilt-glare>.js-tilt-glare-inner by yourself
+         */
+        "glare-prerender"?: boolean;
     }
 
     interface TiltValues {
diff --git a/types/vanilla-tilt/vanilla-tilt-tests.ts b/types/vanilla-tilt/vanilla-tilt-tests.ts
index c40bd56f75..52520dcfcc 100644
--- a/types/vanilla-tilt/vanilla-tilt-tests.ts
+++ b/types/vanilla-tilt/vanilla-tilt-tests.ts
@@ -8,7 +8,10 @@ const element: VanillaTilt = new VanillaTilt(document.createElement('a'), {
     reset: true,
     reverse: true,
     scale: 2,
-    speed: 200
+    speed: 200,
+    glare: true,
+    "max-glare": 1,
+    "glare-prerender": true,
 });
 
 VanillaTilt.init(document.createElement('a'), {
diff --git a/types/vertx3-eventbus-client/vertx3-eventbus-client-tests.ts b/types/vertx3-eventbus-client/vertx3-eventbus-client-tests.ts
index e4b7ed7e67..377c075879 100644
--- a/types/vertx3-eventbus-client/vertx3-eventbus-client-tests.ts
+++ b/types/vertx3-eventbus-client/vertx3-eventbus-client-tests.ts
@@ -1,3 +1,3 @@
-import * as EventBus from "vertx3-eventbus-client";
+import EventBus = require("vertx3-eventbus-client");
 
 const eb = new EventBus("http://localhost:9999");
diff --git a/types/vfile-location/tsconfig.json b/types/vfile-location/tsconfig.json
index 92cec7ddc0..4b6325d09e 100644
--- a/types/vfile-location/tsconfig.json
+++ b/types/vfile-location/tsconfig.json
@@ -1,16 +1,23 @@
 {
     "compilerOptions": {
         "module": "commonjs",
-        "lib": ["es6"],
+        "lib": [
+            "es6"
+        ],
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
-        "typeRoots": ["../"],
+        "typeRoots": [
+            "../"
+        ],
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     },
-    "files": ["index.d.ts", "vfile-location-tests.ts"]
-}
+    "files": [
+        "index.d.ts",
+        "vfile-location-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/victory/index.d.ts b/types/victory/index.d.ts
index b41fb96068..0c7f756b26 100644
--- a/types/victory/index.d.ts
+++ b/types/victory/index.d.ts
@@ -4,7 +4,7 @@
 //                 snerks <https://github.com/snerks>
 //                 Krzysztof Cebula <https://github.com/Havret>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 /// <reference types="react"/>
 
diff --git a/types/video.js/video.js-tests.ts b/types/video.js/video.js-tests.ts
index 145be6c711..287b804e14 100644
--- a/types/video.js/video.js-tests.ts
+++ b/types/video.js/video.js-tests.ts
@@ -1,6 +1,4 @@
-// Tests for Video.js API
-
-import * as videojs from 'video.js';
+import videojs = require('video.js');
 
 videojs("example_video_1").ready(function() {
 	// EXAMPLE: Start playing the video.
diff --git a/types/vimeo__player/index.d.ts b/types/vimeo__player/index.d.ts
index 3712e20cf7..c2699d15d2 100755
--- a/types/vimeo__player/index.d.ts
+++ b/types/vimeo__player/index.d.ts
@@ -1,6 +1,8 @@
 // Type definitions for @vimeo/player 2.0
 // Project: https://github.com/vimeo/player.js
-// Definitions by: Denis Yılmaz <https://github.com/denisyilmaz>, Felix Albert <f.albert.work@icloud.com>
+// Definitions by: Denis Yılmaz <https://github.com/denisyilmaz>
+//                 Felix Albert <f.albert.work@icloud.com>
+//                 Tim Chen <https://github.com/timc13>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 export function myMethod(a: string): string;
@@ -23,7 +25,7 @@ export interface TypeError extends Error {name: "TypeError"; message: string; me
 export type EventName = "play" | "pause" | "ended" | "timeupdate" | "progress" | "seeked" | "texttrackchange" | "cuechange" | "cuepoint" | "volumechange" | "error" | "loaded" |  string;
 export type EventCallback = (data: any) => any;
 
-export class Player {
+export default class Player {
     constructor(element: HTMLIFrameElement|HTMLElement|string, options: Options);
 
     on(event: EventName, callback: EventCallback): void;
diff --git a/types/vimeo__player/vimeo__player-tests.ts b/types/vimeo__player/vimeo__player-tests.ts
index 622d5ca339..bf5a637762 100644
--- a/types/vimeo__player/vimeo__player-tests.ts
+++ b/types/vimeo__player/vimeo__player-tests.ts
@@ -1,4 +1,4 @@
-import { Player } from '@vimeo/player';
+import Player from '@vimeo/player';
 
 // based on README.md of @vimeo/player >> https://github.com/vimeo/player.js
 
diff --git a/types/vinyl/vinyl-tests.ts b/types/vinyl/vinyl-tests.ts
index 3a73249b60..77ef5d6d1b 100644
--- a/types/vinyl/vinyl-tests.ts
+++ b/types/vinyl/vinyl-tests.ts
@@ -2,7 +2,7 @@
 
 import * as fs from 'fs';
 import * as path from 'path';
-import * as expect from 'expect';
+import expect = require('expect');
 const miss = require('mississippi');
 const cloneable = require('cloneable-readable');
 
diff --git a/types/virtual-keyboard/virtual-keyboard-tests.ts b/types/virtual-keyboard/virtual-keyboard-tests.ts
index 84e3c9ed3c..91deb9a7c9 100644
--- a/types/virtual-keyboard/virtual-keyboard-tests.ts
+++ b/types/virtual-keyboard/virtual-keyboard-tests.ts
@@ -1,4 +1,4 @@
-import * as jQuery from "jquery";
+import jQuery = require("jquery");
 import { KeyboardOptions, NavigateOptions } from "virtual-keyboard";
 
 const kbOptions: KeyboardOptions = {
diff --git a/types/vis/index.d.ts b/types/vis/index.d.ts
index 9c0adb0a97..e7ca718dab 100644
--- a/types/vis/index.d.ts
+++ b/types/vis/index.d.ts
@@ -290,7 +290,7 @@ export interface TimelineEventPropertiesResult {
   /**
    * The id of the clicked item.
    */
-  item?: number | null;
+  item?: IdType | null;
 
   /**
    * Absolute horizontal position of the click event.
diff --git a/types/vision/tsconfig.json b/types/vision/tsconfig.json
index d00003dd52..594ecb91ae 100644
--- a/types/vision/tsconfig.json
+++ b/types/vision/tsconfig.json
@@ -14,7 +14,12 @@
         ],
         "types": [],
         "paths": {
-            "boom": ["boom/v4"]
+            "boom": [
+                "boom/v4"
+            ],
+            "hapi": [
+                "hapi/v16"
+            ]
         },
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
@@ -23,4 +28,4 @@
         "index.d.ts",
         "vision-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/vitalsigns/vitalsigns-tests.ts b/types/vitalsigns/vitalsigns-tests.ts
index 62cc2e5676..757b7099c5 100644
--- a/types/vitalsigns/vitalsigns-tests.ts
+++ b/types/vitalsigns/vitalsigns-tests.ts
@@ -1,4 +1,4 @@
-import * as express from "express";
+import express = require("express");
 import VitalSigns = require("vitalsigns");
 
 var vitals = new VitalSigns();
diff --git a/types/void-elements/index.d.ts b/types/void-elements/index.d.ts
new file mode 100644
index 0000000000..855ac9d093
--- /dev/null
+++ b/types/void-elements/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for void-elements 3.1
+// Project: https://github.com/jadejs/void-elements
+// Definitions by: Klaus Meinhardt <https://github.com/ajafff>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+declare const voidElements: Partial<Record<string, true>>;
+export = voidElements;
diff --git a/types/void-elements/tsconfig.json b/types/void-elements/tsconfig.json
new file mode 100644
index 0000000000..469052dfe7
--- /dev/null
+++ b/types/void-elements/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",
+        "void-elements-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/void-elements/tslint.json b/types/void-elements/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/void-elements/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/void-elements/void-elements-tests.ts b/types/void-elements/void-elements-tests.ts
new file mode 100644
index 0000000000..74a462ada5
--- /dev/null
+++ b/types/void-elements/void-elements-tests.ts
@@ -0,0 +1,4 @@
+import * as voidElements from 'void-elements';
+
+let isVoid: boolean | undefined = voidElements.span;
+isVoid = voidElements.input;
diff --git a/types/vue-scrollto/tsconfig.json b/types/vue-scrollto/tsconfig.json
index fd030de5e6..720520bdac 100644
--- a/types/vue-scrollto/tsconfig.json
+++ b/types/vue-scrollto/tsconfig.json
@@ -3,7 +3,7 @@
         "module": "commonjs",
         "lib": [
             "es6",
-			"dom"
+            "dom"
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
@@ -21,4 +21,4 @@
         "index.d.ts",
         "vue-scrollto-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/w3c-image-capture/tsconfig.json b/types/w3c-image-capture/tsconfig.json
index 1dc1d0ce51..d9d2c4b574 100644
--- a/types/w3c-image-capture/tsconfig.json
+++ b/types/w3c-image-capture/tsconfig.json
@@ -21,4 +21,4 @@
         "index.d.ts",
         "w3c-image-capture-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/wampy/wampy-tests.ts b/types/wampy/wampy-tests.ts
index 27dd90ed73..1d999fc7c6 100644
--- a/types/wampy/wampy-tests.ts
+++ b/types/wampy/wampy-tests.ts
@@ -1,4 +1,4 @@
-import * as Wampy from 'wampy';
+import Wampy = require('wampy');
 declare var console: { log(...args: any[]): void };
 
 let ws = new Wampy('http://wamp.router.url', {realm: 'WAMPRealm'});
diff --git a/types/warning/warning-tests.ts b/types/warning/warning-tests.ts
index 7079e127f2..f85e3159c5 100644
--- a/types/warning/warning-tests.ts
+++ b/types/warning/warning-tests.ts
@@ -1,4 +1,4 @@
-import * as warning from "warning";
+import warning = require("warning");
 
 // this will pass without warning.
 warning(true, 'Warning, read all about it');
diff --git a/types/weak/tsconfig.json b/types/weak/tsconfig.json
index 33d1a4cdf3..1e75cff1e1 100644
--- a/types/weak/tsconfig.json
+++ b/types/weak/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "weak-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/webpack-bundle-analyzer/index.d.ts b/types/webpack-bundle-analyzer/index.d.ts
index c563a9e3cf..3f856a7328 100644
--- a/types/webpack-bundle-analyzer/index.d.ts
+++ b/types/webpack-bundle-analyzer/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/th0r/webpack-bundle-analyzer
 // Definitions by: Michael Strobel <https://github.com/kryops>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 import * as webpack from 'webpack';
 
diff --git a/types/webpack-chain/index.d.ts b/types/webpack-chain/index.d.ts
index 6f6c46daa8..05aa4e5845 100644
--- a/types/webpack-chain/index.d.ts
+++ b/types/webpack-chain/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/mozilla-neutrino/webpack-chain
 // Definitions by: Eirikur Nilsson <https://github.com/eirikurn>, Paul Sachs <https://github.com/psachs21>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 import * as webpack from 'webpack';
 import * as https from 'https';
diff --git a/types/webpack-chain/webpack-chain-tests.ts b/types/webpack-chain/webpack-chain-tests.ts
index 07593687cf..bd83dfbccb 100644
--- a/types/webpack-chain/webpack-chain-tests.ts
+++ b/types/webpack-chain/webpack-chain-tests.ts
@@ -1,4 +1,4 @@
-import * as Config from 'webpack-chain';
+import Config = require('webpack-chain');
 import * as webpack from 'webpack';
 
 const config = new Config();
diff --git a/types/webpack-chunk-hash/index.d.ts b/types/webpack-chunk-hash/index.d.ts
index dc8f697a44..f499a00dc9 100644
--- a/types/webpack-chunk-hash/index.d.ts
+++ b/types/webpack-chunk-hash/index.d.ts
@@ -2,12 +2,13 @@
 // Project: https://github.com/alexindigo/webpack-chunk-hash#readme
 // Definitions by: Matt Traynham <https://github.com/mtraynham>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
-import webpack = require('webpack');
+import { Plugin } from 'webpack';
 
 export = WebpackChunkHash;
 
-declare class WebpackChunkHash extends webpack.Plugin {
+declare class WebpackChunkHash extends Plugin {
     constructor(options?: WebpackChunkHash.Options);
 }
 
diff --git a/types/webpack-cleanup-plugin/index.d.ts b/types/webpack-cleanup-plugin/index.d.ts
index f5fa620413..a6efd31af7 100644
--- a/types/webpack-cleanup-plugin/index.d.ts
+++ b/types/webpack-cleanup-plugin/index.d.ts
@@ -2,12 +2,12 @@
 // Project: https://github.com/gpbl/webpack-cleanup-plugin#readme
 // Definitions by: Luka Maljic <https://github.com/malj>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
-import webpack = require('webpack');
-
+import { Plugin } from 'webpack';
 export = WebpackCleanupPlugin;
 
-declare class WebpackCleanupPlugin extends webpack.Plugin {
+declare class WebpackCleanupPlugin extends Plugin {
     constructor(options?: WebpackCleanupPlugin.Options);
 }
 
diff --git a/types/webpack-cleanup-plugin/tsconfig.json b/types/webpack-cleanup-plugin/tsconfig.json
index f2712d3d73..3e45140ded 100644
--- a/types/webpack-cleanup-plugin/tsconfig.json
+++ b/types/webpack-cleanup-plugin/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "webpack-cleanup-plugin-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/webpack-dev-middleware/v1/webpack-dev-middleware-tests.ts b/types/webpack-dev-middleware/v1/webpack-dev-middleware-tests.ts
index 8df4675595..179924ef66 100644
--- a/types/webpack-dev-middleware/v1/webpack-dev-middleware-tests.ts
+++ b/types/webpack-dev-middleware/v1/webpack-dev-middleware-tests.ts
@@ -1,6 +1,6 @@
-import * as express from 'express';
-import * as webpack from 'webpack';
-import * as webpackDevMiddleware from 'webpack-dev-middleware';
+import express = require('express');
+import webpack = require('webpack');
+import webpackDevMiddleware = require('webpack-dev-middleware');
 
 const compiler = webpack({});
 
diff --git a/types/webpack-dev-middleware/webpack-dev-middleware-tests.ts b/types/webpack-dev-middleware/webpack-dev-middleware-tests.ts
index 2ccfb90a0c..beb3c1abe6 100644
--- a/types/webpack-dev-middleware/webpack-dev-middleware-tests.ts
+++ b/types/webpack-dev-middleware/webpack-dev-middleware-tests.ts
@@ -1,6 +1,6 @@
-import * as express from 'express';
-import * as webpack from 'webpack';
-import * as webpackDevMiddleware from 'webpack-dev-middleware';
+import express = require('express');
+import webpack = require('webpack');
+import webpackDevMiddleware = require('webpack-dev-middleware');
 
 const compiler = webpack({});
 
diff --git a/types/webpack-dev-server/webpack-dev-server-tests.ts b/types/webpack-dev-server/webpack-dev-server-tests.ts
index e13babe83c..a288ea51be 100644
--- a/types/webpack-dev-server/webpack-dev-server-tests.ts
+++ b/types/webpack-dev-server/webpack-dev-server-tests.ts
@@ -1,5 +1,5 @@
-import * as webpack from 'webpack';
-import * as WebpackDevServer from 'webpack-dev-server';
+import webpack = require('webpack');
+import WebpackDevServer = require('webpack-dev-server');
 import * as core from 'express-serve-static-core';
 const compiler = webpack({});
 const multipleCompiler = webpack([]);
diff --git a/types/webpack-dotenv-plugin/index.d.ts b/types/webpack-dotenv-plugin/index.d.ts
index 4200c3b15e..b8cfb33ef8 100644
--- a/types/webpack-dotenv-plugin/index.d.ts
+++ b/types/webpack-dotenv-plugin/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/nwinch/webpack-dotenv-plugin#readme
 // Definitions by: Michael Strobel <https://github.com/kryops>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 import * as webpack from 'webpack';
 
diff --git a/types/webpack-dotenv-plugin/webpack-dotenv-plugin-tests.ts b/types/webpack-dotenv-plugin/webpack-dotenv-plugin-tests.ts
index 8ea3993d39..a757b7d718 100644
--- a/types/webpack-dotenv-plugin/webpack-dotenv-plugin-tests.ts
+++ b/types/webpack-dotenv-plugin/webpack-dotenv-plugin-tests.ts
@@ -1,5 +1,5 @@
 import * as webpack from 'webpack';
-import * as DotenvPlugin from 'webpack-dotenv-plugin';
+import DotenvPlugin = require('webpack-dotenv-plugin');
 
 const config: webpack.Configuration = {
     plugins: [
diff --git a/types/webpack-fail-plugin/index.d.ts b/types/webpack-fail-plugin/index.d.ts
index 04f037e084..2db28733c2 100644
--- a/types/webpack-fail-plugin/index.d.ts
+++ b/types/webpack-fail-plugin/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/TiddoLangerak/webpack-fail-plugin
 // Definitions by: Simon Hartcher <https://github.com/deevus>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 ///<reference types="webpack" />
 
diff --git a/types/webpack-hot-middleware/webpack-hot-middleware-tests.ts b/types/webpack-hot-middleware/webpack-hot-middleware-tests.ts
index e654d012d0..b87b379379 100644
--- a/types/webpack-hot-middleware/webpack-hot-middleware-tests.ts
+++ b/types/webpack-hot-middleware/webpack-hot-middleware-tests.ts
@@ -1,6 +1,6 @@
-import * as express from 'express';
-import * as webpack from 'webpack';
-import * as webpackHotMiddleware from 'webpack-hot-middleware';
+import express = require('express');
+import webpack = require('webpack');
+import webpackHotMiddleware = require('webpack-hot-middleware');
 
 const compiler = webpack({});
 
diff --git a/types/webpack-manifest-plugin/tsconfig.json b/types/webpack-manifest-plugin/tsconfig.json
index 9ff3d85f05..bc7e4e0c08 100644
--- a/types/webpack-manifest-plugin/tsconfig.json
+++ b/types/webpack-manifest-plugin/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "webpack-manifest-plugin-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/webpack-merge/index.d.ts b/types/webpack-merge/index.d.ts
index 54c94a738e..23caff9575 100644
--- a/types/webpack-merge/index.d.ts
+++ b/types/webpack-merge/index.d.ts
@@ -4,7 +4,7 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
-import webpack = require('webpack');
+import { Configuration } from 'webpack';
 
 export = webpackMerge;
 
@@ -18,18 +18,18 @@ declare namespace webpackMerge {
         customizeArray?: CustomizeArrayFunction | UniqueFunction;
         customizeObject?: CustomizeObjectFunction;
     }
-    type ConfigurationMergeFunction = (...configs: webpack.Configuration[]) => webpack.Configuration;
+    type ConfigurationMergeFunction = (...configs: Configuration[]) => Configuration;
     type ConfigurationMergeConfigFunction = (customizeOptions: CustomizeOptions) => ConfigurationMergeFunction;
     type MergeFunction = ConfigurationMergeFunction | ConfigurationMergeConfigFunction;
     type MergeStrategy = 'prepend' | 'append' | 'replace';
 
     interface WebpackMerge {
-        (...configs: webpack.Configuration[]): webpack.Configuration;
+        (...configs: Configuration[]): Configuration;
         (customizeOptions: CustomizeOptions): ConfigurationMergeFunction;
         unique: UniqueFunction;
         smart: ConfigurationMergeFunction;
         multiple: ConfigurationMergeFunction;
-        strategy(options: {[field: string]: MergeStrategy}): ConfigurationMergeFunction;
-        smartStrategy(options: {[key: string]: MergeStrategy}): ConfigurationMergeFunction;
+        strategy(options: { [field: string]: MergeStrategy }): ConfigurationMergeFunction;
+        smartStrategy(options: { [key: string]: MergeStrategy }): ConfigurationMergeFunction;
     }
 }
diff --git a/types/webpack-merge/v0/index.d.ts b/types/webpack-merge/v0/index.d.ts
index a939a2ed53..4cf82afd88 100644
--- a/types/webpack-merge/v0/index.d.ts
+++ b/types/webpack-merge/v0/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/survivejs/webpack-merge
 // Definitions by: Simon Hartcher <https://github.com/deevus>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 ///<reference types="webpack" />
 
diff --git a/types/webpack-node-externals/index.d.ts b/types/webpack-node-externals/index.d.ts
index 80dc73b27b..c93d3edecf 100644
--- a/types/webpack-node-externals/index.d.ts
+++ b/types/webpack-node-externals/index.d.ts
@@ -2,12 +2,13 @@
 // Project: https://github.com/liady/webpack-node-externals
 // Definitions by: Matt Traynham <https://github.com/mtraynham>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
-import webpack = require('webpack');
+import { ExternalsFunctionElement } from 'webpack';
 
 export = webpackNodeExternals;
 
-declare function webpackNodeExternals(options?: webpackNodeExternals.Options): webpack.ExternalsFunctionElement;
+declare function webpackNodeExternals(options?: webpackNodeExternals.Options): ExternalsFunctionElement;
 
 declare namespace webpackNodeExternals {
     type WhitelistOption = string | RegExp;
diff --git a/types/webpack-notifier/index.d.ts b/types/webpack-notifier/index.d.ts
index 1b8e92651f..372b4f2b1c 100644
--- a/types/webpack-notifier/index.d.ts
+++ b/types/webpack-notifier/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/Turbo87/webpack-notifier#readme
 // Definitions by: Benjamin Lim <https://github.com/bumbleblym>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 import { Plugin } from 'webpack';
 
diff --git a/types/webpack-notifier/webpack-notifier-tests.ts b/types/webpack-notifier/webpack-notifier-tests.ts
index f71fe5800f..ad73a10764 100644
--- a/types/webpack-notifier/webpack-notifier-tests.ts
+++ b/types/webpack-notifier/webpack-notifier-tests.ts
@@ -1,5 +1,5 @@
 import { Plugin } from 'webpack';
-import * as WebpackNotifierPlugin from 'webpack-notifier';
+import WebpackNotifierPlugin = require('webpack-notifier');
 
 const optionsArray: WebpackNotifierPlugin.Options[] = [
 	{
diff --git a/types/webpack-stream/index.d.ts b/types/webpack-stream/index.d.ts
index 41fbb3592b..19159f402d 100644
--- a/types/webpack-stream/index.d.ts
+++ b/types/webpack-stream/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/shama/webpack-stream
 // Definitions by: Ian Clanton-Thuon <https://github.com/iclanton>, Benjamin Lim <https://github.com/bumbleblym>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 /// <reference types="node" />
 
diff --git a/types/webpack-stream/webpack-stream-tests.ts b/types/webpack-stream/webpack-stream-tests.ts
index b6e4cce807..15ec19c7bd 100644
--- a/types/webpack-stream/webpack-stream-tests.ts
+++ b/types/webpack-stream/webpack-stream-tests.ts
@@ -1,5 +1,5 @@
 import * as webpack from 'webpack';
-import * as webpackStream from 'webpack-stream';
+import webpackStream = require('webpack-stream');
 
 let output: NodeJS.ReadWriteStream;
 
diff --git a/types/webpack-validator/index.d.ts b/types/webpack-validator/index.d.ts
index 4b6b260877..242a71e6f4 100644
--- a/types/webpack-validator/index.d.ts
+++ b/types/webpack-validator/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/js-dxtools/webpack-validator
 // Definitions by: Simon Hartcher <https://github.com/deevus>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 ///<reference types="webpack" />
 
diff --git a/types/webpack/index.d.ts b/types/webpack/index.d.ts
index f8aa375210..d6102808b6 100644
--- a/types/webpack/index.d.ts
+++ b/types/webpack/index.d.ts
@@ -9,12 +9,15 @@
 //                 Ahmed T. Ali <https://github.com/ahmed-taj>
 //                 Alan Agius <https://github.com/alan-agius4>
 //                 Spencer Elliott <https://github.com/elliottsj>
+//                 Jason Cheatham <https://github.com/jason0x43>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 /// <reference types="node" />
 
 import Tapable = require('tapable');
 import * as UglifyJS from 'uglify-js';
+import { RawSourceMap } from 'source-map';
 
 export = webpack;
 
@@ -76,7 +79,7 @@ declare namespace webpack {
         /** Capture timing information for each module. */
         profile?: boolean;
         /** Cache generated modules and chunks to improve performance for multiple incremental builds. */
-        cache?: boolean | any;
+        cache?: boolean | object;
         /** Enter watch mode, which rebuilds on file change. */
         watch?: boolean;
         watchOptions?: Options.WatchOptions;
@@ -491,7 +494,7 @@ declare namespace webpack {
              */
             maxEntrypointSize?: number;
         }
-        type Stats = webpack.Stats.ToStringOptions;
+        type Stats = Stats.ToStringOptions;
         type WatchOptions = ICompiler.WatchOptions;
     }
 
@@ -541,7 +544,7 @@ declare namespace webpack {
         type Handler = ICompiler.Handler;
         type WatchOptions = ICompiler.WatchOptions;
 
-        class Watching implements webpack.Watching {
+        class Watching implements Watching {
             constructor(compiler: Compiler, watchOptions: Watching.WatchOptions, handler: Watching.Handler);
 
             close(callback: () => void): void;
@@ -1020,7 +1023,7 @@ declare namespace webpack {
 
     namespace loader {
         interface Loader extends Function {
-            (this: LoaderContext, source: string | Buffer, sourceMap: string | Buffer): string | Buffer | void | undefined;
+            (this: LoaderContext, source: string | Buffer, sourceMap?: RawSourceMap): string | Buffer | void | undefined;
 
             /**
              * The order of chained loaders are always called from right to left.
@@ -1029,7 +1032,7 @@ declare namespace webpack {
              * If a loader delivers a result in the pitch method the process turns around and skips the remaining loaders,
              * continuing with the calls to the more left loaders. data can be passed between pitch and normal call.
              */
-            pitch?(remainingRequest: string, precedingRequest: string, data: any): any | undefined;
+            pitch?(remainingRequest: string, precedingRequest: string, data: any): any;
 
             /**
              * By default, the resource file is treated as utf-8 string and passed as String to the loader.
@@ -1040,7 +1043,7 @@ declare namespace webpack {
             raw?: boolean;
         }
 
-        type loaderCallback = (err: Error | undefined | null, content?: string | Buffer, sourceMap?: string | Buffer) => void;
+        type loaderCallback = (err: Error | undefined | null, content?: string | Buffer, sourceMap?: RawSourceMap) => void;
 
         interface LoaderContext {
             /**
@@ -1259,37 +1262,40 @@ declare namespace webpack {
     /** @deprecated */
     namespace compiler {
         /** @deprecated use webpack.Compiler */
+        // tslint:disable-next-line:no-unnecessary-qualifier
         type Compiler = webpack.Compiler;
 
         /** @deprecated use webpack.Compiler.Watching */
-        type Watching = webpack.Compiler.Watching;
+        type Watching = Compiler.Watching;
 
         /** @deprecated use webpack.Compiler.WatchOptions */
-        type WatchOptions = webpack.Compiler.WatchOptions;
+
+        type WatchOptions = Compiler.WatchOptions;
 
         /** @deprecated use webpack.Stats */
+        // tslint:disable-next-line:no-unnecessary-qualifier
         type Stats = webpack.Stats;
 
         /** @deprecated use webpack.Stats.ToJsonOptions */
-        type StatsOptions = webpack.Stats.ToJsonOptions;
+        type StatsOptions = Stats.ToJsonOptions;
 
         /** @deprecated use webpack.Stats.ToStringOptions */
-        type StatsToStringOptions = webpack.Stats.ToStringOptions;
+        type StatsToStringOptions = Stats.ToStringOptions;
 
         /** @deprecated use webpack.Compiler.Handler */
-        type CompilerCallback = webpack.Compiler.Handler;
+        type CompilerCallback = Compiler.Handler;
     }
 
     /** @deprecated use webpack.Options.Performance */
-    type PerformanceOptions = webpack.Options.Performance;
+    type PerformanceOptions = Options.Performance;
     /** @deprecated use webpack.Options.WatchOptions */
-    type WatchOptions = webpack.Options.WatchOptions;
+    type WatchOptions = Options.WatchOptions;
     /** @deprecated use webpack.EvalSourceMapDevToolPlugin.Options */
-    type EvalSourceMapDevToolPluginOptions = webpack.EvalSourceMapDevToolPlugin.Options;
+    type EvalSourceMapDevToolPluginOptions = EvalSourceMapDevToolPlugin.Options;
     /** @deprecated use webpack.SourceMapDevToolPlugin.Options */
-    type SourceMapDevToolPluginOptions = webpack.SourceMapDevToolPlugin.Options;
+    type SourceMapDevToolPluginOptions = SourceMapDevToolPlugin.Options;
     /** @deprecated use webpack.optimize.UglifyJsPlugin.CommentFilter */
-    type UglifyCommentFunction = webpack.optimize.UglifyJsPlugin.CommentFilter;
+    type UglifyCommentFunction = optimize.UglifyJsPlugin.CommentFilter;
     /** @deprecated use webpack.optimize.UglifyJsPlugin.Options */
-    type UglifyPluginOptions = webpack.optimize.UglifyJsPlugin.Options;
+    type UglifyPluginOptions = optimize.UglifyJsPlugin.Options;
 }
diff --git a/types/webpack/package.json b/types/webpack/package.json
new file mode 100644
index 0000000000..59c231c54c
--- /dev/null
+++ b/types/webpack/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "source-map": "^0.6.0"
+    }
+}
diff --git a/types/webpack/tslint.json b/types/webpack/tslint.json
index 590af11d7e..b4b47a0378 100644
--- a/types/webpack/tslint.json
+++ b/types/webpack/tslint.json
@@ -1,10 +1,3 @@
 {
-	"extends": "dtslint/dt.json",
-	"rules": {
-		// TODO
-		"no-any-union": false,
-		"no-unnecessary-qualifier": false,
-		"no-void-expression": false,
-		"space-within-parens": false
-	}
+	"extends": "dtslint/dt.json"
 }
diff --git a/types/webpack/webpack-tests.ts b/types/webpack/webpack-tests.ts
index becaa20dd6..f56dbb84b6 100644
--- a/types/webpack/webpack-tests.ts
+++ b/types/webpack/webpack-tests.ts
@@ -1,4 +1,5 @@
-import * as webpack from 'webpack';
+import webpack = require('webpack');
+import { RawSourceMap } from 'source-map';
 
 const {
     optimize,
@@ -509,8 +510,10 @@ declare function successfullyCompiled(): void;
 webpack({
     // configuration
 }, (err, stats) => {
-    if (err)
-        return handleFatalError(err);
+    if (err) {
+        handleFatalError(err);
+        return;
+    }
     const jsonStats = stats.toJson();
     const jsonStatsWithAllOptions = stats.toJson({
         assets: true,
@@ -537,10 +540,13 @@ webpack({
         excludeAssets: ["filter", "excluded"]
     });
 
-    if (jsonStats.errors.length > 0)
-        return handleSoftErrors(jsonStats.errors);
-    if (jsonStats.warnings.length > 0)
+    if (jsonStats.errors.length > 0) {
+        handleSoftErrors(jsonStats.errors);
+        return;
+    }
+    if (jsonStats.warnings.length > 0) {
         handleWarnings(jsonStats.warnings);
+    }
     successfullyCompiled();
 });
 
@@ -637,7 +643,7 @@ configuration = {
     performance,
 };
 
-function loader(this: webpack.loader.LoaderContext, source: string | Buffer, sourcemap: string | Buffer): void {
+function loader(this: webpack.loader.LoaderContext, source: string | Buffer, sourcemap?: RawSourceMap): void {
     this.cacheable();
 
     this.async();
diff --git a/types/webrtc/RTCPeerConnection.d.ts b/types/webrtc/RTCPeerConnection.d.ts
index 472f2b0318..210ab66ddd 100644
--- a/types/webrtc/RTCPeerConnection.d.ts
+++ b/types/webrtc/RTCPeerConnection.d.ts
@@ -314,6 +314,7 @@ interface RTCPeerConnection extends EventTarget {
     addIceCandidate(candidate?: RTCIceCandidateInit | RTCIceCandidate): Promise<void>;
 
     readonly signalingState: RTCSignalingState;
+    readonly connectionState: RTCPeerConnectionState;
 
     getConfiguration(): RTCConfiguration;
     setConfiguration(configuration: RTCConfiguration): void;
diff --git a/types/webrtc/test/RTCPeerConnection.ts b/types/webrtc/test/RTCPeerConnection.ts
index 95a6d45694..f99ed1c05b 100644
--- a/types/webrtc/test/RTCPeerConnection.ts
+++ b/types/webrtc/test/RTCPeerConnection.ts
@@ -56,6 +56,12 @@ pc.onconnectionstatechange = ev => console.log(ev.type);
 pc.ontrack = ev => console.log(ev.receiver);
 pc.ondatachannel = ev => console.log(ev.channel);
 
+// State properties
+console.log(pc.signalingState);
+console.log(pc.iceGatheringState);
+console.log(pc.iceConnectionState);
+console.log(pc.connectionState);
+
 // Legacy interface extensions
 pc.createOffer(
     (sdp: RTCSessionDescription) => console.log(sdp.sdp),
diff --git a/types/website-scraper/website-scraper-tests.ts b/types/website-scraper/website-scraper-tests.ts
index dc479d5c76..bbcb1fda9d 100644
--- a/types/website-scraper/website-scraper-tests.ts
+++ b/types/website-scraper/website-scraper-tests.ts
@@ -1,4 +1,4 @@
-import * as scraper from "website-scraper";
+import scraper = require("website-scraper");
 
 scraper({
     urls: [
diff --git a/types/websocket/index.d.ts b/types/websocket/index.d.ts
index 006d94800f..f67a5da142 100644
--- a/types/websocket/index.d.ts
+++ b/types/websocket/index.d.ts
@@ -571,6 +571,12 @@ declare class client extends events.EventEmitter {
     connect(requestUrl: url.Url, protocols?: string, origin?: string, headers?: object, extraRequestOptions?: http.RequestOptions): void;
     connect(requestUrl: string, protocols?: string, origin?: string, headers?: object, extraRequestOptions?: http.RequestOptions): void;
 
+    /**
+     * Will cancel an in-progress connection request before either the `connect` event or the `connectFailed` event has been emitted.
+     * If the `connect` or `connectFailed` event has already been emitted, calling `abort()` will do nothing.
+     */
+    abort(): void;
+
     // Events
     on(event: string, listener: () => void): this;
     on(event: 'connect', cb: (connection: connection) => void): this;
diff --git a/types/websocket/websocket-tests.ts b/types/websocket/websocket-tests.ts
index 3044f9bf7d..94f8a11e16 100644
--- a/types/websocket/websocket-tests.ts
+++ b/types/websocket/websocket-tests.ts
@@ -180,8 +180,18 @@ function clientTest2() {
     
 }
 
+function testClientAbortApi() {
+    var ipArray = getLocalIpArray();
+    var client = new websocket.client();
+    client.connect(`ws://${ipArray[0]}:8888`, undefined, undefined, undefined, {
+        localAddress: ipArray[0]
+    });
+    client.abort();
+}
+
 {
     console.log(`websocket test start.`);
     serverTest2();
     clientTest2();
+    testClientAbortApi();
 }
diff --git a/types/webtorrent/webtorrent-tests.ts b/types/webtorrent/webtorrent-tests.ts
index 06d8f853f3..63a9647902 100644
--- a/types/webtorrent/webtorrent-tests.ts
+++ b/types/webtorrent/webtorrent-tests.ts
@@ -1,4 +1,4 @@
-import * as WebTorrent from 'webtorrent';
+import WebTorrent = require('webtorrent');
 import * as fs from 'fs';
 
 const client = new WebTorrent();
diff --git a/types/wheel/tsconfig.json b/types/wheel/tsconfig.json
index 2857ce81c3..2e0f811c37 100644
--- a/types/wheel/tsconfig.json
+++ b/types/wheel/tsconfig.json
@@ -1,13 +1,18 @@
 {
     "compilerOptions": {
         "module": "commonjs",
-        "lib": ["es5", "dom"],
+        "lib": [
+            "es5",
+            "dom"
+        ],
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
-        "typeRoots": ["../"],
+        "typeRoots": [
+            "../"
+        ],
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
@@ -16,4 +21,4 @@
         "index.d.ts",
         "wheel-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/why-did-you-update/index.d.ts b/types/why-did-you-update/index.d.ts
index 593cf6791d..f7f4fb820a 100644
--- a/types/why-did-you-update/index.d.ts
+++ b/types/why-did-you-update/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/garbles/why-did-you-update
 // Definitions by: rhysd <https://rhysd.github.io>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 /// <reference types="react" />
 
diff --git a/types/winston/index.d.ts b/types/winston/index.d.ts
index 3de43e4349..df360f1e01 100644
--- a/types/winston/index.d.ts
+++ b/types/winston/index.d.ts
@@ -223,7 +223,7 @@ declare namespace winston {
         unhandleExceptions(...transports: TransportInstance[]): void;
         add(transport: TransportInstance, options?: TransportOptions, created?: boolean): LoggerInstance;
         clear(): void;
-        remove(transport: TransportInstance): LoggerInstance;
+        remove(transport: string | TransportInstance): LoggerInstance;
         startTimer(): ProfileHandler;
         profile(id: string, msg?: string, meta?: any, callback?: (err: Error, level: string, msg: string, meta: any) => void): LoggerInstance;
         configure(options: LoggerOptions): void;
diff --git a/types/winston/winston-tests.ts b/types/winston/winston-tests.ts
index a0620c94e0..c9c8fcd0da 100644
--- a/types/winston/winston-tests.ts
+++ b/types/winston/winston-tests.ts
@@ -260,6 +260,9 @@ logger = new (winston.Logger)({
   ]
 });
 
+/* Remove transport by name */
+logger = logger.remove('nooo');
+
 /* Reconfigure logger */
 logger.configure({ level: 'silly' });
 
diff --git a/types/word-list-json/tsconfig.json b/types/word-list-json/tsconfig.json
index 8f34d90409..3bbe8a5d08 100644
--- a/types/word-list-json/tsconfig.json
+++ b/types/word-list-json/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "word-list-json-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/write-json-file/write-json-file-tests.ts b/types/write-json-file/write-json-file-tests.ts
index 7354dfc17f..bad3b1a5a1 100644
--- a/types/write-json-file/write-json-file-tests.ts
+++ b/types/write-json-file/write-json-file-tests.ts
@@ -1,4 +1,4 @@
-import * as write from 'write-json-file';
+import write = require('write-json-file');
 
 // Basic
 write('foo.json', {foo: true}).then(() => { });
diff --git a/types/ws/index.d.ts b/types/ws/index.d.ts
index 2a52883365..303dcc3875 100644
--- a/types/ws/index.d.ts
+++ b/types/ws/index.d.ts
@@ -68,7 +68,7 @@ declare class WebSocket extends events.EventEmitter {
 
     // Events
     on(event: 'close', listener: (code: number, reason: string) => void): this;
-    on(event: 'error', listener: (event: {error: any, message: any, type: string, target: WebSocket }) => void): this;
+    on(event: 'error', listener: (err: Error) => void): this;
     on(event: 'upgrade', listener: (request: http.IncomingMessage) => void): this;
     on(event: 'message', listener: (data: WebSocket.Data) => void): this;
     on(event: 'open' , listener: () => void): this;
diff --git a/types/ws/ws-tests.ts b/types/ws/ws-tests.ts
index 29334a647f..51d37bea9c 100644
--- a/types/ws/ws-tests.ts
+++ b/types/ws/ws-tests.ts
@@ -1,4 +1,4 @@
-import * as WebSocket from 'ws';
+import WebSocket = require('ws');
 import * as http from 'http';
 import * as https from 'https';
 
diff --git a/types/wtfnode/tsconfig.json b/types/wtfnode/tsconfig.json
index 429ee54cb7..aebc38afe0 100644
--- a/types/wtfnode/tsconfig.json
+++ b/types/wtfnode/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "wtfnode-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/x-ray-crawler/tsconfig.json b/types/x-ray-crawler/tsconfig.json
index 3b3a573f0a..26247c6108 100644
--- a/types/x-ray-crawler/tsconfig.json
+++ b/types/x-ray-crawler/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "x-ray-crawler-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/x-ray/tsconfig.json b/types/x-ray/tsconfig.json
index 7dc474842a..d7865de910 100644
--- a/types/x-ray/tsconfig.json
+++ b/types/x-ray/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "x-ray-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/xml/xml-tests.ts b/types/xml/xml-tests.ts
index 3493a464fd..b26ffd054a 100644
--- a/types/xml/xml-tests.ts
+++ b/types/xml/xml-tests.ts
@@ -1,6 +1,6 @@
 // Code get from the test file of https://github.com/dylang/node-xml
 
-import * as xml from "xml";
+import xml = require("xml");
 
 interface Tester {
   is(a: any, b: any): void;
diff --git a/types/xmlpoke/xmlpoke-tests.ts b/types/xmlpoke/xmlpoke-tests.ts
index aba04c0962..1079d19756 100644
--- a/types/xmlpoke/xmlpoke-tests.ts
+++ b/types/xmlpoke/xmlpoke-tests.ts
@@ -1,5 +1,5 @@
-import * as xmlpoke from 'xmlpoke';
-import * as assert from 'assert';
+import xmlpoke = require('xmlpoke');
+import assert = require('assert');
 
 let result: string;
 
diff --git a/types/xtend/xtend-tests.ts b/types/xtend/xtend-tests.ts
index 12ad82a1b0..5f72688fdb 100644
--- a/types/xtend/xtend-tests.ts
+++ b/types/xtend/xtend-tests.ts
@@ -1,4 +1,4 @@
-import * as xtend from "xtend";
+import xtend = require("xtend");
 
 interface Target {
   hellow: string;
diff --git a/types/yargs/index.d.ts b/types/yargs/index.d.ts
index d4a47c84e7..882e8e9999 100644
--- a/types/yargs/index.d.ts
+++ b/types/yargs/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for yargs 10.0
+// Type definitions for yargs 11.0
 // Project: https://github.com/chevex/yargs
 // Definitions by: Martin Poelstra <https://github.com/poelstra>
 //                 Mizunashi Mana <https://github.com/mizunashi-mana>
@@ -262,9 +262,17 @@ declare namespace yargs {
         nargs?: number;
         normalize?: boolean;
         number?: boolean;
+        /**
+         *  @deprecated since version 6.6.0
+         *  Use 'demandOption' instead
+         */
         require?: boolean | string;
+        /**
+         *  @deprecated since version 6.6.0
+         *  Use 'demandOption' instead
+         */
         required?: boolean | string;
-        requiresArg?: boolean | string;
+        requiresArg?: boolean;
         skipValidation?: boolean;
         string?: boolean;
         type?: "array" | "count" | PositionalOptionsType;
diff --git a/types/yargs/tsconfig.json b/types/yargs/tsconfig.json
index f0fcef8f10..003b792854 100644
--- a/types/yargs/tsconfig.json
+++ b/types/yargs/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "yargs-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/yargs/v10/.editorconfig b/types/yargs/v10/.editorconfig
new file mode 100644
index 0000000000..db9b917e06
--- /dev/null
+++ b/types/yargs/v10/.editorconfig
@@ -0,0 +1,5 @@
+[*.ts]
+indent_style = space
+indent_size = 4
+end_of_line = lf
+charset = utf-8
diff --git a/types/yargs/v10/index.d.ts b/types/yargs/v10/index.d.ts
new file mode 100644
index 0000000000..d4a47c84e7
--- /dev/null
+++ b/types/yargs/v10/index.d.ts
@@ -0,0 +1,304 @@
+// Type definitions for yargs 10.0
+// Project: https://github.com/chevex/yargs
+// Definitions by: Martin Poelstra <https://github.com/poelstra>
+//                 Mizunashi Mana <https://github.com/mizunashi-mana>
+//                 Jeffery Grajkowski <https://github.com/pushplay>
+//                 Jeff Kenney <https://github.com/jeffkenney>
+//                 Jimi (Dimitris) Charalampidis <https://github.com/JimiC>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+// The following TSLint rules have been disabled:
+// unified-signatures: Because there is useful information in the argument names of the overloaded signatures
+
+// Convention:
+// Use 'union types' when:
+//  - parameter types have similar signature type (i.e. 'string | string[]')
+//  - parameter names have the same semantic meaning (i.e. ['command', 'commands'] , ['key', 'keys'])
+//    An example for not using 'union types' is the declaration of 'env' where `prefix` and `enable` parameters
+//    have different semantics. On the other hand, in the declaration of 'usage', a `command: string` parameter
+//    has the same semantic meaning with declaring an overload method by using `commands: string[]`, thus
+//    it's prefered to use `command: string | string[]`
+// Use parameterless declaration instead of declaring all parameters optional,
+// when all parameters are optional and more than one
+
+declare namespace yargs {
+    interface Argv {
+        (): Arguments;
+        (args: string[], cwd?: string): Arguments;
+
+        alias(shortName: string | string[], longName: string | string[]): Argv;
+        alias(aliases: { [shortName: string]: string | string[] }): Argv;
+
+        argv: Arguments;
+
+        array(key: string | string[]): Argv;
+
+        boolean(key: string | string[]): Argv;
+
+        check(func: (argv: Arguments, aliases: { [alias: string]: string }) => any, global?: boolean): Argv;
+
+        choices(key: string, values: Choices): Argv;
+        choices(choices: { [argName: string]: Choices }): Argv;
+
+        coerce(key: string | string[], func: (arg: any) => any): Argv;
+        coerce(opts: { [key: string]: (arg: any) => any; }): Argv;
+
+        command(command: string | string[], description: string, builder?: (args: Argv) => Argv, handler?: (args: Arguments) => void): Argv;
+        command(command: string | string[], description: string, builder?: { [key: string]: Options }, handler?: (args: Arguments) => void): Argv;
+        command(command: string | string[], description: string, module: CommandModule): Argv;
+        command(command: string | string[], showInHelp: false, builder?: (args: Argv) => Argv, handler?: (args: Arguments) => void): Argv;
+        command(command: string | string[], showInHelp: false, builder?: { [key: string]: Options }, handler?: (args: Arguments) => void): Argv;
+        command(command: string | string[], showInHelp: false, module: CommandModule): Argv;
+        command(module: CommandModule): Argv;
+
+        // Advanced API
+        commandDir(dir: string, opts?: RequireDirectoryOptions): Argv;
+
+        completion(): Argv;
+        completion(cmd: string, func?: AsyncCompletionFunction): Argv;
+        completion(cmd: string, func?: SyncCompletionFunction): Argv;
+        completion(cmd: string, description?: string, func?: AsyncCompletionFunction): Argv;
+        completion(cmd: string, description?: string, func?: SyncCompletionFunction): Argv;
+
+        config(): Argv;
+        config(key: string | string[], description?: string, parseFn?: (configPath: string) => object): Argv;
+        config(key: string | string[], parseFn: (configPath: string) => object): Argv;
+        config(explicitConfigurationObject: object): Argv;
+
+        conflicts(key: string, value: string | string[]): Argv;
+        conflicts(conflicts: { [key: string]: string | string[] }): Argv;
+
+        count(key: string | string[]): Argv;
+
+        default(key: string, value: any, description?: string): Argv;
+        default(defaults: { [key: string]: any }, description?: string): Argv;
+
+        /**
+         * @deprecated since version 6.6.0
+         * Use '.demandCommand()' or '.demandOption()' instead
+         */
+        demand(key: string | string[], msg: string): Argv;
+        demand(key: string | string[], required?: boolean): Argv;
+        demand(positionals: number, msg: string): Argv;
+        demand(positionals: number, required?: boolean): Argv;
+        demand(positionals: number, max: number, msg?: string): Argv;
+
+        demandOption(key: string | string[], msg?: string): Argv;
+        demandOption(key: string | string[], demand?: boolean): Argv;
+
+        demandCommand(): Argv;
+        demandCommand(min: number, minMsg?: string): Argv;
+        demandCommand(min: number, max?: number, minMsg?: string, maxMsg?: string): Argv;
+
+        describe(key: string | string[], description: string): Argv;
+        describe(descriptions: { [key: string]: string }): Argv;
+
+        detectLocale(detect: boolean): Argv;
+
+        env(): Argv;
+        env(prefix: string): Argv;
+        env(enable: boolean): Argv;
+
+        epilog(msg: string): Argv;
+
+        epilogue(msg: string): Argv;
+
+        example(command: string, description: string): Argv;
+
+        exitProcess(enabled: boolean): Argv;
+
+        fail(func: (msg: string, err: Error) => any): Argv;
+
+        getCompletion(args: string[], done: (completions: string[]) => void): Argv;
+
+        global(key: string | string[]): Argv;
+
+        group(key: string | string[], groupName: string): Argv;
+
+        help(): Argv;
+        help(enableExplicit: boolean): Argv;
+        help(option: string, enableExplicit: boolean): Argv;
+        help(option: string, description?: string, enableExplicit?: boolean): Argv;
+
+        implies(key: string, value: string | string[]): Argv;
+        implies(implies: { [key: string]: string | string[] }): Argv;
+
+        locale(): string;
+        locale(loc: string): Argv;
+
+        nargs(key: string, count: number): Argv;
+        nargs(nargs: { [key: string]: number }): Argv;
+
+        normalize(key: string | string[]): Argv;
+
+        number(key: string | string[]): Argv;
+
+        option(key: string, options: Options): Argv;
+        option(options: { [key: string]: Options }): Argv;
+
+        options(key: string, options: Options): Argv;
+        options(options: { [key: string]: Options }): Argv;
+
+        parse(): Arguments;
+        parse(arg: string | string[], context?: object, parseCallback?: ParseCallback): Arguments;
+
+        pkgConf(key: string | string[], cwd?: string): Argv;
+
+        /**
+         * 'positional' should be called in a command's builder function, and is not
+         * available on the top-level yargs instance. If so, it will throw an error.
+         */
+        positional(key: string, opt: PositionalOptions): Argv;
+
+        recommendCommands(): Argv;
+
+        /**
+         * @deprecated since version 6.6.0
+         * Use '.demandCommand()' or '.demandOption()' instead
+         */
+        require(key: string, msg: string): Argv;
+        require(key: string, required: boolean): Argv;
+        require(keys: number[], msg: string): Argv;
+        require(keys: number[], required: boolean): Argv;
+        require(positionals: number, required: boolean): Argv;
+        require(positionals: number, msg: string): Argv;
+
+        /**
+         * @deprecated since version 6.6.0
+         * Use '.demandCommand()' or '.demandOption()' instead
+         */
+        required(key: string, msg: string): Argv;
+        required(key: string, required: boolean): Argv;
+        required(keys: number[], msg: string): Argv;
+        required(keys: number[], required: boolean): Argv;
+        required(positionals: number, required: boolean): Argv;
+        required(positionals: number, msg: string): Argv;
+
+        requiresArg(key: string | string[]): Argv;
+
+        /**
+         * @deprecated since version 6.6.0
+         * Use '.global()' instead
+         */
+        reset(): Argv;
+
+        showCompletionScript(): Argv;
+
+        showHelp(consoleLevel?: string): Argv;
+
+        showHelpOnFail(enable: boolean, message?: string): Argv;
+
+        skipValidation(key: string | string[]): Argv;
+
+        strict(): Argv;
+
+        string(key: string | string[]): Argv;
+
+        // Intended to be used with '.wrap()'
+        terminalWidth(): number;
+
+        updateLocale(obj: { [key: string]: string }): Argv;
+
+        updateStrings(obj: { [key: string]: string }): Argv;
+
+        usage(message: string): Argv;
+        usage(command: string | string[], description: string, builder?: (args: Argv) => Argv, handler?: (args: Arguments) => void): Argv;
+        usage(command: string | string[], showInHelp: boolean, builder?: (args: Argv) => Argv, handler?: (args: Arguments) => void): Argv;
+        usage(command: string | string[], description: string, builder?: { [key: string]: Options }, handler?: (args: Arguments) => void): Argv;
+        usage(commands: string | string[], showInHelp: boolean, builder?: { [key: string]: Options }, handler?: (args: Arguments) => void): Argv;
+
+        version(): Argv;
+        version(version: string): Argv;
+        version(enable: boolean): Argv;
+        version(optionKey: string, version: string): Argv;
+        version(optionKey: string, description: string, version: string): Argv;
+
+        wrap(columns: number | null): Argv;
+    }
+
+    interface Arguments {
+        /** Non-option arguments */
+        _: string[];
+        /** The script name or node command */
+        $0: string;
+        /** All remaining options */
+        [argName: string]: any;
+    }
+
+    interface RequireDirectoryOptions {
+        recurse?: boolean;
+        extensions?: string[];
+        visit?: (commandObject: any, pathToFile?: string, filename?: string) => any;
+        include?: RegExp | ((pathToFile: string) => boolean);
+        exclude?: RegExp | ((pathToFile: string) => boolean);
+    }
+
+    interface Options {
+        alias?: string | string[];
+        array?: boolean;
+        boolean?: boolean;
+        choices?: Choices;
+        coerce?: (arg: any) => any;
+        config?: boolean;
+        configParser?: (configPath: string) => object;
+        conflicts?: string | string[] | { [key: string]: string | string[] };
+        count?: boolean;
+        default?: any;
+        defaultDescription?: string;
+        /**
+         *  @deprecated since version 6.6.0
+         *  Use 'demandOption' instead
+         */
+        demand?: boolean | string;
+        demandOption?: boolean | string;
+        desc?: string;
+        describe?: string;
+        description?: string;
+        global?: boolean;
+        group?: string;
+        hidden?: boolean;
+        implies?: string | string[] | { [key: string]: string | string[] };
+        nargs?: number;
+        normalize?: boolean;
+        number?: boolean;
+        require?: boolean | string;
+        required?: boolean | string;
+        requiresArg?: boolean | string;
+        skipValidation?: boolean;
+        string?: boolean;
+        type?: "array" | "count" | PositionalOptionsType;
+    }
+
+    interface PositionalOptions {
+        alias?: string | string[];
+        choices?: Choices;
+        coerce?: (arg: any) => any;
+        conflicts?: string | string[] | { [key: string]: string | string[] };
+        default?: any;
+        desc?: string;
+        describe?: string;
+        description?: string;
+        implies?: string | string[] | { [key: string]: string | string[] };
+        normalize?: boolean;
+        type?: PositionalOptionsType;
+    }
+
+    interface CommandModule {
+        aliases?: string[] | string;
+        builder?: CommandBuilder;
+        command?: string[] | string;
+        describe?: string | false;
+        handler: (args: any) => void;
+    }
+
+    type ParseCallback = (err: Error | undefined, argv: Arguments, output: string) => void;
+    type CommandBuilder = { [key: string]: Options } | ((args: Argv) => Argv);
+    type SyncCompletionFunction = (current: string, argv: any) => string[];
+    type AsyncCompletionFunction = (current: string, argv: any, done: (completion: string[]) => void) => void;
+    type Choices = Array<string | true | undefined>;
+    type PositionalOptionsType = "boolean" | "number" | "string";
+}
+
+declare var yargs: yargs.Argv;
+export = yargs;
diff --git a/types/yargs/v10/tsconfig.json b/types/yargs/v10/tsconfig.json
new file mode 100644
index 0000000000..b615180ff7
--- /dev/null
+++ b/types/yargs/v10/tsconfig.json
@@ -0,0 +1,28 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": false,
+        "strictFunctionTypes": true,
+        "baseUrl": "../../",
+        "paths": {
+            "yargs": [
+                "yargs/v10"
+            ]
+        },
+        "typeRoots": [
+            "../../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "yargs-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/yargs/v10/tslint.json b/types/yargs/v10/tslint.json
new file mode 100644
index 0000000000..08b1465cd6
--- /dev/null
+++ b/types/yargs/v10/tslint.json
@@ -0,0 +1,6 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "unified-signatures": false
+    }
+}
diff --git a/types/yargs/v10/yargs-tests.ts b/types/yargs/v10/yargs-tests.ts
new file mode 100644
index 0000000000..43779309bf
--- /dev/null
+++ b/types/yargs/v10/yargs-tests.ts
@@ -0,0 +1,650 @@
+/// <reference types="node" />
+
+import yargs = require('yargs');
+
+import * as fs from 'fs';
+import * as path from 'path';
+
+const stringVal = 'string';
+
+// Examples taken from yargs website
+// https://github.com/chevex/yargs
+
+// With yargs, the options be just a hash!
+function xup() {
+    const argv = yargs.argv;
+
+    if (argv.rif - 5 * argv.xup > 7.138) {
+        console.log('Plunder more riffiwobbles!');
+    } else {
+        console.log('Drop the xupptumblers!');
+    }
+}
+
+// And non-hyphenated options too! Just use argv._!
+function nonopt() {
+    const argv = yargs.argv;
+    console.log('(%d,%d)', argv.x, argv.y);
+    console.log(argv._);
+}
+
+// Yargs even counts your booleans!
+function count() {
+    const argv = yargs
+        .count('verbose')
+        .alias('v', 'verbose')
+        .argv;
+
+    const VERBOSE_LEVEL: number = argv.verbose;
+
+    function WARN() { VERBOSE_LEVEL >= 0 && console.log.apply(console, arguments); }
+    function INFO() { VERBOSE_LEVEL >= 1 && console.log.apply(console, arguments); }
+    function DEBUG() { VERBOSE_LEVEL >= 2 && console.log.apply(console, arguments); }
+}
+
+// Tell users how to use yer options and make demands.
+function divide() {
+    const argv = yargs
+        .usage('Usage: $0 -x [num] -y [num]')
+        .demand(['x', 'y'])
+        .argv;
+
+    console.log(argv.x / argv.y);
+}
+
+// After yer demands have been met, demand more! Ask for non-hypenated arguments!
+function demand_count() {
+    const argv = yargs
+        .demand(2)
+        .demand(2, false)
+        .demand(2, 2)
+        .demand(2, 2, "message")
+        .argv;
+    console.dir(argv);
+}
+
+// EVEN MORE SHIVER ME TIMBERS!
+function default_singles() {
+    const argv = yargs
+        .default('x', 10)
+        .default('y', 10)
+        .argv
+        ;
+    console.log(argv.x + argv.y);
+}
+function default_hash() {
+    const argv = yargs
+        .default({ x: 10, y: 10 })
+        .argv
+        ;
+    console.log(argv.x + argv.y);
+}
+
+// And if you really want to get all descriptive about it...
+function boolean_single() {
+    const argv = yargs
+        .boolean('v')
+        .argv
+        ;
+    console.dir(argv.v);
+    console.dir(argv._);
+}
+function boolean_double() {
+    const argv = yargs
+        .boolean(['x', 'y', 'z'])
+        .argv
+        ;
+    console.dir([argv.x, argv.y, argv.z]);
+    console.dir(argv._);
+}
+
+// Yargs is here to help you...
+function line_count() {
+    const argv = yargs
+        .usage('Count the lines in a file.\nUsage: $0')
+        .example('$0 -f', 'count the lines in the given file')
+        .demand('f')
+        .alias('f', 'file')
+        .describe('f', 'Load a file')
+        .argv
+        ;
+}
+
+// Below are tests for individual methods.
+// Not all methods are covered yet, and neither are all possible invocations of methods.
+
+function Argv$argv() {
+    const argv = yargs.argv;
+    console.log("command name: " + argv.$0);
+    console.log("command: " + argv._[1]);
+}
+
+function Argv_parsing() {
+    const argv1 = yargs.parse();
+    const argv2 = yargs(['-x', '1', '-y', '2']).argv;
+    const argv3 = yargs.parse(['-x', '1', '-y', '2']);
+    console.log(argv1.x, argv2.x, argv3.x);
+}
+
+function Argv$options() {
+    const argv1 = yargs
+        .options('f', {
+            alias: 'file',
+            default: '/etc/passwd',
+            defaultDescription: 'The /etc/passwd file',
+            group: 'files',
+            normalize: true,
+            global: false,
+            array: true,
+            nargs: 3,
+            implies: 'other-arg',
+            conflicts: 'conflicting-arg',
+        })
+        .argv
+        ;
+
+    const argv2 = yargs
+        .alias('f', 'file')
+        .default('f', '/etc/passwd')
+        .argv
+        ;
+}
+
+function Argv$global() {
+    const argv = yargs
+        .global('foo')
+        .global(['bar', 'baz', 'fizz', 'buzz']);
+}
+
+function Argv$group() {
+    const argv = yargs
+        .group('foo', 'foogroup')
+        .group(['bing', 'bang', 'buzz'], 'onomatopoeia');
+}
+
+function Argv$env() {
+    const argv = yargs
+        .env('YARGS_PREFIX_')
+        .env()
+        .env(true);
+}
+
+function Argv$array() {
+    const argv = yargs
+        .array('foo')
+        .array(['bar', 'baz']);
+}
+
+function Argv$nargs() {
+    const argv = yargs
+        .nargs('foo', 12)
+        .nargs({ bing: 3, bang: 2, buzz: 4 });
+}
+
+function Argv$choices() {
+    // example from documentation
+    const argv = yargs
+        .alias('i', 'ingredient')
+        .describe('i', 'choose your sandwich ingredients')
+        .choices('i', ['peanut-butter', 'jelly', 'banana', 'pickles'])
+        .help('help')
+        .argv;
+
+    yargs
+        .choices('i', [undefined, true, 'asdf', 'test'])
+        .choices({
+            test: [undefined, true, 'test-value']
+        });
+}
+
+function Argv$usage_as_default_command() {
+    const argv = yargs
+        .usage(
+        "$0 get",
+        'make a get HTTP request',
+        (yargs) => {
+            return yargs.option('u', {
+                alias: 'url',
+                describe: 'the URL to make an HTTP request to'
+            });
+        },
+        (argv) => {
+            console.dir(argv.url);
+        }
+        )
+        .argv;
+}
+
+function Argv$command() {
+    const argv = yargs
+        .usage('npm <command>')
+        .command('install', 'tis a mighty fine package to install')
+        .command('publish', 'shiver me timbers, should you be sharing all that', yargs =>
+            yargs.option('f', {
+                alias: 'force',
+                description: 'yar, it usually be a bad idea'
+            })
+                .help('help')
+        )
+        .command("build", "arghh, build it mate", {
+            tag: {
+                default: true,
+                demand: true,
+                description: "Tag the build, mate!"
+            },
+            publish: {
+                default: false,
+                description: "Should i publish?"
+            }
+        })
+        .command({
+            command: "test",
+            describe: "test package",
+            builder: {
+                mateys: {
+                    demand: false
+                }
+            },
+            handler: (args: any) => {
+                /* handle me mateys! */
+            }
+        })
+        .command("test", "test mateys", {
+            handler: (args: any) => {
+                /* handle me mateys! */
+            }
+        })
+        .help('help')
+        .argv;
+
+    yargs
+        .command('get', 'make a get HTTP request', (yargs) => {
+            return yargs.option('url', {
+                alias: 'u',
+                default: 'http://yargs.js.org/'
+            });
+        })
+        .help()
+        .argv;
+
+    yargs
+        .command(
+        'get',
+        'make a get HTTP request',
+        (yargs) => {
+            return yargs.option('u', {
+                alias: 'url',
+                describe: 'the URL to make an HTTP request to'
+            });
+        },
+        (argv) => {
+            console.dir(argv.url);
+        }
+        )
+        .help()
+        .argv;
+}
+
+function Argv$completion_sync() {
+    const argv = yargs
+        .completion('completion', (current, argv) => {
+            // 'current' is the current command being completed.
+            // 'argv' is the parsed arguments so far.
+            // simply return an array of completions.
+            return [
+                'foo',
+                'bar'
+            ];
+        })
+        .argv;
+}
+
+function Argv$completion_async() {
+    const argv = yargs
+        .completion('completion', (current: string, argv: any, done: (completion: string[]) => void) => {
+            setTimeout(() => {
+                done([
+                    'apple',
+                    'banana'
+                ]);
+            }, 500);
+        })
+        .argv;
+}
+
+function Argv$help() {
+    const argv = yargs
+        .usage("$0 -operand1 number -operand2 number -operation [add|subtract]")
+        .help()
+        .argv;
+}
+
+function Argv$showHelpOnFail() {
+    const argv = yargs
+        .usage('Count the lines in a file.\nUsage: $0')
+        .demand('f')
+        .alias('f', 'file')
+        .describe('f', 'Load a file')
+        .showHelpOnFail(false, "Specify --help for available options")
+        .argv;
+}
+
+function Argv$showHelp() {
+    const yargs1 = yargs
+        .usage("$0 -operand1 number -operand2 number -operation [add|subtract]");
+    yargs1.showHelp();
+}
+
+function Argv$version() {
+    const argv1 = yargs
+        .version();
+
+    const argv2 = yargs
+        .version('1.0.0');
+
+    const argv3 = yargs
+        .version('--version', '1.0.0');
+
+    const argv4 = yargs
+        .version('--version', 'Show version', '1.0.0');
+
+    const argv5 = yargs
+        .version(false);
+}
+
+function Argv$wrap() {
+    const argv1 = yargs
+        .wrap(null);
+
+    const argv2 = yargs
+        .wrap(yargs.terminalWidth());
+}
+
+function Argv$locale() {
+    const argv = yargs
+        .usage('./$0 - follow ye instructions true')
+        .option('option', {
+            alias: 'o',
+            describe: "'tis a mighty fine option",
+            demand: true
+        })
+        .command('run', "Arrr, ya best be knowin' what yer doin'")
+        .example('$0 run foo', "shiver me timbers, here's an example for ye")
+        .help('help')
+        .wrap(70)
+        .locale('pirate')
+        .argv;
+}
+
+function Argv$epilogue() {
+    const argv = yargs
+        .epilogue('for more information, find our manual at http://example.com');
+}
+
+function Argv$reset() {
+    const ya = yargs
+        .usage('$0 command')
+        .command('hello', 'hello command')
+        .command('world', 'world command')
+        .demand(1, 'must provide a valid command');
+    const argv = yargs.argv;
+    const command = argv._[0];
+
+    if (command === 'hello') {
+        ya.reset()
+            .usage('$0 hello')
+            .help('h')
+            .example('$0 hello', 'print the hello message!')
+            .argv;
+
+        console.log('hello!');
+    } else if (command === 'world') {
+        ya.reset()
+            .usage('$0 world')
+            .help('h')
+            .example('$0 world', 'print the world message!')
+            .argv;
+
+        console.log('world!');
+    } else {
+        ya.showHelp();
+    }
+}
+
+// http://yargs.js.org/docs/#methods-commanddirdirectory-opts
+function Argv$commandDir() {
+    const ya = yargs
+        .commandDir('.')
+        .argv;
+}
+
+// http://yargs.js.org/docs/#methods-commanddirdirectory-opts
+function Argv$commandDirWithOptions() {
+    const ya = yargs
+        .commandDir('.', {
+            recurse: false,
+            extensions: ['js'],
+            visit: (commandObject: any, pathToFile: string, filename: string) => void 0,
+            include: /.*\.js$/,
+            exclude: /.*\.spec.js$/,
+        })
+        .argv;
+}
+
+function Argv$normalize() {
+    const ya = yargs
+        .normalize('path')
+        .normalize(['user', 'group'])
+        .argv;
+}
+
+// From http://yargs.js.org/docs/#methods-coercekey-fn
+function Argv$coerce() {
+    const ya = yargs
+        .coerce('file', (arg: string) => {
+            return fs.readFileSync(arg, 'utf8');
+        })
+        .argv;
+}
+function Argv$coerces() {
+    const ya = yargs
+        .coerce({
+            date: Date.parse,
+            json: JSON.parse
+        })
+        .argv;
+}
+function Argv$coerceWithKeys() {
+    const ya = yargs
+        .coerce(['src', 'dest'], path.resolve)
+        .argv;
+}
+
+// From http://yargs.js.org/docs/#methods-failfn
+function Argv$fail() {
+    const ya = yargs
+        .fail((msg, err) => {
+            if (err) throw err; // preserve stack
+            console.error('You broke it!');
+            console.error(msg);
+            process.exit(1);
+        })
+        .argv;
+}
+
+function Argv$implies() {
+    const ya = yargs
+        .implies('foo', 'snuh')
+        .implies({
+            x: 'y'
+        })
+        .argv;
+}
+
+function Argv$count() {
+    const ya = yargs
+        .count('size')
+        .count(['w', 'h'])
+        .argv;
+}
+
+function Argv$number() {
+    const ya = yargs
+        .number('n')
+        .number(['width', 'height'])
+        .argv;
+}
+
+function Argv$updateStrings() {
+    const ya = yargs
+        .command('run', 'the run command')
+        .help('help')
+        .updateStrings({
+            'Commands:': 'My Commands -->\n'
+        })
+        .wrap(null)
+        .argv;
+}
+
+function Argv$default() {
+    const ya = yargs
+        .default('random', function randomValue() {
+            return Math.random() * 256;
+        })
+        .argv;
+}
+
+function Argv$configObject() {
+    const ya = yargs
+        .config({ foo: 1, bar: 2 })
+        .argv;
+}
+
+function Argv$configParseFunction() {
+    const ya = yargs
+        .config('settings', (configPath) => {
+            return JSON.parse(fs.readFileSync(configPath, 'utf-8'));
+        })
+        .config('settings', 'description', (configPath) => {
+            return JSON.parse(fs.readFileSync(configPath, 'utf-8'));
+        })
+        .argv;
+}
+
+function Argv$helpDescriptionExplicit() {
+    const ya = yargs
+        .help('help', 'description', true)
+        .argv;
+}
+
+function Argv$showHelpConsoleLevel() {
+    yargs.showHelp("log"); // prints to stdout using console.log()
+}
+
+function Argv$getCompletion() {
+    const ya = yargs
+        .option('foobar', {})
+        .option('foobaz', {})
+        .completion()
+        .getCompletion(['./test.js', '--foo'], (completions) => {
+            console.log(completions);
+        })
+        .argv;
+}
+
+function Argv$pkgConf() {
+    const ya = yargs
+        .pkgConf(['key1', 'key2'], 'configFile.json')
+        .argv;
+}
+
+function Argv$recommendCommands() {
+    const ya = yargs
+        .recommendCommands()
+        .argv;
+}
+
+function Argv$showCompletionScript() {
+    const ya = yargs
+        .showCompletionScript()
+        .argv;
+}
+
+function Argv$skipValidation() {
+    const ya = yargs
+        .skipValidation('arg1')
+        .skipValidation(['arg2', 'arg3'])
+        .argv;
+}
+
+function Argv$commandObject() {
+    const options: yargs.Options = {
+        alias: "string",
+        array: true,
+        boolean: true,
+        choices: [undefined, true, "a", "b", "c"],
+        coerce: f => JSON.stringify(f),
+        config: true,
+        configParser: t => JSON.parse(fs.readFileSync(t, "utf8")),
+        count: true,
+        default: "myvalue",
+        defaultDescription: "description",
+        demand: true,
+        demandOption: true,
+        desc: "desc",
+        describe: "describe",
+        description: "description",
+        global: false,
+        group: "group",
+        nargs: 1,
+        normalize: false,
+        number: true,
+        requiresArg: true,
+        skipValidation: false,
+        string: true,
+        type: "string"
+    };
+    const ya = yargs.command("commandname", "description", { arg: options });
+}
+
+function Argv$demandCommand() {
+    const ya = yargs
+        .demandCommand(1)
+        .demandCommand(1, 'at least 1 command required')
+        .demandCommand(1, 2)
+        .demandCommand(1, 2, 'at least 1 command required')
+        .demandCommand(1, 2, 'at least 1 command required', 'at most 2 commands required')
+        .argv;
+}
+
+function Argv$demandOption() {
+    const ya = yargs
+        .demandOption('a')
+        .demandOption('a', 'a is required')
+        .demandOption('a', true)
+        .demandOption(['a', 'b'])
+        .demandOption(['a', 'b'], 'a and b are required')
+        .demandOption(['a', 'b'], true)
+        .argv;
+}
+
+function Argv$conflicts() {
+    const ya = yargs
+        .conflicts('a', 'b')
+        .conflicts({
+            a: 'b'
+        })
+        .argv;
+}
+
+function Argv$commandArray() {
+    const ya = yargs
+        .command(['commandName', 'commandAlias'], 'command description')
+        .argv;
+}
+
+function Argv$check() {
+    const ya = yargs
+        .check((argv, aliases) => void 0)
+        .check((argv, aliases) => void 0, false);
+}
diff --git a/types/yargs/v8/tsconfig.json b/types/yargs/v8/tsconfig.json
index 191904df93..744f9ddc55 100644
--- a/types/yargs/v8/tsconfig.json
+++ b/types/yargs/v8/tsconfig.json
@@ -25,4 +25,4 @@
         "index.d.ts",
         "yargs-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/yargs/v8/yargs-tests.ts b/types/yargs/v8/yargs-tests.ts
index 3f5b8829aa..5e95564faf 100644
--- a/types/yargs/v8/yargs-tests.ts
+++ b/types/yargs/v8/yargs-tests.ts
@@ -1,6 +1,6 @@
 /// <reference types="node" />
 
-import * as yargs from 'yargs';
+import yargs = require('yargs');
 
 import * as fs from 'fs';
 import * as path from 'path';
diff --git a/types/yargs/yargs-tests.ts b/types/yargs/yargs-tests.ts
index aa0ff28235..43779309bf 100644
--- a/types/yargs/yargs-tests.ts
+++ b/types/yargs/yargs-tests.ts
@@ -1,6 +1,6 @@
 /// <reference types="node" />
 
-import * as yargs from 'yargs';
+import yargs = require('yargs');
 
 import * as fs from 'fs';
 import * as path from 'path';
diff --git a/types/yayson/yayson-tests.ts b/types/yayson/yayson-tests.ts
index 4e8b9c7d36..4945c03737 100644
--- a/types/yayson/yayson-tests.ts
+++ b/types/yayson/yayson-tests.ts
@@ -1,4 +1,4 @@
-import * as Yayson from "yayson";
+import Yayson = require("yayson");
 
 const yayson = Yayson({ adapter: 'default' }) || Yayson({ adapter: 'sequelize' }) || Yayson();
 const Adapter = yayson.Adapter;
diff --git a/types/youtube-dl/tsconfig.json b/types/youtube-dl/tsconfig.json
index 2634bd2234..e4e1a8f527 100644
--- a/types/youtube-dl/tsconfig.json
+++ b/types/youtube-dl/tsconfig.json
@@ -5,7 +5,9 @@
     ],
     "compilerOptions": {
         "module": "commonjs",
-        "lib": ["es6"],
+        "lib": [
+            "es6"
+        ],
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
diff --git a/types/yup/index.d.ts b/types/yup/index.d.ts
index 99e67121d8..e6dc35c1ea 100644
--- a/types/yup/index.d.ts
+++ b/types/yup/index.d.ts
@@ -1,13 +1,13 @@
 // Type definitions for yup 0.24
 // Project: https://github.com/jquense/yup
-// Definitions by: Dominik Hardtke <https://github.com/dhardtke>, Vladyslav Tserman <https://github.com/vtserman>
+// Definitions by: Dominik Hardtke <https://github.com/dhardtke>, Vladyslav Tserman <https://github.com/vtserman>, Moreton Bay Regional Council <https://github.com/MoretonBayRC>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
-export function reach(schema: Schema, path: string, value?: any, context?: any): Schema;
-export function addMethod<T extends Schema>(schemaCtor: AnySchemaConstructor, name: string, method: (this: T, ...args: any[]) => T): void;
+export function reach<T>(schema: Schema<T>, path: string, value?: any, context?: any): Schema<T>;
+export function addMethod<T extends Schema<any>>(schemaCtor: AnySchemaConstructor, name: string, method: (this: T, ...args: any[]) => T): void;
 export function ref(path: string, options?: { contextPrefix: string }): Ref;
-export function lazy(fn: (value: any) => Schema): Lazy;
+export function lazy<T>(fn: (value: T) => Schema<T>): Lazy;
 export function ValidationError(errors: string | string[], value: any, path: string, type?: any): ValidationError;
 
 export const mixed: MixedSchemaConstructor;
@@ -27,19 +27,19 @@ export type AnySchemaConstructor = MixedSchemaConstructor
     | ArraySchemaConstructor
     | ObjectSchemaConstructor;
 
-export interface Schema {
+export interface Schema<T> {
     clone(): this;
     label(label: string): this;
     meta(metadata: any): this;
     meta(): any;
     describe(): SchemaDescription;
     concat(schema: this): this;
-    validate<U>(value: U, options?: ValidateOptions): Promise<ValidationError|U>;
-    validateSync<U>(value: U, options?: ValidateOptions): ValidationError|U;
-    isValid(value: any, options?: any): Promise<boolean>;
-    isValidSync(value: any, options?: any): boolean;
-    cast(value: any, options?: any): any;
-    isType(value: any): boolean;
+    validate(value: T, options?: ValidateOptions): Promise<ValidationError|T>;
+    validateSync(value: T, options?: ValidateOptions): ValidationError|T;
+    isValid(value: T, options?: any): Promise<boolean>;
+    isValidSync(value: T, options?: any): boolean;
+    cast(value: any, options?: any): T;
+    isType(value: any): value is T;
     strict(isStrict: boolean): this;
     strip(strip: boolean): this;
     withMutation(fn: (current: this) => void): void;
@@ -61,7 +61,7 @@ export interface MixedSchemaConstructor {
 }
 
 // tslint:disable-next-line:no-empty-interface
-export interface MixedSchema extends Schema {
+export interface MixedSchema extends Schema<any> {
 }
 
 export interface StringSchemaConstructor {
@@ -69,7 +69,7 @@ export interface StringSchemaConstructor {
     new(): StringSchema;
 }
 
-export interface StringSchema extends Schema {
+export interface StringSchema extends Schema<string> {
     min(limit: number | Ref, message?: string): StringSchema;
     max(limit: number | Ref, message?: string): StringSchema;
     matches(regex: RegExp, message?: string): StringSchema;
@@ -86,7 +86,7 @@ export interface NumberSchemaConstructor {
     new(): NumberSchema;
 }
 
-export interface NumberSchema extends Schema {
+export interface NumberSchema extends Schema<number> {
     min(limit: number | Ref, message?: string): NumberSchema;
     max(limit: number | Ref, message?: string): NumberSchema;
     lessThan(limit: number | Ref, message?: string): NumberSchema;
@@ -104,7 +104,7 @@ export interface BooleanSchemaConstructor {
 }
 
 // tslint:disable-next-line:no-empty-interface
-export interface BooleanSchema extends Schema {
+export interface BooleanSchema extends Schema<boolean> {
 }
 
 export interface DateSchemaConstructor {
@@ -112,36 +112,36 @@ export interface DateSchemaConstructor {
     new(): DateSchema;
 }
 
-export interface DateSchema extends Schema {
+export interface DateSchema extends Schema<Date> {
     min(limit: Date | string | Ref, message?: string): DateSchema;
     max(limit: Date | string | Ref, message?: string): DateSchema;
 }
 
 export interface ArraySchemaConstructor {
-    (): ArraySchema;
-    new(): ArraySchema;
+    <T>(schema?: Schema<T>): ArraySchema<T>;
+    new(): ArraySchema<{}>;
 }
 
-export interface ArraySchema extends Schema {
-    of(type: Schema): ArraySchema;
-    min(limit: number | Ref, message?: string): ArraySchema;
-    max(limit: number | Ref, message?: string): ArraySchema;
-    ensure(): ArraySchema;
-    compact(rejector: (value: any) => boolean): ArraySchema;
+export interface ArraySchema<T> extends Schema<T[]> {
+    of<U>(type: Schema<U>): ArraySchema<U>;
+    min(limit: number | Ref, message?: string): ArraySchema<T>;
+    max(limit: number | Ref, message?: string): ArraySchema<T>;
+    ensure(): ArraySchema<T>;
+    compact(rejector: (value: any) => boolean): ArraySchema<T>;
 }
 
 export interface ObjectSchemaConstructor {
-    (fields?: any): ObjectSchema;
-    new(): ObjectSchema;
+    <T>(fields?: { [field in keyof T]: Schema<T[field]> }): ObjectSchema<T>;
+    new (): ObjectSchema<{}>;
 }
 
-export interface ObjectSchema extends Schema {
-    shape(fields: any, noSortEdges?: Array<[string, string]>): ObjectSchema;
-    from(fromKey: string, toKey: string, alias?: boolean): ObjectSchema;
-    noUnknown(onlyKnownKeys: boolean, message?: string): ObjectSchema;
+export interface ObjectSchema<T> extends Schema<T> {
+    shape(fields: { [field in keyof T]: Schema<T[field]> }, noSortEdges?: Array<[string, string]>): ObjectSchema<T>;
+    from(fromKey: string, toKey: string, alias?: boolean): ObjectSchema<T>;
+    noUnknown(onlyKnownKeys: boolean, message?: string): ObjectSchema<T>;
     transformKeys(callback: (key: any) => any): void;
-    camelCase(): ObjectSchema;
-    constantCase(): ObjectSchema;
+    camelCase(): ObjectSchema<T>;
+    constantCase(): ObjectSchema<T>;
 }
 
 export type TransformFunction<T> = ((this: T, value: any, originalValue: any) => any);
@@ -240,7 +240,7 @@ export interface Ref {
 }
 
 // tslint:disable-next-line:no-empty-interface
-export interface Lazy extends Schema {
+export interface Lazy extends Schema<any> {
 }
 
 export interface LocaleObject {
@@ -250,6 +250,6 @@ export interface LocaleObject {
   boolean?: { [key in keyof BooleanSchema]?: string };
   bool?: { [key in keyof BooleanSchema]?: string };
   date?: { [key in keyof DateSchema]?: string };
-  array?: { [key in keyof ArraySchema]?: string };
-  object?: { [key in keyof ObjectSchema]?: string };
+  array?: { [key in keyof ArraySchema<any>]?: string };
+  object?: { [key in keyof ObjectSchema<any>]?: string };
 }
diff --git a/types/yup/tsconfig.json b/types/yup/tsconfig.json
index c0aa18bfc2..2f701d2d03 100644
--- a/types/yup/tsconfig.json
+++ b/types/yup/tsconfig.json
@@ -21,4 +21,4 @@
         "lib/customLocale.d.ts",
         "yup-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/yup/yup-tests.ts b/types/yup/yup-tests.ts
index 8d84bbf42d..9dd02ced73 100644
--- a/types/yup/yup-tests.ts
+++ b/types/yup/yup-tests.ts
@@ -35,7 +35,7 @@ schema = yup.object().shape({
 schema.cast({ foo: { bar: 'boom' } }, { context: { x: 5 } });
 
 // lazy function
-const node: ObjectSchema = yup.object().shape({
+const node: ObjectSchema<any> = yup.object().shape({
     id: yup.number(),
     child: yup.lazy(() =>
       node.default(undefined)
@@ -158,7 +158,7 @@ yup.object().shape({
 });
 
 // String schema
-const strSchema = yup.string();
+const strSchema = yup.string(); // $ExpectType StringSchema
 strSchema.isValid('hello'); // => true
 strSchema.required();
 strSchema.min(5, 'message');
@@ -172,7 +172,7 @@ strSchema.lowercase();
 strSchema.uppercase();
 
 // Number schema
-const numSchema = yup.number();
+const numSchema = yup.number(); // $ExpectType NumberSchema
 numSchema.isValid(10); // => true
 numSchema.min(5, 'message');
 numSchema.max(5, 'message');
@@ -209,6 +209,10 @@ arrSchema.required();
 arrSchema.ensure();
 arrSchema.compact(value => value === null);
 
+yup.array(); // $ExpectType ArraySchema<{}>
+yup.array(yup.string()); // $ExpectType ArraySchema<string>
+yup.array().of(yup.string()); // $ExpectType ArraySchema<string>
+
 // Object Schema
 const objSchema = yup.object().shape({
     name: yup.string().required(),
@@ -261,3 +265,71 @@ setLocale({
     number: { max: "Max message", min: "Min message" },
     string: { email: "String message"}
 });
+
+interface MyInterface {
+    stringField: string;
+    numberField: number;
+    subFields: SubInterface;
+    arrayField: string[];
+}
+
+interface SubInterface {
+    testField: string;
+}
+
+// $ExpectType ObjectSchema<MyInterface>
+const typedSchema = yup.object<MyInterface>({
+    stringField: yup.string().required(), // $ExpectType StringSchema
+    numberField: yup.number().required(), // $ExpectType NumberSchema
+    subFields: yup.object({
+        testField: yup.string().required(),
+    }).required(),
+    arrayField: yup.array(yup.string()).required(), // $ExpectType ArraySchema<string>
+});
+
+const testObject: MyInterface = {
+    stringField: "test1",
+    numberField: 123,
+    subFields: {
+        testField: "test2"
+    },
+    arrayField: ["hi"],
+};
+
+typedSchema.validateSync(testObject); // $ExpectType ValidationError | MyInterface
+
+// $ExpectError
+yup.object<MyInterface>({
+    stringField: yup.string().required(),
+    subFields: yup.object({
+        testField: yup.string().required(),
+    }).required(),
+    arrayField: yup.array(yup.string()).required(),
+});
+
+// $ExpectError
+yup.object<MyInterface>({
+    stringField: yup.number().required(),
+    numberField: yup.number().required(),
+    subFields: yup.object({
+        testField: yup.string().required(),
+    }).required(),
+    arrayField: yup.array(yup.string()).required(),
+});
+
+// $ExpectError
+yup.object<MyInterface>({
+    stringField: yup.string().required(),
+    numberField: yup.number().required(),
+    arrayField: yup.array(yup.string()).required(),
+});
+
+// $ExpectError
+yup.object<MyInterface>({
+    stringField: yup.string().required(),
+    numberField: yup.number().required(),
+    subFields: yup.object({
+        testField: yup.number().required(),
+    }).required(),
+    arrayField: yup.array(yup.string()).required(),
+});
diff --git a/types/zen-observable/zen-observable-tests.ts b/types/zen-observable/zen-observable-tests.ts
index b4da077311..b06e7cb512 100644
--- a/types/zen-observable/zen-observable-tests.ts
+++ b/types/zen-observable/zen-observable-tests.ts
@@ -1,4 +1,4 @@
-import * as Observable from 'zen-observable';
+import Observable = require('zen-observable');
 
 function assert(val: boolean) {
     if (!val) {
diff --git a/types/zen-push/tsconfig.json b/types/zen-push/tsconfig.json
index d3e8efb833..7f5c9dded5 100644
--- a/types/zen-push/tsconfig.json
+++ b/types/zen-push/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "zen-push-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/zen-push/zen-push-tests.ts b/types/zen-push/zen-push-tests.ts
index 79abc517e8..70feab99f6 100644
--- a/types/zen-push/zen-push-tests.ts
+++ b/types/zen-push/zen-push-tests.ts
@@ -1,5 +1,5 @@
 import PushStream from 'zen-push';
-import * as Observable from 'zen-observable';
+import Observable = require('zen-observable');
 
 function assert(val: boolean) {
     if (!val) {
diff --git a/types/zenscroll/tsconfig.json b/types/zenscroll/tsconfig.json
index 89fc59c020..4d5538d022 100644
--- a/types/zenscroll/tsconfig.json
+++ b/types/zenscroll/tsconfig.json
@@ -8,7 +8,7 @@
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": false,
-		"strictFunctionTypes": true,
+        "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"
@@ -19,6 +19,6 @@
     },
     "files": [
         "index.d.ts",
-		"zenscroll-tests.ts"
+        "zenscroll-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/types/zeromq/index.d.ts b/types/zeromq/index.d.ts
index 189d60fc29..d1088aba8f 100644
--- a/types/zeromq/index.d.ts
+++ b/types/zeromq/index.d.ts
@@ -240,3 +240,14 @@ export function createSocket(type: string, options?: any): Socket;
  * @return The public and secret portions of the key.
  */
 export function curveKeypair(): CurveKeyPair;
+
+/**
+ * Connects a frontend socket to a backend socket.
+ * @param frontend The frontend socket to connect with the backend socket.
+ *                 Frontend socket should be a 'push', 'pull', 'xpub', 'router' or 'xrep' socket.
+ * @param backend The backend socket to connect with the frontend socket.
+ *                Backend socket should be a 'pull', 'push', 'xsub', 'dealer' or 'xreq' socket.
+ * @param capture If defined, this socket will receive all messages from frontend and backend socket
+ *                Capture socket should be a 'pub', 'dealer', 'push' or 'pair' socket.
+ */
+export function proxy(frontend: Socket, backend: Socket, capture ?: Socket): void;
diff --git a/types/zeromq/zeromq-tests.ts b/types/zeromq/zeromq-tests.ts
index a1230957a7..466deaf4b7 100644
--- a/types/zeromq/zeromq-tests.ts
+++ b/types/zeromq/zeromq-tests.ts
@@ -48,3 +48,13 @@ function test6() {
     sock.pause();
     sock.resume();
 }
+
+function test7() {
+    const xPubSocket = zeromq.socket('xpub');
+    const xPSubSocket = zeromq.socket('xsub');
+
+    xPubSocket.bindSync(`tcp://127.0.0.1:3000`);
+    xPSubSocket.bindSync('tcp://127.0.0.1:3001');
+
+    zeromq.proxy(xPubSocket, xPSubSocket);
+}
diff --git a/types/zipcodes/tsconfig.json b/types/zipcodes/tsconfig.json
index ff98ed05f8..5958e9b659 100644
--- a/types/zipcodes/tsconfig.json
+++ b/types/zipcodes/tsconfig.json
@@ -1,23 +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",
-    "zipcodes-tests.ts"
-  ]
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "zipcodes-tests.ts"
+    ]
 }
\ No newline at end of file
diff --git a/types/zipkin-context-cls/tsconfig.json b/types/zipkin-context-cls/tsconfig.json
index 6cd3375b4f..57430d50b2 100644
--- a/types/zipkin-context-cls/tsconfig.json
+++ b/types/zipkin-context-cls/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "zipkin-context-cls-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/zipkin-instrumentation-express/tsconfig.json b/types/zipkin-instrumentation-express/tsconfig.json
index 8038e5a2cd..fe28fc0e75 100644
--- a/types/zipkin-instrumentation-express/tsconfig.json
+++ b/types/zipkin-instrumentation-express/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "zipkin-instrumentation-express-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/zipkin-instrumentation-fetch/tsconfig.json b/types/zipkin-instrumentation-fetch/tsconfig.json
index 1cf310ea24..56ca69ea74 100644
--- a/types/zipkin-instrumentation-fetch/tsconfig.json
+++ b/types/zipkin-instrumentation-fetch/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "zipkin-instrumentation-fetch-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/zipkin-transport-http/tsconfig.json b/types/zipkin-transport-http/tsconfig.json
index 4f892dbef3..7ed663b14b 100644
--- a/types/zipkin-transport-http/tsconfig.json
+++ b/types/zipkin-transport-http/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "zipkin-transport-http-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/zookeeper/tsconfig.json b/types/zookeeper/tsconfig.json
index 281f393e23..8a2da6e565 100644
--- a/types/zookeeper/tsconfig.json
+++ b/types/zookeeper/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "zookeeper-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/zxcvbn/tsconfig.json b/types/zxcvbn/tsconfig.json
index 72bae94375..c31dddc18b 100644
--- a/types/zxcvbn/tsconfig.json
+++ b/types/zxcvbn/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "zxcvbn-tests.ts"
     ]
-}
+}
\ No newline at end of file