diff --git a/types/ansi-regex/ansi-regex-tests.ts b/types/ansi-regex/ansi-regex-tests.ts
new file mode 100644
index 0000000000..a5787902f0
--- /dev/null
+++ b/types/ansi-regex/ansi-regex-tests.ts
@@ -0,0 +1,13 @@
+import ansiRegex = require("ansi-regex");
+
+ansiRegex(); // $ExpectType RegExp
+
+// From the ansi-regex README.md
+ansiRegex().test('\u001B[4mcake\u001B[0m'); // $ExpectType boolean
+// => true
+
+ansiRegex().test('cake'); // $ExpectType boolean
+// => false
+
+'\u001B[4mcake\u001B[0m'.match(ansiRegex()); // $ExpectType RegExpMatchArray | null
+// => ['\u001B[4m', '\u001B[0m']
diff --git a/types/ansi-regex/index.d.ts b/types/ansi-regex/index.d.ts
new file mode 100644
index 0000000000..34890912dc
--- /dev/null
+++ b/types/ansi-regex/index.d.ts
@@ -0,0 +1,7 @@
+// Type definitions for ansi-regex 3.0
+// Project: https://github.com/chalk/ansi-regex#readme
+// Definitions by: Manish Vachharajani <https://github.com/mvachhar>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare function r(): RegExp;
+export = r;
diff --git a/types/ansi-regex/tsconfig.json b/types/ansi-regex/tsconfig.json
new file mode 100644
index 0000000000..cf1ac84a5c
--- /dev/null
+++ b/types/ansi-regex/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",
+        "ansi-regex-tests.ts"
+    ]
+}
diff --git a/types/ansi-regex/tslint.json b/types/ansi-regex/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/ansi-regex/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/autobahn/index.d.ts b/types/autobahn/index.d.ts
index 7f01a53e3a..969c703478 100644
--- a/types/autobahn/index.d.ts
+++ b/types/autobahn/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for AutobahnJS v0.9.7
 // Project: http://autobahn.ws/js/
-// Definitions by: Elad Zelingher <https://github.com/darkl>, Andy Hawkins <https://github.com/a904guy/,http://a904guy.com/,http://www.bmbsqd.com>, Wladimir Totino <https://github.com/valepu>
+// Definitions by: Elad Zelingher <https://github.com/darkl>, Andy Hawkins <https://github.com/a904guy/,http://a904guy.com/,http://www.bmbsqd.com>, Wladimir Totino <https://github.com/valepu>, Mathias Teier <https://github.com/glenroy37/,http://kagent.at>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="when" />
@@ -179,6 +179,7 @@ declare namespace autobahn {
 
     interface ISubscribeOptions {
         match?: string;
+        get_retained?: boolean;
     }
 
     interface IRegisterOptions {
diff --git a/types/babel-traverse/index.d.ts b/types/babel-traverse/index.d.ts
index 682550b161..df420c17bd 100644
--- a/types/babel-traverse/index.d.ts
+++ b/types/babel-traverse/index.d.ts
@@ -600,185 +600,185 @@ export class NodePath<T = Node> {
     addComments(type: string, comments: any[]): void;
 
     // ------------------------- isXXX -------------------------
-    isArrayExpression(opts?: object): boolean;
-    isAssignmentExpression(opts?: object): boolean;
-    isBinaryExpression(opts?: object): boolean;
-    isDirective(opts?: object): boolean;
-    isDirectiveLiteral(opts?: object): boolean;
-    isBlockStatement(opts?: object): boolean;
-    isBreakStatement(opts?: object): boolean;
-    isCallExpression(opts?: object): boolean;
-    isCatchClause(opts?: object): boolean;
-    isConditionalExpression(opts?: object): boolean;
-    isContinueStatement(opts?: object): boolean;
-    isDebuggerStatement(opts?: object): boolean;
-    isDoWhileStatement(opts?: object): boolean;
-    isEmptyStatement(opts?: object): boolean;
-    isExpressionStatement(opts?: object): boolean;
-    isFile(opts?: object): boolean;
-    isForInStatement(opts?: object): boolean;
-    isForStatement(opts?: object): boolean;
-    isFunctionDeclaration(opts?: object): boolean;
-    isFunctionExpression(opts?: object): boolean;
-    isIdentifier(opts?: object): boolean;
-    isIfStatement(opts?: object): boolean;
-    isLabeledStatement(opts?: object): boolean;
-    isStringLiteral(opts?: object): boolean;
-    isNumericLiteral(opts?: object): boolean;
-    isNullLiteral(opts?: object): boolean;
-    isBooleanLiteral(opts?: object): boolean;
-    isRegExpLiteral(opts?: object): boolean;
-    isLogicalExpression(opts?: object): boolean;
-    isMemberExpression(opts?: object): boolean;
-    isNewExpression(opts?: object): boolean;
-    isProgram(opts?: object): boolean;
-    isObjectExpression(opts?: object): boolean;
-    isObjectMethod(opts?: object): boolean;
-    isObjectProperty(opts?: object): boolean;
-    isRestElement(opts?: object): boolean;
-    isReturnStatement(opts?: object): boolean;
-    isSequenceExpression(opts?: object): boolean;
-    isSwitchCase(opts?: object): boolean;
-    isSwitchStatement(opts?: object): boolean;
-    isThisExpression(opts?: object): boolean;
-    isThrowStatement(opts?: object): boolean;
-    isTryStatement(opts?: object): boolean;
-    isUnaryExpression(opts?: object): boolean;
-    isUpdateExpression(opts?: object): boolean;
-    isVariableDeclaration(opts?: object): boolean;
-    isVariableDeclarator(opts?: object): boolean;
-    isWhileStatement(opts?: object): boolean;
-    isWithStatement(opts?: object): boolean;
-    isAssignmentPattern(opts?: object): boolean;
-    isArrayPattern(opts?: object): boolean;
-    isArrowFunctionExpression(opts?: object): boolean;
-    isClassBody(opts?: object): boolean;
-    isClassDeclaration(opts?: object): boolean;
-    isClassExpression(opts?: object): boolean;
-    isExportAllDeclaration(opts?: object): boolean;
-    isExportDefaultDeclaration(opts?: object): boolean;
-    isExportNamedDeclaration(opts?: object): boolean;
-    isExportSpecifier(opts?: object): boolean;
-    isForOfStatement(opts?: object): boolean;
-    isImportDeclaration(opts?: object): boolean;
-    isImportDefaultSpecifier(opts?: object): boolean;
-    isImportNamespaceSpecifier(opts?: object): boolean;
-    isImportSpecifier(opts?: object): boolean;
-    isMetaProperty(opts?: object): boolean;
-    isClassMethod(opts?: object): boolean;
-    isObjectPattern(opts?: object): boolean;
-    isSpreadElement(opts?: object): boolean;
-    isSuper(opts?: object): boolean;
-    isTaggedTemplateExpression(opts?: object): boolean;
-    isTemplateElement(opts?: object): boolean;
-    isTemplateLiteral(opts?: object): boolean;
-    isYieldExpression(opts?: object): boolean;
-    isAnyTypeAnnotation(opts?: object): boolean;
-    isArrayTypeAnnotation(opts?: object): boolean;
-    isBooleanTypeAnnotation(opts?: object): boolean;
-    isBooleanLiteralTypeAnnotation(opts?: object): boolean;
-    isNullLiteralTypeAnnotation(opts?: object): boolean;
-    isClassImplements(opts?: object): boolean;
-    isClassProperty(opts?: object): boolean;
-    isDeclareClass(opts?: object): boolean;
-    isDeclareFunction(opts?: object): boolean;
-    isDeclareInterface(opts?: object): boolean;
-    isDeclareModule(opts?: object): boolean;
-    isDeclareTypeAlias(opts?: object): boolean;
-    isDeclareVariable(opts?: object): boolean;
-    isExistentialTypeParam(opts?: object): boolean;
-    isFunctionTypeAnnotation(opts?: object): boolean;
-    isFunctionTypeParam(opts?: object): boolean;
-    isGenericTypeAnnotation(opts?: object): boolean;
-    isInterfaceExtends(opts?: object): boolean;
-    isInterfaceDeclaration(opts?: object): boolean;
-    isIntersectionTypeAnnotation(opts?: object): boolean;
-    isMixedTypeAnnotation(opts?: object): boolean;
-    isNullableTypeAnnotation(opts?: object): boolean;
-    isNumericLiteralTypeAnnotation(opts?: object): boolean;
-    isNumberTypeAnnotation(opts?: object): boolean;
-    isStringLiteralTypeAnnotation(opts?: object): boolean;
-    isStringTypeAnnotation(opts?: object): boolean;
-    isThisTypeAnnotation(opts?: object): boolean;
-    isTupleTypeAnnotation(opts?: object): boolean;
-    isTypeofTypeAnnotation(opts?: object): boolean;
-    isTypeAlias(opts?: object): boolean;
-    isTypeAnnotation(opts?: object): boolean;
-    isTypeCastExpression(opts?: object): boolean;
-    isTypeParameterDeclaration(opts?: object): boolean;
-    isTypeParameterInstantiation(opts?: object): boolean;
-    isObjectTypeAnnotation(opts?: object): boolean;
-    isObjectTypeCallProperty(opts?: object): boolean;
-    isObjectTypeIndexer(opts?: object): boolean;
-    isObjectTypeProperty(opts?: object): boolean;
-    isQualifiedTypeIdentifier(opts?: object): boolean;
-    isUnionTypeAnnotation(opts?: object): boolean;
-    isVoidTypeAnnotation(opts?: object): boolean;
-    isJSXAttribute(opts?: object): boolean;
-    isJSXClosingElement(opts?: object): boolean;
-    isJSXElement(opts?: object): boolean;
-    isJSXEmptyExpression(opts?: object): boolean;
-    isJSXExpressionContainer(opts?: object): boolean;
-    isJSXIdentifier(opts?: object): boolean;
-    isJSXMemberExpression(opts?: object): boolean;
-    isJSXNamespacedName(opts?: object): boolean;
-    isJSXOpeningElement(opts?: object): boolean;
-    isJSXSpreadAttribute(opts?: object): boolean;
-    isJSXText(opts?: object): boolean;
-    isNoop(opts?: object): boolean;
-    isParenthesizedExpression(opts?: object): boolean;
-    isAwaitExpression(opts?: object): boolean;
-    isBindExpression(opts?: object): boolean;
-    isDecorator(opts?: object): boolean;
-    isDoExpression(opts?: object): boolean;
-    isExportDefaultSpecifier(opts?: object): boolean;
-    isExportNamespaceSpecifier(opts?: object): boolean;
-    isRestProperty(opts?: object): boolean;
-    isSpreadProperty(opts?: object): boolean;
-    isExpression(opts?: object): boolean;
-    isBinary(opts?: object): boolean;
-    isScopable(opts?: object): boolean;
-    isBlockParent(opts?: object): boolean;
-    isBlock(opts?: object): boolean;
-    isStatement(opts?: object): boolean;
-    isTerminatorless(opts?: object): boolean;
-    isCompletionStatement(opts?: object): boolean;
-    isConditional(opts?: object): boolean;
-    isLoop(opts?: object): boolean;
-    isWhile(opts?: object): boolean;
-    isExpressionWrapper(opts?: object): boolean;
-    isFor(opts?: object): boolean;
-    isForXStatement(opts?: object): boolean;
-    isFunction(opts?: object): boolean;
-    isFunctionParent(opts?: object): boolean;
-    isPureish(opts?: object): boolean;
-    isDeclaration(opts?: object): boolean;
-    isLVal(opts?: object): boolean;
-    isLiteral(opts?: object): boolean;
-    isImmutable(opts?: object): boolean;
-    isUserWhitespacable(opts?: object): boolean;
-    isMethod(opts?: object): boolean;
-    isObjectMember(opts?: object): boolean;
-    isProperty(opts?: object): boolean;
-    isUnaryLike(opts?: object): boolean;
-    isPattern(opts?: object): boolean;
-    isClass(opts?: object): boolean;
-    isModuleDeclaration(opts?: object): boolean;
-    isExportDeclaration(opts?: object): boolean;
-    isModuleSpecifier(opts?: object): boolean;
-    isFlow(opts?: object): boolean;
-    isFlowBaseAnnotation(opts?: object): boolean;
-    isFlowDeclaration(opts?: object): boolean;
-    isJSX(opts?: object): boolean;
-    isNumberLiteral(opts?: object): boolean;
-    isRegexLiteral(opts?: object): boolean;
-    isReferencedIdentifier(opts?: object): boolean;
-    isReferencedMemberExpression(opts?: object): boolean;
-    isBindingIdentifier(opts?: object): boolean;
-    isScope(opts?: object): boolean;
+    isArrayExpression(opts?: object): this is NodePath<t.ArrayExpression> ;
+    isAssignmentExpression(opts?: object): this is NodePath<t.AssignmentExpression>;
+    isBinaryExpression(opts?: object): this is NodePath<t.BinaryExpression>;
+    isDirective(opts?: object): this is NodePath<t.Directive>;
+    isDirectiveLiteral(opts?: object): this is NodePath<t.DirectiveLiteral>;
+    isBlockStatement(opts?: object): this is NodePath<t.BlockStatement>;
+    isBreakStatement(opts?: object): this is NodePath<t.BreakStatement>;
+    isCallExpression(opts?: object): this is NodePath<t.CallExpression>;
+    isCatchClause(opts?: object): this is NodePath<t.CatchClause>;
+    isConditionalExpression(opts?: object): this is NodePath<t.ConditionalExpression>;
+    isContinueStatement(opts?: object): this is NodePath<t.ContinueStatement>;
+    isDebuggerStatement(opts?: object): this is NodePath<t.DebuggerStatement>;
+    isDoWhileStatement(opts?: object): this is NodePath<t.DoWhileStatement>;
+    isEmptyStatement(opts?: object): this is NodePath<t.EmptyStatement>;
+    isExpressionStatement(opts?: object): this is NodePath<t.ExpressionStatement>;
+    isFile(opts?: object): this is NodePath<t.File>;
+    isForInStatement(opts?: object): this is NodePath<t.ForInStatement>;
+    isForStatement(opts?: object): this is NodePath<t.ForStatement>;
+    isFunctionDeclaration(opts?: object): this is NodePath<t.FunctionDeclaration>;
+    isFunctionExpression(opts?: object): this is NodePath<t.FunctionExpression>;
+    isIdentifier(opts?: object): this is NodePath<t.Identifier>;
+    isIfStatement(opts?: object): this is NodePath<t.IfStatement>;
+    isLabeledStatement(opts?: object): this is NodePath<t.LabeledStatement>;
+    isStringLiteral(opts?: object): this is NodePath<t.StringLiteral>;
+    isNumericLiteral(opts?: object): this is NodePath<t.NumericLiteral>;
+    isNullLiteral(opts?: object): this is NodePath<t.NullLiteral>;
+    isBooleanLiteral(opts?: object): this is NodePath<t.BooleanLiteral>;
+    isRegExpLiteral(opts?: object): this is NodePath<t.RegExpLiteral>;
+    isLogicalExpression(opts?: object): this is NodePath<t.LogicalExpression>;
+    isMemberExpression(opts?: object): this is NodePath<t.MemberExpression>;
+    isNewExpression(opts?: object): this is NodePath<t.NewExpression>;
+    isProgram(opts?: object): this is NodePath<t.Program>;
+    isObjectExpression(opts?: object): this is NodePath<t.ObjectExpression>;
+    isObjectMethod(opts?: object): this is NodePath<t.ObjectMethod>;
+    isObjectProperty(opts?: object): this is NodePath<t.ObjectProperty>;
+    isRestElement(opts?: object): this is NodePath<t.RestElement>;
+    isReturnStatement(opts?: object): this is NodePath<t.ReturnStatement>;
+    isSequenceExpression(opts?: object): this is NodePath<t.SequenceExpression>;
+    isSwitchCase(opts?: object): this is NodePath<t.SwitchCase>;
+    isSwitchStatement(opts?: object): this is NodePath<t.SwitchStatement>;
+    isThisExpression(opts?: object): this is NodePath<t.ThisExpression>;
+    isThrowStatement(opts?: object): this is NodePath<t.ThrowStatement>;
+    isTryStatement(opts?: object): this is NodePath<t.TryStatement>;
+    isUnaryExpression(opts?: object): this is NodePath<t.UnaryExpression>;
+    isUpdateExpression(opts?: object): this is NodePath<t.UpdateExpression>;
+    isVariableDeclaration(opts?: object): this is NodePath<t.VariableDeclaration>;
+    isVariableDeclarator(opts?: object): this is NodePath<t.VariableDeclarator>;
+    isWhileStatement(opts?: object): this is NodePath<t.WhileStatement>;
+    isWithStatement(opts?: object): this is NodePath<t.WithStatement>;
+    isAssignmentPattern(opts?: object): this is NodePath<t.AssignmentPattern>;
+    isArrayPattern(opts?: object): this is NodePath<t.ArrayPattern>;
+    isArrowFunctionExpression(opts?: object): this is NodePath<t.ArrowFunctionExpression>;
+    isClassBody(opts?: object): this is NodePath<t.ClassBody>;
+    isClassDeclaration(opts?: object): this is NodePath<t.ClassDeclaration>;
+    isClassExpression(opts?: object): this is NodePath<t.ClassExpression>;
+    isExportAllDeclaration(opts?: object): this is NodePath<t.ExportAllDeclaration>;
+    isExportDefaultDeclaration(opts?: object): this is NodePath<t.ExportDefaultDeclaration>;
+    isExportNamedDeclaration(opts?: object): this is NodePath<t.ExportNamedDeclaration>;
+    isExportSpecifier(opts?: object): this is NodePath<t.ExportSpecifier>;
+    isForOfStatement(opts?: object): this is NodePath<t.ForOfStatement>;
+    isImportDeclaration(opts?: object): this is NodePath<t.ImportDeclaration>;
+    isImportDefaultSpecifier(opts?: object): this is NodePath<t.ImportDefaultSpecifier>;
+    isImportNamespaceSpecifier(opts?: object): this is NodePath<t.ImportNamespaceSpecifier>;
+    isImportSpecifier(opts?: object): this is NodePath<t.ImportSpecifier>;
+    isMetaProperty(opts?: object): this is NodePath<t.MetaProperty>;
+    isClassMethod(opts?: object): this is NodePath<t.ClassMethod>;
+    isObjectPattern(opts?: object): this is NodePath<t.ObjectPattern>;
+    isSpreadElement(opts?: object): this is NodePath<t.SpreadElement>;
+    isSuper(opts?: object): this is NodePath<t.Super>;
+    isTaggedTemplateExpression(opts?: object): this is NodePath<t.TaggedTemplateExpression>;
+    isTemplateElement(opts?: object): this is NodePath<t.TemplateElement>;
+    isTemplateLiteral(opts?: object): this is NodePath<t.TemplateLiteral>;
+    isYieldExpression(opts?: object): this is NodePath<t.YieldExpression>;
+    isAnyTypeAnnotation(opts?: object): this is NodePath<t.AnyTypeAnnotation>;
+    isArrayTypeAnnotation(opts?: object): this is NodePath<t.ArrayTypeAnnotation>;
+    isBooleanTypeAnnotation(opts?: object): this is NodePath<t.BooleanTypeAnnotation>;
+    isBooleanLiteralTypeAnnotation(opts?: object): this is NodePath<t.BooleanLiteralTypeAnnotation>;
+    isNullLiteralTypeAnnotation(opts?: object): this is NodePath<t.NullLiteralTypeAnnotation>;
+    isClassImplements(opts?: object): this is NodePath<t.ClassImplements>;
+    isClassProperty(opts?: object): this is NodePath<t.ClassProperty>;
+    isDeclareClass(opts?: object): this is NodePath<t.DeclareClass>;
+    isDeclareFunction(opts?: object): this is NodePath<t.DeclareFunction>;
+    isDeclareInterface(opts?: object): this is NodePath<t.DeclareInterface>;
+    isDeclareModule(opts?: object): this is NodePath<t.DeclareModule>;
+    isDeclareTypeAlias(opts?: object): this is NodePath<t.DeclareTypeAlias>;
+    isDeclareVariable(opts?: object): this is NodePath<t.DeclareVariable>;
+    isExistentialTypeParam(opts?: object): this is NodePath<t.ExistentialTypeParam>;
+    isFunctionTypeAnnotation(opts?: object): this is NodePath<t.FunctionTypeAnnotation>;
+    isFunctionTypeParam(opts?: object): this is NodePath<t.FunctionTypeParam>;
+    isGenericTypeAnnotation(opts?: object): this is NodePath<t.GenericTypeAnnotation>;
+    isInterfaceExtends(opts?: object): this is NodePath<t.InterfaceExtends>;
+    isInterfaceDeclaration(opts?: object): this is NodePath<t.InterfaceDeclaration>;
+    isIntersectionTypeAnnotation(opts?: object): this is NodePath<t.IntersectionTypeAnnotation>;
+    isMixedTypeAnnotation(opts?: object): this is NodePath<t.MixedTypeAnnotation>;
+    isNullableTypeAnnotation(opts?: object): this is NodePath<t.NullableTypeAnnotation>;
+    isNumericLiteralTypeAnnotation(opts?: object): this is NodePath<t.NumericLiteralTypeAnnotation>;
+    isNumberTypeAnnotation(opts?: object): this is NodePath<t.NumberTypeAnnotation>;
+    isStringLiteralTypeAnnotation(opts?: object): this is NodePath<t.StringLiteralTypeAnnotation>;
+    isStringTypeAnnotation(opts?: object): this is NodePath<t.StringTypeAnnotation>;
+    isThisTypeAnnotation(opts?: object): this is NodePath<t.ThisTypeAnnotation>;
+    isTupleTypeAnnotation(opts?: object): this is NodePath<t.TupleTypeAnnotation>;
+    isTypeofTypeAnnotation(opts?: object): this is NodePath<t.TypeofTypeAnnotation>;
+    isTypeAlias(opts?: object): this is NodePath<t.TypeAlias>;
+    isTypeAnnotation(opts?: object): this is NodePath<t.TypeAnnotation>;
+    isTypeCastExpression(opts?: object): this is NodePath<t.TypeCastExpression>;
+    isTypeParameterDeclaration(opts?: object): this is NodePath<t.TypeParameterDeclaration>;
+    isTypeParameterInstantiation(opts?: object): this is NodePath<t.TypeParameterInstantiation>;
+    isObjectTypeAnnotation(opts?: object): this is NodePath<t.ObjectTypeAnnotation>;
+    isObjectTypeCallProperty(opts?: object): this is NodePath<t.ObjectTypeCallProperty>;
+    isObjectTypeIndexer(opts?: object): this is NodePath<t.ObjectTypeIndexer>;
+    isObjectTypeProperty(opts?: object): this is NodePath<t.ObjectTypeProperty>;
+    isQualifiedTypeIdentifier(opts?: object): this is NodePath<t.QualifiedTypeIdentifier>;
+    isUnionTypeAnnotation(opts?: object): this is NodePath<t.UnionTypeAnnotation>;
+    isVoidTypeAnnotation(opts?: object): this is NodePath<t.VoidTypeAnnotation>;
+    isJSXAttribute(opts?: object): this is NodePath<t.JSXAttribute>;
+    isJSXClosingElement(opts?: object): this is NodePath<t.JSXClosingElement>;
+    isJSXElement(opts?: object): this is NodePath<t.JSXElement>;
+    isJSXEmptyExpression(opts?: object): this is NodePath<t.JSXEmptyExpression>;
+    isJSXExpressionContainer(opts?: object): this is NodePath<t.JSXExpressionContainer>;
+    isJSXIdentifier(opts?: object): this is NodePath<t.JSXIdentifier>;
+    isJSXMemberExpression(opts?: object): this is NodePath<t.JSXMemberExpression>;
+    isJSXNamespacedName(opts?: object): this is NodePath<t.JSXNamespacedName>;
+    isJSXOpeningElement(opts?: object): this is NodePath<t.JSXOpeningElement>;
+    isJSXSpreadAttribute(opts?: object): this is NodePath<t.JSXSpreadAttribute>;
+    isJSXText(opts?: object): this is NodePath<t.JSXText>;
+    isNoop(opts?: object): this is NodePath<t.Noop>;
+    isParenthesizedExpression(opts?: object): this is NodePath<t.ParenthesizedExpression>;
+    isAwaitExpression(opts?: object): this is NodePath<t.AwaitExpression>;
+    isBindExpression(opts?: object): this is NodePath<t.BindExpression>;
+    isDecorator(opts?: object): this is NodePath<t.Decorator>;
+    isDoExpression(opts?: object): this is NodePath<t.DoExpression>;
+    isExportDefaultSpecifier(opts?: object): this is NodePath<t.ExportDefaultSpecifier>;
+    isExportNamespaceSpecifier(opts?: object): this is NodePath<t.ExportNamespaceSpecifier>;
+    isRestProperty(opts?: object): this is NodePath<t.RestProperty>;
+    isSpreadProperty(opts?: object): this is NodePath<t.SpreadProperty>;
+    isExpression(opts?: object): this is NodePath<t.Expression>;
+    isBinary(opts?: object): this is NodePath<t.Binary>;
+    isScopable(opts?: object): this is NodePath<t.Scopable>;
+    isBlockParent(opts?: object): this is NodePath<t.BlockParent>;
+    isBlock(opts?: object): this is NodePath<t.Block>;
+    isStatement(opts?: object): this is NodePath<t.Statement>;
+    isTerminatorless(opts?: object): this is NodePath<t.Terminatorless>;
+    isCompletionStatement(opts?: object): this is NodePath<t.CompletionStatement>;
+    isConditional(opts?: object): this is NodePath<t.Conditional>;
+    isLoop(opts?: object): this is NodePath<t.Loop>;
+    isWhile(opts?: object): this is NodePath<t.While>;
+    isExpressionWrapper(opts?: object): this is NodePath<t.ExpressionWrapper>;
+    isFor(opts?: object): this is NodePath<t.For>;
+    isForXStatement(opts?: object): this is NodePath<t.ForXStatement>;
+    isFunction(opts?: object): this is NodePath<t.Function>;
+    isFunctionParent(opts?: object): this is NodePath<t.FunctionParent>;
+    isPureish(opts?: object): this is NodePath<t.Pureish>;
+    isDeclaration(opts?: object): this is NodePath<t.Declaration>;
+    isLVal(opts?: object): this is NodePath<t.LVal>;
+    isLiteral(opts?: object): this is NodePath<t.Literal>;
+    isImmutable(opts?: object): this is NodePath<t.Immutable>;
+    isUserWhitespacable(opts?: object): this is NodePath<t.UserWhitespacable>;
+    isMethod(opts?: object): this is NodePath<t.Method>;
+    isObjectMember(opts?: object): this is NodePath<t.ObjectMember>;
+    isProperty(opts?: object): this is NodePath<t.Property>;
+    isUnaryLike(opts?: object): this is NodePath<t.UnaryLike>;
+    isPattern(opts?: object): this is NodePath<t.Pattern>;
+    isClass(opts?: object): this is NodePath<t.Class>;
+    isModuleDeclaration(opts?: object): this is NodePath<t.ModuleDeclaration>;
+    isExportDeclaration(opts?: object): this is NodePath<t.ExportDeclaration>;
+    isModuleSpecifier(opts?: object): this is NodePath<t.ModuleSpecifier>;
+    isFlow(opts?: object): this is NodePath<t.Flow>;
+    isFlowBaseAnnotation(opts?: object): this is NodePath<t.FlowBaseAnnotation>;
+    isFlowDeclaration(opts?: object): this is NodePath<t.FlowDeclaration>;
+    isJSX(opts?: object): this is NodePath<t.JSX>;
+    isNumberLiteral(opts?: object): this is NodePath<t.NumericLiteral>;
+    isRegexLiteral(opts?: object): this is NodePath<t.RegExpLiteral>;
+    isReferencedIdentifier(opts?: object): this is NodePath<t.Identifier | t.JSXIdentifier>;
+    isReferencedMemberExpression(opts?: object): this is NodePath<t.MemberExpression>;
+    isBindingIdentifier(opts?: object): this is NodePath<t.Identifier>;
+    isScope(opts?: object): this is NodePath<t.Scopable>;
     isReferenced(opts?: object): boolean;
-    isBlockScoped(opts?: object): boolean;
-    isVar(opts?: object): boolean;
+    isBlockScoped(opts?: object): this is NodePath<t.FunctionDeclaration | t.ClassDeclaration | t.VariableDeclaration>;
+    isVar(opts?: object): this is NodePath<t.VariableDeclaration>;
     isUser(opts?: object): boolean;
     isGenerated(opts?: object): boolean;
     isPure(opts?: object): boolean;
diff --git a/types/babel-types/index.d.ts b/types/babel-types/index.d.ts
index 1879c81e85..a49909ed4a 100644
--- a/types/babel-types/index.d.ts
+++ b/types/babel-types/index.d.ts
@@ -1265,13 +1265,13 @@ export function isJSX(node: object, opts?: object): node is JSX;
 export function isNumberLiteral(node: object, opts?: object): node is NumericLiteral;
 export function isRegexLiteral(node: object, opts?: object): node is RegExpLiteral;
 
-export function isReferencedIdentifier(node: object, opts?: object): boolean;
-export function isReferencedMemberExpression(node: object, opts?: object): boolean;
-export function isBindingIdentifier(node: object, opts?: object): boolean;
-export function isScope(node: object, opts?: object): boolean;
+export function isReferencedIdentifier(node: object, opts?: object): node is Identifier | JSXIdentifier;
+export function isReferencedMemberExpression(node: object, opts?: object): node is MemberExpression;
+export function isBindingIdentifier(node: object, opts?: object): node is Identifier;
+export function isScope(node: object, opts?: object): node is Scopable;
 export function isReferenced(node: object, opts?: object): boolean;
-export function isBlockScoped(node: object, opts?: object): boolean;
-export function isVar(node: object, opts?: object): boolean;
+export function isBlockScoped(node: object, opts?: object): node is FunctionDeclaration | ClassDeclaration | VariableDeclaration;
+export function isVar(node: object, opts?: object): node is VariableDeclaration;
 export function isUser(node: object, opts?: object): boolean;
 export function isGenerated(node: object, opts?: object): boolean;
 export function isPure(node: object, opts?: object): boolean;
diff --git a/types/bson/index.d.ts b/types/bson/index.d.ts
index 2b6a636e89..6aeeabe3d9 100644
--- a/types/bson/index.d.ts
+++ b/types/bson/index.d.ts
@@ -39,6 +39,9 @@ export class Binary {
 
     constructor(buffer: Buffer, subType?: number);
 
+    /** The underlying Buffer which stores the binary data. */
+    readonly buffer: Buffer;
+
     /** The length of the binary. */
     length(): number;
     /** Updates this binary with byte_value */
diff --git a/types/chai/chai-tests.ts b/types/chai/chai-tests.ts
index 0076396422..401e5f468a 100644
--- a/types/chai/chai-tests.ts
+++ b/types/chai/chai-tests.ts
@@ -1357,6 +1357,56 @@ suite('assert', () => {
         assert.notInclude(undefined, 'bar');
     });
 
+    test('deepInclude', () => {
+        assert.deepInclude('foobar', 'bar');
+        assert.deepInclude([1, 2, 3], 3);
+        assert.deepInclude('foobar', 'baz');
+        assert.deepInclude(undefined, 'bar');
+    });
+
+    test('notDeepInclude', () => {
+        assert.notDeepInclude('foobar', 'baz');
+        assert.notDeepInclude([1, 2, 3], 4);
+        assert.notDeepInclude('foobar', 'bar');
+        assert.notDeepInclude(undefined, 'bar');
+    });
+
+    test('nestedInclude', () => {
+        assert.nestedInclude({'.a': {'b': 'x'}}, {'\\.a.[b]': 'x'});
+        assert.nestedInclude({'a': {'[b]': 'x'}}, {'a.\\[b\\]': 'x'});
+    });
+
+    test('notNestedInclude', () => {
+        assert.notNestedInclude({'.a': {'b': 'x'}}, {'\\.a.b': 'y'});
+        assert.notNestedInclude({'a': {'[b]': 'x'}}, {'a.\\[b\\]': 'y'});
+    });
+
+    test('deepNestedInclude', () => {
+        assert.deepNestedInclude({a: {b: [{x: 1}]}}, {'a.b[0]': {x: 1}});
+        assert.deepNestedInclude({'.a': {'[b]': {x: 1}}}, {'\\.a.\\[b\\]': {x: 1}});
+    });
+
+    test('notDeepNestedInclude', () => {
+        assert.notDeepNestedInclude({a: {b: [{x: 1}]}}, {'a.b[0]': {y: 1}})
+        assert.notDeepNestedInclude({'.a': {'[b]': {x: 1}}}, {'\\.a.\\[b\\]': {y: 2}});
+    });
+
+    test('ownInclude', () => {
+        assert.ownInclude({ a: 1 }, { a: 1 });
+    });
+
+    test('notOwnInclude', () => {
+        assert.notOwnInclude({ a: 1 }, { a: 1 });
+    });
+
+    test('deepOwnInclude', () => {
+        assert.deepOwnInclude({a: {b: 2}}, {a: {b: 2}});
+    });
+
+    test('notDeepOwnInclude', () => {
+        assert.notDeepOwnInclude({a: {b: 2}}, {a: {c: 3}});
+    });
+
     test('lengthOf', () => {
         assert.lengthOf([1, 2, 3], 3);
         assert.lengthOf('foobar', 6);
diff --git a/types/chai/index.d.ts b/types/chai/index.d.ts
index 340d69f7cd..faafa3b2a8 100644
--- a/types/chai/index.d.ts
+++ b/types/chai/index.d.ts
@@ -7,6 +7,7 @@
 //                 Matt Wistrand <https://github.com/mwistrand>,
 //                 Josh Goldberg <https://github.com/joshuakgoldberg>
 //                 Shaun Luttin <https://github.com/shaunluttin>
+//                 Gintautas Miselis <https://github.com/Naktibalda>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 // <reference types="assertion-error"/>
@@ -706,13 +707,145 @@ declare namespace Chai {
         /**
          * Asserts that haystack does not include needle.
          *
-         * @type T   Type of values in haystack.
          * @param haystack   Container array.
          * @param needle   Potential value contained in haystack.
          * @param message   Message to display on error.
          */
         notInclude(haystack: any[], needle: any, message?: string): void;
 
+
+        /**
+         * Asserts that haystack includes needle. Can be used to assert the inclusion of a value in an array or a subset of properties in an object. Deep equality is used.
+         *
+         * @param haystack   Container string.
+         * @param needle   Potential expected substring of haystack.
+         * @param message   Message to display on error.
+         */
+        deepInclude(haystack: string, needle: string, message?: string): void;
+
+        /**
+         * Asserts that haystack includes needle. Can be used to assert the inclusion of a value in an array or a subset of properties in an object. Deep equality is used.
+         *
+         * @param haystack
+         * @param needle
+         * @param message   Message to display on error.
+         */
+        deepInclude<T>(haystack: any, needle: any, message?: string): void;
+
+        /**
+         * Asserts that haystack does not include needle. Can be used to assert the absence of a value in an array or a subset of properties in an object. Deep equality is used.
+         *
+         * @param haystack   Container string.
+         * @param needle   Potential expected substring of haystack.
+         * @param message   Message to display on error.
+         */
+        notDeepInclude(haystack: string, needle: any, message?: string): void;
+
+        /**
+         * Asserts that haystack does not include needle. Can be used to assert the absence of a value in an array or a subset of properties in an object. Deep equality is used.
+         *
+         * @param haystack
+         * @param needle
+         * @param message   Message to display on error.
+         */
+        notDeepInclude(haystack: any[], needle: any, message?: string): void;
+
+        /**
+         * Asserts that ‘haystack’ includes ‘needle’. Can be used to assert the inclusion of a subset of properties in an object.
+         *
+         * Enables the use of dot- and bracket-notation for referencing nested properties.
+         * ‘[]’ and ‘.’ in property names can be escaped using double backslashes.Asserts that ‘haystack’ includes ‘needle’.
+         * Can be used to assert the inclusion of a subset of properties in an object.
+         * Enables the use of dot- and bracket-notation for referencing nested properties.
+         * ‘[]’ and ‘.’ in property names can be escaped using double backslashes.
+         *
+         * @param haystack
+         * @param needle
+         * @param message   Message to display on error.
+         */
+        nestedInclude(haystack: any, needle: any, message?: string): void;
+
+        /**
+         * Asserts that ‘haystack’ does not include ‘needle’. Can be used to assert the absence of a subset of properties in an object.
+         *
+         * Enables the use of dot- and bracket-notation for referencing nested properties.
+         * ‘[]’ and ‘.’ in property names can be escaped using double backslashes.Asserts that ‘haystack’ includes ‘needle’.
+         * Can be used to assert the inclusion of a subset of properties in an object.
+         * Enables the use of dot- and bracket-notation for referencing nested properties.
+         * ‘[]’ and ‘.’ in property names can be escaped using double backslashes.
+         *
+         * @param haystack
+         * @param needle
+         * @param message   Message to display on error.
+         */
+        notNestedInclude(haystack: any, needle: any, message?: string): void;
+
+        /**
+         * Asserts that ‘haystack’ includes ‘needle’. Can be used to assert the inclusion of a subset of properties in an object while checking for deep equality
+         *
+         * Enables the use of dot- and bracket-notation for referencing nested properties.
+         * ‘[]’ and ‘.’ in property names can be escaped using double backslashes.Asserts that ‘haystack’ includes ‘needle’.
+         * Can be used to assert the inclusion of a subset of properties in an object.
+         * Enables the use of dot- and bracket-notation for referencing nested properties.
+         * ‘[]’ and ‘.’ in property names can be escaped using double backslashes.
+         *
+         * @param haystack
+         * @param needle
+         * @param message   Message to display on error.
+         */
+        deepNestedInclude(haystack: any, needle: any, message?: string): void;
+
+        /**
+         * Asserts that ‘haystack’ does not include ‘needle’. Can be used to assert the absence of a subset of properties in an object while checking for deep equality.
+         *
+         * Enables the use of dot- and bracket-notation for referencing nested properties.
+         * ‘[]’ and ‘.’ in property names can be escaped using double backslashes.Asserts that ‘haystack’ includes ‘needle’.
+         * Can be used to assert the inclusion of a subset of properties in an object.
+         * Enables the use of dot- and bracket-notation for referencing nested properties.
+         * ‘[]’ and ‘.’ in property names can be escaped using double backslashes.
+         *
+         * @param haystack
+         * @param needle
+         * @param message   Message to display on error.
+         */
+        notDeepNestedInclude(haystack: any, needle: any, message?: string): void;
+
+        /**
+         * Asserts that ‘haystack’ includes ‘needle’. Can be used to assert the inclusion of a subset of properties in an object while ignoring inherited properties.
+         *
+         * @param haystack
+         * @param needle
+         * @param message   Message to display on error.
+         */
+        ownInclude(haystack: any, needle: any, message?: string): void;
+
+        /**
+         * Asserts that ‘haystack’ includes ‘needle’. Can be used to assert the absence of a subset of properties in an object while ignoring inherited properties.
+         *
+         * @param haystack
+         * @param needle
+         * @param message   Message to display on error.
+         */
+        notOwnInclude(haystack: any, needle: any, message?: string): void;
+
+        /**
+         * Asserts that ‘haystack’ includes ‘needle’. Can be used to assert the inclusion of a subset of properties in an object while ignoring inherited properties and checking for deep
+         *
+         * @param haystack
+         * @param needle
+         * @param message   Message to display on error.
+         */
+        deepOwnInclude(haystack: any, needle: any, message?: string): void;
+
+        /**
+         * Asserts that ‘haystack’ includes ‘needle’. Can be used to assert the absence of a subset of properties in an object while ignoring inherited properties and checking for deep equality.
+         *
+         * @param haystack
+         * @param needle
+         * @param message   Message to display on error.
+         */
+        notDeepOwnInclude(haystack: any, needle: any, message?: string): void;
+
         /**
          * Asserts that value matches the regular expression regexp.
          *
diff --git a/types/chart.js/index.d.ts b/types/chart.js/index.d.ts
index f4f4bda40d..049488f8db 100644
--- a/types/chart.js/index.d.ts
+++ b/types/chart.js/index.d.ts
@@ -159,6 +159,7 @@ declare namespace Chart {
     interface ChartOptions {
         responsive?: boolean;
         responsiveAnimationDuration?: number;
+        aspectRatio?: number;
         maintainAspectRatio?: boolean;
         events?: string[];
         onClick?(event?: MouseEvent, activeElements?: Array<{}>): any;
diff --git a/types/cheerio/index.d.ts b/types/cheerio/index.d.ts
index 511fce354d..8250848374 100644
--- a/types/cheerio/index.d.ts
+++ b/types/cheerio/index.d.ts
@@ -263,6 +263,7 @@ interface CheerioElement {
     parent: CheerioElement;
     parentNode: CheerioElement;
     nodeValue: string;
+    data?: string;
 }
 
 interface CheerioAPI extends CheerioSelector, CheerioStatic {
diff --git a/types/codemirror/index.d.ts b/types/codemirror/index.d.ts
index 8fd9f59148..4f479b29d0 100644
--- a/types/codemirror/index.d.ts
+++ b/types/codemirror/index.d.ts
@@ -105,9 +105,9 @@ declare namespace CodeMirror {
     function signal(target: any, name: string, ...args: any[]): void;
 
     type DOMEvent = 'mousedown' | 'dblclick' | 'touchstart' | 'contextmenu' | 'keydown' | 'keypress' | 'keyup' | 'cut' | 'copy' | 'paste' | 'dragstart' | 'dragenter' | 'dragover' | 'dragleave' | 'drop';
-    
+
     type CoordsMode = 'window' | 'page' | 'local';
-    
+
     interface Token {
         /** The character(on the given line) at which the token starts. */
         start: number;
@@ -202,10 +202,10 @@ declare namespace CodeMirror {
         /** Compute the line at the given pixel height. mode is the relative element
         to use to compute this line, it may be "window", "page" (the default), or "local" */
         lineAtHeight(height: number, mode?: CoordsMode): number;
-        
-        /** Computes the height of the top of a line, in the coordinate system specified by mode, it may be "window", 
-        "page" (the default), or "local". When a line below the bottom of the document is specified, the returned value 
-        is the bottom of the last line in the document. By default, the position of the actual text is returned. 
+
+        /** Computes the height of the top of a line, in the coordinate system specified by mode, it may be "window",
+        "page" (the default), or "local". When a line below the bottom of the document is specified, the returned value
+        is the bottom of the last line in the document. By default, the position of the actual text is returned.
         If includeWidgets is true and the line has line widgets, the position above the first line widget is returned. */
         heightAtLine(line: any, mode?: CoordsMode, includeWidgets?: boolean): number;
 
@@ -292,7 +292,7 @@ declare namespace CodeMirror {
         charCoords(pos: CodeMirror.Position, mode?: CoordsMode): { left: number; right: number; top: number; bottom: number; };
 
         /** Given an { left , top } object , returns the { line , ch } position that corresponds to it.
-        The optional mode parameter determines relative to what the coordinates are interpreted. 
+        The optional mode parameter determines relative to what the coordinates are interpreted.
         It may be "window", "page" (the default), or "local". */
         coordsChar(object: { left: number; top: number; }, mode?: CoordsMode): CodeMirror.Position;
 
@@ -512,7 +512,7 @@ declare namespace CodeMirror {
 
         /** Get the currently selected code. */
         getSelection(): string;
-        
+
         /** Returns an array containing a string for each selection, representing the content of the selections. */
         getSelections(lineSep?: string): Array<string>;
 
@@ -535,8 +535,14 @@ declare namespace CodeMirror {
         /** Set the cursor position.You can either pass a single { line , ch } object , or the line and the character as two separate parameters. */
         setCursor(pos: CodeMirror.Position): void;
 
-        /** Set the selection range.anchor and head should be { line , ch } objects.head defaults to anchor when not given. */
-        setSelection(anchor: CodeMirror.Position, head: CodeMirror.Position): void;
+        /** Set a single selection range. anchor and head should be {line, ch} objects. head defaults to anchor when not given. */
+        setSelection(anchor: CodeMirror.Position, head: CodeMirror.Position, options?: { bias?: number, origin?: string, scroll?: boolean }): void;
+
+        /** Sets a new set of selections. There must be at least one selection in the given array. When primary is a
+        number, it determines which selection is the primary one. When it is not given, the primary index is taken from
+        the previous selection, or set to the last range if the previous selection had less ranges than the new one.
+        Supports the same options as setSelection. */
+        setSelections(ranges: Array<{ anchor: CodeMirror.Position, head: CodeMirror.Position }>, primary?: number, options?: { bias?: number, origin?: string, scroll?: boolean }): void;
 
         /** Similar to setSelection , but will, if shift is held or the extending flag is set,
         move the head of the selection while leaving the anchor at its current place.
@@ -779,7 +785,7 @@ declare namespace CodeMirror {
         /** Determines whether the gutter scrolls along with the content horizontally (false)
         or whether it stays fixed during horizontal scrolling (true, the default). */
         fixedGutter?: boolean;
-        
+
         /**
          * Chooses a scrollbar implementation. The default is "native", showing native scrollbars. The core library also
          * provides the "null" style, which completely hides the scrollbars. Addons can implement additional scrollbar models.
diff --git a/types/cordova-plugin-keyboard/cordova-plugin-keyboard-tests.ts b/types/cordova-plugin-keyboard/cordova-plugin-keyboard-tests.ts
index 767eaa6ed2..fa5cf72a30 100644
--- a/types/cordova-plugin-keyboard/cordova-plugin-keyboard-tests.ts
+++ b/types/cordova-plugin-keyboard/cordova-plugin-keyboard-tests.ts
@@ -1,23 +1,31 @@
 Keyboard.shrinkView(true);
 Keyboard.shrinkView(false);
+Keyboard.shrinkView(null, (currentValue) => console.log(currentValue));
+
 Keyboard.hideFormAccessoryBar(true);
 Keyboard.hideFormAccessoryBar(false);
+Keyboard.hideFormAccessoryBar(null, (currentValue) => console.log(currentValue));
+
 Keyboard.disableScrollingInShrinkView(true);
 Keyboard.disableScrollingInShrinkView(false);
+Keyboard.disableScrollingInShrinkView(null, (currentValue) => console.log(currentValue));
+
+Keyboard.hide();
+
+Keyboard.show();
+
 if (Keyboard.isVisible) {
     console.log('Keyboard is visible');
 }
-Keyboard.automaticScrollToTopOnHiding = true;
-Keyboard.onshow = function () {
-    console.log('onshow');
-};
-Keyboard.onhide = function () {
-    console.log('onhide');
-};
-Keyboard.onshowing = function () {
-    console.log('onshowing');
-};
-Keyboard.onhiding= function () {
-    console.log('onhiding');
-};
 
+Keyboard.automaticScrollToTopOnHiding = true;
+
+window.addEventListener('keyboardDidShow', () => console.log('keyboardDidShow'));
+
+window.addEventListener('keyboardDidHide', () => console.log('keyboardDidHide'));
+
+window.addEventListener('keyboardWillShow', () => console.log('keyboardWillShow'));
+
+window.addEventListener('keyboardWillHide', () => console.log('keyboardWillHide'));
+
+window.addEventListener('keyboardHeightWillChange', (event: CordovaKeyboardEvent) => console.log(`keyboardHeightWillChange - keyboard height: ${event.keyboardHeight}`));
diff --git a/types/cordova-plugin-keyboard/index.d.ts b/types/cordova-plugin-keyboard/index.d.ts
index 427a5425e5..af880d732a 100644
--- a/types/cordova-plugin-keyboard/index.d.ts
+++ b/types/cordova-plugin-keyboard/index.d.ts
@@ -1,32 +1,9 @@
-// Type definitions for Apache Cordova Keyboard plugin v0.1.2
-// Project: https://github.com/apache/cordova-plugins/tree/master/keyboard
-// Definitions by: Dan Manastireanu <https://github.com/danmana>
+// Type definitions for Apache Cordova Keyboard plugin v1.2.0
+// Project: https://github.com/cjpearson/cordova-plugin-keyboard
+// Definitions by:  Dan Manastireanu <https://github.com/danmana>
+//                  Jochen Becker <https://github.com/jkfb>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/**
- * The Keyboard object provides some functions to customize the iOS keyboard.
- *
- * <i>Supported Platforms: iOS</i>
- *
- * This plugin has only been tested in Cordova 3.2 or greater,
- * and its use in previous Cordova versions is not recommended
- * (potential conflict with keyboard customization code present in the core in previous Cordova versions).
- *
- * If you do use this plugin in an older Cordova version (again, not recommended),
- * you have to make sure the HideKeyboardFormAccessoryBar and KeyboardShrinksView preference values are always false,
- * and only use the API functions to turn things on/off.
- *
- * This plugin supports the HideKeyboardFormAccessoryBar (boolean)
- * and KeyboardShrinksView (boolean) preferences in config.xml.
- *
- * Permissions in config.xml
- * <code>
- *     <feature name="Keyboard">
- *         <param name="ios-package" value="CDVKeyboard" onload="true" />
- *     </feature>
- * </code>
- *
- */
 interface Keyboard {
 
     // Methods
@@ -39,15 +16,20 @@ interface Keyboard {
      * This applies to apps that position their elements relative to the bottom of the WebView.
      * This is the default behaviour on Android, and makes a lot of sense when building apps as opposed to webpages.
      *
+     * Supported Platforms:
+     *  - iOS
+     *
      * Example:
      * <code>
      * Keyboard.shrinkView(true);
      * Keyboard.shrinkView(false);
+     * Keyboard.shrinkView(null, function (currentValue) { console.log(currentValue); });
      * </code>
      *
      * @param shrink
+     * @param successCallback A success callbackfunction
      */
-    shrinkView(shrink:boolean): void,
+    shrinkView(shrink: boolean, successCallback?: (currentValue: any) => void): void,
 
     /**
      * Hide the keyboard toolbar.
@@ -55,21 +37,29 @@ interface Keyboard {
      * Set to true to hide the additional toolbar that is on top of the keyboard.
      * This toolbar features the Prev, Next, and Done buttons.
      *
+     * Supported Platforms:
+     *  - iOS
+     *
      * Example:
      * <code>
      * Keyboard.hideFormAccessoryBar(true);
      * Keyboard.hideFormAccessoryBar(false);
+     * Keyboard.hideFormAccessoryBar(null, function (currentValue) { console.log(currentValue); });
      * </code>
      *
      * @param hide
+     * @param successCallback A success callbackfunction
      */
-    hideFormAccessoryBar(hide:boolean): void,
+    hideFormAccessoryBar(hide: boolean, successCallback?: (currentValue: any) => void): void,
 
     /**
      * Disable scrolling when the the WebView is shrunk.
      *
      * Set to true to disable scrolling when the WebView is shrunk.
      *
+     * Supported Platforms:
+     *  - iOS
+     *
      * Example:
      * <code>
      * Keyboard.disableScrollingInShrinkView(true);
@@ -77,8 +67,40 @@ interface Keyboard {
      * </code>
      *
      * @param disable
+     * @param successCallback A success callbackfunction
      */
-    disableScrollingInShrinkView(disable:boolean): void,
+    disableScrollingInShrinkView(disable: boolean, successCallback?: (currentValue: any) => void): void,
+
+    /**
+     * Hide the keyboard
+     *
+     * Call this method to hide the keyboard
+     *
+     * Supported Platforms:
+     *  - iOS
+     *  - Android
+     *
+     * Example:
+     * <code>
+     * Keyboard.hide();
+     * </code>
+     */
+    hide(): void,
+
+    /**
+     * Show the keyboard
+     *
+     * Call this method to show the keyboard.
+     *
+     * Supported Platforms:
+     *  - Android
+     *
+     * Example:
+     * <code>
+     * Keyboard.show();
+     * </code>
+     */
+    show(): void,
 
     // Properties
 
@@ -87,6 +109,9 @@ interface Keyboard {
      *
      * Read this property to determine if the keyboard is visible.
      *
+     * Supported Platforms:
+     *  - iOS
+     *
      * Example:
      * <code>
      * if (Keyboard.isVisible) {
@@ -102,6 +127,9 @@ interface Keyboard {
      * Set this to true if you need that page scroll to beginning when keyboard is hiding.
      * This is allows to fix issue with elements declared with position: fixed, after keyboard is hiding.
      *
+     * Supported Platforms:
+     *  - iOS
+     *
      * Example:
      * <code>
      *     Keyboard.automaticScrollToTopOnHiding = true;
@@ -110,65 +138,48 @@ interface Keyboard {
      */
     automaticScrollToTopOnHiding: boolean,
 
-    // Events
+    /**
+     * Deprecated Events
+     */
+    onshow(): void,
 
-    /**
-     * If defined, this function is fired when keyboard fully shown.
-     *
-     * Attach handler to this event to be able to receive notification when keyboard is shown.
-     *
-     * Example:
-     * <code>
-     * Keyboard.onshow = function () {
-     *     // Describe your logic which will be run each time keyboard is shown.
-     * }
-     * </code>
-     *
-     */
-    onshow():void,
-    /**
-     * If defined, this function is fired when keyboard fully closed.
-     *
-     * Attach handler to this event to be able to receive notification when keyboard is closed.
-     *
-     * Example:
-     * <code>
-     * Keyboard.onhide = function () {
-     *     // Describe your logic which will be run each time keyboard is closed.
-     * }
-     * </code>
-     *
-     */
-    onhide():void,
-    /**
-     * If defined, this function is fired before keyboard will be shown.
-     *
-     * Attach handler to this event to be able to receive notification when keyboard is about to be shown on the screen.
-     *
-     * Example:
-     * <code>
-     * Keyboard.onshowing = function () {
-     *     // Describe your logic which will be run each time when keyboard is about to be shown.
-     * }
-     * </code>
-     *
-     */
-    onshowing():void,
-    /**
-     * If defined, this function is fired when keyboard is about to be closed.
-     *
-     * Attach handler to this event to be able to receive notification when keyboard is about to be closed.
-     *
-     * Example:
-     * <code>
-     * Keyboard.onhiding = function () {
-     *     // Describe your logic which will be run each time when keyboard is about to be closed.
-     * }
-     * </code>
-     *
-     */
-    onhiding():void,
+    onhide(): void,
 
+    onhiding(): void,
+
+    onshowing(): void
 }
 
-declare var Keyboard:Keyboard;
+interface CordovaKeyboardEvent extends Event {
+    /** The height of the keyboard */
+    keyboardHeight: number;
+}
+
+interface WindowEventMap {
+    /**
+     * This event is fired when keyboard fully shown.
+     */
+    'keyboardDidShow': Event,
+
+    /**
+     * This event is fired when the keyboard is fully closed.
+     */
+    'keyboardDidHide': Event,
+
+    /**
+     * This event fires before keyboard will be shown.
+     */
+    'keyboardWillShow': Event,
+
+    /**
+     * This event is fired when the keyboard is fully closed.
+     */
+    'keyboardWillHide': Event,
+
+    /**
+     * This event is fired when the keyboard is fully closed.
+     */
+    'keyboardHeightWillChange': CordovaKeyboardEvent
+  }
+
+declare var Keyboard: Keyboard;
diff --git a/types/css/index.d.ts b/types/css/index.d.ts
index c892d5c3a2..be8f1323a0 100644
--- a/types/css/index.d.ts
+++ b/types/css/index.d.ts
@@ -112,7 +112,7 @@ export interface Comment extends Node {
 /** 
  * The @charset at-rule. 
  */
-export interface Charset {
+export interface Charset extends Node {
     /** The part following @charset. */
     charset?: string;
 }
@@ -120,7 +120,7 @@ export interface Charset {
 /**
  * The @custom-media at-rule 
  */
-export interface CustomMedia {
+export interface CustomMedia extends Node {
     /** The ---prefixed name. */
     name?: string;
     /** The part following the name. */
@@ -130,7 +130,7 @@ export interface CustomMedia {
 /**
  * The @document at-rule.
  */
-export interface Document {
+export interface Document extends Node {
     /** The part following @document. */
     document?: string;
     /** The vendor prefix in @document, or undefined if there is none. */
@@ -142,7 +142,7 @@ export interface Document {
 /**
  * The @font-face at-rule.
  */
-export interface FontFace {
+export interface FontFace extends Node {
     /** Array of nodes with the types declaration and comment. */
     declarations?: Array<Declaration | Comment>;
 }
@@ -150,7 +150,7 @@ export interface FontFace {
 /**
  * The @host at-rule.
  */
-export interface Host {
+export interface Host extends Node {
     /** Array of nodes with the types rule, comment and any of the at-rule types. */
     rules?: Array<Rule | Comment | AtRule>;
 }
@@ -158,7 +158,7 @@ export interface Host {
 /**
  * The @import at-rule.
  */
-export interface Import {
+export interface Import extends Node {
     /** The part following @import. */
     import?: string;
 }
@@ -166,7 +166,7 @@ export interface Import {
 /**
  * The @keyframes at-rule.
  */
-export interface KeyFrames {
+export interface KeyFrames extends Node {
     /** The name of the keyframes rule. */
     name?: string;
     /** The vendor prefix in @keyframes, or undefined if there is none. */
@@ -175,7 +175,7 @@ export interface KeyFrames {
     keyframes?: Array<KeyFrame | Comment>;
 }
 
-export interface KeyFrame {
+export interface KeyFrame extends Node {
     /** The list of "selectors" of the keyframe rule, split on commas. Each “selector” is trimmed from whitespace. */
     values?: Array<string>;
     /** Array of nodes with the types declaration and comment. */
@@ -185,7 +185,7 @@ export interface KeyFrame {
 /**
  * The @media at-rule.
  */
-export interface Media {
+export interface Media extends Node {
     /** The part following @media. */
     media?: string;
     /** Array of nodes with the types rule, comment and any of the at-rule types. */
@@ -195,7 +195,7 @@ export interface Media {
 /**
  * The @namespace at-rule.
  */
-export interface Namespace {
+export interface Namespace extends Node {
     /** The part following @namespace. */
     namespace?: string;
 }
@@ -203,7 +203,7 @@ export interface Namespace {
 /**
  * The @page at-rule.
  */
-export interface Page {
+export interface Page extends Node {
     /** The list of selectors of the rule, split on commas. Each selector is trimmed from whitespace and comments. */
     selectors?: Array<string>;
     /** Array of nodes with the types declaration and comment. */
@@ -213,7 +213,7 @@ export interface Page {
 /**
  * The @supports at-rule.
  */
-export interface Supports {
+export interface Supports extends Node {
     /** The part following @supports. */
     supports?: string;
     /** Array of nodes with the types rule, comment and any of the at-rule types. */
@@ -223,16 +223,21 @@ export interface Supports {
 /** All at-rules. */
 export type AtRule = Charset | CustomMedia | Document | FontFace | Host | Import | KeyFrames | Media | Namespace | Page | Supports;
 
+/**
+ * A collection of rules
+ */
+export interface StyleRules {
+    /** Array of nodes with the types rule, comment and any of the at-rule types. */
+    rules: Array<Rule | Comment | AtRule>;
+    /** Array of Errors. Errors collected during parsing when option silent is true. */
+    parsingErrors?: Array<ParserError>
+}
+
 /** 
  * The root node returned by css.parse. 
  */
 export interface Stylesheet extends Node {
-    stylesheet?: {
-        /** Array of nodes with the types rule, comment and any of the at-rule types. */
-        rules?: Array<Rule | Comment | AtRule>;
-        /** Array of Errors. Errors collected during parsing when option silent is true. */
-        parsingErrors?: Array<ParserError>
-    };
+    stylesheet?: StyleRules;
 }
 
 // ---------------------------------------------------------------------------------
diff --git a/types/cucumber/index.d.ts b/types/cucumber/index.d.ts
index d72b3ee4ac..ce2f586d9b 100644
--- a/types/cucumber/index.d.ts
+++ b/types/cucumber/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for cucumber-js 2.0
+// Type definitions for cucumber-js 2.1
 // Project: https://github.com/cucumber/cucumber-js
 // Definitions by: Abraão Alves <https://github.com/abraaoalves>
 //                 Jan Molak <https://github.com/jan-molak>
@@ -23,9 +23,7 @@ export interface TableDefinition {
     hashes(): Array<{ [colName: string]: string }>;
 }
 
-export type StepDefinitionParam = string | number | CallbackStepDefinition | TableDefinition;
-
-export type StepDefinitionCode = (this: World, ...stepArgs: StepDefinitionParam[]) => PromiseLike<any> | any | void;
+export type StepDefinitionCode = (this: World, ...stepArgs: any[]) => any;
 
 export interface StepDefinitionOptions {
     timeout?: number;
diff --git a/types/cypress/cypress-tests.ts b/types/cypress/cypress-tests.ts
index 806443474a..9502f1a63d 100644
--- a/types/cypress/cypress-tests.ts
+++ b/types/cypress/cypress-tests.ts
@@ -12,6 +12,8 @@ cy
   .get('.query-button')
   .contains('Save Form').should('have.class', 'btn');
 
+cy.location('host');
+
 cy
   .get('form')
   .find('input')
diff --git a/types/cypress/index.d.ts b/types/cypress/index.d.ts
index 808c765e24..f76aad4afb 100644
--- a/types/cypress/index.d.ts
+++ b/types/cypress/index.d.ts
@@ -249,7 +249,8 @@ declare namespace Cypress {
     /**
      * @see https://on.cypress.io/api/location
      */
-    location(options?: Loggable): Chainable;
+    location(options?: LoggableTimeoutable): Chainable;
+    location(key: string, options?: LoggableTimeoutable): Chainable;
 
     /**
      * @see https://on.cypress.io/api/log
diff --git a/types/d3-geo/index.d.ts b/types/d3-geo/index.d.ts
index 4093b696e9..7efbb72010 100644
--- a/types/d3-geo/index.d.ts
+++ b/types/d3-geo/index.d.ts
@@ -36,7 +36,10 @@ export type GeoGeometryObjects = GeoJSON.GeometryObject | GeoSphere;
 export interface ExtendedGeometryCollection<GeometryType extends GeoGeometryObjects> {
     type: string;
     bbox?: number[];
-    crs?: GeoJSON.CoordinateReferenceSystem;
+    crs?: {
+        type: string;
+        properties: any;
+    };
     geometries: GeometryType[];
 }
 
diff --git a/types/elasticsearch/elasticsearch-tests.ts b/types/elasticsearch/elasticsearch-tests.ts
index 1be3f740bc..3043a1f473 100644
--- a/types/elasticsearch/elasticsearch-tests.ts
+++ b/types/elasticsearch/elasticsearch-tests.ts
@@ -1,6 +1,6 @@
-import elasticsearch = require("elasticsearch");
+import * as elasticsearch from "elasticsearch";
 
-var client = new elasticsearch.Client({
+let client = new elasticsearch.Client({
   host: 'localhost:9200',
   log: 'trace'
 });
@@ -10,26 +10,26 @@ client = new elasticsearch.Client({
     'box1.server.org',
     'box2.server.org'
   ],
-  selector: function (hosts: any) { }
+  selector: (hosts: any) => { }
 });
 
 client.ping({
   requestTimeout: 30000
-}, function (error) {
+}, (error) => {
 });
 
 client.search({
   q: 'pants'
-}).then(function (body) {
-  var hits = body.hits.hits;
-}, function (error) {
+}).then((body) => {
+  const hits = body.hits.hits;
+}, (error) => {
 });
 
 client.indices.delete({
   index: 'test_index',
   ignore: [404]
-}).then(function (body) {
-}, function (error) {
+}).then((body) => {
+}, (error) => {
 });
 
 client.deleteByQuery({
@@ -39,8 +39,8 @@ client.deleteByQuery({
     query: {
     }
   }
-}).then(function (response) {
-}, function (error) {
+}).then((response) => {
+}, (error) => {
 });
 
 client.create({
@@ -103,7 +103,7 @@ client.cluster.stats({
 
 client.count({
   index: 'index_name'
-}, function (error, response) {
+}, (error, response) => {
   // ...
 });
 
@@ -120,7 +120,7 @@ client.count({
       }
     }
   }
-}, function (err, response) {
+}, (err, response) => {
   // ...
 });
 
@@ -132,7 +132,7 @@ client.explain({
 
   // the query to score it against
   q: 'field:value'
-}, function (error, response) {
+}, (error, response) => {
   // ...
 });
 
@@ -145,7 +145,7 @@ client.explain({
       match: { title: 'test' }
     }
   }
-}, function (error, response) {
+}, (error, response) => {
   // ...
 });
 
@@ -158,8 +158,7 @@ client.index({
     tags: ['y', 'z'],
     published: true,
   }
-}, function (error, response) {
-
+}, (error, response) => {
 });
 
 client.mget({
@@ -170,7 +169,7 @@ client.mget({
       { _index: 'indexC', _type: 'typeC', _id: '1' }
     ]
   }
-}, function (error, response) {
+}, (error, response) => {
   // ...
 });
 
@@ -180,14 +179,14 @@ client.mget({
   body: {
     ids: [1, 2, 3]
   }
-}, function (error, response) {
+}, (error, response) => {
   // ...
 });
 
 client.search({
   index: 'myindex',
   q: 'title:test'
-}, function (error, response) {
+}, (error, response) => {
   // ...
 });
 
@@ -207,7 +206,7 @@ client.search({
       }
     }
   }
-}, function (error, response) {
+}, (error, response) => {
   // ...
 });
 
@@ -221,12 +220,11 @@ client.suggest({
       }
     }
   }
-}, function (error, response) {
+}, (error, response) => {
 });
 
-
 // first we do a search, and specify a scroll timeout
-var allTitles: string[] = [];
+const allTitles: string[] = [];
 client.search({
   index: 'myindex',
   // Set to 30 seconds because we are calling right back
@@ -236,14 +234,14 @@ client.search({
   q: 'title:test'
 }, function getMoreUntilDone(error, response) {
   // collect the title from each response
-  response.hits.hits.forEach(function (hit) {
+  response.hits.hits.forEach((hit) => {
     allTitles.push(hit.fields.title);
   });
 
   if (response.hits.total !== allTitles.length) {
     // now we can call scroll over and over
     client.scroll({
-      scrollId: response._scroll_id,
+      scrollId: response._scroll_id!,
       scroll: '30s'
     }, getMoreUntilDone);
   } else {
@@ -258,8 +256,13 @@ client.indices.updateAliases({
       { add: { index: 'logstash-2014.05', alias: 'logstash-current' } }
     ]
   }
-}).then(function (response) {
+}).then((response) => {
   // ...
-}, function (error) {
+}, (error) => {
   // ...
 });
+
+// Errors
+function testErrors() {
+    throw new elasticsearch.errors.AuthenticationException();
+}
diff --git a/types/elasticsearch/index.d.ts b/types/elasticsearch/index.d.ts
index 8acc7e4097..1b45a237e5 100644
--- a/types/elasticsearch/index.d.ts
+++ b/types/elasticsearch/index.d.ts
@@ -1,1608 +1,1659 @@
 // Type definitions for elasticsearch 5.0
 // Project: https://www.elastic.co/guide/en/elasticsearch/client/javascript-api/current/index.html
-// Definitions by: Casper Skydt <https://github.com/CasperSkydt>, Blake Smith <https://github.com/bfsmith>, Dave Dunkin <https://github.com/ddunkin>, Jeffery Grajkowski <https://github.com/pushplay>, Margus Lamp <https://github.com/mlamp>, Ahmad Ferdous Bin Alam <https://github.com/ahmadferdous>
+// Definitions by: Casper Skydt <https://github.com/CasperSkydt>
+//                 Blake Smith <https://github.com/bfsmith>
+//                 Dave Dunkin <https://github.com/ddunkin>
+//                 Jeffery Grajkowski <https://github.com/pushplay>
+//                 Margus Lamp <https://github.com/mlamp>
+//                 Ahmad Ferdous Bin Alam <https://github.com/ahmadferdous>
+//                 Simon Schick <https://github.com/SimonSchick>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
-declare module Elasticsearch {
-    export class Client {
-        constructor(params: ConfigOptions);
-        cat: Cat;
-        cluster: Cluster;
-        indices: Indices;
-        ingest: Ingest;
-        nodes: Nodes;
-        snapshot: Snapshot;
-        tasks: Tasks;
-        bulk(params: BulkIndexDocumentsParams): Promise<any>;
-        bulk(params: BulkIndexDocumentsParams, callback: (error: any, response: any) => void): void;
-        clearScroll(params: ClearScrollParams, callback: (error: any, response: any) => void): void;
-        clearScroll(params: ClearScrollParams): Promise<any>;
-        count(params: CountParams, callback: (error: any, response: CountResponse) => void): void;
-        count(params: CountParams): Promise<CountResponse>;
-        create(params: CreateDocumentParams): Promise<CreateDocumentResponse>;
-        create(params: CreateDocumentParams, callback: (err: any, response: CreateDocumentResponse, status: any) => void): void;
-        delete(params: DeleteDocumentParams): Promise<DeleteDocumentResponse>;
-        delete(params: DeleteDocumentParams, callback: (error: any, response: DeleteDocumentResponse) => void): void;
-        deleteByQuery(params: DeleteDocumentByQueryParams): Promise<DeleteDocumentByQueryResponse>;
-        deleteByQuery(params: DeleteDocumentByQueryParams, callback: (error: any, response: DeleteDocumentByQueryResponse) => void): void;
-        deleteScript(params: DeleteScriptParams): Promise<any>;
-        deleteScript(params: DeleteScriptParams, callback: (error: any, response: any) => void): void;
-        deleteTemplate(params: DeleteTemplateParams): Promise<any>;
-        deleteTemplate(params: DeleteTemplateParams, callback: (error: any, response: any) => void): void;
-        exists(params: ExistsParams): Promise<any>;
-        exists(params: ExistsParams, callback: (error: any, response: any, status?: any) => void): void;
-        explain(params: ExplainParams): Promise<ExplainResponse>;
-        explain(params: ExplainParams, callback: (error: any, response: ExplainResponse) => void): void;
-        fieldStats(params: FieldStatsParams): Promise<FieldStatsResponse>;
-        fieldStats(params: FieldStatsParams, callback: (error: any, response: FieldStatsResponse) => void): void;
-        get<T>(params: GetParams, callback: (error: any, response: GetResponse<T>) => void): void;
-        get<T>(params: GetParams): Promise<GetResponse<T>>;
-        getScript(params: GetScriptParams): Promise<any>;
-        getScript(params: GetScriptParams, callback: (error: any, response: any) => void): void;
-        getSource(params: GetSourceParams): Promise<any>;
-        getSource(params: GetSourceParams, callback: (error: any, response: any) => void): void;
-        getTemplate(params: GetTemplateParams): Promise<any>;
-        getTemplate(params: GetTemplateParams, callback: (error: any, response: any) => void): void;
-        index<T>(params: IndexDocumentParams<T>): Promise<any>;
-        index<T>(params: IndexDocumentParams<T>, callback: (error: any, response: any) => void): void;
-        info(params: InfoParams): Promise<any>;
-        info(params: InfoParams, callback: (error: any, response: any) => void): void;
-        mget<T>(params: MGetParams, callback: (error: any, response: MGetResponse<T>) => void): void;
-        mget<T>(params: MGetParams): Promise<MGetResponse<T>>;
-        msearch<T>(params: MSearchParams, callback: (error: any, response: MSearchResponse<T>) => void): void;
-        msearch<T>(params: MSearchParams): Promise<MSearchResponse<T>>;
-        msearchTemplate<T>(params: MSearchTemplateParams, callback: (error: any, response: MSearchResponse<T>) => void): void;
-        msearchTemplate<T>(params: MSearchTemplateParams): Promise<MSearchResponse<T>>;
-        mtermvectors(params: MTermVectorsParams): Promise<any>;
-        mtermvectors(params: MTermVectorsParams, callback: (error: any, response: any) => void): void;
-        ping(params: PingParams): Promise<any>;
-        ping(params: PingParams, callback: (err: any, response: any, status: any) => void): void;
-        putScript(params: PutScriptParams): Promise<any>;
-        putScript(params: PutScriptParams, callback: (err: any, response: any, status: any) => void): void;
-        putTemplate(params: PutTemplateParams): Promise<any>;
-        putTemplate(params: PutTemplateParams, callback: (err: any, response: any, status: any) => void): void;
-        reindex(params: ReindexParams): Promise<ReindexResponse>;
-        reindex(params: ReindexParams, callback: (error: any, response: ReindexResponse) => void): void;
-        reindexRethrottle(params: ReindexRethrottleParams): Promise<any>;
-        reindexRethrottle(params: ReindexRethrottleParams, callback: (error: any, response: any) => void): void;
-        renderSearchTemplate(params: RenderSearchTemplateParams): Promise<any>;
-        renderSearchTemplate(params: RenderSearchTemplateParams, callback: (error: any, response: any) => void): void;
-        scroll<T>(params: ScrollParams): Promise<SearchResponse<T>>;
-        scroll<T>(params: ScrollParams, callback: (error: any, response: SearchResponse<T>) => void): void;
-        search<T>(params: SearchParams): Promise<SearchResponse<T>>;
-        search<T>(params: SearchParams, callback: (error: any, response: SearchResponse<T>) => void): void;
-        searchShards(params: SearchShardsParams): Promise<SearchShardsResponse>;
-        searchShards(params: SearchShardsParams, callback: (error: any, response: SearchShardsResponse) => void): void;
-        searchTemplate(params: SearchTemplateParams): Promise<any>;
-        searchTemplate(params: SearchTemplateParams, callback: (error: any, response: any) => void): void;
-        suggest(params: SuggestParams): Promise<any>;
-        suggest(params: SuggestParams, callback: (error: any, response: any) => void): void;
-        termvectors(params: TermvectorsParams): Promise<any>;
-        termvectors(params: TermvectorsParams, callback: (error: any, response: any) => void): void;
-        update(params: UpdateDocumentParams): Promise<any>;
-        update(params: UpdateDocumentParams, callback: (error: any, response: any) => void): void;
-        updateByQuery(params: UpdateDocumentByQueryParams): Promise<any>;
-        updateByQuery(params: UpdateDocumentByQueryParams, callback: (error: any, response: any) => void): void;
-        close(): void;
-    }
+export class Client {
+    constructor(params: ConfigOptions);
+    cat: Cat;
+    cluster: Cluster;
+    indices: Indices;
+    ingest: Ingest;
+    nodes: Nodes;
+    snapshot: Snapshot;
+    tasks: Tasks;
+    bulk(params: BulkIndexDocumentsParams): Promise<any>;
+    bulk(params: BulkIndexDocumentsParams, callback: (error: any, response: any) => void): void;
+    clearScroll(params: ClearScrollParams, callback: (error: any, response: any) => void): void;
+    clearScroll(params: ClearScrollParams): Promise<any>;
+    count(params: CountParams, callback: (error: any, response: CountResponse) => void): void;
+    count(params: CountParams): Promise<CountResponse>;
+    create(params: CreateDocumentParams): Promise<CreateDocumentResponse>;
+    create(params: CreateDocumentParams, callback: (err: any, response: CreateDocumentResponse, status: any) => void): void;
+    delete(params: DeleteDocumentParams): Promise<DeleteDocumentResponse>;
+    delete(params: DeleteDocumentParams, callback: (error: any, response: DeleteDocumentResponse) => void): void;
+    deleteByQuery(params: DeleteDocumentByQueryParams): Promise<DeleteDocumentByQueryResponse>;
+    deleteByQuery(params: DeleteDocumentByQueryParams, callback: (error: any, response: DeleteDocumentByQueryResponse) => void): void;
+    deleteScript(params: DeleteScriptParams): Promise<any>;
+    deleteScript(params: DeleteScriptParams, callback: (error: any, response: any) => void): void;
+    deleteTemplate(params: DeleteTemplateParams): Promise<any>;
+    deleteTemplate(params: DeleteTemplateParams, callback: (error: any, response: any) => void): void;
+    exists(params: ExistsParams): Promise<any>;
+    exists(params: ExistsParams, callback: (error: any, response: any, status?: any) => void): void;
+    explain(params: ExplainParams): Promise<ExplainResponse>;
+    explain(params: ExplainParams, callback: (error: any, response: ExplainResponse) => void): void;
+    fieldStats(params: FieldStatsParams): Promise<FieldStatsResponse>;
+    fieldStats(params: FieldStatsParams, callback: (error: any, response: FieldStatsResponse) => void): void;
+    get<T>(params: GetParams, callback: (error: any, response: GetResponse<T>) => void): void;
+    get<T>(params: GetParams): Promise<GetResponse<T>>;
+    getScript(params: GetScriptParams): Promise<any>;
+    getScript(params: GetScriptParams, callback: (error: any, response: any) => void): void;
+    getSource(params: GetSourceParams): Promise<any>;
+    getSource(params: GetSourceParams, callback: (error: any, response: any) => void): void;
+    getTemplate(params: GetTemplateParams): Promise<any>;
+    getTemplate(params: GetTemplateParams, callback: (error: any, response: any) => void): void;
+    index<T>(params: IndexDocumentParams<T>): Promise<any>;
+    index<T>(params: IndexDocumentParams<T>, callback: (error: any, response: any) => void): void;
+    info(params: InfoParams): Promise<any>;
+    info(params: InfoParams, callback: (error: any, response: any) => void): void;
+    mget<T>(params: MGetParams, callback: (error: any, response: MGetResponse<T>) => void): void;
+    mget<T>(params: MGetParams): Promise<MGetResponse<T>>;
+    msearch<T>(params: MSearchParams, callback: (error: any, response: MSearchResponse<T>) => void): void;
+    msearch<T>(params: MSearchParams): Promise<MSearchResponse<T>>;
+    msearchTemplate<T>(params: MSearchTemplateParams, callback: (error: any, response: MSearchResponse<T>) => void): void;
+    msearchTemplate<T>(params: MSearchTemplateParams): Promise<MSearchResponse<T>>;
+    mtermvectors(params: MTermVectorsParams): Promise<any>;
+    mtermvectors(params: MTermVectorsParams, callback: (error: any, response: any) => void): void;
+    ping(params: PingParams): Promise<any>;
+    ping(params: PingParams, callback: (err: any, response: any, status: any) => void): void;
+    putScript(params: PutScriptParams): Promise<any>;
+    putScript(params: PutScriptParams, callback: (err: any, response: any, status: any) => void): void;
+    putTemplate(params: PutTemplateParams): Promise<any>;
+    putTemplate(params: PutTemplateParams, callback: (err: any, response: any, status: any) => void): void;
+    reindex(params: ReindexParams): Promise<ReindexResponse>;
+    reindex(params: ReindexParams, callback: (error: any, response: ReindexResponse) => void): void;
+    reindexRethrottle(params: ReindexRethrottleParams): Promise<any>;
+    reindexRethrottle(params: ReindexRethrottleParams, callback: (error: any, response: any) => void): void;
+    renderSearchTemplate(params: RenderSearchTemplateParams): Promise<any>;
+    renderSearchTemplate(params: RenderSearchTemplateParams, callback: (error: any, response: any) => void): void;
+    scroll<T>(params: ScrollParams): Promise<SearchResponse<T>>;
+    scroll<T>(params: ScrollParams, callback: (error: any, response: SearchResponse<T>) => void): void;
+    search<T>(params: SearchParams): Promise<SearchResponse<T>>;
+    search<T>(params: SearchParams, callback: (error: any, response: SearchResponse<T>) => void): void;
+    searchShards(params: SearchShardsParams): Promise<SearchShardsResponse>;
+    searchShards(params: SearchShardsParams, callback: (error: any, response: SearchShardsResponse) => void): void;
+    searchTemplate(params: SearchTemplateParams): Promise<any>;
+    searchTemplate(params: SearchTemplateParams, callback: (error: any, response: any) => void): void;
+    suggest(params: SuggestParams): Promise<any>;
+    suggest(params: SuggestParams, callback: (error: any, response: any) => void): void;
+    termvectors(params: TermvectorsParams): Promise<any>;
+    termvectors(params: TermvectorsParams, callback: (error: any, response: any) => void): void;
+    update(params: UpdateDocumentParams): Promise<any>;
+    update(params: UpdateDocumentParams, callback: (error: any, response: any) => void): void;
+    updateByQuery(params: UpdateDocumentByQueryParams): Promise<any>;
+    updateByQuery(params: UpdateDocumentByQueryParams, callback: (error: any, response: any) => void): void;
+    close(): void;
+}
 
-    export interface ConfigOptions {
-        host?: any;
-        hosts?: any;
-        httpAuth?: string;
-        log?: any;
-        apiVersion?: string;
-        plugins?: any;
-        sniffOnStart?: boolean;
-        sniffInterval?: number;
-        sniffOnConnectionFault?: boolean;
-        maxRetries?: number;
-        requestTimeout?: number;
-        deadTimeout?: number;
-        pingTimeout?: number;
-        keepAlive?: boolean;
-        maxSockets?: number;
-        suggestCompression?: boolean;
-        connectionClass?: string;
-        sniffedNodesProtocol?: string;
-        ssl?: Object;
-        selector?: any;
-        defer?: () => void;
-        nodesToHostCallback?: any;
-        createNodeAgent?: any;
-    }
+export interface ConfigOptions {
+    host?: any;
+    hosts?: any;
+    httpAuth?: string;
+    log?: any;
+    apiVersion?: string;
+    plugins?: any;
+    sniffOnStart?: boolean;
+    sniffInterval?: number;
+    sniffOnConnectionFault?: boolean;
+    maxRetries?: number;
+    requestTimeout?: number;
+    deadTimeout?: number;
+    pingTimeout?: number;
+    keepAlive?: boolean;
+    maxSockets?: number;
+    suggestCompression?: boolean;
+    connectionClass?: string;
+    sniffedNodesProtocol?: string;
+    ssl?: object;
+    selector?: any;
+    defer?: () => void;
+    nodesToHostCallback?: any;
+    createNodeAgent?: any;
+}
 
-    export interface Explanation {
-        value: number;
-        description: string;
-        details: Explanation[];
-    }
+export interface Explanation {
+    value: number;
+    description: string;
+    details: Explanation[];
+}
 
-    export interface GenericParams {
-        requestTimeout?: number;
-        maxRetries?: number;
-        method?: string;
-        body?: any;
-        ignore?: number | number[];
-        filterPath?: string | string[];
-    }
+export interface GenericParams {
+    requestTimeout?: number;
+    maxRetries?: number;
+    method?: string;
+    body?: any;
+    ignore?: number | number[];
+    filterPath?: string | string[];
+}
 
-    export interface ShardsResponse {
-        total: number;
-        successful: number;
-        failed: number;
-    }
+export interface ShardsResponse {
+    total: number;
+    successful: number;
+    failed: number;
+}
 
-    /**
-     * A string of a number and a time unit.  A time unit is one of
-     * [d, h, m, s, ms, micros, nanos].  eg: "30s" for 30 seconds.
-     * These are incorrectly identified as `Date | number` in the docs as of 2016-11-15.
-     */
-    export type TimeSpan = string;
+/**
+ * A string of a number and a time unit.  A time unit is one of
+ * [d, h, m, s, ms, micros, nanos].  eg: "30s" for 30 seconds.
+ * These are incorrectly identified as `Date | number` in the docs as of 2016-11-15.
+ */
+export type TimeSpan = string;
 
-    export type NameList = string | string[] | boolean;
-    export type Refresh = boolean | "true" | "false" | "wait_for" | "";
-    export type VersionType = "internal" | "external" | "external_gte" | "force";
-    export type ExpandWildcards = "open" | "closed" | "none" | "all";
-    export type DefaultOperator = "AND" | "OR";
-    export type Conflicts = "abort" | "proceed";
+export type NameList = string | string[] | boolean;
+export type Refresh = boolean | "true" | "false" | "wait_for" | "";
+export type VersionType = "internal" | "external" | "external_gte" | "force";
+export type ExpandWildcards = "open" | "closed" | "none" | "all";
+export type DefaultOperator = "AND" | "OR";
+export type Conflicts = "abort" | "proceed";
 
-    export interface BulkIndexDocumentsParams extends GenericParams {
-        waitForActiveShards?: string;
-        refresh?: Refresh;
-        routing?: string;
-        timeout?: TimeSpan;
-        type?: string;
-        fields?: NameList;
-        _source?: NameList;
-        _sourceExclude?: NameList;
-        _sourceInclude?: NameList;
-        pipeline?: string;
-        index?: string;
-    }
+export interface BulkIndexDocumentsParams extends GenericParams {
+    waitForActiveShards?: string;
+    refresh?: Refresh;
+    routing?: string;
+    timeout?: TimeSpan;
+    type?: string;
+    fields?: NameList;
+    _source?: NameList;
+    _sourceExclude?: NameList;
+    _sourceInclude?: NameList;
+    pipeline?: string;
+    index?: string;
+}
 
-    export interface ClearScrollParams extends GenericParams {
-        scrollId: NameList;
-    }
+export interface ClearScrollParams extends GenericParams {
+    scrollId: NameList;
+}
 
-    export interface CountParams extends GenericParams {
-        ignoreUnavailable?: boolean;
-        allowNoIndices?: boolean;
-        expandWildcards?: ExpandWildcards;
-        minScore?: number;
-        preference?: string;
-        routing?: string;
-        q?: string;
-        analyzer?: string;
-        analyzeWildcard?: boolean;
-        defaultOperator?: DefaultOperator;
-        df?: string;
-        lenient?: boolean;
-        lowercaseExpandedTerms?: boolean;
-        index?: NameList;
-        type?: NameList;
-    }
+export interface CountParams extends GenericParams {
+    ignoreUnavailable?: boolean;
+    allowNoIndices?: boolean;
+    expandWildcards?: ExpandWildcards;
+    minScore?: number;
+    preference?: string;
+    routing?: string;
+    q?: string;
+    analyzer?: string;
+    analyzeWildcard?: boolean;
+    defaultOperator?: DefaultOperator;
+    df?: string;
+    lenient?: boolean;
+    lowercaseExpandedTerms?: boolean;
+    index?: NameList;
+    type?: NameList;
+}
 
-    export interface CountResponse {
-        count: number;
-        _shards: ShardsResponse;
-    }
+export interface CountResponse {
+    count: number;
+    _shards: ShardsResponse;
+}
 
-    export interface CreateDocumentParams extends GenericParams {
-        waitForActiveShards?: string;
-        parent?: string;
-        refresh?: Refresh;
-        timeout?: TimeSpan;
-        timestamp?: Date | number;
-        ttl?: TimeSpan;
-        version?: number;
-        versionType?: VersionType;
-        pipeline?: string;
-        id?: string;
-        index: string;
-        type: string;
-    }
+export interface CreateDocumentParams extends GenericParams {
+    waitForActiveShards?: string;
+    parent?: string;
+    refresh?: Refresh;
+    timeout?: TimeSpan;
+    timestamp?: Date | number;
+    ttl?: TimeSpan;
+    version?: number;
+    versionType?: VersionType;
+    pipeline?: string;
+    id?: string;
+    index: string;
+    type: string;
+}
 
-    export interface CreateDocumentResponse {
-        _shards: ShardsResponse;
-        _index: string;
-        _type: string;
-        _id: string;
-        _version: number;
-        created: boolean;
-        result: string;
-    }
+export interface CreateDocumentResponse {
+    _shards: ShardsResponse;
+    _index: string;
+    _type: string;
+    _id: string;
+    _version: number;
+    created: boolean;
+    result: string;
+}
 
-    export interface DeleteDocumentParams extends GenericParams {
-        waitForActiveShards?: string;
-        parent?: string;
-        refresh?: Refresh;
-        routing?: string;
-        timeout?: TimeSpan;
-        version?: number;
-        versionType?: VersionType;
-        index: string;
-        type: string;
-        id: string;
-    }
+export interface DeleteDocumentParams extends GenericParams {
+    waitForActiveShards?: string;
+    parent?: string;
+    refresh?: Refresh;
+    routing?: string;
+    timeout?: TimeSpan;
+    version?: number;
+    versionType?: VersionType;
+    index: string;
+    type: string;
+    id: string;
+}
 
-    export interface DeleteDocumentResponse {
-        _shards: ShardsResponse;
-        found: boolean;
-        _index: string;
-        _type: string;
-        _id: string;
-        _version: number;
-        result: string;
-    }
+export interface DeleteDocumentResponse {
+    _shards: ShardsResponse;
+    found: boolean;
+    _index: string;
+    _type: string;
+    _id: string;
+    _version: number;
+    result: string;
+}
 
-    export interface DeleteDocumentByQueryParams extends GenericParams {
-        analyzer?: string;
-        analyzeWildcard?: boolean;
-        defaultOperator?: DefaultOperator;
-        df?: string;
-        from?: number;
-        ignoreUnavailable?: boolean;
-        allowNoIndices?: boolean;
-        conflicts?: Conflicts;
-        expandWildcards?: ExpandWildcards;
-        lenient?: boolean;
-        lowercaseExpandedTerms?: boolean;
-        preference?: string;
-        q?: string;
-        routing?: string | string[] | boolean;
-        scroll?: string;
-        searchType?: "query_then_fetch" | "dfs_query_then_fetch";
-        searchTimeout?: TimeSpan;
-        size?: number;
-        sort?: NameList;
-        _source?: NameList;
-        _sourceExclude?: NameList;
-        _sourceInclude?: NameList;
-        terminateAfter?: number;
-        stats?: string | string[] | boolean;
-        version?: number;
-        requestCache?: boolean;
-        refresh?: Refresh;
-        timeout?: TimeSpan;
-        waitForActiveShards?: string;
-        scrollSize?: number;
-        waitForCompletion?: boolean;
-        requestsPerSecond?: number;
-        index?: string;
-        type?: string;
-    }
+export interface DeleteDocumentByQueryParams extends GenericParams {
+    analyzer?: string;
+    analyzeWildcard?: boolean;
+    defaultOperator?: DefaultOperator;
+    df?: string;
+    from?: number;
+    ignoreUnavailable?: boolean;
+    allowNoIndices?: boolean;
+    conflicts?: Conflicts;
+    expandWildcards?: ExpandWildcards;
+    lenient?: boolean;
+    lowercaseExpandedTerms?: boolean;
+    preference?: string;
+    q?: string;
+    routing?: string | string[] | boolean;
+    scroll?: string;
+    searchType?: "query_then_fetch" | "dfs_query_then_fetch";
+    searchTimeout?: TimeSpan;
+    size?: number;
+    sort?: NameList;
+    _source?: NameList;
+    _sourceExclude?: NameList;
+    _sourceInclude?: NameList;
+    terminateAfter?: number;
+    stats?: string | string[] | boolean;
+    version?: number;
+    requestCache?: boolean;
+    refresh?: Refresh;
+    timeout?: TimeSpan;
+    waitForActiveShards?: string;
+    scrollSize?: number;
+    waitForCompletion?: boolean;
+    requestsPerSecond?: number;
+    index?: string;
+    type?: string;
+}
 
-    export interface DeleteDocumentByQueryResponse {
-        took: number;
-        timed_out: boolean;
-        deleted: number;
-        batches: number;
-        version_conflicts: number;
-        noops: number;
-        retries: {
-            bulk: number;
-            search: number;
-        };
-        throttled_millis: number;
-        requests_per_second: number;
-        throttled_until_millis: number;
-        total: number;
-        failures: any[];
-    }
+export interface DeleteDocumentByQueryResponse {
+    took: number;
+    timed_out: boolean;
+    deleted: number;
+    batches: number;
+    version_conflicts: number;
+    noops: number;
+    retries: {
+        bulk: number;
+        search: number;
+    };
+    throttled_millis: number;
+    requests_per_second: number;
+    throttled_until_millis: number;
+    total: number;
+    failures: any[];
+}
 
-    export interface DeleteScriptParams extends GenericParams {
-        id: string;
-        lang: string;
-    }
+export interface DeleteScriptParams extends GenericParams {
+    id: string;
+    lang: string;
+}
 
-    export interface DeleteTemplateParams extends GenericParams {
-        id: string;
-    }
+export interface DeleteTemplateParams extends GenericParams {
+    id: string;
+}
 
-    export interface ExistsParams extends GenericParams {
-        parent?: string;
-        preference?: string;
-        realtime?: boolean;
-        refresh?: boolean;
-        routing?: string;
-        id: string;
-        index: string;
-        type: string;
-    }
+export interface ExistsParams extends GenericParams {
+    parent?: string;
+    preference?: string;
+    realtime?: boolean;
+    refresh?: boolean;
+    routing?: string;
+    id: string;
+    index: string;
+    type: string;
+}
 
-    export interface ExplainParams extends GenericParams {
-        analyzeWildcard?: boolean;
-        analyzer?: string;
-        defaultOperator?: DefaultOperator;
-        df?: string;
-        storedFields?: NameList;
-        lenient?: boolean;
-        lowercaseExpandedTerms?: boolean;
-        parent?: string;
-        preference?: string;
-        q?: string;
-        routing?: string;
-        _source?: NameList;
-        _sourceExclude?: NameList;
-        _sourceInclude?: NameList;
-        id?: string;
-        index?: string;
-        type?: string;
-    }
+export interface ExplainParams extends GenericParams {
+    analyzeWildcard?: boolean;
+    analyzer?: string;
+    defaultOperator?: DefaultOperator;
+    df?: string;
+    storedFields?: NameList;
+    lenient?: boolean;
+    lowercaseExpandedTerms?: boolean;
+    parent?: string;
+    preference?: string;
+    q?: string;
+    routing?: string;
+    _source?: NameList;
+    _sourceExclude?: NameList;
+    _sourceInclude?: NameList;
+    id?: string;
+    index?: string;
+    type?: string;
+}
 
-    export interface ExplainResponse {
-        _index: string;
-        _type: string;
-        _id: string;
-        matched: boolean;
-        explanation: ExplainResponseDetails;
-    }
+export interface ExplainResponse {
+    _index: string;
+    _type: string;
+    _id: string;
+    matched: boolean;
+    explanation: ExplainResponseDetails;
+}
 
-    export interface ExplainResponseDetails {
-        value: number;
-        description: string;
-        details: ExplainResponseDetails[];
-    }
+export interface ExplainResponseDetails {
+    value: number;
+    description: string;
+    details: ExplainResponseDetails[];
+}
 
-    export interface FieldStatsParams extends GenericParams {
-        fields?: NameList;
-        level?: "indices" | "cluster";
-        ignoreUnavailable?: boolean;
-        allowNoIndices?: boolean;
-        expandWildcards?: ExpandWildcards;
-        index?: NameList;
-    }
+export interface FieldStatsParams extends GenericParams {
+    fields?: NameList;
+    level?: "indices" | "cluster";
+    ignoreUnavailable?: boolean;
+    allowNoIndices?: boolean;
+    expandWildcards?: ExpandWildcards;
+    index?: NameList;
+}
 
-    export interface FieldStatsResponse {
-        _shards: ShardsResponse;
-        indices: { [indexName: string]: FieldStatsResponseIndex };
-        conflicts?: { [fieldName: string]: string };
-    }
+export interface FieldStatsResponse {
+    _shards: ShardsResponse;
+    indices: { [indexName: string]: FieldStatsResponseIndex };
+    conflicts?: { [fieldName: string]: string };
+}
 
-    export interface FieldStatsResponseIndex {
-        fields: { [fieldName: string]: FieldStatsResponseField };
-    }
+export interface FieldStatsResponseIndex {
+    fields: { [fieldName: string]: FieldStatsResponseField };
+}
 
-    export interface FieldStatsResponseField {
-        max_doc: number;
-        doc_count: number;
-        density: number;
-        sum_doc_freq: number;
-        sum_total_term_freq: number;
-        min_value: any;
-        max_value: any;
-        is_searchable: string;
-        is_aggregatable: string;
-    }
+export interface FieldStatsResponseField {
+    max_doc: number;
+    doc_count: number;
+    density: number;
+    sum_doc_freq: number;
+    sum_total_term_freq: number;
+    min_value: any;
+    max_value: any;
+    is_searchable: string;
+    is_aggregatable: string;
+}
 
-    export interface GetParams extends GenericParams {
-        storedFields?: NameList;
-        parent?: string;
-        preference?: string;
-        realtime?: boolean;
-        refresh?: boolean;
-        routing?: string;
-        _source?: NameList;
-        _sourceExclude?: NameList;
-        _sourceInclude?: NameList;
-        version?: number;
-        versionType?: VersionType;
-        id: string;
-        index: string;
-        type: string;
-    }
+export interface GetParams extends GenericParams {
+    storedFields?: NameList;
+    parent?: string;
+    preference?: string;
+    realtime?: boolean;
+    refresh?: boolean;
+    routing?: string;
+    _source?: NameList;
+    _sourceExclude?: NameList;
+    _sourceInclude?: NameList;
+    version?: number;
+    versionType?: VersionType;
+    id: string;
+    index: string;
+    type: string;
+}
 
-    export interface GetResponse<T> {
-        _index: string;
-        _type: string;
-        _id: string;
-        _version: number;
-        found: boolean;
-        _source: T;
-    }
+export interface GetResponse<T> {
+    _index: string;
+    _type: string;
+    _id: string;
+    _version: number;
+    found: boolean;
+    _source: T;
+}
 
-    export interface GetScriptParams extends GenericParams {
-        id: string;
-        lang: string;
-    }
+export interface GetScriptParams extends GenericParams {
+    id: string;
+    lang: string;
+}
 
-    export interface GetSourceParams extends GenericParams {
-        preference?: string;
-        realtime?: boolean;
-        refresh?: boolean;
-        routing?: string;
-        _source: NameList;
-        _sourceExclude?: NameList;
-        _sourceInclude?: NameList;
-        version?: number;
-        versionType?: VersionType;
-        id: string;
-        index: string;
-        type: string;
-    }
+export interface GetSourceParams extends GenericParams {
+    preference?: string;
+    realtime?: boolean;
+    refresh?: boolean;
+    routing?: string;
+    _source: NameList;
+    _sourceExclude?: NameList;
+    _sourceInclude?: NameList;
+    version?: number;
+    versionType?: VersionType;
+    id: string;
+    index: string;
+    type: string;
+}
 
-    export interface GetTemplateParams extends GenericParams {
-        id: string;
-    }
+export interface GetTemplateParams extends GenericParams {
+    id: string;
+}
 
-    export interface IndexDocumentParams<T> extends GenericParams {
-        waitForActiveShards?: string;
-        opType?: "index" | "create";
-        parent?: string;
-        refresh?: string;
-        routing?: string;
-        timeout?: TimeSpan;
-        timestamp?: Date | number;
-        ttl?: TimeSpan;
-        version?: number;
-        versionType?: VersionType;
-        pipeline?: string;
-        id?: string;
-        index: string;
-        type: string;
-        body: T;
-    }
+export interface IndexDocumentParams<T> extends GenericParams {
+    waitForActiveShards?: string;
+    opType?: "index" | "create";
+    parent?: string;
+    refresh?: string;
+    routing?: string;
+    timeout?: TimeSpan;
+    timestamp?: Date | number;
+    ttl?: TimeSpan;
+    version?: number;
+    versionType?: VersionType;
+    pipeline?: string;
+    id?: string;
+    index: string;
+    type: string;
+    body: T;
+}
 
-    export interface InfoParams extends GenericParams {
-    }
+export interface InfoParams extends GenericParams {
+}
 
-    export interface MGetParams extends GenericParams {
-        storedFields?: NameList;
-        preference?: string;
-        realtime?: Boolean;
-        refresh?: Boolean;
-        source?: NameList;
-        _sourceExclude?: NameList;
-        _sourceInclude?: NameList;
-        index?: string;
-        type?: string;
-    }
+export interface MGetParams extends GenericParams {
+    storedFields?: NameList;
+    preference?: string;
+    realtime?: boolean;
+    refresh?: boolean;
+    source?: NameList;
+    _sourceExclude?: NameList;
+    _sourceInclude?: NameList;
+    index?: string;
+    type?: string;
+}
 
-    export interface MGetResponse<T> {
-        docs?: GetResponse<T>[];
-    }
+export interface MGetResponse<T> {
+    docs?: Array<GetResponse<T>>;
+}
 
-    export interface MSearchParams extends GenericParams {
-        search_type?: "query_then_fetch" | "query_and_fetch" | "dfs_query_then_fetch" | "dfs_query_and_fetch";
-        maxConcurrentSearches?: number;
-        index?: NameList;
-        type?: NameList;
-    }
+export interface MSearchParams extends GenericParams {
+    search_type?: "query_then_fetch" | "query_and_fetch" | "dfs_query_then_fetch" | "dfs_query_and_fetch";
+    maxConcurrentSearches?: number;
+    index?: NameList;
+    type?: NameList;
+}
 
-    export interface MSearchResponse<T> {
-        responses?: SearchResponse<T>[];
-    }
+export interface MSearchResponse<T> {
+    responses?: Array<SearchResponse<T>>;
+}
 
-    export interface MSearchTemplateParams extends GenericParams {
-        search_type?: "query_then_fetch" | "query_and_fetch" | "dfs_query_then_fetch" | "dfs_query_and_fetch";
-        index?: NameList;
-        type?: NameList;
-    }
+export interface MSearchTemplateParams extends GenericParams {
+    search_type?: "query_then_fetch" | "query_and_fetch" | "dfs_query_then_fetch" | "dfs_query_and_fetch";
+    index?: NameList;
+    type?: NameList;
+}
 
-    export interface MTermVectorsParams extends GenericParams {
-        ids?: NameList;
-        termStatistics?: boolean;
-        fieldStatistics?: boolean;
-        fields?: NameList;
-        offsets?: boolean;
-        positions?: boolean;
-        payloads?: boolean;
-        preference?: string;
-        routing?: string;
-        parent?: string;
-        realtime?: boolean;
-        version?: number;
-        versionType?: VersionType;
-        index: string;
-        type: string;
-    }
+export interface MTermVectorsParams extends GenericParams {
+    ids?: NameList;
+    termStatistics?: boolean;
+    fieldStatistics?: boolean;
+    fields?: NameList;
+    offsets?: boolean;
+    positions?: boolean;
+    payloads?: boolean;
+    preference?: string;
+    routing?: string;
+    parent?: string;
+    realtime?: boolean;
+    version?: number;
+    versionType?: VersionType;
+    index: string;
+    type: string;
+}
 
-    export interface PingParams extends GenericParams {
-    }
+export interface PingParams extends GenericParams {
+}
 
-    export interface PutScriptParams extends GenericParams {
-        id: string;
-        lang: string;
-        body: any;
-    }
+export interface PutScriptParams extends GenericParams {
+    id: string;
+    lang: string;
+    body: any;
+}
 
-    export interface PutTemplateParams extends GenericParams {
-        id: string;
-        body: any;
-    }
+export interface PutTemplateParams extends GenericParams {
+    id: string;
+    body: any;
+}
 
-    export interface ReindexParams extends GenericParams {
-        refresh?: boolean;
-        timeout?: TimeSpan;
-        waitForActiveShards?: string;
-        waitForCompletion?: boolean;
-        requestsPerSecond?: number;
-        body: {
-            conflicts?: string;
-            source: {
-                index: string | string[];
-                type?: string | string[];
-                query?: any;
-                sort?: any;
-                size?: number;
-                remote?: {
-                    host: string;
-                    username?: string;
-                    password?: string;
-                }
-            };
-            dest: {
-                index: string;
-                version_type?: string;
-                op_type?: string;
-                routing?: string;
-                pipeline?: string;
-            };
-            script?: {
-                inline: string;
-                lang: string;
+export interface ReindexParams extends GenericParams {
+    refresh?: boolean;
+    timeout?: TimeSpan;
+    waitForActiveShards?: string;
+    waitForCompletion?: boolean;
+    requestsPerSecond?: number;
+    body: {
+        conflicts?: string;
+        source: {
+            index: string | string[];
+            type?: string | string[];
+            query?: any;
+            sort?: any;
+            size?: number;
+            remote?: {
+                host: string;
+                username?: string;
+                password?: string;
             }
         };
-    }
-
-    export interface ReindexResponse {
-        took: number;
-        updated: number;
-        created: number;
-        batches: number;
-        version_conflicts: number;
-        retries: {
-            bulk: number;
-            search: number;
-        };
-        throttled_millis: number;
-        failures: any[];
-    }
-
-    export interface ReindexRethrottleParams extends GenericParams {
-        requestsPerSecond: number;
-        taskId: string;
-    }
-
-    export interface RenderSearchTemplateParams extends GenericParams {
-        id: string;
-    }
-
-    export interface ScrollParams extends GenericParams {
-        scroll: TimeSpan;
-        scrollId: string;
-    }
-
-    export interface SearchParams extends GenericParams {
-        analyzer?: string;
-        analyzeWildcard?: boolean;
-        defaultOperator?: DefaultOperator;
-        df?: string;
-        explain?: boolean;
-        storedFields?: NameList;
-        docvalueFields?: NameList;
-        fielddataFields?: NameList;
-        from?: number;
-        ignoreUnavailable?: boolean;
-        allowNoIndices?: boolean;
-        expandWildcards?: ExpandWildcards;
-        lenient?: boolean;
-        lowercaseExpandedTerms?: boolean;
-        preference?: string;
-        q?: string;
-        routing?: NameList;
-        scroll?: TimeSpan;
-        searchType?: "query_then_fetch" | "dfs_query_then_fetch";
-        size?: number;
-        sort?: NameList;
-        _source?: NameList;
-        _sourceExclude?: NameList;
-        _sourceInclude?: NameList;
-        terminateAfter?: number;
-        stats?: NameList;
-        suggestField?: string;
-        suggestMode?: "missing" | "popular" | "always";
-        suggestSize?: number;
-        suggestText?: string;
-        timeout?: TimeSpan;
-        trackScores?: boolean;
-        version?: boolean;
-        requestCache?: boolean;
-        index?: NameList;
-        type?: NameList;
-    }
-
-    export interface SearchResponse<T> {
-        took: number;
-        timed_out: boolean;
-        _scroll_id?: string;
-        _shards: ShardsResponse;
-        hits: {
-            total: number;
-            max_score: number;
-            hits: {
-                _index: string;
-                _type: string;
-                _id: string;
-                _score: number;
-                _source: T;
-                _version?: number;
-                _explanation?: Explanation;
-                fields?: any;
-                highlight?: any;
-                inner_hits?: any;
-            }[];
-        };
-        aggregations?: any;
-    }
-
-    export interface SearchShardsParams extends GenericParams {
-        preference?: string;
-        routing?: string;
-        local?: boolean;
-        ignoreUnavailable?: boolean;
-        allowNoIndices?: boolean;
-        expandWildcards?: ExpandWildcards;
-        index: NameList;
-        type: NameList;
-    }
-
-    export interface SearchShardsResponse {
-        nodes: any;
-        shards: SearchShardsResponseShard[][];
-    }
-
-    export interface SearchShardsResponseShard {
-        index: string;
-        node: string;
-        primary: boolean;
-        share: number;
-        state: string;
-        allocation_id: {
-            id: string;
-        };
-        relocating_node: any;
-    }
-
-    export interface SearchTemplateParams extends GenericParams {
-        ignoreUnavailable?: boolean;
-        allowNoIndices?: boolean;
-        expandWildcards?: ExpandWildcards;
-        preference?: string;
-        routing?: NameList;
-        scroll?: TimeSpan;
-        searchType?: "query_then_fetch" | "query_and_fetch" | "dfs_query_then_fetch" | "dfs_query_and_fetch";
-        index: NameList;
-        type: NameList;
-    }
-
-    export interface SuggestParams extends GenericParams {
-        ignoreUnavailable?: boolean;
-        allowNoIndices?: boolean;
-        expandWildcards?: ExpandWildcards;
-        preference?: string;
-        routing?: string;
-        index: NameList;
-    }
-
-    export interface TermvectorsParams extends GenericParams {
-        termStatistics?: boolean;
-        fieldStatistics?: boolean;
-        fields?: NameList;
-        offsets?: boolean;
-        positions?: boolean;
-        payloads?: boolean;
-        preference?: string;
-        routing?: string;
-        parent?: string;
-        realtime?: boolean;
-        version?: number;
-        versionType?: VersionType;
-        index: string;
-        type: string;
-        id?: string;
-    }
-
-    export interface UpdateDocumentParams extends GenericParams {
-        waitForActiveShards?: string;
-        fields?: NameList;
-        _source?: NameList;
-        _sourceExclude?: NameList;
-        _sourceInclude?: NameList;
-        lang?: string;
-        parent?: string;
-        refresh?: Refresh;
-        retryOnConflict?: number;
-        routing?: string;
-        timeout?: TimeSpan;
-        timestamp?: Date | number;
-        ttl?: TimeSpan;
-        version?: number;
-        versionType?: "internal" | "force";
-        id: string;
-        index: string;
-        type: string;
-    }
-
-    export interface UpdateDocumentByQueryParams extends GenericParams {
-        analyzer?: string;
-        analyzeWildcard?: boolean;
-        defaultOperator?: DefaultOperator;
-        df?: string;
-        explain?: boolean;
-        storedFields?: NameList;
-        docvalueFields?: NameList;
-        fielddataFields?: NameList;
-        from?: number;
-        ignoreUnavailable?: boolean;
-        allowNoIndices?: boolean;
-        conflicts?: Conflicts;
-        expandWildcards?: ExpandWildcards;
-        lenient?: boolean;
-        lowercaseExpandedTerms?: boolean;
-        pipeline?: string;
-        preference?: string;
-        q?: string;
-        routing?: NameList;
-        scroll?: TimeSpan;
-        searchType?: "query_then_fetch" | "dfs_query_then_fetch";
-        searchTimeout?: TimeSpan;
-        size?: number;
-        sort?: NameList;
-        _source?: NameList;
-        _sourceExclude?: NameList;
-        _sourceInclude?: NameList;
-        terminateAfter?: number;
-        stats?: NameList;
-        suggestField?: string;
-        suggestMode?: "missing" | "popular" | "always";
-        suggestSize?: number;
-        suggestText?: string;
-        timeout?: TimeSpan;
-        trackScores?: boolean;
-        version?: boolean;
-        versionType?: boolean;
-        requestCache?: boolean;
-        refresh?: boolean;
-        waitForActiveShards?: string;
-        scrollSize?: number;
-        waitForCompletion?: boolean;
-        requestsPerSecond?: number;
-        index: NameList;
-        type: NameList;
-    }
-
-    export interface Cat {
-        aliases(params: CatAliasesParams, callback: (error: any, response: any) => void): void;
-        aliases(params: CatAliasesParams): Promise<any>;
-        allocation(params: CatAllocationParams, callback: (error: any, response: any) => void): void;
-        allocation(params: CatAllocationParams): Promise<any>;
-        count(params: CatCountParams, callback: (error: any, response: any) => void): void;
-        count(params: CatAllocationParams): Promise<any>;
-        fielddata(params: CatFielddataParams, callback: (error: any, response: any) => void): void;
-        fielddata(params: CatFielddataParams): Promise<any>;
-        health(params: CatHealthParams, callback: (error: any, response: any) => void): void;
-        health(params: CatHealthParams): Promise<any>;
-        help(params: CatHelpParams, callback: (error: any, response: any) => void): void;
-        help(params: CatHelpParams): Promise<any>;
-        indices(params: CatIndicesParams, callback: (error: any, response: any) => void): void;
-        indices(params: CatIndicesParams): Promise<any>;
-        master(params: CatCommonParams, callback: (error: any, response: any) => void): void;
-        master(params: CatCommonParams): Promise<any>;
-        nodeattrs(params: CatCommonParams, callback: (error: any, response: any) => void): void;
-        nodeattrs(params: CatCommonParams): Promise<any>;
-        nodes(params: CatCommonParams, callback: (error: any, response: any) => void): void;
-        nodes(params: CatCommonParams): Promise<any>;
-        pendingTasks(params: CatCommonParams, callback: (error: any, response: any) => void): void;
-        pendingTasks(params: CatCommonParams): Promise<any>;
-        plugins(params: CatCommonParams, callback: (error: any, response: any) => void): void;
-        plugins(params: CatCommonParams): Promise<any>;
-        recovery(params: CatRecoveryParams, callback: (error: any, response: any) => void): void;
-        recovery(params: CatRecoveryParams): Promise<any>;
-        repositories(params: CatCommonParams, callback: (error: any, response: any) => void): void;
-        repositories(params: CatCommonParams): Promise<any>;
-        segments(params: CatSegmentsParams, callback: (error: any, response: any) => void): void;
-        segments(params: CatSegmentsParams): Promise<any>;
-        shards(params: CatShardsParams, callback: (error: any, response: any) => void): void;
-        shards(params: CatShardsParams): Promise<any>;
-        snapshots(params: CatSnapshotsParams, callback: (error: any, response: any) => void): void;
-        snapshots(params: CatSnapshotsParams): Promise<any>;
-        tasks(params: CatTasksParams, callback: (error: any, response: any) => void): void;
-        tasks(params: CatTasksParams): Promise<any>;
-        threadPool(params: CatThreadPoolParams, callback: (error: any, response: any) => void): void;
-        threadPool(params: CatThreadPoolParams): Promise<any>;
-    }
-
-    export type CatBytes = "b" | "k" | "kb" | "m" | "mb" | "g" | "gb" | "t" | "tb" | "p" | "pb";
-
-    export interface CatCommonParams extends GenericParams {
-        format: string;
-        local?: boolean;
-        masterTimeout?: TimeSpan;
-        h?: NameList;
-        help?: boolean;
-        v?: boolean;
-    }
-
-    export interface CatAliasesParams extends CatCommonParams {
-        name?: NameList;
-    }
-
-    export interface CatAllocationParams extends CatCommonParams {
-        bytes?: CatBytes;
-        nodeId?: NameList;
-    }
-
-    export interface CatCountParams extends CatCommonParams {
-        index?: NameList;
-    }
-
-    export interface CatFielddataParams extends CatCommonParams {
-        bytes?: CatBytes;
-        fields?: NameList;
-    }
-
-    export interface CatHealthParams extends CatCommonParams {
-        ts?: boolean;
-    }
-
-    export interface CatHelpParams extends GenericParams {
-        help?: boolean;
-    }
-
-    export interface CatIndicesParams extends CatCommonParams {
-        bytes?: CatBytes;
-        health?: "green" | "yellow" | "red";
-        pri?: boolean;
-        index?: NameList;
-    }
-
-    export interface CatRecoveryParams extends GenericParams {
-        format: string;
-        bytes?: CatBytes;
-        masterTimeout?: TimeSpan;
-        h?: NameList;
-        help?: boolean;
-        v?: boolean;
-    }
-
-    export interface CatSegmentsParams extends GenericParams {
-        format: string;
-        h?: NameList;
-        help?: boolean;
-        v?: boolean;
-        index?: NameList;
-    }
-
-    export interface CatShardsParams extends CatCommonParams {
-        index?: NameList;
-    }
-
-    export interface CatSnapshotsParams extends GenericParams {
-        format: string;
-        ignoreUnavailable?: boolean;
-        masterTimeout?: TimeSpan;
-        h?: NameList;
-        help?: boolean;
-        v?: boolean;
-        repository?: NameList;
-    }
-
-    export interface CatTasksParams extends GenericParams {
-        format: string;
-        nodeId?: NameList;
-        actions?: NameList;
-        detailed?: boolean;
-        parentNode?: string;
-        parentTask?: number;
-        h?: NameList;
-        help?: boolean;
-        v?: boolean;
-    }
-
-    export interface CatThreadPoolParams extends CatCommonParams {
-        size?: "" | "k" | "m" | "g" | "t" | "p";
-        threadPoolPatterns?: NameList;
-    }
-
-    export interface Cluster {
-        allocationExplain(params: ClusterAllocationExplainParams, callback: (error: any, response: any) => void): void;
-        allocationExplain(params: ClusterAllocationExplainParams): Promise<any>;
-        getSettings(params: ClusterGetSettingsParams, callback: (error: any, response: any) => void): void;
-        getSettings(params: ClusterGetSettingsParams): Promise<any>;
-        health(params: ClusterHealthParams, callback: (error: any, response: any) => void): void;
-        health(params: ClusterHealthParams): Promise<any>;
-        pendingTasks(params: ClusterPendingTasksParams, callback: (error: any, response: any) => void): void;
-        pendingTasks(params: ClusterPendingTasksParams): Promise<any>;
-        putSettings(params: ClusterPutSettingsParams, callback: (error: any, response: any) => void): void;
-        putSettings(params: ClusterPutSettingsParams): Promise<any>;
-        reroute(params: ClusterRerouteParams, callback: (error: any, response: any) => void): void;
-        reroute(params: ClusterRerouteParams): Promise<any>;
-        state(params: ClusterStateParams, callback: (error: any, response: any) => void): void;
-        state(params: ClusterStateParams): Promise<any>;
-        stats(params: ClusterStatsParams, callback: (error: any, response: any) => void): void;
-        stats(params: ClusterStatsParams): Promise<any>;
-    }
-
-    export interface ClusterAllocationExplainParams extends GenericParams {
-        includeYesDecisions?: boolean;
-        includeDiskInfo?: boolean;
-    }
-
-    export interface ClusterGetSettingsParams extends GenericParams {
-        flatSettings?: boolean;
-        masterTimeout?: TimeSpan;
-        timeout?: TimeSpan;
-        includeDefaults?: boolean;
-    }
-
-    export interface ClusterHealthParams extends GenericParams {
-        level?: "cluster" | "indices" | "shards";
-        local?: boolean;
-        masterTimeout?: TimeSpan;
-        waitForActiveShards?: string;
-        waitForNodes?: string;
-        waitForEvents?: "immediate" | "urgent" | "high" | "normal" | "low" | "languid";
-        waitForRelocatingShards?: boolean;
-        waitForStatus?: "green" | "yellow" | "red";
-        index?: NameList;
-    }
-
-    export interface ClusterPendingTasksParams extends GenericParams {
-        local?: boolean;
-        masterTimeout?: TimeSpan;
-    }
-
-    export interface ClusterPutSettingsParams extends GenericParams {
-        flatSettings?: boolean;
-        masterTimeout?: TimeSpan;
-        timeout?: TimeSpan;
-    }
-
-    export interface ClusterRerouteParams extends GenericParams {
-        dryRun?: boolean;
-        explain?: boolean;
-        retryFailed?: boolean;
-        metric?: NameList;
-        masterTimeout?: TimeSpan;
-        timeout?: TimeSpan;
-    }
-
-    export interface ClusterStateParams extends GenericParams {
-        local?: boolean;
-        masterTimeout?: TimeSpan;
-        flatSettings?: boolean;
-        ignoreUnavailable?: boolean;
-        allowNoIndices?: boolean;
-        expandWildcards?: ExpandWildcards;
-        index?: NameList;
-        metric?: NameList;
-    }
-
-    export interface ClusterStatsParams extends GenericParams {
-        flatSettings?: boolean;
-        human?: boolean;
-        timeout?: TimeSpan;
-        nodeId?: NameList;
-    }
-
-    export class Indices {
-        analyze(params: IndicesAnalyzeParams, callback: (error: any, response: any, status: any) => void): void;
-        analyze(params: IndicesAnalyzeParams): Promise<any>;
-        clearCache(params: IndicesClearCacheParams, callback: (error: any, response: any, status: any) => void): void;
-        clearCache(params: IndicesClearCacheParams): Promise<any>;
-        close(params: IndicesCloseParams, callback: (error: any, response: any, status: any) => void): void;
-        close(params: IndicesCloseParams): Promise<any>;
-        create(params: IndicesCreateParams, callback: (error: any, response: any, status: any) => void): void;
-        create(params: IndicesCreateParams): Promise<any>;
-        delete(params: IndicesDeleteParams, callback: (error: any, response: any, status: any) => void): void;
-        delete(params: IndicesDeleteParams): Promise<any>;
-        deleteAlias(params: IndicesDeleteAliasParams, callback: (error: any, response: any, status: any) => void): void;
-        deleteAlias(params: IndicesDeleteAliasParams): Promise<any>;
-        deleteTemplate(params: IndicesDeleteTemplateParams, callback: (error: any, response: any, status: any) => void): void;
-        deleteTemplate(params: IndicesDeleteTemplateParams): Promise<any>;
-        exists(params: IndicesExistsParams, callback: (error: any, response: any, status: any) => void): void;
-        exists(params: IndicesExistsParams): Promise<any>;
-        existsAlias(params: IndicesExistsAliasParams, callback: (error: any, response: any, status: any) => void): void;
-        existsAlias(params: IndicesExistsAliasParams): Promise<any>;
-        existsTemplate(params: IndicesExistsTemplateParams, callback: (error: any, response: any, status: any) => void): void;
-        existsTemplate(params: IndicesExistsTemplateParams): Promise<any>;
-        existsType(params: IndicesExistsTypeParams, callback: (error: any, response: any, status: any) => void): void;
-        existsType(params: IndicesExistsTypeParams): Promise<any>;
-        flush(params: IndicesFlushParams, callback: (error: any, response: any, status: any) => void): void;
-        flush(params: IndicesFlushParams): Promise<any>;
-        flushSynced(params: IndicesFlushSyncedParams, callback: (error: any, response: any, status: any) => void): void;
-        flushSynced(params: IndicesFlushSyncedParams): Promise<any>;
-        forcemerge(params: IndicesForcemergeParams, callback: (error: any, response: any, status: any) => void): void;
-        forcemerge(params: IndicesForcemergeParams): Promise<any>;
-        get(params: IndicesGetParams, callback: (error: any, response: any, status: any) => void): void;
-        get(params: IndicesGetParams): Promise<any>;
-        getAlias(params: IndicesGetAliasParams, callback: (error: any, response: any, status: any) => void): void;
-        getAlias(params: IndicesGetAliasParams): Promise<any>;
-        getFieldMapping(params: IndicesGetFieldMappingParams, callback: (error: any, response: any, status: any) => void): void;
-        getFieldMapping(params: IndicesGetFieldMappingParams): Promise<any>;
-        getMapping(params: IndicesGetMappingParams, callback: (error: any, response: any, status: any) => void): void;
-        getMapping(params: IndicesGetMappingParams): Promise<any>;
-        getSettings(params: IndicesGetSettingsParams, callback: (error: any, response: any, status: any) => void): void;
-        getSettings(params: IndicesGetSettingsParams): Promise<any>;
-        getTemplate(params: IndicesGetTemplateParams, callback: (error: any, response: any, status: any) => void): void;
-        getTemplate(params: IndicesGetTemplateParams): Promise<any>;
-        getUpgrade(params: IndicesGetUpgradeParams, callback: (error: any, response: any, status: any) => void): void;
-        getUpgrade(params: IndicesGetUpgradeParams): Promise<any>;
-        open(params: IndicesOpenParams, callback: (error: any, response: any, status: any) => void): void;
-        open(params: IndicesOpenParams): Promise<any>;
-        putAlias(params: IndicesPutAliasParams, callback: (error: any, response: any, status: any) => void): void;
-        putAlias(params: IndicesPutAliasParams): Promise<any>;
-        putMapping(params: IndicesPutMappingParams, callback: (error: any, response: any, status: any) => void): void;
-        putMapping(params: IndicesPutMappingParams): Promise<any>;
-        putSettings(params: IndicesPutSettingsParams, callback: (error: any, response: any, status: any) => void): void;
-        putSettings(params: IndicesPutSettingsParams): Promise<any>;
-        putTemplate(params: IndicesPutTemplateParams, callback: (error: any, response: any) => void): void;
-        putTemplate(params: IndicesPutTemplateParams): Promise<any>;
-        recovery(params: IndicesRecoveryParams, callback: (error: any, response: any) => void): void;
-        recovery(params: IndicesRecoveryParams): Promise<any>;
-        refresh(params: IndicesRefreshParams, callback: (error: any, response: any) => void): void;
-        refresh(params: IndicesRefreshParams): Promise<any>;
-        rollover(params: IndicesRolloverParams, callback: (error: any, response: IndicesRolloverResponse) => void): void;
-        rollover(params: IndicesRolloverParams): Promise<IndicesRolloverResponse>;
-        segments(params: IndicesSegmentsParams, callback: (error: any, response: any) => void): void;
-        segments(params: IndicesSegmentsParams): Promise<any>;
-        shardStores(params: IndicesShardStoresParams, callback: (error: any, response: any) => void): void;
-        shardStores(params: IndicesShardStoresParams): Promise<any>;
-        shrink(params: IndicesShrinkParams, callback: (error: any, response: any) => void): void;
-        shrink(params: IndicesShrinkParams): Promise<any>;
-        stats(params: IndicesStatsParams, callback: (error: any, response: any) => void): void;
-        stats(params: IndicesStatsParams): Promise<any>;
-        updateAliases(params: IndicesUpdateAliasesParams, callback: (error: any, response: any) => void): void;
-        updateAliases(params: IndicesUpdateAliasesParams): Promise<any>;
-        upgrade(params: IndicesUpgradeParams, callback: (error: any, response: any) => void): void;
-        upgrade(params: IndicesUpgradeParams): Promise<any>;
-        validateQuery(params: IndicesValidateQueryParams, callback: (error: any, response: any) => void): void;
-        validateQuery(params: IndicesValidateQueryParams): Promise<any>;
-    }
-
-    export interface IndicesAnalyzeParams extends GenericParams {
-        analyzer?: string;
-        charFilter?: NameList;
-        field?: string;
-        filter?: NameList;
-        index?: string;
-        perferLocal?: boolean;
-        text?: NameList;
-        tokenizer?: string;
-        explain?: boolean;
-        attributes?: NameList;
-        format?: "";
-    }
-
-    export interface IndicesClearCacheParams extends GenericParams {
-        fieldData?: boolean;
-        fielddata?: boolean;    // yes the docs really have both
-        fields?: NameList;
-        query?: boolean;
-        ignoreUnavailable?: boolean;
-        allowNoIndices?: boolean;
-        expandWildcards?: ExpandWildcards;
-        index?: NameList;
-        recycler?: boolean;
-        request?: boolean;
-    }
-
-    export interface IndicesCloseParams extends GenericParams {
-        timeout?: TimeSpan;
-        masterTimeout?: TimeSpan;
-        ignoreUnavailable?: boolean;
-        allowNoIndices?: boolean;
-        expandWildcards?: ExpandWildcards;
-        index: NameList;
-    }
-
-    export interface IndicesCreateParams extends GenericParams {
-        waitForActiveShards?: string;
-        timeout?: TimeSpan;
-        masterTimeout?: TimeSpan;
-        updateAllTypes?: boolean;
-        index: string;
-    }
-
-    export interface IndicesDeleteParams extends GenericParams {
-        timeout?: TimeSpan;
-        masterTimeout?: TimeSpan;
-        index: NameList;
-    }
-
-    export interface IndicesDeleteAliasParams extends GenericParams {
-        timeout?: TimeSpan;
-        masterTimeout?: TimeSpan;
-        index: NameList;
-        name: NameList;
-    }
-
-    export interface IndicesDeleteTemplateParams extends GenericParams {
-        timeout?: TimeSpan;
-        masterTimeout?: TimeSpan;
-        name: string;
-    }
-
-    export interface IndicesExistsParams extends GenericParams {
-        ignoreUnavailable?: boolean;
-        allowNoIndices?: boolean;
-        expandWildcards?: ExpandWildcards;
-        local?: boolean;
-        index: NameList;
-    }
-
-    export interface IndicesExistsAliasParams extends IndicesExistsParams {
-        name: NameList;
-    }
-
-    export interface IndicesExistsTemplateParams extends GenericParams {
-        timeout?: TimeSpan;
-        masterTimeout?: TimeSpan;
-        name: NameList;
-    }
-
-    export interface IndicesExistsTypeParams extends IndicesExistsParams {
-        type: NameList;
-    }
-
-    export interface IndicesFlushParams extends GenericParams {
-        force?: boolean;
-        waitIfOngoing?: boolean;
-        ignoreUnavailable?: boolean;
-        allowNoIndices?: boolean;
-        expandWildcards?: ExpandWildcards;
-        index: NameList;
-    }
-
-    export interface IndicesFlushSyncedParams extends GenericParams {
-        ignoreUnavailable?: boolean;
-        allowNoIndices?: boolean;
-        expandWildcards?: ExpandWildcards;
-        index: NameList;
-    }
-
-    export interface IndicesForcemergeParams extends GenericParams {
-        flush?: boolean;
-        ignoreUnavailable?: boolean;
-        allowNoIndices?: boolean;
-        expandWildcards?: ExpandWildcards;
-        maxNumSegments?: number;
-        onlyExpungeDeletes?: boolean;
-        operationThreading?: any;   // even the docs don't know what this does
-        waitForMerge?: boolean;
-        index: NameList;
-    }
-
-    export interface IndicesGetParams extends GenericParams {
-        local?: boolean;
-        ignoreUnavailable?: boolean;
-        allowNoIndices?: boolean;
-        expandWildcards?: ExpandWildcards;
-        flatSettings?: boolean;
-        human?: boolean;
-        includeDefaults?: boolean;
-        index?: NameList;
-        feature?: NameList;
-    }
-
-    export interface IndicesGetAliasParams extends GenericParams {
-        ignoreUnavailable?: boolean;
-        allowNoIndices?: boolean;
-        expandWildcards?: ExpandWildcards;
-        local?: boolean;
-        index?: NameList;
-        name?: NameList;
-    }
-
-    export interface IndicesGetFieldMappingParams extends GenericParams {
-        includeDefaults?: boolean;
-        ignoreUnavailable?: boolean;
-        allowNoIndices?: boolean;
-        expandWildcards?: ExpandWildcards;
-        local?: boolean;
-        index?: NameList;
-        type?: NameList;
-        fields?: NameList;
-    }
-
-    export interface IndicesGetMappingParams extends GenericParams {
-        ignoreUnavailable?: boolean;
-        allowNoIndices?: boolean;
-        expandWildcards?: ExpandWildcards;
-        local?: boolean;
-        index?: NameList;
-        type?: NameList;
-    }
-
-    export interface IndicesGetSettingsParams extends GenericParams {
-        ignoreUnavailable?: boolean;
-        allowNoIndices?: boolean;
-        expandWildcards?: ExpandWildcards;
-        flatSettings?: boolean;
-        local?: boolean;
-        human?: boolean;
-        includeDefaults?: boolean;
-        index?: NameList;
-        name?: NameList;
-    }
-
-    export interface IndicesGetTemplateParams extends GenericParams {
-        flatSettings?: boolean;
-        masterTimeout?: TimeSpan;
-        local?: boolean;
-        name?: NameList;
-    }
-
-    export interface IndicesGetUpgradeParams extends GenericParams {
-        ignoreUnavailable?: boolean;
-        allowNoIndices?: boolean;
-        expandWildcards?: ExpandWildcards;
-        human?: boolean;
-        index?: NameList;
-    }
-
-    export interface IndicesOpenParams extends GenericParams {
-        timeout?: TimeSpan;
-        masterTimeout?: TimeSpan;
-        ignoreUnavailable?: boolean;
-        allowNoIndices?: boolean;
-        expandWildcards?: ExpandWildcards;
-        index?: NameList;
-    }
-
-    export interface IndicesPutAliasParams extends GenericParams {
-        timeout?: TimeSpan;
-        masterTimeout?: TimeSpan;
-        index?: NameList;
-        name: NameList;
-    }
-
-    export interface IndicesPutMappingParams extends GenericParams {
-        timeout?: TimeSpan;
-        masterTimeout?: TimeSpan;
-        ignoreUnavailable?: boolean;
-        allowNoIndices?: boolean;
-        expandWildcards?: ExpandWildcards;
-        updateAllTypes?: boolean;
-        index: NameList;
-        type: string;
-        body: any;
-    }
-
-    export interface IndicesPutSettingsParams extends GenericParams {
-        masterTimeout?: TimeSpan;
-        preserveExisting?: boolean;
-        ignoreUnavailable?: boolean;
-        allowNoIndices?: boolean;
-        expandWildcards?: ExpandWildcards;
-        flatSettings?: boolean;
-        index: NameList;
-        body: any;
-    }
-
-    export interface IndicesPutTemplateParams extends GenericParams {
-        order?: number;
-        create?: boolean;
-        timeout?: TimeSpan;
-        masterTimeout?: TimeSpan;
-        flatSettings?: boolean;
-        name: string;
-        body: any;
-    }
-
-    export interface IndicesRecoveryParams extends GenericParams {
-        detailed?: boolean;
-        activeOnly?: boolean;
-        human?: boolean;
-        index: NameList;
-    }
-
-    export interface IndicesRefreshParams extends GenericParams {
-        ignoreUnavailable?: boolean;
-        allowNoIndices?: boolean;
-        expandWildcards?: ExpandWildcards;
-        force?: boolean;
-        operationThreading?: any;   // even the docs don't know what this does
-        index: NameList;
-    }
-
-    export interface IndicesRolloverParams extends GenericParams {
-        timeout?: TimeSpan;
-        masterTimeout?: TimeSpan;
-        waitForActiveShards?: number | string;
-        alias?: string;
-        newIndex?: string;
-    }
-
-    export interface IndicesRolloverResponse {
-        acknowledged: boolean;
-        shards_acknowledged: boolean;
-        old_index: string;
-        new_index: string;
-        rolled_over: boolean;
-        dry_run: boolean;
-        conditions: { [condition: string]: boolean };
-    }
-
-    export interface IndicesSegmentsParams extends GenericParams {
-        ignoreUnavailable?: boolean;
-        allowNoIndices?: boolean;
-        expandWildcards?: ExpandWildcards;
-        human?: boolean;
-        operationThreading?: any;   // even the docs don't know what this does
-        verbose?: boolean;
-        index: NameList;
-    }
-
-    export interface IndicesShardStoresParams extends GenericParams {
-        status?: NameList;
-        ignoreUnavailable?: boolean;
-        allowNoIndices?: boolean;
-        expandWildcards?: ExpandWildcards;
-        operationThreading?: any;   // even the docs don't know what this does
-        index: NameList;
-    }
-
-    export interface IndicesShrinkParams extends GenericParams {
-        timeout?: TimeSpan;
-        masterTimeout?: TimeSpan;
-        waitForActiveShards?: string | number;
-        index: string;
-        target: string;
-    }
-
-    export interface IndicesStatsParams extends GenericParams {
-        completionFields?: NameList;
-        fielddataFields?: NameList;
-        fields?: NameList;
-        groups?: NameList;
-        human?: boolean;
-        level?: "cluster" | "indices" | "shards";
-        types?: NameList;
-        index: NameList;
-        metric?: NameList;
-    }
-
-    export interface IndicesUpdateAliasesParams extends GenericParams {
-        timeout?: TimeSpan;
-        masterTimeout?: TimeSpan;
-        body: {
-            actions: IndicesUpdateAliasesParamsAction[];
-        };
-    }
-
-    export interface IndicesUpdateAliasesParamsAction {
-        add?: {
-            index?: string;
-            indices?: string[];
-            alias: string;
-        };
-        remove?: {
-            index?: string;
-            indices?: string[];
-            alias: string;
-        };
-        remove_index?: {
+        dest: {
             index: string;
+            version_type?: string;
+            op_type?: string;
+            routing?: string;
+            pipeline?: string;
         };
-    }
-
-    export interface IndicesUpgradeParams extends GenericParams {
-        expandWildcards?: ExpandWildcards;
-        ignoreUnavailable?: boolean;
-        waitForCompletion?: boolean;
-        onlyAncientSegments?: boolean;
-        index: NameList;
-    }
-
-    export interface IndicesValidateQueryParams extends GenericParams {
-        explain?: boolean;
-        ignoreUnavailable?: boolean;
-        allowNoIndices?: boolean;
-        expandWildcards?: ExpandWildcards;
-        operationThreading?: any;   // even the docs don't know what this does
-        q?: string;
-        analyzer?: string;
-        analyzeWildcard?: boolean;
-        defaultOperator?: DefaultOperator;
-        df?: string;
-        lenient?: boolean;
-        lowercaseExpandedTerms?: boolean;
-        rewrite?: boolean;
-        index: NameList;
-        type?: NameList;
-    }
-
-    export class Ingest {
-        deletePipeline(params: IngestDeletePipelineParams, callback: (error: any, response: any, status: any) => void): void;
-        deletePipeline(params: IngestDeletePipelineParams): Promise<any>;
-        getPipeline(params: IngestGetPipelineParams, callback: (error: any, response: any, status: any) => void): void;
-        getPipeline(params: IngestGetPipelineParams): Promise<any>;
-        putPipeline(params: IngestPutPipelineParams, callback: (error: any, response: any, status: any) => void): void;
-        putPipeline(params: IngestPutPipelineParams): Promise<any>;
-        simulate(params: IngestSimulateParams, callback: (error: any, response: any, status: any) => void): void;
-        simulate(params: IngestSimulateParams): Promise<any>;
-    }
-
-    export interface IngestDeletePipelineParams extends GenericParams {
-        masterTimeout?: number;
-        timeout?: number;
-        id: string;
-    }
-
-    export interface IngestGetPipelineParams extends GenericParams {
-        masterTimeout?: number;
-        id: string;
-    }
-
-    export interface IngestPutPipelineParams extends GenericParams {
-        masterTimeout?: number;
-        timeout?: number;
-        id: string;
-        body: any;
-    }
-
-    export interface IngestSimulateParams extends GenericParams {
-        verbose?: boolean;
-        id: string;
-    }
-
-    export class Nodes {
-        hotThreads(params: NodesHotThreadsParams, callback: (error: any, response: any, status: any) => void): void;
-        hotThreads(params: NodesHotThreadsParams): Promise<any>;
-        info(params: NodesInfoParams, callback: (error: any, response: any, status: any) => void): void;
-        info(params: NodesInfoParams): Promise<any>;
-        stats(params: NodesStatsParams, callback: (error: any, response: any, status: any) => void): void;
-        stats(params: NodesStatsParams): Promise<any>;
-    }
-
-    export interface NodesHotThreadsParams extends GenericParams {
-        interval?: TimeSpan;
-        snapshots?: number;
-        threads?: number;
-        ignoreIdleThreads?: boolean;
-        type?: "cpu" | "wait" | "blocked";
-        timeout?: TimeSpan;
-        nodeId: NameList;
-    }
-
-    export interface NodesInfoParams extends GenericParams {
-        flatSettings?: boolean;
-        human?: boolean;
-        timeout?: TimeSpan;
-        nodeId: NameList;
-        metric?: NameList;
-    }
-
-    export interface NodesStatsParams extends GenericParams {
-        completionFields?: NameList;
-        fielddataFields?: NameList;
-        fields?: NameList;
-        groups?: boolean;
-        human?: boolean;
-        level?: "indices" | "node" | "shards";
-        types?: NameList;
-        timeout?: TimeSpan;
-        metric?: NameList;
-        indexMetric?: NameList;
-        nodeId?: NameList;
-    }
-
-    export class Snapshot {
-        create(params: SnapshotCreateParams, callback: (error: any, response: any, status: any) => void): void;
-        create(params: SnapshotCreateParams): Promise<any>;
-        createRepository(params: SnapshotCreateRepositoryParams, callback: (error: any, response: any, status: any) => void): void;
-        createRepository(params: SnapshotCreateRepositoryParams): Promise<any>;
-        delete(params: SnapshotDeleteParams, callback: (error: any, response: any, status: any) => void): void;
-        delete(params: SnapshotDeleteParams): Promise<any>;
-        deleteRepository(params: SnapshotDeleteRepositoryParams, callback: (error: any, response: any, status: any) => void): void;
-        deleteRepository(params: SnapshotDeleteRepositoryParams): Promise<any>;
-        get(params: SnapshotGetParams, callback: (error: any, response: any, status: any) => void): void;
-        get(params: SnapshotGetParams): Promise<any>;
-        getRepository(params: SnapshotGetRepositoryParams, callback: (error: any, response: any, status: any) => void): void;
-        getRepository(params: SnapshotGetRepositoryParams): Promise<any>;
-        restore(params: SnapshotRestoreParams, callback: (error: any, response: any, status: any) => void): void;
-        restore(params: SnapshotRestoreParams): Promise<any>;
-        status(params: SnapshotStatusParams, callback: (error: any, response: any, status: any) => void): void;
-        status(params: SnapshotStatusParams): Promise<any>;
-        verifyRepository(params: SnapshotVerifyRepositoryParams, callback: (error: any, response: any, status: any) => void): void;
-        verifyRepository(params: SnapshotVerifyRepositoryParams): Promise<any>;
-    }
-
-    export interface SnapshotCreateParams extends GenericParams {
-        masterTimeout?: TimeSpan;
-        waitForCompletion?: boolean;
-        repository: string;
-        snapshot: string;
-    }
-
-    export interface SnapshotCreateRepositoryParams extends GenericParams {
-        masterTimeout?: TimeSpan;
-        timeout?: TimeSpan;
-        verify?: boolean;
-        repository: string;
-    }
-
-    export interface SnapshotDeleteParams extends GenericParams {
-        masterTimeout?: TimeSpan;
-        repository: string;
-        snapshot: string;
-    }
-
-    export interface SnapshotDeleteRepositoryParams extends GenericParams {
-        masterTimeout?: TimeSpan;
-        timeout?: TimeSpan;
-        repository: string;
-    }
-
-    export interface SnapshotGetParams extends GenericParams {
-        masterTimeout?: TimeSpan;
-        ignoreUnavailable?: boolean;
-        repository: string;
-        snapshot: NameList;
-    }
-
-    export interface SnapshotGetRepositoryParams extends GenericParams {
-        masterTimeout?: TimeSpan;
-        local?: boolean;
-        repository: NameList;
-    }
-
-    export interface SnapshotRestoreParams extends GenericParams {
-        masterTimeout?: TimeSpan;
-        waitForCompletion?: boolean;
-        repository: string;
-        snapshot: string;
-    }
-
-    export interface SnapshotStatusParams extends GenericParams {
-        masterTimeout?: TimeSpan;
-        ignoreUnavailable?: boolean;
-        repository: string;
-        snapshot: NameList;
-    }
-
-    export interface SnapshotVerifyRepositoryParams extends GenericParams {
-        masterTimeout?: TimeSpan;
-        timeout?: TimeSpan;
-        repository: string;
-    }
-
-    export class Tasks {
-        cancel(params: TasksCancelParams, callback: (error: any, response: any, status: any) => void): void;
-        cancel(params: TasksCancelParams): Promise<any>;
-        get(params: TasksGetParams, callback: (error: any, response: any, status: any) => void): void;
-        get(params: TasksGetParams): Promise<any>;
-        list(params: TasksListParams, callback: (error: any, response: any, status: any) => void): void;
-        list(params: TasksListParams): Promise<any>;
-    }
-
-    export interface TasksCancelParams extends GenericParams {
-        nodeId?: NameList;
-        actions?: NameList;
-        parentNode?: string;
-        parentTask?: string;
-        taskId?: string;
-    }
-
-    export interface TasksGetParams extends GenericParams {
-        waitForCompletion?: boolean;
-        taskId?: string;
-    }
-
-    export interface TasksListParams extends GenericParams {
-        nodeId?: NameList;
-        actions?: NameList;
-        detailed?: boolean;
-        parentNode?: string;
-        parentTask?: string;
-        waitForCompletion?: boolean;
-        groupBy?: "nodes" | "parents";
-    }
+        script?: {
+            inline: string;
+            lang: string;
+        }
+    };
 }
 
-declare module "elasticsearch" {
-    export = Elasticsearch;
+export interface ReindexResponse {
+    took: number;
+    updated: number;
+    created: number;
+    batches: number;
+    version_conflicts: number;
+    retries: {
+        bulk: number;
+        search: number;
+    };
+    throttled_millis: number;
+    failures: any[];
+}
+
+export interface ReindexRethrottleParams extends GenericParams {
+    requestsPerSecond: number;
+    taskId: string;
+}
+
+export interface RenderSearchTemplateParams extends GenericParams {
+    id: string;
+}
+
+export interface ScrollParams extends GenericParams {
+    scroll: TimeSpan;
+    scrollId: string;
+}
+
+export interface SearchParams extends GenericParams {
+    analyzer?: string;
+    analyzeWildcard?: boolean;
+    defaultOperator?: DefaultOperator;
+    df?: string;
+    explain?: boolean;
+    storedFields?: NameList;
+    docvalueFields?: NameList;
+    fielddataFields?: NameList;
+    from?: number;
+    ignoreUnavailable?: boolean;
+    allowNoIndices?: boolean;
+    expandWildcards?: ExpandWildcards;
+    lenient?: boolean;
+    lowercaseExpandedTerms?: boolean;
+    preference?: string;
+    q?: string;
+    routing?: NameList;
+    scroll?: TimeSpan;
+    searchType?: "query_then_fetch" | "dfs_query_then_fetch";
+    size?: number;
+    sort?: NameList;
+    _source?: NameList;
+    _sourceExclude?: NameList;
+    _sourceInclude?: NameList;
+    terminateAfter?: number;
+    stats?: NameList;
+    suggestField?: string;
+    suggestMode?: "missing" | "popular" | "always";
+    suggestSize?: number;
+    suggestText?: string;
+    timeout?: TimeSpan;
+    trackScores?: boolean;
+    version?: boolean;
+    requestCache?: boolean;
+    index?: NameList;
+    type?: NameList;
+}
+
+export interface SearchResponse<T> {
+    took: number;
+    timed_out: boolean;
+    _scroll_id?: string;
+    _shards: ShardsResponse;
+    hits: {
+        total: number;
+        max_score: number;
+        hits: Array<{
+            _index: string;
+            _type: string;
+            _id: string;
+            _score: number;
+            _source: T;
+            _version?: number;
+            _explanation?: Explanation;
+            fields?: any;
+            highlight?: any;
+            inner_hits?: any;
+        }>;
+    };
+    aggregations?: any;
+}
+
+export interface SearchShardsParams extends GenericParams {
+    preference?: string;
+    routing?: string;
+    local?: boolean;
+    ignoreUnavailable?: boolean;
+    allowNoIndices?: boolean;
+    expandWildcards?: ExpandWildcards;
+    index: NameList;
+    type: NameList;
+}
+
+export interface SearchShardsResponse {
+    nodes: any;
+    shards: SearchShardsResponseShard[][];
+}
+
+export interface SearchShardsResponseShard {
+    index: string;
+    node: string;
+    primary: boolean;
+    share: number;
+    state: string;
+    allocation_id: {
+        id: string;
+    };
+    relocating_node: any;
+}
+
+export interface SearchTemplateParams extends GenericParams {
+    ignoreUnavailable?: boolean;
+    allowNoIndices?: boolean;
+    expandWildcards?: ExpandWildcards;
+    preference?: string;
+    routing?: NameList;
+    scroll?: TimeSpan;
+    searchType?: "query_then_fetch" | "query_and_fetch" | "dfs_query_then_fetch" | "dfs_query_and_fetch";
+    index: NameList;
+    type: NameList;
+}
+
+export interface SuggestParams extends GenericParams {
+    ignoreUnavailable?: boolean;
+    allowNoIndices?: boolean;
+    expandWildcards?: ExpandWildcards;
+    preference?: string;
+    routing?: string;
+    index: NameList;
+}
+
+export interface TermvectorsParams extends GenericParams {
+    termStatistics?: boolean;
+    fieldStatistics?: boolean;
+    fields?: NameList;
+    offsets?: boolean;
+    positions?: boolean;
+    payloads?: boolean;
+    preference?: string;
+    routing?: string;
+    parent?: string;
+    realtime?: boolean;
+    version?: number;
+    versionType?: VersionType;
+    index: string;
+    type: string;
+    id?: string;
+}
+
+export interface UpdateDocumentParams extends GenericParams {
+    waitForActiveShards?: string;
+    fields?: NameList;
+    _source?: NameList;
+    _sourceExclude?: NameList;
+    _sourceInclude?: NameList;
+    lang?: string;
+    parent?: string;
+    refresh?: Refresh;
+    retryOnConflict?: number;
+    routing?: string;
+    timeout?: TimeSpan;
+    timestamp?: Date | number;
+    ttl?: TimeSpan;
+    version?: number;
+    versionType?: "internal" | "force";
+    id: string;
+    index: string;
+    type: string;
+}
+
+export interface UpdateDocumentByQueryParams extends GenericParams {
+    analyzer?: string;
+    analyzeWildcard?: boolean;
+    defaultOperator?: DefaultOperator;
+    df?: string;
+    explain?: boolean;
+    storedFields?: NameList;
+    docvalueFields?: NameList;
+    fielddataFields?: NameList;
+    from?: number;
+    ignoreUnavailable?: boolean;
+    allowNoIndices?: boolean;
+    conflicts?: Conflicts;
+    expandWildcards?: ExpandWildcards;
+    lenient?: boolean;
+    lowercaseExpandedTerms?: boolean;
+    pipeline?: string;
+    preference?: string;
+    q?: string;
+    routing?: NameList;
+    scroll?: TimeSpan;
+    searchType?: "query_then_fetch" | "dfs_query_then_fetch";
+    searchTimeout?: TimeSpan;
+    size?: number;
+    sort?: NameList;
+    _source?: NameList;
+    _sourceExclude?: NameList;
+    _sourceInclude?: NameList;
+    terminateAfter?: number;
+    stats?: NameList;
+    suggestField?: string;
+    suggestMode?: "missing" | "popular" | "always";
+    suggestSize?: number;
+    suggestText?: string;
+    timeout?: TimeSpan;
+    trackScores?: boolean;
+    version?: boolean;
+    versionType?: boolean;
+    requestCache?: boolean;
+    refresh?: boolean;
+    waitForActiveShards?: string;
+    scrollSize?: number;
+    waitForCompletion?: boolean;
+    requestsPerSecond?: number;
+    index: NameList;
+    type: NameList;
+}
+
+export interface Cat {
+    aliases(params: CatAliasesParams, callback: (error: any, response: any) => void): void;
+    aliases(params: CatAliasesParams): Promise<any>;
+    allocation(params: CatAllocationParams, callback: (error: any, response: any) => void): void;
+    allocation(params: CatAllocationParams): Promise<any>;
+    count(params: CatCountParams, callback: (error: any, response: any) => void): void;
+    count(params: CatAllocationParams): Promise<any>;
+    fielddata(params: CatFielddataParams, callback: (error: any, response: any) => void): void;
+    fielddata(params: CatFielddataParams): Promise<any>;
+    health(params: CatHealthParams, callback: (error: any, response: any) => void): void;
+    health(params: CatHealthParams): Promise<any>;
+    help(params: CatHelpParams, callback: (error: any, response: any) => void): void;
+    help(params: CatHelpParams): Promise<any>;
+    indices(params: CatIndicesParams, callback: (error: any, response: any) => void): void;
+    indices(params: CatIndicesParams): Promise<any>;
+    master(params: CatCommonParams, callback: (error: any, response: any) => void): void;
+    master(params: CatCommonParams): Promise<any>;
+    nodeattrs(params: CatCommonParams, callback: (error: any, response: any) => void): void;
+    nodeattrs(params: CatCommonParams): Promise<any>;
+    nodes(params: CatCommonParams, callback: (error: any, response: any) => void): void;
+    nodes(params: CatCommonParams): Promise<any>;
+    pendingTasks(params: CatCommonParams, callback: (error: any, response: any) => void): void;
+    pendingTasks(params: CatCommonParams): Promise<any>;
+    plugins(params: CatCommonParams, callback: (error: any, response: any) => void): void;
+    plugins(params: CatCommonParams): Promise<any>;
+    recovery(params: CatRecoveryParams, callback: (error: any, response: any) => void): void;
+    recovery(params: CatRecoveryParams): Promise<any>;
+    repositories(params: CatCommonParams, callback: (error: any, response: any) => void): void;
+    repositories(params: CatCommonParams): Promise<any>;
+    segments(params: CatSegmentsParams, callback: (error: any, response: any) => void): void;
+    segments(params: CatSegmentsParams): Promise<any>;
+    shards(params: CatShardsParams, callback: (error: any, response: any) => void): void;
+    shards(params: CatShardsParams): Promise<any>;
+    snapshots(params: CatSnapshotsParams, callback: (error: any, response: any) => void): void;
+    snapshots(params: CatSnapshotsParams): Promise<any>;
+    tasks(params: CatTasksParams, callback: (error: any, response: any) => void): void;
+    tasks(params: CatTasksParams): Promise<any>;
+    threadPool(params: CatThreadPoolParams, callback: (error: any, response: any) => void): void;
+    threadPool(params: CatThreadPoolParams): Promise<any>;
+}
+
+export type CatBytes = "b" | "k" | "kb" | "m" | "mb" | "g" | "gb" | "t" | "tb" | "p" | "pb";
+
+export interface CatCommonParams extends GenericParams {
+    format: string;
+    local?: boolean;
+    masterTimeout?: TimeSpan;
+    h?: NameList;
+    help?: boolean;
+    v?: boolean;
+}
+
+export interface CatAliasesParams extends CatCommonParams {
+    name?: NameList;
+}
+
+export interface CatAllocationParams extends CatCommonParams {
+    bytes?: CatBytes;
+    nodeId?: NameList;
+}
+
+export interface CatCountParams extends CatCommonParams {
+    index?: NameList;
+}
+
+export interface CatFielddataParams extends CatCommonParams {
+    bytes?: CatBytes;
+    fields?: NameList;
+}
+
+export interface CatHealthParams extends CatCommonParams {
+    ts?: boolean;
+}
+
+export interface CatHelpParams extends GenericParams {
+    help?: boolean;
+}
+
+export interface CatIndicesParams extends CatCommonParams {
+    bytes?: CatBytes;
+    health?: "green" | "yellow" | "red";
+    pri?: boolean;
+    index?: NameList;
+}
+
+export interface CatRecoveryParams extends GenericParams {
+    format: string;
+    bytes?: CatBytes;
+    masterTimeout?: TimeSpan;
+    h?: NameList;
+    help?: boolean;
+    v?: boolean;
+}
+
+export interface CatSegmentsParams extends GenericParams {
+    format: string;
+    h?: NameList;
+    help?: boolean;
+    v?: boolean;
+    index?: NameList;
+}
+
+export interface CatShardsParams extends CatCommonParams {
+    index?: NameList;
+}
+
+export interface CatSnapshotsParams extends GenericParams {
+    format: string;
+    ignoreUnavailable?: boolean;
+    masterTimeout?: TimeSpan;
+    h?: NameList;
+    help?: boolean;
+    v?: boolean;
+    repository?: NameList;
+}
+
+export interface CatTasksParams extends GenericParams {
+    format: string;
+    nodeId?: NameList;
+    actions?: NameList;
+    detailed?: boolean;
+    parentNode?: string;
+    parentTask?: number;
+    h?: NameList;
+    help?: boolean;
+    v?: boolean;
+}
+
+export interface CatThreadPoolParams extends CatCommonParams {
+    size?: "" | "k" | "m" | "g" | "t" | "p";
+    threadPoolPatterns?: NameList;
+}
+
+export interface Cluster {
+    allocationExplain(params: ClusterAllocationExplainParams, callback: (error: any, response: any) => void): void;
+    allocationExplain(params: ClusterAllocationExplainParams): Promise<any>;
+    getSettings(params: ClusterGetSettingsParams, callback: (error: any, response: any) => void): void;
+    getSettings(params: ClusterGetSettingsParams): Promise<any>;
+    health(params: ClusterHealthParams, callback: (error: any, response: any) => void): void;
+    health(params: ClusterHealthParams): Promise<any>;
+    pendingTasks(params: ClusterPendingTasksParams, callback: (error: any, response: any) => void): void;
+    pendingTasks(params: ClusterPendingTasksParams): Promise<any>;
+    putSettings(params: ClusterPutSettingsParams, callback: (error: any, response: any) => void): void;
+    putSettings(params: ClusterPutSettingsParams): Promise<any>;
+    reroute(params: ClusterRerouteParams, callback: (error: any, response: any) => void): void;
+    reroute(params: ClusterRerouteParams): Promise<any>;
+    state(params: ClusterStateParams, callback: (error: any, response: any) => void): void;
+    state(params: ClusterStateParams): Promise<any>;
+    stats(params: ClusterStatsParams, callback: (error: any, response: any) => void): void;
+    stats(params: ClusterStatsParams): Promise<any>;
+}
+
+export interface ClusterAllocationExplainParams extends GenericParams {
+    includeYesDecisions?: boolean;
+    includeDiskInfo?: boolean;
+}
+
+export interface ClusterGetSettingsParams extends GenericParams {
+    flatSettings?: boolean;
+    masterTimeout?: TimeSpan;
+    timeout?: TimeSpan;
+    includeDefaults?: boolean;
+}
+
+export interface ClusterHealthParams extends GenericParams {
+    level?: "cluster" | "indices" | "shards";
+    local?: boolean;
+    masterTimeout?: TimeSpan;
+    waitForActiveShards?: string;
+    waitForNodes?: string;
+    waitForEvents?: "immediate" | "urgent" | "high" | "normal" | "low" | "languid";
+    waitForRelocatingShards?: boolean;
+    waitForStatus?: "green" | "yellow" | "red";
+    index?: NameList;
+}
+
+export interface ClusterPendingTasksParams extends GenericParams {
+    local?: boolean;
+    masterTimeout?: TimeSpan;
+}
+
+export interface ClusterPutSettingsParams extends GenericParams {
+    flatSettings?: boolean;
+    masterTimeout?: TimeSpan;
+    timeout?: TimeSpan;
+}
+
+export interface ClusterRerouteParams extends GenericParams {
+    dryRun?: boolean;
+    explain?: boolean;
+    retryFailed?: boolean;
+    metric?: NameList;
+    masterTimeout?: TimeSpan;
+    timeout?: TimeSpan;
+}
+
+export interface ClusterStateParams extends GenericParams {
+    local?: boolean;
+    masterTimeout?: TimeSpan;
+    flatSettings?: boolean;
+    ignoreUnavailable?: boolean;
+    allowNoIndices?: boolean;
+    expandWildcards?: ExpandWildcards;
+    index?: NameList;
+    metric?: NameList;
+}
+
+export interface ClusterStatsParams extends GenericParams {
+    flatSettings?: boolean;
+    human?: boolean;
+    timeout?: TimeSpan;
+    nodeId?: NameList;
+}
+
+export class Indices {
+    analyze(params: IndicesAnalyzeParams, callback: (error: any, response: any, status: any) => void): void;
+    analyze(params: IndicesAnalyzeParams): Promise<any>;
+    clearCache(params: IndicesClearCacheParams, callback: (error: any, response: any, status: any) => void): void;
+    clearCache(params: IndicesClearCacheParams): Promise<any>;
+    close(params: IndicesCloseParams, callback: (error: any, response: any, status: any) => void): void;
+    close(params: IndicesCloseParams): Promise<any>;
+    create(params: IndicesCreateParams, callback: (error: any, response: any, status: any) => void): void;
+    create(params: IndicesCreateParams): Promise<any>;
+    delete(params: IndicesDeleteParams, callback: (error: any, response: any, status: any) => void): void;
+    delete(params: IndicesDeleteParams): Promise<any>;
+    deleteAlias(params: IndicesDeleteAliasParams, callback: (error: any, response: any, status: any) => void): void;
+    deleteAlias(params: IndicesDeleteAliasParams): Promise<any>;
+    deleteTemplate(params: IndicesDeleteTemplateParams, callback: (error: any, response: any, status: any) => void): void;
+    deleteTemplate(params: IndicesDeleteTemplateParams): Promise<any>;
+    exists(params: IndicesExistsParams, callback: (error: any, response: any, status: any) => void): void;
+    exists(params: IndicesExistsParams): Promise<any>;
+    existsAlias(params: IndicesExistsAliasParams, callback: (error: any, response: any, status: any) => void): void;
+    existsAlias(params: IndicesExistsAliasParams): Promise<any>;
+    existsTemplate(params: IndicesExistsTemplateParams, callback: (error: any, response: any, status: any) => void): void;
+    existsTemplate(params: IndicesExistsTemplateParams): Promise<any>;
+    existsType(params: IndicesExistsTypeParams, callback: (error: any, response: any, status: any) => void): void;
+    existsType(params: IndicesExistsTypeParams): Promise<any>;
+    flush(params: IndicesFlushParams, callback: (error: any, response: any, status: any) => void): void;
+    flush(params: IndicesFlushParams): Promise<any>;
+    flushSynced(params: IndicesFlushSyncedParams, callback: (error: any, response: any, status: any) => void): void;
+    flushSynced(params: IndicesFlushSyncedParams): Promise<any>;
+    forcemerge(params: IndicesForcemergeParams, callback: (error: any, response: any, status: any) => void): void;
+    forcemerge(params: IndicesForcemergeParams): Promise<any>;
+    get(params: IndicesGetParams, callback: (error: any, response: any, status: any) => void): void;
+    get(params: IndicesGetParams): Promise<any>;
+    getAlias(params: IndicesGetAliasParams, callback: (error: any, response: any, status: any) => void): void;
+    getAlias(params: IndicesGetAliasParams): Promise<any>;
+    getFieldMapping(params: IndicesGetFieldMappingParams, callback: (error: any, response: any, status: any) => void): void;
+    getFieldMapping(params: IndicesGetFieldMappingParams): Promise<any>;
+    getMapping(params: IndicesGetMappingParams, callback: (error: any, response: any, status: any) => void): void;
+    getMapping(params: IndicesGetMappingParams): Promise<any>;
+    getSettings(params: IndicesGetSettingsParams, callback: (error: any, response: any, status: any) => void): void;
+    getSettings(params: IndicesGetSettingsParams): Promise<any>;
+    getTemplate(params: IndicesGetTemplateParams, callback: (error: any, response: any, status: any) => void): void;
+    getTemplate(params: IndicesGetTemplateParams): Promise<any>;
+    getUpgrade(params: IndicesGetUpgradeParams, callback: (error: any, response: any, status: any) => void): void;
+    getUpgrade(params: IndicesGetUpgradeParams): Promise<any>;
+    open(params: IndicesOpenParams, callback: (error: any, response: any, status: any) => void): void;
+    open(params: IndicesOpenParams): Promise<any>;
+    putAlias(params: IndicesPutAliasParams, callback: (error: any, response: any, status: any) => void): void;
+    putAlias(params: IndicesPutAliasParams): Promise<any>;
+    putMapping(params: IndicesPutMappingParams, callback: (error: any, response: any, status: any) => void): void;
+    putMapping(params: IndicesPutMappingParams): Promise<any>;
+    putSettings(params: IndicesPutSettingsParams, callback: (error: any, response: any, status: any) => void): void;
+    putSettings(params: IndicesPutSettingsParams): Promise<any>;
+    putTemplate(params: IndicesPutTemplateParams, callback: (error: any, response: any) => void): void;
+    putTemplate(params: IndicesPutTemplateParams): Promise<any>;
+    recovery(params: IndicesRecoveryParams, callback: (error: any, response: any) => void): void;
+    recovery(params: IndicesRecoveryParams): Promise<any>;
+    refresh(params: IndicesRefreshParams, callback: (error: any, response: any) => void): void;
+    refresh(params: IndicesRefreshParams): Promise<any>;
+    rollover(params: IndicesRolloverParams, callback: (error: any, response: IndicesRolloverResponse) => void): void;
+    rollover(params: IndicesRolloverParams): Promise<IndicesRolloverResponse>;
+    segments(params: IndicesSegmentsParams, callback: (error: any, response: any) => void): void;
+    segments(params: IndicesSegmentsParams): Promise<any>;
+    shardStores(params: IndicesShardStoresParams, callback: (error: any, response: any) => void): void;
+    shardStores(params: IndicesShardStoresParams): Promise<any>;
+    shrink(params: IndicesShrinkParams, callback: (error: any, response: any) => void): void;
+    shrink(params: IndicesShrinkParams): Promise<any>;
+    stats(params: IndicesStatsParams, callback: (error: any, response: any) => void): void;
+    stats(params: IndicesStatsParams): Promise<any>;
+    updateAliases(params: IndicesUpdateAliasesParams, callback: (error: any, response: any) => void): void;
+    updateAliases(params: IndicesUpdateAliasesParams): Promise<any>;
+    upgrade(params: IndicesUpgradeParams, callback: (error: any, response: any) => void): void;
+    upgrade(params: IndicesUpgradeParams): Promise<any>;
+    validateQuery(params: IndicesValidateQueryParams, callback: (error: any, response: any) => void): void;
+    validateQuery(params: IndicesValidateQueryParams): Promise<any>;
+}
+
+export interface IndicesAnalyzeParams extends GenericParams {
+    analyzer?: string;
+    charFilter?: NameList;
+    field?: string;
+    filter?: NameList;
+    index?: string;
+    perferLocal?: boolean;
+    text?: NameList;
+    tokenizer?: string;
+    explain?: boolean;
+    attributes?: NameList;
+    format?: "";
+}
+
+export interface IndicesClearCacheParams extends GenericParams {
+    fieldData?: boolean;
+    fielddata?: boolean;    // yes the docs really have both
+    fields?: NameList;
+    query?: boolean;
+    ignoreUnavailable?: boolean;
+    allowNoIndices?: boolean;
+    expandWildcards?: ExpandWildcards;
+    index?: NameList;
+    recycler?: boolean;
+    request?: boolean;
+}
+
+export interface IndicesCloseParams extends GenericParams {
+    timeout?: TimeSpan;
+    masterTimeout?: TimeSpan;
+    ignoreUnavailable?: boolean;
+    allowNoIndices?: boolean;
+    expandWildcards?: ExpandWildcards;
+    index: NameList;
+}
+
+export interface IndicesCreateParams extends GenericParams {
+    waitForActiveShards?: string;
+    timeout?: TimeSpan;
+    masterTimeout?: TimeSpan;
+    updateAllTypes?: boolean;
+    index: string;
+}
+
+export interface IndicesDeleteParams extends GenericParams {
+    timeout?: TimeSpan;
+    masterTimeout?: TimeSpan;
+    index: NameList;
+}
+
+export interface IndicesDeleteAliasParams extends GenericParams {
+    timeout?: TimeSpan;
+    masterTimeout?: TimeSpan;
+    index: NameList;
+    name: NameList;
+}
+
+export interface IndicesDeleteTemplateParams extends GenericParams {
+    timeout?: TimeSpan;
+    masterTimeout?: TimeSpan;
+    name: string;
+}
+
+export interface IndicesExistsParams extends GenericParams {
+    ignoreUnavailable?: boolean;
+    allowNoIndices?: boolean;
+    expandWildcards?: ExpandWildcards;
+    local?: boolean;
+    index: NameList;
+}
+
+export interface IndicesExistsAliasParams extends IndicesExistsParams {
+    name: NameList;
+}
+
+export interface IndicesExistsTemplateParams extends GenericParams {
+    timeout?: TimeSpan;
+    masterTimeout?: TimeSpan;
+    name: NameList;
+}
+
+export interface IndicesExistsTypeParams extends IndicesExistsParams {
+    type: NameList;
+}
+
+export interface IndicesFlushParams extends GenericParams {
+    force?: boolean;
+    waitIfOngoing?: boolean;
+    ignoreUnavailable?: boolean;
+    allowNoIndices?: boolean;
+    expandWildcards?: ExpandWildcards;
+    index: NameList;
+}
+
+export interface IndicesFlushSyncedParams extends GenericParams {
+    ignoreUnavailable?: boolean;
+    allowNoIndices?: boolean;
+    expandWildcards?: ExpandWildcards;
+    index: NameList;
+}
+
+export interface IndicesForcemergeParams extends GenericParams {
+    flush?: boolean;
+    ignoreUnavailable?: boolean;
+    allowNoIndices?: boolean;
+    expandWildcards?: ExpandWildcards;
+    maxNumSegments?: number;
+    onlyExpungeDeletes?: boolean;
+    operationThreading?: any;   // even the docs don't know what this does
+    waitForMerge?: boolean;
+    index: NameList;
+}
+
+export interface IndicesGetParams extends GenericParams {
+    local?: boolean;
+    ignoreUnavailable?: boolean;
+    allowNoIndices?: boolean;
+    expandWildcards?: ExpandWildcards;
+    flatSettings?: boolean;
+    human?: boolean;
+    includeDefaults?: boolean;
+    index?: NameList;
+    feature?: NameList;
+}
+
+export interface IndicesGetAliasParams extends GenericParams {
+    ignoreUnavailable?: boolean;
+    allowNoIndices?: boolean;
+    expandWildcards?: ExpandWildcards;
+    local?: boolean;
+    index?: NameList;
+    name?: NameList;
+}
+
+export interface IndicesGetFieldMappingParams extends GenericParams {
+    includeDefaults?: boolean;
+    ignoreUnavailable?: boolean;
+    allowNoIndices?: boolean;
+    expandWildcards?: ExpandWildcards;
+    local?: boolean;
+    index?: NameList;
+    type?: NameList;
+    fields?: NameList;
+}
+
+export interface IndicesGetMappingParams extends GenericParams {
+    ignoreUnavailable?: boolean;
+    allowNoIndices?: boolean;
+    expandWildcards?: ExpandWildcards;
+    local?: boolean;
+    index?: NameList;
+    type?: NameList;
+}
+
+export interface IndicesGetSettingsParams extends GenericParams {
+    ignoreUnavailable?: boolean;
+    allowNoIndices?: boolean;
+    expandWildcards?: ExpandWildcards;
+    flatSettings?: boolean;
+    local?: boolean;
+    human?: boolean;
+    includeDefaults?: boolean;
+    index?: NameList;
+    name?: NameList;
+}
+
+export interface IndicesGetTemplateParams extends GenericParams {
+    flatSettings?: boolean;
+    masterTimeout?: TimeSpan;
+    local?: boolean;
+    name?: NameList;
+}
+
+export interface IndicesGetUpgradeParams extends GenericParams {
+    ignoreUnavailable?: boolean;
+    allowNoIndices?: boolean;
+    expandWildcards?: ExpandWildcards;
+    human?: boolean;
+    index?: NameList;
+}
+
+export interface IndicesOpenParams extends GenericParams {
+    timeout?: TimeSpan;
+    masterTimeout?: TimeSpan;
+    ignoreUnavailable?: boolean;
+    allowNoIndices?: boolean;
+    expandWildcards?: ExpandWildcards;
+    index?: NameList;
+}
+
+export interface IndicesPutAliasParams extends GenericParams {
+    timeout?: TimeSpan;
+    masterTimeout?: TimeSpan;
+    index?: NameList;
+    name: NameList;
+}
+
+export interface IndicesPutMappingParams extends GenericParams {
+    timeout?: TimeSpan;
+    masterTimeout?: TimeSpan;
+    ignoreUnavailable?: boolean;
+    allowNoIndices?: boolean;
+    expandWildcards?: ExpandWildcards;
+    updateAllTypes?: boolean;
+    index: NameList;
+    type: string;
+    body: any;
+}
+
+export interface IndicesPutSettingsParams extends GenericParams {
+    masterTimeout?: TimeSpan;
+    preserveExisting?: boolean;
+    ignoreUnavailable?: boolean;
+    allowNoIndices?: boolean;
+    expandWildcards?: ExpandWildcards;
+    flatSettings?: boolean;
+    index: NameList;
+    body: any;
+}
+
+export interface IndicesPutTemplateParams extends GenericParams {
+    order?: number;
+    create?: boolean;
+    timeout?: TimeSpan;
+    masterTimeout?: TimeSpan;
+    flatSettings?: boolean;
+    name: string;
+    body: any;
+}
+
+export interface IndicesRecoveryParams extends GenericParams {
+    detailed?: boolean;
+    activeOnly?: boolean;
+    human?: boolean;
+    index: NameList;
+}
+
+export interface IndicesRefreshParams extends GenericParams {
+    ignoreUnavailable?: boolean;
+    allowNoIndices?: boolean;
+    expandWildcards?: ExpandWildcards;
+    force?: boolean;
+    operationThreading?: any;   // even the docs don't know what this does
+    index: NameList;
+}
+
+export interface IndicesRolloverParams extends GenericParams {
+    timeout?: TimeSpan;
+    masterTimeout?: TimeSpan;
+    waitForActiveShards?: number | string;
+    alias?: string;
+    newIndex?: string;
+}
+
+export interface IndicesRolloverResponse {
+    acknowledged: boolean;
+    shards_acknowledged: boolean;
+    old_index: string;
+    new_index: string;
+    rolled_over: boolean;
+    dry_run: boolean;
+    conditions: { [condition: string]: boolean };
+}
+
+export interface IndicesSegmentsParams extends GenericParams {
+    ignoreUnavailable?: boolean;
+    allowNoIndices?: boolean;
+    expandWildcards?: ExpandWildcards;
+    human?: boolean;
+    operationThreading?: any;   // even the docs don't know what this does
+    verbose?: boolean;
+    index: NameList;
+}
+
+export interface IndicesShardStoresParams extends GenericParams {
+    status?: NameList;
+    ignoreUnavailable?: boolean;
+    allowNoIndices?: boolean;
+    expandWildcards?: ExpandWildcards;
+    operationThreading?: any;   // even the docs don't know what this does
+    index: NameList;
+}
+
+export interface IndicesShrinkParams extends GenericParams {
+    timeout?: TimeSpan;
+    masterTimeout?: TimeSpan;
+    waitForActiveShards?: string | number;
+    index: string;
+    target: string;
+}
+
+export interface IndicesStatsParams extends GenericParams {
+    completionFields?: NameList;
+    fielddataFields?: NameList;
+    fields?: NameList;
+    groups?: NameList;
+    human?: boolean;
+    level?: "cluster" | "indices" | "shards";
+    types?: NameList;
+    index: NameList;
+    metric?: NameList;
+}
+
+export interface IndicesUpdateAliasesParams extends GenericParams {
+    timeout?: TimeSpan;
+    masterTimeout?: TimeSpan;
+    body: {
+        actions: IndicesUpdateAliasesParamsAction[];
+    };
+}
+
+export interface IndicesUpdateAliasesParamsAction {
+    add?: {
+        index?: string;
+        indices?: string[];
+        alias: string;
+    };
+    remove?: {
+        index?: string;
+        indices?: string[];
+        alias: string;
+    };
+    remove_index?: {
+        index: string;
+    };
+}
+
+export interface IndicesUpgradeParams extends GenericParams {
+    expandWildcards?: ExpandWildcards;
+    ignoreUnavailable?: boolean;
+    waitForCompletion?: boolean;
+    onlyAncientSegments?: boolean;
+    index: NameList;
+}
+
+export interface IndicesValidateQueryParams extends GenericParams {
+    explain?: boolean;
+    ignoreUnavailable?: boolean;
+    allowNoIndices?: boolean;
+    expandWildcards?: ExpandWildcards;
+    operationThreading?: any;   // even the docs don't know what this does
+    q?: string;
+    analyzer?: string;
+    analyzeWildcard?: boolean;
+    defaultOperator?: DefaultOperator;
+    df?: string;
+    lenient?: boolean;
+    lowercaseExpandedTerms?: boolean;
+    rewrite?: boolean;
+    index: NameList;
+    type?: NameList;
+}
+
+export class Ingest {
+    deletePipeline(params: IngestDeletePipelineParams, callback: (error: any, response: any, status: any) => void): void;
+    deletePipeline(params: IngestDeletePipelineParams): Promise<any>;
+    getPipeline(params: IngestGetPipelineParams, callback: (error: any, response: any, status: any) => void): void;
+    getPipeline(params: IngestGetPipelineParams): Promise<any>;
+    putPipeline(params: IngestPutPipelineParams, callback: (error: any, response: any, status: any) => void): void;
+    putPipeline(params: IngestPutPipelineParams): Promise<any>;
+    simulate(params: IngestSimulateParams, callback: (error: any, response: any, status: any) => void): void;
+    simulate(params: IngestSimulateParams): Promise<any>;
+}
+
+export interface IngestDeletePipelineParams extends GenericParams {
+    masterTimeout?: number;
+    timeout?: number;
+    id: string;
+}
+
+export interface IngestGetPipelineParams extends GenericParams {
+    masterTimeout?: number;
+    id: string;
+}
+
+export interface IngestPutPipelineParams extends GenericParams {
+    masterTimeout?: number;
+    timeout?: number;
+    id: string;
+    body: any;
+}
+
+export interface IngestSimulateParams extends GenericParams {
+    verbose?: boolean;
+    id: string;
+}
+
+export class Nodes {
+    hotThreads(params: NodesHotThreadsParams, callback: (error: any, response: any, status: any) => void): void;
+    hotThreads(params: NodesHotThreadsParams): Promise<any>;
+    info(params: NodesInfoParams, callback: (error: any, response: any, status: any) => void): void;
+    info(params: NodesInfoParams): Promise<any>;
+    stats(params: NodesStatsParams, callback: (error: any, response: any, status: any) => void): void;
+    stats(params: NodesStatsParams): Promise<any>;
+}
+
+export interface NodesHotThreadsParams extends GenericParams {
+    interval?: TimeSpan;
+    snapshots?: number;
+    threads?: number;
+    ignoreIdleThreads?: boolean;
+    type?: "cpu" | "wait" | "blocked";
+    timeout?: TimeSpan;
+    nodeId: NameList;
+}
+
+export interface NodesInfoParams extends GenericParams {
+    flatSettings?: boolean;
+    human?: boolean;
+    timeout?: TimeSpan;
+    nodeId: NameList;
+    metric?: NameList;
+}
+
+export interface NodesStatsParams extends GenericParams {
+    completionFields?: NameList;
+    fielddataFields?: NameList;
+    fields?: NameList;
+    groups?: boolean;
+    human?: boolean;
+    level?: "indices" | "node" | "shards";
+    types?: NameList;
+    timeout?: TimeSpan;
+    metric?: NameList;
+    indexMetric?: NameList;
+    nodeId?: NameList;
+}
+
+export class Snapshot {
+    create(params: SnapshotCreateParams, callback: (error: any, response: any, status: any) => void): void;
+    create(params: SnapshotCreateParams): Promise<any>;
+    createRepository(params: SnapshotCreateRepositoryParams, callback: (error: any, response: any, status: any) => void): void;
+    createRepository(params: SnapshotCreateRepositoryParams): Promise<any>;
+    delete(params: SnapshotDeleteParams, callback: (error: any, response: any, status: any) => void): void;
+    delete(params: SnapshotDeleteParams): Promise<any>;
+    deleteRepository(params: SnapshotDeleteRepositoryParams, callback: (error: any, response: any, status: any) => void): void;
+    deleteRepository(params: SnapshotDeleteRepositoryParams): Promise<any>;
+    get(params: SnapshotGetParams, callback: (error: any, response: any, status: any) => void): void;
+    get(params: SnapshotGetParams): Promise<any>;
+    getRepository(params: SnapshotGetRepositoryParams, callback: (error: any, response: any, status: any) => void): void;
+    getRepository(params: SnapshotGetRepositoryParams): Promise<any>;
+    restore(params: SnapshotRestoreParams, callback: (error: any, response: any, status: any) => void): void;
+    restore(params: SnapshotRestoreParams): Promise<any>;
+    status(params: SnapshotStatusParams, callback: (error: any, response: any, status: any) => void): void;
+    status(params: SnapshotStatusParams): Promise<any>;
+    verifyRepository(params: SnapshotVerifyRepositoryParams, callback: (error: any, response: any, status: any) => void): void;
+    verifyRepository(params: SnapshotVerifyRepositoryParams): Promise<any>;
+}
+
+export interface SnapshotCreateParams extends GenericParams {
+    masterTimeout?: TimeSpan;
+    waitForCompletion?: boolean;
+    repository: string;
+    snapshot: string;
+}
+
+export interface SnapshotCreateRepositoryParams extends GenericParams {
+    masterTimeout?: TimeSpan;
+    timeout?: TimeSpan;
+    verify?: boolean;
+    repository: string;
+}
+
+export interface SnapshotDeleteParams extends GenericParams {
+    masterTimeout?: TimeSpan;
+    repository: string;
+    snapshot: string;
+}
+
+export interface SnapshotDeleteRepositoryParams extends GenericParams {
+    masterTimeout?: TimeSpan;
+    timeout?: TimeSpan;
+    repository: string;
+}
+
+export interface SnapshotGetParams extends GenericParams {
+    masterTimeout?: TimeSpan;
+    ignoreUnavailable?: boolean;
+    repository: string;
+    snapshot: NameList;
+}
+
+export interface SnapshotGetRepositoryParams extends GenericParams {
+    masterTimeout?: TimeSpan;
+    local?: boolean;
+    repository: NameList;
+}
+
+export interface SnapshotRestoreParams extends GenericParams {
+    masterTimeout?: TimeSpan;
+    waitForCompletion?: boolean;
+    repository: string;
+    snapshot: string;
+}
+
+export interface SnapshotStatusParams extends GenericParams {
+    masterTimeout?: TimeSpan;
+    ignoreUnavailable?: boolean;
+    repository: string;
+    snapshot: NameList;
+}
+
+export interface SnapshotVerifyRepositoryParams extends GenericParams {
+    masterTimeout?: TimeSpan;
+    timeout?: TimeSpan;
+    repository: string;
+}
+
+export class Tasks {
+    cancel(params: TasksCancelParams, callback: (error: any, response: any, status: any) => void): void;
+    cancel(params: TasksCancelParams): Promise<any>;
+    get(params: TasksGetParams, callback: (error: any, response: any, status: any) => void): void;
+    get(params: TasksGetParams): Promise<any>;
+    list(params: TasksListParams, callback: (error: any, response: any, status: any) => void): void;
+    list(params: TasksListParams): Promise<any>;
+}
+
+export interface TasksCancelParams extends GenericParams {
+    nodeId?: NameList;
+    actions?: NameList;
+    parentNode?: string;
+    parentTask?: string;
+    taskId?: string;
+}
+
+export interface TasksGetParams extends GenericParams {
+    waitForCompletion?: boolean;
+    taskId?: string;
+}
+
+export interface TasksListParams extends GenericParams {
+    nodeId?: NameList;
+    actions?: NameList;
+    detailed?: boolean;
+    parentNode?: string;
+    parentTask?: string;
+    waitForCompletion?: boolean;
+    groupBy?: "nodes" | "parents";
+}
+
+export namespace errors {
+    class _Abstract extends Error {}
+    class Generic extends _Abstract {}
+    class ConnectionFault extends _Abstract {}
+    class NoConnections extends _Abstract {}
+    class Serialization extends _Abstract {}
+    class RequestTypeError extends _Abstract {}
+
+    class AuthenticationException extends _Abstract {}
+    class AuthorizationException extends _Abstract {}
+    class BadGateway extends _Abstract {}
+    class BadRequest extends _Abstract {}
+    class BlockedByWindowsParentalControls extends _Abstract {}
+    class ClientClosedRequest extends _Abstract {}
+    class Conflict extends _Abstract {}
+    class ExpectationFailed extends _Abstract {}
+    class GatewayTimeout extends _Abstract {}
+    class HTTPToHTTPS extends _Abstract {}
+    class HTTPVersionNotSupported extends _Abstract {}
+    class ImATeapot extends _Abstract {}
+    class InternalServerError extends _Abstract {}
+    class LengthRequired extends _Abstract {}
+    class MethodNotAllowed extends _Abstract {}
+    class MovedPermanently extends _Abstract {}
+    class MultipleChoices extends _Abstract {}
+    class NotAcceptable extends _Abstract {}
+    class NotExtended extends _Abstract {}
+    class NotFound extends _Abstract {}
+    class NotImplemented extends _Abstract {}
+    class NotModified extends _Abstract {}
+    class PaymentRequired extends _Abstract {}
+    class PermanentRedirect extends _Abstract {}
+    class PreconditionFailed extends _Abstract {}
+    class ProxyAuthenticationRequired extends _Abstract {}
+    class RequestedRangeNotSatisfiable extends _Abstract {}
+    class RequestEntityTooLarge extends _Abstract {}
+    class RequestHeaderTooLarge extends _Abstract {}
+    class RequestTimeout extends _Abstract {}
+    class RequestURITooLong extends _Abstract {}
+    class SeeOther extends _Abstract {}
+    class ServiceUnavailable extends _Abstract {}
+    class TemporaryRedirect extends _Abstract {}
+    class TooManyConnectionsFromThisIP extends _Abstract {}
+    class TooManyRequests extends _Abstract {}
+    class UnsupportedMediaType extends _Abstract {}
+    class UpgradeRequired extends _Abstract {}
+    class UseProxy extends _Abstract {}
+    class VariantAlsoNegotiates extends _Abstract {}
 }
diff --git a/types/elasticsearch/tsconfig.json b/types/elasticsearch/tsconfig.json
index 2d62eac43d..21ac20d7e9 100644
--- a/types/elasticsearch/tsconfig.json
+++ b/types/elasticsearch/tsconfig.json
@@ -7,7 +7,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
@@ -21,4 +21,4 @@
         "index.d.ts",
         "elasticsearch-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/elasticsearch/tslint.json b/types/elasticsearch/tslint.json
index a41bf5d19a..e9003e412b 100644
--- a/types/elasticsearch/tslint.json
+++ b/types/elasticsearch/tslint.json
@@ -1,79 +1,7 @@
 {
     "extends": "dtslint/dt.json",
     "rules": {
-        "adjacent-overload-signatures": false,
-        "array-type": false,
-        "arrow-return-shorthand": false,
-        "ban-types": false,
-        "callable-types": false,
-        "comment-format": false,
-        "dt-header": false,
-        "eofline": false,
-        "export-just-namespace": false,
-        "import-spacing": false,
-        "interface-name": false,
-        "interface-over-type-literal": false,
-        "jsdoc-format": false,
-        "max-line-length": false,
-        "member-access": false,
-        "new-parens": false,
-        "no-any-union": false,
-        "no-boolean-literal-compare": false,
-        "no-conditional-assignment": false,
-        "no-consecutive-blank-lines": false,
-        "no-construct": false,
-        "no-declare-current-package": false,
-        "no-duplicate-imports": false,
-        "no-duplicate-variable": false,
-        "no-empty-interface": false,
-        "no-for-in-array": false,
-        "no-inferrable-types": false,
-        "no-internal-module": false,
-        "no-irregular-whitespace": false,
-        "no-mergeable-namespace": false,
-        "no-misused-new": false,
-        "no-namespace": false,
-        "no-object-literal-type-assertion": false,
-        "no-padding": false,
-        "no-redundant-jsdoc": false,
-        "no-redundant-jsdoc-2": false,
-        "no-redundant-undefined": false,
-        "no-reference-import": false,
-        "no-relative-import-in-test": false,
-        "no-self-import": false,
-        "no-single-declare-module": false,
-        "no-string-throw": false,
-        "no-unnecessary-callback-wrapper": false,
-        "no-unnecessary-class": false,
         "no-unnecessary-generics": false,
-        "no-unnecessary-qualifier": false,
-        "no-unnecessary-type-assertion": false,
-        "no-useless-files": false,
-        "no-var-keyword": false,
-        "no-var-requires": false,
-        "no-void-expression": false,
-        "no-trailing-whitespace": false,
-        "object-literal-key-quotes": false,
-        "object-literal-shorthand": false,
-        "one-line": false,
-        "one-variable-per-declaration": false,
-        "only-arrow-functions": false,
-        "prefer-conditional-expression": false,
-        "prefer-const": false,
-        "prefer-declare-function": false,
-        "prefer-for-of": false,
-        "prefer-method-signature": false,
-        "prefer-template": false,
-        "radix": false,
-        "semicolon": false,
-        "space-before-function-paren": false,
-        "space-within-parens": false,
-        "strict-export-declare-modifiers": false,
-        "trim-file": false,
-        "triple-equals": false,
-        "typedef-whitespace": false,
-        "unified-signatures": false,
-        "void-return": false,
-        "whitespace": false
+        "no-empty-interface": false
     }
 }
diff --git a/types/ember-data/index.d.ts b/types/ember-data/index.d.ts
index bf273f2f20..0e0678e7d7 100644
--- a/types/ember-data/index.d.ts
+++ b/types/ember-data/index.d.ts
@@ -993,6 +993,7 @@ declare namespace DS {
      * Push some raw data into the store.
      */
     pushPayload(modelName: string, inputPayload: {}): any;
+    pushPayload(inputPayload: {}): any;
     /**
      * `normalize` converts a json payload into the normalized form that
      * [push](#method_push) expects.
@@ -1032,6 +1033,14 @@ declare namespace DS {
    * should use the REST adapter.
    */
   class RESTAdapter extends Adapter implements BuildURLMixin {
+    /**
+     * Takes a URL, an HTTP method and a hash of data, and makes an HTTP request.
+     */
+    ajax(url: string, type: string, options?: object): Promise<any>;
+    /**
+     * Generate ajax options
+     */
+    ajaxOptions(url: string, type: string, options?: object): object;
     /**
      * By default, the RESTAdapter will send the query params sorted alphabetically to the
      * server.
diff --git a/types/ember-data/test/adapter.ts b/types/ember-data/test/adapter.ts
index d648f73310..5d9d45fd4b 100644
--- a/types/ember-data/test/adapter.ts
+++ b/types/ember-data/test/adapter.ts
@@ -23,3 +23,34 @@ const AuthTokenHeader = DS.JSONAPIAdapter.extend({
         };
     })
 });
+
+const UseAjax = DS.JSONAPIAdapter.extend({
+    query(store: DS.Store, type: string, query: object) {
+        const url = 'https://api.example.com/my-api';
+        return this.ajax(url, 'POST', {
+            param: 'foo'
+        });
+    }
+});
+
+const UseAjaxOptions = DS.JSONAPIAdapter.extend({
+    query(store: DS.Store, type: string, query: object) {
+        const url = 'https://api.example.com/my-api';
+        const options = this.ajaxOptions(url, 'DELETE', {
+            foo: 'bar'
+        });
+        return Ember.$.ajax(url, {
+            ...options
+        });
+    }
+});
+
+const UseAjaxOptionsWithOptionalThirdParams = DS.JSONAPIAdapter.extend({
+    query(store: DS.Store, type: string, query: object) {
+        const url = 'https://api.example.com/my-api';
+        const options = this.ajaxOptions(url, 'DELETE');
+        return Ember.$.ajax(url, {
+            ...options
+        });
+    }
+});
diff --git a/types/gapi.auth2/index.d.ts b/types/gapi.auth2/index.d.ts
index c5cfff0d9e..0acae5e2a7 100644
--- a/types/gapi.auth2/index.d.ts
+++ b/types/gapi.auth2/index.d.ts
@@ -27,7 +27,7 @@ declare namespace gapi.auth2 {
      * Signs in the user using the specified options.
      * If no option specified here, fallback to the options specified to gapi.auth2.init().
      */
-    signIn(options?: SigninOptions | SigninOptionsBuilder): any;
+    signIn(options?: SigninOptions | SigninOptionsBuilder): Promise<GoogleUser>;
 
     /**
      * Signs out all accounts from the application.
diff --git a/types/geojson/geojson-tests.ts b/types/geojson/geojson-tests.ts
index 4adb7f88f2..ce8c62418e 100644
--- a/types/geojson/geojson-tests.ts
+++ b/types/geojson/geojson-tests.ts
@@ -1,4 +1,10 @@
-let featureCollection: GeoJSON.FeatureCollection<any> =  {
+import {
+    BBox,
+    Feature, FeatureCollection, GeometryCollection, LineString,
+    MultiLineString, MultiPoint, MultiPolygon, Point, Polygon, GeometryObject
+} from "geojson";
+
+let featureCollection: FeatureCollection<Point | LineString | Polygon | MultiPoint | MultiLineString | MultiPolygon | GeometryCollection> = {
     type: "FeatureCollection",
     features: [
         {
@@ -34,7 +40,7 @@ let featureCollection: GeoJSON.FeatureCollection<any> =  {
             geometry: {
                 type: "Polygon",
                 coordinates: [
-                    [ [100.0, 0.0], [101.0, 0.0], [101.0, 1.0], [100.0, 1.0], [100.0, 0.0] ]
+                    [[100.0, 0.0], [101.0, 0.0], [101.0, 1.0], [100.0, 1.0], [100.0, 0.0]]
                 ]
             },
             properties: {
@@ -44,17 +50,10 @@ let featureCollection: GeoJSON.FeatureCollection<any> =  {
                 }
             }
         }
-    ],
-    crs: {
-        type: "link",
-        properties: {
-            href: "http://example.com/crs/42",
-            type: "proj4"
-        }
-    }
+    ]
 };
 
-let featureWithPolygon: GeoJSON.Feature<GeoJSON.Polygon> = {
+const featureWithPolygon: Feature<Polygon> = {
     type: "Feature",
     bbox: [-180.0, -90.0, 180.0, 90.0],
     geometry: {
@@ -66,57 +65,57 @@ let featureWithPolygon: GeoJSON.Feature<GeoJSON.Polygon> = {
     properties: null
 };
 
-let point: GeoJSON.Point = {
+const point: Point = {
     type: "Point",
     coordinates: [100.0, 0.0]
 };
 
 // This type is commonly used in the turf package
-let pointCoordinates: number[] = point.coordinates;
+const pointCoordinates: number[] = point.coordinates;
 
-let lineString: GeoJSON.LineString = {
+const lineString: LineString = {
     type: "LineString",
-    coordinates: [ [100.0, 0.0], [101.0, 1.0] ]
+    coordinates: [[100.0, 0.0], [101.0, 1.0]]
 };
 
-let polygon: GeoJSON.Polygon = {
+const polygon: Polygon = {
     type: "Polygon",
     coordinates: [
-        [ [100.0, 0.0], [101.0, 0.0], [101.0, 1.0], [100.0, 1.0], [100.0, 0.0] ]
+        [[100.0, 0.0], [101.0, 0.0], [101.0, 1.0], [100.0, 1.0], [100.0, 0.0]]
     ]
 };
 
-let polygonWithHole: GeoJSON.Polygon = {
+const polygonWithHole: Polygon = {
     type: "Polygon",
     coordinates: [
-        [ [100.0, 0.0], [101.0, 0.0], [101.0, 1.0], [100.0, 1.0], [100.0, 0.0] ],
-        [ [100.2, 0.2], [100.8, 0.2], [100.8, 0.8], [100.2, 0.8], [100.2, 0.2] ]
+        [[100.0, 0.0], [101.0, 0.0], [101.0, 1.0], [100.0, 1.0], [100.0, 0.0]],
+        [[100.2, 0.2], [100.8, 0.2], [100.8, 0.8], [100.2, 0.8], [100.2, 0.2]]
     ]
 };
 
-let multiPoint: GeoJSON.MultiPoint = {
+const multiPoint: MultiPoint = {
     type: "MultiPoint",
-    coordinates: [ [100.0, 0.0], [101.0, 1.0] ]
+    coordinates: [[100.0, 0.0], [101.0, 1.0]]
 };
 
-let multiLineString: GeoJSON.MultiLineString = {
+const multiLineString: MultiLineString = {
     type: "MultiLineString",
     coordinates: [
-        [ [100.0, 0.0], [101.0, 1.0] ],
-        [ [102.0, 2.0], [103.0, 3.0] ]
+        [[100.0, 0.0], [101.0, 1.0]],
+        [[102.0, 2.0], [103.0, 3.0]]
     ]
 };
 
-let multiPolygon: GeoJSON.MultiPolygon = {
+const multiPolygon: MultiPolygon = {
     type: "MultiPolygon",
     coordinates: [
         [[[102.0, 2.0], [103.0, 2.0], [103.0, 3.0], [102.0, 3.0], [102.0, 2.0]]],
         [[[100.0, 0.0], [101.0, 0.0], [101.0, 1.0], [100.0, 1.0], [100.0, 0.0]],
-            [[100.2, 0.2], [100.8, 0.2], [100.8, 0.8], [100.2, 0.8], [100.2, 0.2]]]
+        [[100.2, 0.2], [100.8, 0.2], [100.8, 0.8], [100.2, 0.8], [100.2, 0.2]]]
     ]
 };
 
-let geometryCollection: GeoJSON.GeometryCollection = {
+const geometryCollection: GeometryCollection = {
     type: "GeometryCollection",
     geometries: [
         {
@@ -125,16 +124,17 @@ let geometryCollection: GeoJSON.GeometryCollection = {
         },
         {
             type: "LineString",
-            coordinates: [ [101.0, 0.0], [102.0, 1.0] ]
+            coordinates: [[101.0, 0.0], [102.0, 1.0]]
         }
     ]
 };
 
-let feature: GeoJSON.Feature<GeoJSON.GeometryObject> = {
+let feature: Feature<GeometryObject> = {
     type: "Feature",
     geometry: lineString,
     properties: null
 };
+
 feature = {
     type: "Feature",
     geometry: polygon,
@@ -172,44 +172,37 @@ featureCollection = {
         {
             type: "Feature",
             geometry: lineString,
-            properties: {test: "OK"}
+            properties: { test: "OK" }
         }, {
             type: "Feature",
             geometry: polygon,
-            properties: {test: "OK"}
+            properties: { test: "OK" }
         }, {
             type: "Feature",
             geometry: polygonWithHole,
-            properties: {test: "OK"}
+            properties: { test: "OK" }
         }, {
             type: "Feature",
             geometry: multiPoint,
-            properties: {test: "OK"}
+            properties: { test: "OK" }
         }, {
             type: "Feature",
             geometry: multiLineString,
-            properties: {test: "OK"}
+            properties: { test: "OK" }
         }, {
             type: "Feature",
             geometry: multiPolygon,
-            properties: {test: "OK"}
+            properties: { test: "OK" }
         }, {
             type: "Feature",
             geometry: geometryCollection,
-            properties: {test: "OK"}
+            properties: { test: "OK" }
         }
-    ],
-    crs: {
-        type: "link",
-        properties: {
-            href: "http://example.com/crs/42",
-            type: "proj4"
-        }
-    }
+    ]
 };
 
 // Allow access to custom properties
-const pt: GeoJSON.Feature<GeoJSON.Point> = {
+const pt: Feature<Point> = {
     type: "Feature",
     properties: {
         foo: "bar",
@@ -221,9 +214,14 @@ const pt: GeoJSON.Feature<GeoJSON.Point> = {
         coordinates: [0, 0]
     }
 };
-pt.properties.foo;
-pt.properties.hello;
-pt.properties[1];
+
+if (pt.properties) {
+    if (pt.properties.foo == null || pt.properties.hello == null || pt.properties[1] == null) {
+        throw TypeError("Properties should not be null or undefined.");
+    }
+} else {
+    throw TypeError("Feature should have a 'properties' property.");
+}
 
 // Optional generic for properties
 
@@ -232,19 +230,21 @@ interface TestProperty {
     hello: string;
 }
 
-const typedPropertiesFeature: GeoJSON.Feature<GeoJSON.Point, TestProperty> = {
+const testProps: TestProperty = {
+    foo: "bar",
+    hello: "world"
+};
+
+const typedPropertiesFeature: Feature<Point> = {
     type: "Feature",
-    properties: {
-        foo: "bar",
-        hello: "world",
-    },
+    properties: testProps,
     geometry: {
         type: "Point",
         coordinates: [0, 0]
     }
 };
 
-const typedPropertiesFeatureCollection: GeoJSON.FeatureCollection<GeoJSON.Point, TestProperty> = {
+const typedPropertiesFeatureCollection: FeatureCollection<Point> = {
     type: "FeatureCollection",
     features: [typedPropertiesFeature]
 };
diff --git a/types/geojson/index.d.ts b/types/geojson/index.d.ts
index b916179fac..e6783255eb 100644
--- a/types/geojson/index.d.ts
+++ b/types/geojson/index.d.ts
@@ -1,123 +1,165 @@
-// Type definitions for GeoJSON Format Specification Revision 1.0
-// Project: http://geojson.org/
+// Type definitions for geojson 7946.0
+// Project: https://geojson.org/
 // Definitions by: Jacob Bruun <https://github.com/cobster>
 //                 Arne Schubert <https://github.com/atd-schubert>
+//                 Jeff Jacobson <https://github.com/JeffJacobson>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
+// Note: as of the RFC 7946 version of GeoJSON, Coordinate Reference Systems
+// are no longer supported. (See https://tools.ietf.org/html/rfc7946#appendix-B)}
+
 export as namespace GeoJSON;
 
-/***
- * http://geojson.org/geojson-spec.html#geojson-objects
+/**
+ * The valid values for the "type" property of GeoJSON geometry objects.
+ * https://tools.ietf.org/html/rfc7946#section-1.4
+ */
+export type GeoJsonGeometryTypes = "Point" | "LineString" | "MultiPoint" | "Polygon" | "MultiLineString" |
+    "MultiPolygon" | "GeometryCollection";
+
+/**
+ * The value values for the "type" property of GeoJSON Objects.
+ * https://tools.ietf.org/html/rfc7946#section-1.4
+ */
+export type GeoJsonTypes = "FeatureCollection" | "Feature" | GeoJsonGeometryTypes;
+
+/**
+ * Bounding box
+ * https://tools.ietf.org/html/rfc7946#section-5
+ */
+export type BBox = [number, number, number, number] | [number, number, number, number, number, number];
+
+/**
+ * A Position is an array of coordinates.
+ * https://tools.ietf.org/html/rfc7946#section-3.1.1
+ * Array should contain between two and three elements.
+ * The previous GeoJSON specification allowed more elements (e.g., which could be used to represent M values),
+ * but the current specification only allows X, Y, and (optionally) Z to be defined.
+ */
+export type Position = number[]; // [number, number] | [number, number, number];
+
+/**
+ * The base GeoJSON object.
+ * https://tools.ietf.org/html/rfc7946#section-3
+ * The GeoJSON specification also allows foreign members
+ * (https://tools.ietf.org/html/rfc7946#section-6.1)
+ * Developers should use "&" type in TypeScript or extend the interface
+ * to add these foreign members.
  */
 export interface GeoJsonObject {
-    type: string;
-    bbox?: number[];
-    crs?: CoordinateReferenceSystem;
+    // Don't include foreign members directly into this type def.
+    // in order to preserve type safety.
+    // [key: string]: any;
+    /**
+     * Specifies the type of GeoJSON object.
+     */
+    type: GeoJsonTypes;
+    /**
+     * Bounding box of the coordinate range of the object's Geometries, Features, or Feature Collections.
+     * https://tools.ietf.org/html/rfc7946#section-5
+     */
+    bbox?: BBox;
 }
 
-/***
- * http://geojson.org/geojson-spec.html#positions
- */
-export type Position = number[];
-
-/***
- * http://geojson.org/geojson-spec.html#geometry-objects
- */
-export interface DirectGeometryObject extends GeoJsonObject {
-    coordinates: Position[][][] | Position[][] | Position[] | Position;
-}
 /**
- * GeometryObject supports geometry collection as well
+ * A geometry object.
+ * https://tools.ietf.org/html/rfc7946#section-3
  */
-export type GeometryObject = DirectGeometryObject | GeometryCollection;
+export interface GeometryObject extends GeoJsonObject {
+    type: GeoJsonGeometryTypes;
+}
 
-/***
- * http://geojson.org/geojson-spec.html#point
+/**
+ * Point geometry object.
+ * https://tools.ietf.org/html/rfc7946#section-3.1.2
  */
-export interface Point extends DirectGeometryObject {
+export interface Point extends GeometryObject {
     type: "Point";
     coordinates: Position;
 }
 
-/***
- * http://geojson.org/geojson-spec.html#multipoint
+/**
+ * MultiPoint geometry object.
+ *  https://tools.ietf.org/html/rfc7946#section-3.1.3
  */
-export interface MultiPoint extends DirectGeometryObject {
+export interface MultiPoint extends GeometryObject {
     type: "MultiPoint";
     coordinates: Position[];
 }
 
-/***
- * http://geojson.org/geojson-spec.html#linestring
+/**
+ * LineString geometry object.
+ * https://tools.ietf.org/html/rfc7946#section-3.1.4
  */
-export interface LineString extends DirectGeometryObject {
+export interface LineString extends GeometryObject {
     type: "LineString";
     coordinates: Position[];
 }
 
-/***
- * http://geojson.org/geojson-spec.html#multilinestring
+/**
+ * MultiLineString geometry object.
+ * https://tools.ietf.org/html/rfc7946#section-3.1.5
  */
-export interface MultiLineString extends DirectGeometryObject {
+export interface MultiLineString extends GeometryObject {
     type: "MultiLineString";
     coordinates: Position[][];
 }
 
-/***
- * http://geojson.org/geojson-spec.html#polygon
+/**
+ * Polygon geometry object.
+ * https://tools.ietf.org/html/rfc7946#section-3.1.6
  */
-export interface Polygon extends DirectGeometryObject {
+export interface Polygon extends GeometryObject {
     type: "Polygon";
     coordinates: Position[][];
 }
 
-/***
- * http://geojson.org/geojson-spec.html#multipolygon
+/**
+ * MultiPolygon geometry object.
+ * https://tools.ietf.org/html/rfc7946#section-3.1.7
  */
-export interface MultiPolygon extends DirectGeometryObject {
+export interface MultiPolygon extends GeometryObject {
     type: "MultiPolygon";
     coordinates: Position[][][];
 }
 
-/***
- * http://geojson.org/geojson-spec.html#geometry-collection
+/**
+ * Geometry Collection
+ * https://tools.ietf.org/html/rfc7946#section-3.1.8
  */
-export interface GeometryCollection extends GeoJsonObject {
+export interface GeometryCollection extends GeometryObject {
     type: "GeometryCollection";
-    geometries: GeometryObject[];
+    geometries: Array<Point | LineString | Polygon | MultiPoint | MultiLineString | MultiPolygon>;
 }
 
-/***
+export type GeoJsonProperties = { [name: string]: any; } | null;
+
+/**
+ * A feature object which contains a geometry and associated properties.
  * https://tools.ietf.org/html/rfc7946#section-3.2
  */
-export interface Feature<G extends GeometryObject, P = any> extends GeoJsonObject {
+export interface Feature<G extends GeometryObject, P = GeoJsonProperties> extends GeoJsonObject {
     type: "Feature";
-    geometry: G;
-    properties: P;
+    /**
+     * The feature's geometry
+     */
+    geometry: G | null;
+    /**
+     * A value that uniquely identifies this feature in a
+     * https://tools.ietf.org/html/rfc7946#section-3.2.
+     */
     id?: string | number;
+    /**
+     * Properties associated with this feature.
+     */
+    properties: P | null;
 }
 
-/***
- * http://geojson.org/geojson-spec.html#feature-collection-objects
+/**
+ * A collection of feature objects.
+ *  https://tools.ietf.org/html/rfc7946#section-3.3
  */
-export interface FeatureCollection<G extends GeometryObject, P = any> extends GeoJsonObject {
-    type: "FeatureCollection";
+export interface FeatureCollection<G extends GeometryObject, P = GeoJsonProperties> extends GeoJsonObject {
     features: Array<Feature<G, P>>;
 }
-
-/***
- * http://geojson.org/geojson-spec.html#coordinate-reference-system-objects
- */
-export interface CoordinateReferenceSystem {
-    type: string;
-    properties: any;
-}
-
-export interface NamedCoordinateReferenceSystem extends CoordinateReferenceSystem {
-    properties: { name: string };
-}
-
-export interface LinkedCoordinateReferenceSystem extends CoordinateReferenceSystem {
-    properties: { href: string; type: string };
-}
diff --git a/types/graphql/type/definition.d.ts b/types/graphql/type/definition.d.ts
index 7f84c875fb..52df7bd46c 100644
--- a/types/graphql/type/definition.d.ts
+++ b/types/graphql/type/definition.d.ts
@@ -455,6 +455,7 @@ export class GraphQLEnumType {
     constructor(config: GraphQLEnumTypeConfig);
     getValues(): GraphQLEnumValue[];
     getValue(name: string): GraphQLEnumValue;
+    isValidValue(value: any): boolean;
     serialize(value: any): string;
     parseValue(value: any): any;
     parseLiteral(valueNode: ValueNode): any;
diff --git a/types/gzip-size/gzip-size-tests.ts b/types/gzip-size/gzip-size-tests.ts
index f07d99bd50..70ea15b5e6 100644
--- a/types/gzip-size/gzip-size-tests.ts
+++ b/types/gzip-size/gzip-size-tests.ts
@@ -1,7 +1,16 @@
+import fs = require('fs');
 import gzipSize = require('gzip-size');
 
 const string = 'Lorem ipsum dolor sit amet.';
 
 console.log(string.length);
 
+gzipSize(string).then(size => console.log(size));
+
 console.log(gzipSize.sync(string));
+
+const stream = fs.createReadStream("index.d.ts");
+const gstream = stream.pipe(gzipSize.stream()).on("gzip-size", size => console.log(size));
+console.log(gstream.gzipSize); // Could be a number or undefined. Recommended to use "gzip-size" event instead
+
+gzipSize.file("index.d.ts").then(size => console.log(size));
diff --git a/types/gzip-size/index.d.ts b/types/gzip-size/index.d.ts
index cab8ec225b..66251e0da8 100644
--- a/types/gzip-size/index.d.ts
+++ b/types/gzip-size/index.d.ts
@@ -1,7 +1,8 @@
-// Type definitions for gzip-size 4.0
+// Type definitions for gzip-size 4.1
 // Project: https://github.com/sindresorhus/gzip-size
 // Definitions by: York Yao <https://github.com/plantain-00>
 //                 Jimi van der Woning <https://github.com/jimivdw>
+//                 Andre Wiggins <https://github.com/andrewiggins>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />
@@ -9,11 +10,45 @@
 import * as stream from 'stream';
 import * as zlib from 'zlib';
 
+interface GzipSizeStream extends stream.PassThrough {
+    on(event: string, listener: (...args: any[]) => void): this;
+    on(event: "gzip-size", listener: (size: number) => void): this;
+
+    /**
+     * Contains the gzip size of the stream after it is finished.
+     * Since this happens asynchronously, it is recommended you use
+     * the `.on("gzip-size", size => console.log(size))` method instead
+     */
+    gzipSize?: number;
+}
+
+/**
+ * Returns a Promise for the size.
+ * @param input A string or Buffer to determine the gzip size of
+ * @param options Any zlib option
+ */
 declare function gzipSize(input: string | Buffer, options?: zlib.ZlibOptions): Promise<number>;
 
 declare namespace gzipSize {
+    /**
+     * Returns the size synchronously
+     * @param input A string or Buffer to determine the gzip size of
+     * @param options Any zlib option
+     */
     function sync(input: string | Buffer, options?: zlib.ZlibOptions): number;
-    function stream(options?: zlib.ZlibOptions): stream.PassThrough;
+
+    /**
+     * Returns a stream.PassThrough. The stream emits a gzip-size event and has a gzipSize property.
+     * @param options Any zlib option
+     */
+    function stream(options?: zlib.ZlibOptions): GzipSizeStream;
+
+    /**
+     * Returns a Promise for the size of the file.
+     * @param path The path to the file
+     * @param options Any zlib option
+     */
+    function file(path: string, options?: zlib.ZlibOptions): Promise<number>;
 }
 
 export = gzipSize;
diff --git a/types/highlight.js/index.d.ts b/types/highlight.js/index.d.ts
index d691811b47..f96be1c06f 100644
--- a/types/highlight.js/index.d.ts
+++ b/types/highlight.js/index.d.ts
@@ -1,10 +1,14 @@
 // Type definitions for highlight.js v9.12
 // Project: https://github.com/isagalaev/highlight.js
-// Definitions by: Niklas Mollenhauer <https://github.com/nikeee>, Jeremy Hull <https://github.com/sourrust>
+// Definitions by: Niklas Mollenhauer <https://github.com/nikeee>
+//                 Jeremy Hull <https://github.com/sourrust>
+//                 Josh Goldberg <https://github.com/joshuakgoldberg>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare namespace hljs
 {
+	interface Node { }
+
 	export function highlight(
 		name: string,
 		value: string,
diff --git a/types/highlight.js/tsconfig.json b/types/highlight.js/tsconfig.json
index 5f5d2ae011..e3627e99ca 100644
--- a/types/highlight.js/tsconfig.json
+++ b/types/highlight.js/tsconfig.json
@@ -2,8 +2,7 @@
     "compilerOptions": {
         "module": "commonjs",
         "lib": [
-            "es6",
-            "dom"
+            "es6"
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
diff --git a/types/http-aws-es/index.d.ts b/types/http-aws-es/index.d.ts
index c14547a58f..91e12604f8 100644
--- a/types/http-aws-es/index.d.ts
+++ b/types/http-aws-es/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/TheDeveloper/http-aws-es#readme
 // Definitions by: Marco Gonzalez <https://github.com/marcogrcr>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 /// <reference types="node" />
 
diff --git a/types/is/index.d.ts b/types/is/index.d.ts
index 3c0e279eea..b61bd6deee 100644
--- a/types/is/index.d.ts
+++ b/types/is/index.d.ts
@@ -1320,4 +1320,8 @@ declare var is: Is;
 
 declare module 'is' {
     export = is;
-}
\ No newline at end of file
+}
+
+declare module 'is_js' {
+    export = is;
+}
diff --git a/types/joi/index.d.ts b/types/joi/index.d.ts
index 6dbc08245a..41a8063cac 100644
--- a/types/joi/index.d.ts
+++ b/types/joi/index.d.ts
@@ -8,6 +8,7 @@
 //                 Rytis Alekna <https://github.com/ralekna>
 //                 Pavel Ivanov <https://github.com/schfkt>
 //                 Youngrok Kim <https://github.com/rokoroku>
+//                 Dan Kraus <https://github.com/dankraus>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
 
@@ -127,6 +128,13 @@ export interface UriOptions {
     scheme?: string | RegExp | Array<string | RegExp>;
 }
 
+export interface Base64Options {
+    /**
+     * optional parameter defaulting to true which will require = padding if true or make padding optional if false
+     */
+    paddingRequired?: boolean;
+}
+
 export interface WhenOptions {
     /**
      * the required condition joi type.
@@ -520,6 +528,12 @@ export interface StringSchema extends AnySchema {
      */
     normalize(form?: 'NFC' | 'NFD' | 'NFKC' | 'NFKD'): this;
 
+    /**
+     * Requires the string value to be a valid base64 string; does not check the decoded value.
+     * @param options - optional settings: The unicode normalization options to use. Valid values: NFC [default], NFD, NFKC, NFKD
+     */
+    base64(options?: Base64Options): this;
+
     /**
      * Requires the number to be a credit card number (Using Lunh Algorithm).
      */
diff --git a/types/joi/joi-tests.ts b/types/joi/joi-tests.ts
index 96d91a72b9..785360746e 100644
--- a/types/joi/joi-tests.ts
+++ b/types/joi/joi-tests.ts
@@ -1,51 +1,52 @@
 import Joi = require('joi');
+import { GuidVersions } from 'joi';
 
 // --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
 
-var x: any = null;
-var value: any = null;
-var num: number = 0;
-var str: string = '';
-var bool: boolean = false;
-var exp: RegExp = null;
-var obj: object = null;
-var date: Date = null;
-var err: Error = null;
-var func: Function = null;
+let x: any = null;
+let value: any = null;
+let num: number = 0;
+let str: string = '';
+let bool: boolean = false;
+let exp: RegExp = null;
+let obj: object = null;
+let date: Date = null;
+let err: Error = null;
+let func: Function = null;
 
-var anyArr: any[] = [];
-var numArr: number[] = [];
-var strArr: string[] = [];
-var boolArr: boolean[] = [];
-var expArr: RegExp[] = [];
-var objArr: object[] = [];
-var errArr: Error[] = [];
-var funcArr: Function[] = [];
+let anyArr: any[] = [];
+let numArr: number[] = [];
+let strArr: string[] = [];
+let boolArr: boolean[] = [];
+let expArr: RegExp[] = [];
+let objArr: object[] = [];
+let errArr: Error[] = [];
+let funcArr: Function[] = [];
 
 // --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
 
-var schema: Joi.Schema = null;
-var schemaLike: Joi.SchemaLike = null;
+let schema: Joi.Schema = null;
+let schemaLike: Joi.SchemaLike = null;
 
-var anySchema: Joi.AnySchema = null;
-var numSchema: Joi.NumberSchema = null;
-var strSchema: Joi.StringSchema = null;
-var arrSchema: Joi.ArraySchema = null;
-var boolSchema: Joi.BooleanSchema = null;
-var binSchema: Joi.BinarySchema = null;
-var dateSchema: Joi.DateSchema = null;
-var funcSchema: Joi.FunctionSchema = null;
-var objSchema: Joi.ObjectSchema = null;
-var altSchema: Joi.AlternativesSchema = null;
+let anySchema: Joi.AnySchema = null;
+let numSchema: Joi.NumberSchema = null;
+let strSchema: Joi.StringSchema = null;
+let arrSchema: Joi.ArraySchema = null;
+let boolSchema: Joi.BooleanSchema = null;
+let binSchema: Joi.BinarySchema = null;
+let dateSchema: Joi.DateSchema = null;
+let funcSchema: Joi.FunctionSchema = null;
+let objSchema: Joi.ObjectSchema = null;
+let altSchema: Joi.AlternativesSchema = null;
 
-var schemaArr: Joi.Schema[] = [];
+let schemaArr: Joi.Schema[] = [];
 
-var ref: Joi.Reference = null;
-var description: Joi.Description = null;
+let ref: Joi.Reference = null;
+let description: Joi.Description = null;
 
 // --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
 
-var validOpts: Joi.ValidationOptions = null;
+let validOpts: Joi.ValidationOptions = null;
 
 validOpts = { abortEarly: bool };
 validOpts = { convert: bool };
@@ -77,7 +78,7 @@ validOpts = {
 
 // --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
 
-var renOpts: Joi.RenameOptions = null;
+let renOpts: Joi.RenameOptions = null;
 
 renOpts = { alias: bool };
 renOpts = { multiple: bool };
@@ -86,7 +87,7 @@ renOpts = { ignoreUndefined: bool };
 
 // --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
 
-var emailOpts: Joi.EmailOptions = null;
+let emailOpts: Joi.EmailOptions = null;
 
 emailOpts = { errorLevel: num };
 emailOpts = { errorLevel: bool };
@@ -96,7 +97,7 @@ emailOpts = { minDomainAtoms: num };
 
 // --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
 
-var ipOpts: Joi.IpOptions = null;
+let ipOpts: Joi.IpOptions = null;
 
 ipOpts = { version: str };
 ipOpts = { version: strArr };
@@ -104,7 +105,7 @@ ipOpts = { cidr: str };
 
 // --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
 
-var uriOpts: Joi.UriOptions = null;
+let uriOpts: Joi.UriOptions = null;
 
 uriOpts = { scheme: str };
 uriOpts = { scheme: exp };
@@ -113,7 +114,13 @@ uriOpts = { scheme: expArr };
 
 // --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
 
-var whenOpts: Joi.WhenOptions = null;
+let base64Opts: Joi.Base64Options = null;
+
+base64Opts = { paddingRequired: bool };
+
+// --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
+
+let whenOpts: Joi.WhenOptions = null;
 
 whenOpts = { is: x };
 whenOpts = { is: schema, then: schema };
@@ -122,16 +129,16 @@ whenOpts = { is: schemaLike, then: schemaLike, otherwise: schemaLike };
 
 // --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
 
-var refOpts: Joi.ReferenceOptions = null;
+let refOpts: Joi.ReferenceOptions = null;
 
 refOpts = { separator: str };
 refOpts = { contextPrefix: str };
 
 // --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
 
-var validErr: Joi.ValidationError = null;
-var validErrItem: Joi.ValidationErrorItem;
-var validErrFunc: Joi.ValidationErrorFunction;
+let validErr: Joi.ValidationError = null;
+let validErrItem: Joi.ValidationErrorItem;
+let validErrFunc: Joi.ValidationErrorFunction;
 
 validErrItem = {
     message: str,
@@ -176,7 +183,7 @@ anySchema = objSchema;
 
 // --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
 
-var schemaMap: Joi.SchemaMap = null;
+let schemaMap: Joi.SchemaMap = null;
 
 schemaMap = {
     a: numSchema,
@@ -765,7 +772,7 @@ strSchema = strSchema.ip(ipOpts);
 strSchema = strSchema.uri();
 strSchema = strSchema.uri(uriOpts);
 strSchema = strSchema.guid();
-strSchema = strSchema.guid({ version: ['uuidv1', 'uuidv2', 'uuidv3', 'uuidv4', 'uuidv5'] });
+strSchema = strSchema.guid({ version: ['uuidv1' as GuidVersions, 'uuidv2'  as GuidVersions, 'uuidv3' as GuidVersions, 'uuidv4' as GuidVersions, 'uuidv5'  as GuidVersions]});
 strSchema = strSchema.guid({ version: 'uuidv4' });
 strSchema = strSchema.hex();
 strSchema = strSchema.hostname();
@@ -777,6 +784,8 @@ strSchema = strSchema.truncate();
 strSchema = strSchema.truncate(false);
 strSchema = strSchema.normalize();
 strSchema = strSchema.normalize('NFKC');
+strSchema = strSchema.base64();
+strSchema = strSchema.base64(base64Opts);
 
 namespace common {
     strSchema = strSchema.allow(x);
diff --git a/types/knex/index.d.ts b/types/knex/index.d.ts
index aaee0b27f7..e96dfbefd8 100644
--- a/types/knex/index.d.ts
+++ b/types/knex/index.d.ts
@@ -156,7 +156,7 @@ declare namespace Knex {
         delete(returning?: string | string[]): QueryBuilder;
         truncate(): QueryBuilder;
 
-        transacting(trx: Transaction): QueryBuilder;
+        transacting(trx?: Transaction): QueryBuilder;
         connection(connection: any): QueryBuilder;
 
         clone(): QueryBuilder;
diff --git a/types/knex/knex-tests.ts b/types/knex/knex-tests.ts
index dec1bf055f..c7c99813f1 100644
--- a/types/knex/knex-tests.ts
+++ b/types/knex/knex-tests.ts
@@ -672,6 +672,9 @@ knex.transaction<{ length: number }>(function(trx) {
   console.error(error);
 });
 
+// transacting handles undefined
+knex.insert({ name: 'Old Books'}).transacting(undefined);
+
 knex.schema.withSchema("public").hasTable("table") as Promise<boolean>;
 
 knex.schema.createTable('users', function (table) {
diff --git a/types/lodash/index.d.ts b/types/lodash/index.d.ts
index f038846d22..a0eaef941c 100644
--- a/types/lodash/index.d.ts
+++ b/types/lodash/index.d.ts
@@ -1234,7 +1234,7 @@ declare namespace _ {
          */
         findIndex<T>(
             array: List<T> | null | undefined,
-            predicate?: ListIterateeBoolean<T>,
+            predicate?: ListIterateeCustom<T, boolean>,
             fromIndex?: number
         ): number;
     }
@@ -1245,7 +1245,7 @@ declare namespace _ {
          */
         findIndex<T>(
             this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            predicate?: ListIterateeBoolean<T>,
+            predicate?: ListIterateeCustom<T, boolean>,
             fromIndex?: number
         ): number;
     }
@@ -1256,7 +1256,7 @@ declare namespace _ {
          */
         findIndex<T>(
             this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            predicate?: ListIterateeBoolean<T>,
+            predicate?: ListIterateeCustom<T, boolean>,
             fromIndex?: number
         ): LoDashExplicitWrapper<number>;
     }
@@ -1282,7 +1282,7 @@ declare namespace _ {
          */
         findLastIndex<T>(
             array: List<T> | null | undefined,
-            predicate?: ListIterateeBoolean<T>,
+            predicate?: ListIterateeCustom<T, boolean>,
             fromIndex?: number
         ): number;
     }
@@ -1293,7 +1293,7 @@ declare namespace _ {
          */
         findLastIndex<T>(
             this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            predicate?: ListIterateeBoolean<T>,
+            predicate?: ListIterateeCustom<T, boolean>,
             fromIndex?: number
         ): number;
     }
@@ -1304,7 +1304,7 @@ declare namespace _ {
          */
         findLastIndex<T>(
             this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            predicate?: ListIterateeBoolean<T>,
+            predicate?: ListIterateeCustom<T, boolean>,
             fromIndex?: number
         ): LoDashExplicitWrapper<number>;
     }
@@ -4315,6 +4315,14 @@ declare namespace _ {
          * @param thisArg The this binding of iteratee.
          * @return Returns the composed aggregate object.
          */
+        countBy<T>(
+            collection: string | null | undefined,
+            iteratee?: StringIterator<T>
+        ): Dictionary<number>;
+
+        /**
+         * @see _.countBy
+         */
         countBy<T>(
             collection: List<T> | null | undefined,
             iteratee?: ListIteratee<T>
@@ -4338,6 +4346,14 @@ declare namespace _ {
     }
 
     interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.countBy
+         */
+        countBy<T>(
+            this: LoDashImplicitWrapper<string | null | undefined>,
+            iteratee?: StringIterator<T>
+        ): LoDashImplicitWrapper<Dictionary<number>>;
+
         /**
          * @see _.countBy
          */
@@ -4364,6 +4380,14 @@ declare namespace _ {
     }
 
     interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.countBy
+         */
+        countBy<T>(
+            this: LoDashExplicitWrapper<string | null | undefined>,
+            iteratee?: StringIterator<T>
+        ): LoDashExplicitWrapper<Dictionary<number>>;
+
         /**
          * @see _.countBy
          */
@@ -4479,7 +4503,7 @@ declare namespace _ {
          */
         every<T>(
             collection: List<T> | null | undefined,
-            predicate?: ListIterateeBoolean<T>
+            predicate?: ListIterateeCustom<T, boolean>
         ): boolean;
 
         /**
@@ -4487,7 +4511,7 @@ declare namespace _ {
          */
         every<T>(
             collection: NumericDictionary<T> | null | undefined,
-            predicate?: NumericDictionaryIterateeBoolean<T>
+            predicate?: NumericDictionaryIterateeCustom<T, boolean>
         ): boolean;
 
         /**
@@ -4495,7 +4519,7 @@ declare namespace _ {
          */
         every<T extends object>(
             collection: T | null | undefined,
-            predicate?: ObjectIterateeBoolean<T>
+            predicate?: ObjectIterateeCustom<T, boolean>
         ): boolean;
     }
 
@@ -4505,7 +4529,7 @@ declare namespace _ {
          */
         every<T>(
             this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            predicate?: ListIterateeBoolean<T>
+            predicate?: ListIterateeCustom<T, boolean>
         ): boolean;
 
         /**
@@ -4513,7 +4537,7 @@ declare namespace _ {
          */
         every<T extends object>(
             this: LoDashImplicitWrapper<T | null | undefined>,
-            predicate?: ObjectIterateeBoolean<T>
+            predicate?: ObjectIterateeCustom<T, boolean>
         ): boolean;
 
         /**
@@ -4521,7 +4545,7 @@ declare namespace _ {
          */
         every<T>(
             this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
-            predicate?: NumericDictionaryIterateeBoolean<T>
+            predicate?: NumericDictionaryIterateeCustom<T, boolean>
         ): boolean;
     }
 
@@ -4531,7 +4555,7 @@ declare namespace _ {
          */
         every<T>(
             this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            predicate?: ListIterateeBoolean<T>
+            predicate?: ListIterateeCustom<T, boolean>
         ): LoDashExplicitWrapper<boolean>;
 
         /**
@@ -4539,7 +4563,7 @@ declare namespace _ {
          */
         every<T extends object>(
             this: LoDashExplicitWrapper<T | null | undefined>,
-            predicate?: ObjectIterateeBoolean<T>
+            predicate?: ObjectIterateeCustom<T, boolean>
         ): LoDashExplicitWrapper<boolean>;
 
         /**
@@ -4547,7 +4571,7 @@ declare namespace _ {
          */
         every<T>(
             this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
-            predicate?: NumericDictionaryIterateeBoolean<T>
+            predicate?: NumericDictionaryIterateeCustom<T, boolean>
         ): LoDashExplicitWrapper<boolean>;
     }
 
@@ -4589,7 +4613,7 @@ declare namespace _ {
          */
         filter<T>(
             collection: List<T> | null | undefined,
-            predicate?: ListIterateeBoolean<T>
+            predicate?: ListIterateeCustom<T, boolean>
         ): T[];
 
         /**
@@ -4605,7 +4629,7 @@ declare namespace _ {
          */
         filter<T extends object>(
             collection: T | null | undefined,
-            predicate?: ObjectIterateeBoolean<T>
+            predicate?: ObjectIterateeCustom<T, boolean>
         ): Array<T[keyof T]>;
     }
 
@@ -4631,7 +4655,7 @@ declare namespace _ {
          */
         filter<T>(
             this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            predicate?: ListIterateeBoolean<T>
+            predicate?: ListIterateeCustom<T, boolean>
         ): LoDashImplicitWrapper<T[]>;
 
         /**
@@ -4647,7 +4671,7 @@ declare namespace _ {
          */
         filter<T extends object>(
             this: LoDashImplicitWrapper<T | null | undefined>,
-            predicate?: ObjectIterateeBoolean<T>
+            predicate?: ObjectIterateeCustom<T, boolean>
         ): LoDashImplicitWrapper<Array<T[keyof T]>>;
     }
 
@@ -4673,7 +4697,7 @@ declare namespace _ {
          */
         filter<T>(
             this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            predicate?: ListIterateeBoolean<T>
+            predicate?: ListIterateeCustom<T, boolean>
         ): LoDashExplicitWrapper<T[]>;
 
         /**
@@ -4689,7 +4713,7 @@ declare namespace _ {
          */
         filter<T extends object>(
             this: LoDashExplicitWrapper<T | null | undefined>,
-            predicate?: ObjectIterateeBoolean<T>
+            predicate?: ObjectIterateeCustom<T, boolean>
         ): LoDashExplicitWrapper<Array<T[keyof T]>>;
     }
 
@@ -4724,7 +4748,7 @@ declare namespace _ {
          */
         find<T>(
             collection: List<T> | null | undefined,
-            predicate?: ListIterateeBoolean<T>,
+            predicate?: ListIterateeCustom<T, boolean>,
             fromIndex?: number
         ): T|undefined;
 
@@ -4742,7 +4766,7 @@ declare namespace _ {
          */
         find<T extends object>(
             collection: T | null | undefined,
-            predicate?: ObjectIterateeBoolean<T>,
+            predicate?: ObjectIterateeCustom<T, boolean>,
             fromIndex?: number
         ): T[keyof T]|undefined;
     }
@@ -4762,7 +4786,7 @@ declare namespace _ {
          */
         find<T>(
             this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            predicate?: ListIterateeBoolean<T>,
+            predicate?: ListIterateeCustom<T, boolean>,
             fromIndex?: number
         ): T|undefined;
 
@@ -4780,7 +4804,7 @@ declare namespace _ {
          */
         find<T extends object>(
             this: LoDashImplicitWrapper<T | null | undefined>,
-            predicate?: ObjectIterateeBoolean<T>,
+            predicate?: ObjectIterateeCustom<T, boolean>,
             fromIndex?: number
         ): T[keyof T]|undefined;
     }
@@ -4800,7 +4824,7 @@ declare namespace _ {
          */
         find<T>(
             this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            predicate?: ListIterateeBoolean<T>,
+            predicate?: ListIterateeCustom<T, boolean>,
             fromIndex?: number
         ): LoDashExplicitWrapper<T|undefined>;
 
@@ -4818,7 +4842,7 @@ declare namespace _ {
          */
         find<T extends object>(
             this: LoDashExplicitWrapper<T | null | undefined>,
-            predicate?: ObjectIterateeBoolean<T>,
+            predicate?: ObjectIterateeCustom<T, boolean>,
             fromIndex?: number
         ): LoDashExplicitWrapper<T[keyof T]|undefined>;
     }
@@ -4844,7 +4868,7 @@ declare namespace _ {
          */
         findLast<T>(
             collection: List<T> | null | undefined,
-            predicate?: ListIterateeBoolean<T>,
+            predicate?: ListIterateeCustom<T, boolean>,
             fromIndex?: number
         ): T|undefined;
 
@@ -4862,7 +4886,7 @@ declare namespace _ {
          */
         findLast<T extends object>(
             collection: T | null | undefined,
-            predicate?: ObjectIterateeBoolean<T>,
+            predicate?: ObjectIterateeCustom<T, boolean>,
             fromIndex?: number
         ): T[keyof T]|undefined;
     }
@@ -4882,7 +4906,7 @@ declare namespace _ {
          */
         findLast<T>(
             this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            predicate?: ListIterateeBoolean<T>,
+            predicate?: ListIterateeCustom<T, boolean>,
             fromIndex?: number
         ): T | undefined;
 
@@ -4900,7 +4924,7 @@ declare namespace _ {
          */
         findLast<T extends object>(
             this: LoDashImplicitWrapper<T | null | undefined>,
-            predicate?: ObjectIterateeBoolean<T>,
+            predicate?: ObjectIterateeCustom<T, boolean>,
             fromIndex?: number
         ): T[keyof T]|undefined;
     }
@@ -4920,7 +4944,7 @@ declare namespace _ {
          */
         findLast<T>(
             this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            predicate?: ListIterateeBoolean<T>,
+            predicate?: ListIterateeCustom<T, boolean>,
             fromIndex?: number
         ): LoDashExplicitWrapper<T | undefined>;
 
@@ -4938,7 +4962,7 @@ declare namespace _ {
          */
         findLast<T extends object>(
             this: LoDashExplicitWrapper<T | null | undefined>,
-            predicate?: ObjectIterateeBoolean<T>,
+            predicate?: ObjectIterateeCustom<T, boolean>,
             fromIndex?: number
         ): LoDashExplicitWrapper<T[keyof T]|undefined>;
     }
@@ -5849,9 +5873,17 @@ declare namespace _ {
          * @param thisArg The this binding of iteratee.
          * @return Returns the composed aggregate object.
          */
+        keyBy(
+            collection: string | null | undefined,
+            iteratee?: StringIterator<PropertyName>
+        ): Dictionary<string>;
+
+        /**
+         * @see _.keyBy
+         */
         keyBy<T>(
             collection: List<T> | null | undefined,
-            iteratee?: ListIteratee<T>
+            iteratee?: ListIterateeCustom<T, PropertyName>
         ): Dictionary<T>;
 
         /**
@@ -5859,7 +5891,7 @@ declare namespace _ {
          */
         keyBy<T extends object>(
             collection: T | null | undefined,
-            iteratee?: ObjectIteratee<T>
+            iteratee?: ObjectIterateeCustom<T, PropertyName>
         ): Dictionary<T[keyof T]>;
 
         /**
@@ -5867,17 +5899,25 @@ declare namespace _ {
          */
         keyBy<T>(
             collection: NumericDictionary<T> | null | undefined,
-            iteratee?: NumericDictionaryIteratee<T>
+            iteratee?: NumericDictionaryIterateeCustom<T, PropertyName>
         ): Dictionary<T>;
     }
 
     interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.keyBy
+         */
+        keyBy(
+            this: LoDashImplicitWrapper<string | null | undefined>,
+            iteratee?: StringIterator<PropertyName>
+        ): LoDashImplicitWrapper<Dictionary<string>>;
+
         /**
          * @see _.keyBy
          */
         keyBy<T>(
             this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            iteratee?: ListIteratee<T>
+            iteratee?: ListIterateeCustom<T, PropertyName>
         ): LoDashImplicitWrapper<Dictionary<T>>;
 
         /**
@@ -5885,7 +5925,7 @@ declare namespace _ {
          */
         keyBy<T extends object>(
             this: LoDashImplicitWrapper<T | null | undefined>,
-            iteratee?: ObjectIteratee<T>
+            iteratee?: ObjectIterateeCustom<T, PropertyName>
         ): LoDashImplicitWrapper<Dictionary<T[keyof T]>>;
 
         /**
@@ -5893,17 +5933,25 @@ declare namespace _ {
          */
         keyBy<T>(
             this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
-            iteratee?: NumericDictionaryIteratee<T>
+            iteratee?: NumericDictionaryIterateeCustom<T, PropertyName>
         ): LoDashImplicitWrapper<Dictionary<T>>;
     }
 
     interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.keyBy
+         */
+        keyBy(
+            this: LoDashExplicitWrapper<string | null | undefined>,
+            iteratee?: StringIterator<PropertyName>
+        ): LoDashExplicitWrapper<Dictionary<string>>;
+
         /**
          * @see _.keyBy
          */
         keyBy<T>(
             this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            iteratee?: ListIteratee<T>
+            iteratee?: ListIterateeCustom<T, PropertyName>
         ): LoDashExplicitWrapper<Dictionary<T>>;
 
         /**
@@ -5911,7 +5959,7 @@ declare namespace _ {
          */
         keyBy<T extends object>(
             this: LoDashExplicitWrapper<T | null | undefined>,
-            iteratee?: ObjectIteratee<T>
+            iteratee?: ObjectIterateeCustom<T, PropertyName>
         ): LoDashExplicitWrapper<Dictionary<T[keyof T]>>;
 
         /**
@@ -5919,7 +5967,7 @@ declare namespace _ {
          */
         keyBy<T>(
             this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
-            iteratee?: NumericDictionaryIteratee<T>
+            iteratee?: NumericDictionaryIterateeCustom<T, PropertyName>
         ): LoDashExplicitWrapper<Dictionary<T>>;
     }
 
@@ -6718,7 +6766,7 @@ declare namespace _ {
          */
         reject<T>(
             collection: List<T> | null | undefined,
-            predicate?: ListIterateeBoolean<T>
+            predicate?: ListIterateeCustom<T, boolean>
         ): T[];
 
         /**
@@ -6726,7 +6774,7 @@ declare namespace _ {
          */
         reject<T extends object>(
             collection: T | null | undefined,
-            predicate?: ObjectIterateeBoolean<T>
+            predicate?: ObjectIterateeCustom<T, boolean>
         ): Array<T[keyof T]>;
     }
 
@@ -6744,7 +6792,7 @@ declare namespace _ {
          */
         reject<T>(
             this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            predicate?: ListIterateeBoolean<T>
+            predicate?: ListIterateeCustom<T, boolean>
         ): LoDashImplicitWrapper<T[]>;
 
         /**
@@ -6752,7 +6800,7 @@ declare namespace _ {
          */
         reject<T extends object>(
             this: LoDashImplicitWrapper<T | null | undefined>,
-            predicate?: ObjectIterateeBoolean<T>
+            predicate?: ObjectIterateeCustom<T, boolean>
         ): LoDashImplicitWrapper<Array<T[keyof T]>>;
     }
 
@@ -6770,7 +6818,7 @@ declare namespace _ {
          */
         reject<T>(
             this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            predicate?: ListIterateeBoolean<T>
+            predicate?: ListIterateeCustom<T, boolean>
         ): LoDashExplicitWrapper<T[]>;
 
         /**
@@ -6778,7 +6826,7 @@ declare namespace _ {
          */
         reject<T extends object>(
             this: LoDashExplicitWrapper<T | null | undefined>,
-            predicate?: ObjectIterateeBoolean<T>
+            predicate?: ObjectIterateeCustom<T, boolean>
         ): LoDashExplicitWrapper<Array<T[keyof T]>>;
     }
 
@@ -6992,7 +7040,7 @@ declare namespace _ {
          */
         some<T>(
             collection: List<T> | null | undefined,
-            predicate?: ListIterateeBoolean<T>
+            predicate?: ListIterateeCustom<T, boolean>
         ): boolean;
 
         /**
@@ -7000,7 +7048,7 @@ declare namespace _ {
          */
         some<T extends object>(
             collection: T | null | undefined,
-            predicate?: ObjectIterateeBoolean<T>
+            predicate?: ObjectIterateeCustom<T, boolean>
         ): boolean;
 
         /**
@@ -7008,7 +7056,7 @@ declare namespace _ {
          */
         some<T>(
             collection: NumericDictionary<T> | null | undefined,
-            predicate?: NumericDictionaryIterateeBoolean<T>
+            predicate?: NumericDictionaryIterateeCustom<T, boolean>
         ): boolean;
     }
 
@@ -7018,7 +7066,7 @@ declare namespace _ {
          */
         some<T>(
             this: LoDashImplicitWrapper<List<T> | null | undefined>,
-            predicate?: ListIterateeBoolean<T>
+            predicate?: ListIterateeCustom<T, boolean>
         ): boolean;
 
         /**
@@ -7026,7 +7074,7 @@ declare namespace _ {
          */
         some<T extends object>(
             this: LoDashImplicitWrapper<T | null | undefined>,
-            predicate?: ObjectIterateeBoolean<T>
+            predicate?: ObjectIterateeCustom<T, boolean>
         ): boolean;
 
         /**
@@ -7034,7 +7082,7 @@ declare namespace _ {
          */
         some<T>(
             this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
-            predicate?: NumericDictionaryIterateeBoolean<T>
+            predicate?: NumericDictionaryIterateeCustom<T, boolean>
         ): boolean;
     }
 
@@ -7044,7 +7092,7 @@ declare namespace _ {
          */
         some<T>(
             this: LoDashExplicitWrapper<List<T> | null | undefined>,
-            predicate?: ListIterateeBoolean<T>
+            predicate?: ListIterateeCustom<T, boolean>
         ): LoDashExplicitWrapper<boolean>;
 
         /**
@@ -7052,7 +7100,7 @@ declare namespace _ {
          */
         some<T extends object>(
             this: LoDashExplicitWrapper<T | null | undefined>,
-            predicate?: ObjectIterateeBoolean<T>
+            predicate?: ObjectIterateeCustom<T, boolean>
         ): LoDashExplicitWrapper<boolean>;
 
         /**
@@ -7060,7 +7108,7 @@ declare namespace _ {
          */
         some<T>(
             this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
-            predicate?: NumericDictionaryIterateeBoolean<T>
+            predicate?: NumericDictionaryIterateeCustom<T, boolean>
         ): LoDashExplicitWrapper<boolean>;
     }
 
@@ -9315,14 +9363,16 @@ declare namespace _ {
         /**
          * @see _.conformsTo
          */
-        conformsTo(source: ConformsPredicateObject<TValue>): boolean;
+        conformsTo<T>(this: LoDashImplicitWrapper<T>, source: ConformsPredicateObject<T>): boolean;
+        // Note: we can't use TValue here,  because it generates a typescript error when strictFunctionTypes is enabled.
     }
 
     interface LoDashExplicitWrapper<TValue> {
         /**
          * @see _.conformsTo
          */
-        conformsTo(source: ConformsPredicateObject<TValue>): LoDashExplicitWrapper<boolean>;
+        conformsTo<T>(this: LoDashImplicitWrapper<T>, source: ConformsPredicateObject<T>): LoDashExplicitWrapper<boolean>;
+        // Note: we can't use TValue here,  because it generates a typescript error when strictFunctionTypes is enabled.
     }
 
     type CondPair<T, R> = [(val: T) => boolean, (val: T) => R]
@@ -10723,7 +10773,7 @@ declare namespace _ {
         /**
          * @see _.toArray
          */
-        toArray(): LoDashImplicitWrapper<Array<TValue[keyof TValue]>>;
+        toArray<T extends object>(this: LoDashImplicitWrapper<T>): LoDashImplicitWrapper<Array<T[keyof T]>>;
     }
 
     interface LoDashExplicitWrapper<TValue> {
@@ -10735,7 +10785,7 @@ declare namespace _ {
         /**
          * @see _.toArray
          */
-        toArray(): LoDashExplicitWrapper<Array<TValue[keyof TValue]>>;
+        toArray<T extends object>(this: LoDashImplicitWrapper<T>): LoDashExplicitWrapper<Array<T[keyof T]>>;
     }
 
     //_.toPlainObject
@@ -14348,6 +14398,9 @@ declare namespace _ {
              ...props: Array<Many<U>>
         ): Pick<T, U>;
 
+        /**
+         * @see _.pick
+         */
         pick<T>(
             object: T | null | undefined,
             ...props: PropertyPath[]
@@ -14355,6 +14408,14 @@ declare namespace _ {
     }
 
     interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.pick
+         */
+        pick<T extends object, U extends keyof T>(
+            this: LoDashImplicitWrapper<T | null | undefined>,
+            ...props: Array<Many<U>>
+        ): LoDashImplicitWrapper<Pick<T, U>>;
+
         /**
          * @see _.pick
          */
@@ -14365,6 +14426,14 @@ declare namespace _ {
     }
 
     interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.pick
+         */
+        pick<T extends object, U extends keyof T>(
+            this: LoDashExplicitWrapper<T | null | undefined>,
+            ...props: Array<Many<U>>
+        ): LoDashExplicitWrapper<Pick<T, U>>;
+
         /**
          * @see _.pick
          */
@@ -17015,13 +17084,13 @@ declare namespace _ {
     type ArrayIterator<T, TResult> = (value: T, index: number, collection: T[]) => TResult;
     type ListIterator<T, TResult> = (value: T, index: number, collection: List<T>) => TResult;
     type ListIteratee<T> = ListIterator<T, NotVoid> | string | [string, any] | PartialDeep<T>;
-    type ListIterateeBoolean<T> = ListIterator<T, boolean> | string | [string, any] | PartialDeep<T>;
+    type ListIterateeCustom<T, TResult> = ListIterator<T, TResult> | string | [string, any] | PartialDeep<T>;
     type ListIteratorTypeGuard<T, S extends T> = (value: T, index: number, collection: List<T>) => value is S;
 
     // Note: key should be string, not keyof T, because the actual object may contain extra properties that were not specified in the type.
     type ObjectIterator<TObject, TResult> = (value: TObject[keyof TObject], key: string, collection: TObject) => TResult;
     type ObjectIteratee<TObject> = ObjectIterator<TObject, NotVoid> | string | [string, any] | PartialDeep<TObject[keyof TObject]>;
-    type ObjectIterateeBoolean<TObject> = ObjectIterator<TObject, boolean> | string | [string, any] | PartialDeep<TObject[keyof TObject]>;
+    type ObjectIterateeCustom<TObject, TResult> = ObjectIterator<TObject, TResult> | string | [string, any] | PartialDeep<TObject[keyof TObject]>;
     type ObjectIteratorTypeGuard<TObject, S extends TObject[keyof TObject]> = (value: TObject[keyof TObject], key: string, collection: TObject) => value is S;
 
     type DictionaryIterator<T, TResult> = ObjectIterator<Dictionary<T>, TResult>;
@@ -17030,7 +17099,7 @@ declare namespace _ {
 
     type NumericDictionaryIterator<T, TResult> = (value: T, key: number, collection: NumericDictionary<T>) => TResult;
     type NumericDictionaryIteratee<T> = NumericDictionaryIterator<T, NotVoid> | string | [string, any] | PartialDeep<T>;
-    type NumericDictionaryIterateeBoolean<T> = NumericDictionaryIterator<T, boolean> | string | [string, any] | PartialDeep<T>;
+    type NumericDictionaryIterateeCustom<T, TResult> = NumericDictionaryIterator<T, TResult> | string | [string, any] | PartialDeep<T>;
 
     type StringIterator<TResult> = (char: string, index: number, string: string) => TResult;
 
diff --git a/types/lodash/lodash-tests.ts b/types/lodash/lodash-tests.ts
index e40569204d..dbefb1abaa 100644
--- a/types/lodash/lodash-tests.ts
+++ b/types/lodash/lodash-tests.ts
@@ -4,86 +4,19 @@ interface IFoodOrganic {
     name: string;
     organic: boolean;
 }
-
-interface IFoodType {
-    name: string;
-    type: string;
-}
-
-interface IFoodCombined {
-    name: string;
-    organic: boolean;
-    type: string;
-}
-
-interface IStoogesQuote {
-    name: string;
-    quotes: string[];
-}
-
 interface IStoogesAge {
     name: string;
     age: number;
 }
 
-interface IStoogesCombined {
-    name: string;
-    age: number;
-    quotes: string[];
-}
-
-interface IKey {
-    dir: string;
-    code: number;
-}
-
-interface IDictionary<T> {
-    [index: string]: T;
-}
-
 const foodsOrganic: IFoodOrganic[] = [
     { name: 'banana', organic: true },
     { name: 'beet', organic: false },
 ];
-const foodsType: IFoodType[] = [
-    { name: 'apple', type: 'fruit' },
-    { name: 'banana', type: 'fruit' },
-    { name: 'beet', type: 'vegetable' }
-];
-const foodsCombined: IFoodCombined[] = [
-    { 'name': 'apple', 'organic': false, 'type': 'fruit' },
-    { 'name': 'carrot', 'organic': true, 'type': 'vegetable' }
-];
-
-const stoogesQuotes: IStoogesQuote[] = [
-    { 'name': 'curly', 'quotes': ['Oh, a wise guy, eh?', 'Poifect!'] },
-    { 'name': 'moe', 'quotes': ['Spread out!', 'You knucklehead!'] }
-];
 const stoogesAges: IStoogesAge[] = [
     { 'name': 'moe', 'age': 40 },
     { 'name': 'larry', 'age': 50 }
 ];
-const stoogesAgesDict: IDictionary<IStoogesAge> = {
-    first: { 'name': 'moe', 'age': 40 },
-    second: { 'name': 'larry', 'age': 50 }
-};
-const stoogesCombined: IStoogesCombined[] = [
-    { 'name': 'curly', 'age': 30, 'quotes': ['Oh, a wise guy, eh?', 'Poifect!'] },
-    { 'name': 'moe', 'age': 40, 'quotes': ['Spread out!', 'You knucklehead!'] }
-];
-
-const keys: IKey[] = [
-    { 'dir': 'left', 'code': 97 },
-    { 'dir': 'right', 'code': 100 }
-];
-
-class Dog {
-    constructor(public name: string) { }
-
-    bark() {
-        // Woof
-    }
-}
 
 let result: any;
 
@@ -4591,9 +4524,9 @@ namespace TestFilter {
     let obj: any = {};
     let dictionary: _.Dictionary<TResult> | null | undefined = obj;
 
-    let stringIterator: (char: string, index: number, string: string) => any = (char: string, index: number, string: string) => 1;
-    let listIterator: (value: TResult, index: number, collection: _.List<TResult>) => any = (value: TResult, index: number, collection: _.List<TResult>) => 1;
-    let dictionaryIterator: (value: TResult, key: string, collection: _.Dictionary<TResult>) => any = (value: TResult, key: string, collection: _.Dictionary<TResult>) => 1;
+    let stringIterator = (char: string, index: number, string: string) => true;
+    let listIterator = (value: TResult, index: number, collection: _.List<TResult>) => true;
+    let dictionaryIterator = (value: TResult, key: string, collection: _.Dictionary<TResult>) => true;
 
     {
         let result: string[];
@@ -5207,7 +5140,7 @@ namespace TestFlatMapDepth {
 
     let listIterator: (value: number|number[], index: number, collection: _.List<number|number[]>) => _.ListOfRecursiveArraysOrValues<number> = (a, b, c) =>[ 1];
 
-    let dictionaryIterator: (value: number|number[], key: number, collection: _.Dictionary<number|number[]>) => _.ListOfRecursiveArraysOrValues<number> = (a, b, c) => [1];
+    let dictionaryIterator: (value: number|number[], key: string, collection: _.Dictionary<number|number[]>) => _.ListOfRecursiveArraysOrValues<number> = (a, b, c) => [1];
 
     let numericDictionaryIterator: (value: number|number[], key: number, collection: _.NumericDictionary<number|number[]>) => _.ListOfRecursiveArraysOrValues<number> = (a, b, c) => [1];
 
@@ -5776,8 +5709,8 @@ namespace TestGroupBy {
     {
         let result: _.Dictionary<string[]>;
 
-        result = _.groupBy<string>('');
-        result = _.groupBy<string>('', stringIterator);
+        result = _.groupBy('');
+        result = _.groupBy('', stringIterator);
     }
 
     {
@@ -5909,16 +5842,16 @@ namespace TestKeyBy {
     let dictionary: _.Dictionary<SampleObject> | null | undefined = obj;
     let numericDictionary: _.NumericDictionary<SampleObject> | null | undefined = obj;
 
-    let stringIterator: (value: string, index: number, collection: string) => any = (value: string, index: number, collection: string) => 1;
-    let listIterator: (value: SampleObject, index: number, collection: _.List<SampleObject>) => any = (value: SampleObject, index: number, collection: _.List<SampleObject>) => 1;
-    let dictionaryIterator: (value: SampleObject, key: string, collection: _.Dictionary<SampleObject>) => any = (value: SampleObject, key: string, collection: _.Dictionary<SampleObject>) => 1;
-    let numericDictionaryIterator: (value: SampleObject, key: number, collection: _.NumericDictionary<SampleObject>) => any = (value: SampleObject, key: number, collection: _.NumericDictionary<SampleObject>) => 1;
+    let stringIterator = (value: string, index: number, collection: string) => "a";
+    let listIterator = (value: SampleObject, index: number, collection: _.List<SampleObject>) => 1;
+    let dictionaryIterator = (value: SampleObject, key: string, collection: _.Dictionary<SampleObject>) => Symbol.name;
+    let numericDictionaryIterator = (value: SampleObject, key: number, collection: _.NumericDictionary<SampleObject>) => "a";
 
     {
         let result: _.Dictionary<string>;
 
-        result = _.keyBy<string>('abcd');
-        result = _.keyBy<string>('abcd', stringIterator);
+        result = _.keyBy('abcd');
+        result = _.keyBy('abcd', stringIterator);
     }
 
     {
@@ -6464,9 +6397,9 @@ namespace TestReject {
     let obj: any = {};
     let dictionary: _.Dictionary<TResult> | null | undefined = obj;
 
-    let stringIterator: (char: string, index: number, string: string) => any = (char: string, index: number, string: string) => 1;
-    let listIterator: (value: TResult, index: number, collection: _.List<TResult>) => any = (value: TResult, index: number, collection: _.List<TResult>) => 1;
-    let dictionaryIterator: (value: TResult, key: string, collection: _.Dictionary<TResult>) => any = (value: TResult, key: string, collection: _.Dictionary<TResult>) => 1;
+    let stringIterator = (char: string, index: number, string: string) => true;
+    let listIterator = (value: TResult, index: number, collection: _.List<TResult>) => true;
+    let dictionaryIterator = (value: TResult, key: string, collection: _.Dictionary<TResult>) => true;
 
     {
         let result: string[];
@@ -8667,9 +8600,7 @@ namespace TestIsEqual {
 
 // _.isEqualWith
 namespace TestIsEqualWith {
-    let customizer = (value: any, other: any, indexOrKey: number|string|undefined, parent: any, otherParent: any, stack: any) => {
-        return value ? undefined : true;
-    };
+    let customizer = (value: any, other: any, indexOrKey: number|string|symbol|undefined, parent: any, otherParent: any, stack: any) => true;
 
     {
         let result: boolean;
@@ -8873,7 +8804,7 @@ namespace TestIsMatch {
 
 // _.isMatchWith
 namespace TestIsMatchWith {
-    let testIsMatchCustiomizerFn = (value: any, other: any, indexOrKey: number|string) => true;
+    let testIsMatchCustiomizerFn = (value: any, other: any, indexOrKey: number|string|symbol) => true;
 
     let result: boolean;
 
@@ -11890,7 +11821,7 @@ namespace TestPick {
     {
         let result: Pick<TResult, 'a' | 'b'>;
         result = _.pick(obj, 'a', 'b');
-        result = _.pick(obj, ['a', 'b']);
+        result = _.pick(obj, ['a' as 'a', 'b' as 'b']);
     }
 
     {
@@ -11901,6 +11832,13 @@ namespace TestPick {
         result = _(obj).pick<TResult>(['b', 1], 0, 'a');
     }
 
+    {
+        let result: _.LoDashImplicitWrapper<Pick<TResult, 'a' | 'b'>>;
+
+        result = _(obj).pick('a', 'b');
+        result = _(obj).pick(['a' as 'a', 'b' as 'b']);
+    }
+
     {
         let result: _.LoDashExplicitWrapper<Partial<TResult>>;
 
@@ -11908,6 +11846,13 @@ namespace TestPick {
         result = _(obj).chain().pick<TResult>(0, 'a');
         result = _(obj).chain().pick<TResult>(['b', 1], 0, 'a');
     }
+
+    {
+        let result: _.LoDashExplicitWrapper<Pick<TResult, 'a' | 'b'>>;
+
+        result = _(obj).chain().pick('a', 'b');
+        result = _(obj).chain().pick(['a' as 'a', 'b' as 'b']);
+    }
 }
 
 // _.pickBy
diff --git a/types/lodash/tsconfig.json b/types/lodash/tsconfig.json
index 2c4aa57c54..8bd56c0b87 100644
--- a/types/lodash/tsconfig.json
+++ b/types/lodash/tsconfig.json
@@ -7,7 +7,7 @@
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
-        "strictFunctionTypes": false,
+        "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"
diff --git a/types/lolex/index.d.ts b/types/lolex/index.d.ts
index c0dec4cd56..510cb911ec 100644
--- a/types/lolex/index.d.ts
+++ b/types/lolex/index.d.ts
@@ -1,6 +1,8 @@
-// Type definitions for lolex 1.5
+// Type definitions for lolex 2.1
 // Project: https://github.com/sinonjs/lolex
-// Definitions by: Wim Looman <https://github.com/Nemo157>, Josh Goldberg <https://github.com/joshuakgoldberg>
+// Definitions by: Wim Looman <https://github.com/Nemo157>
+//                 Josh Goldberg <https://github.com/joshuakgoldberg>
+//                 Rogier Schouten <https://github.com/rogierschouten>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /**
@@ -34,7 +36,7 @@ type BrowserClock = LolexClock<number>;
 type NodeClock = LolexClock<NodeTimer> & {
     /**
      * Mimicks process.hrtime().
-     * 
+     *
      * @param prevTime   Previous system time to calculate time elapsed.
      * @returns High resolution real time as [seconds, nanoseconds].
      */
@@ -49,7 +51,7 @@ type Clock = BrowserClock | NodeClock;
 /**
  * Names of clock methods that may be faked by install.
  */
-type FakeMethod = "setTimeout" | "clearTimeout" | "setImmediate" | "clearImmediate" | "setInterval" | "clearInterval" | "Date";
+type FakeMethod = "setTimeout" | "clearTimeout" | "setImmediate" | "clearImmediate" | "setInterval" | "clearInterval" | "Date" | "nextTick" | "hrtime";
 
 /**
  * Controls the flow of time.
@@ -67,7 +69,7 @@ export interface LolexClock<TTimerId extends TimerId> {
 
     /**
      * Schedules a callback to be fired once timeout milliseconds have ticked by.
-     * 
+     *
      * @param callback   Callback to be fired.
      * @param timeout   How many ticks to wait to run the callback.
      * @param args   Any extra arguments to pass to the callback.
@@ -77,14 +79,14 @@ export interface LolexClock<TTimerId extends TimerId> {
 
     /**
      * Clears a timer, as long as it was created using setTimeout.
-     * 
+     *
      * @param id   Timer ID or object.
      */
     clearTimeout(id: TTimerId): void;
 
     /**
      * Schedules a callback to be fired every time timeout milliseconds have ticked by.
-     * 
+     *
      * @param callback   Callback to be fired.
      * @param timeout   How many ticks to wait between callbacks.
      * @param args   Any extra arguments to pass to the callback.
@@ -94,14 +96,14 @@ export interface LolexClock<TTimerId extends TimerId> {
 
     /**
      * Clears a timer, as long as it was created using setInterval.
-     * 
+     *
      * @param id   Timer ID or object.
      */
     clearInterval(id: TTimerId): void;
 
     /**
      * Schedules the callback to be fired once 0 milliseconds have ticked by.
-     * 
+     *
      * @param callback   Callback to be fired.
      * @remarks You'll still have to call clock.tick() for the callback to fire.
      * @remarks If called during a tick the callback won't fire until 1 millisecond has ticked by.
@@ -110,11 +112,16 @@ export interface LolexClock<TTimerId extends TimerId> {
 
     /**
      * Clears a timer, as long as it was created using setImmediate.
-     * 
+     *
      * @param id   Timer ID or object.
      */
     clearImmediate(id: TTimerId): void;
 
+    /**
+     * Simulates process.nextTick();
+     */
+    nextTick(callback: () => void): void;
+
     /**
      * Advances the clock to the the moment of the first scheduled timer, firing it.
      */
@@ -122,14 +129,14 @@ export interface LolexClock<TTimerId extends TimerId> {
 
     /**
      * Advance the clock, firing callbacks if necessary.
-     * 
+     *
      * @param time   How many ticks to advance by.
      */
     tick(time: number | string): void;
 
     /**
      * Runs all pending timers until there are none remaining.
-     * 
+     *
      * @remarks  If new timers are added while it is executing they will be run as well.
      */
     runAll(): void;
@@ -142,7 +149,7 @@ export interface LolexClock<TTimerId extends TimerId> {
 
     /**
      * Simulates a user changing the system clock.
-     * 
+     *
      * @param now   New system time.
      * @remarks This affects the current time but it does not in itself cause timers to fire.
      */
@@ -157,7 +164,7 @@ export interface LolexClock<TTimerId extends TimerId> {
 
 /**
  * Creates a clock.
- * 
+ *
  * @param now   Current time for the clock.
  * @param loopLimit    Maximum number of timers that will be run when calling runAll()
  *                     before assuming that we have an infinite loop and throwing an error
@@ -167,23 +174,47 @@ export interface LolexClock<TTimerId extends TimerId> {
  */
 export declare function createClock<TClock extends Clock>(now?: number | Date, loopLimit?: number): TClock;
 
-/**
- * Creates a clock and installs it globally.
- * 
- * @param now   Current time for the clock, as with lolex.createClock().
- * @param toFake   Names of methods that should be faked.
- * @type TClock   Type of clock to create.
- * @usage lolex.install(["setTimeout", "clearTimeout"]);
- */
-export declare function install<TClock extends Clock>(now?: number | Date, toFake?: FakeMethod[]): TClock;
+
+export interface LolexInstallOpts {
+    /**
+     * Installs lolex onto the specified target context (default: global)
+     */
+    target?: any;
+
+    /**
+     * Installs lolex with the specified unix epoch (default: 0)
+     */
+    now?: number;
+
+    /**
+     * An array with explicit function names to hijack. When not set, lolex will automatically fake all methods except nextTick
+     * e.g., lolex.install({ toFake: ["setTimeout", "nextTick"]}) will fake only setTimeout and nextTick
+     */
+    toFake?: FakeMethod[];
+
+    /**
+     * The maximum number of timers that will be run when calling runAll() (default: 1000)
+     */
+    loopLimit?: number;
+
+    /**
+     * Tells lolex to increment mocked time automatically based on the real system time shift (e.g. the mocked time will be incremented by
+     * 20ms for every 20ms change in the real system time) (default: false)
+     */
+    shouldAdvanceTime?: boolean;
+
+    /**
+     * Relevant only when using with shouldAdvanceTime: true. increment mocked time by advanceTimeDelta ms every advanceTimeDelta ms change
+     * in the real system time (default: 20)
+     */
+    advanceTimeDelta?: number;
+}
 
 /**
- * Creates a clock and installs it onto the context object.
- * 
- * @param context   Context to install the clock onto.
+ * Creates a clock and installs it globally.
+ *
  * @param now   Current time for the clock, as with lolex.createClock().
  * @param toFake   Names of methods that should be faked.
  * @type TClock   Type of clock to create.
- * @usage lolex.install(context, ["setTimeout", "clearTimeout"]);
  */
-export declare function install<TClock extends Clock>(context?: any, now?: number | Date, toFake?: FakeMethod[]): TClock;
+export declare function install<TClock extends Clock>(opts: LolexInstallOpts): TClock;
diff --git a/types/lolex/lolex-tests.ts b/types/lolex/lolex-tests.ts
index 876e4280c5..95b6a2be78 100644
--- a/types/lolex/lolex-tests.ts
+++ b/types/lolex/lolex-tests.ts
@@ -16,25 +16,14 @@ lolex.createClock<lolex.NodeClock>(new Date());
 lolex.createClock<lolex.NodeClock>(7, 9001);
 lolex.createClock<lolex.NodeClock>(new Date(), 9001);
 
-lolex.install<lolex.BrowserClock>(7);
-lolex.install<lolex.BrowserClock>(new Date());
-lolex.install<lolex.BrowserClock>(7, ["setTimeout"]);
-lolex.install<lolex.BrowserClock>(new Date(), ["setTimeout"]);
-
-lolex.install<lolex.NodeClock>(7);
-lolex.install<lolex.NodeClock>(new Date());
-lolex.install<lolex.NodeClock>(7, ["setTimeout"]);
-lolex.install<lolex.NodeClock>(new Date(), ["setTimeout"]);
-
-lolex.install<lolex.BrowserClock>({}, 7);
-lolex.install<lolex.BrowserClock>({}, new Date());
-lolex.install<lolex.BrowserClock>({}, 7, ["setTimeout"]);
-lolex.install<lolex.BrowserClock>({}, new Date(), ["setTimeout"]);
-
-lolex.install<lolex.NodeClock>({}, 7);
-lolex.install<lolex.NodeClock>({}, new Date());
-lolex.install<lolex.NodeClock>({}, 7, ["setTimeout"]);
-lolex.install<lolex.NodeClock>({}, new Date(), ["setTimeout"]);
+lolex.install<lolex.BrowserClock>({
+	advanceTimeDelta: 20,
+	loopLimit: 10,
+	now: 0,
+	shouldAdvanceTime: true,
+	target: {},
+	toFake: ["setTimeout", "nextTick", "hrtime"]
+});
 
 const browserNow: number = browserClock.now;
 const browserDate: Date = new browserClock.Date();
@@ -80,5 +69,7 @@ nodeClock.setSystemTime();
 nodeClock.setSystemTime(7);
 nodeClock.setSystemTime(new Date());
 
+nodeClock.nextTick(() => undefined);
+
 browserClock.uninstall();
 nodeClock.uninstall();
diff --git a/types/lozad/index.d.ts b/types/lozad/index.d.ts
index eb0213f6c3..6257c47043 100644
--- a/types/lozad/index.d.ts
+++ b/types/lozad/index.d.ts
@@ -1,25 +1,25 @@
-// Type definitions for lozad 1.0
+// Type definitions for lozad 1.1
 // Project: https://github.com/ApoorvSaxena/lozad.js
 // Definitions by: York Yao <https://github.com/plantain-00>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-interface Option {
-    rootMargin?: string;
-    threshold?: number;
-    load?(element: HTMLElement | HTMLCanvasElement): void;
-}
-
-interface Observer {
-    observe(): void;
-}
-
-declare function lozad(selector?: string, options?: Option): Observer;
-
 declare namespace lozad {
+    interface Option {
+        rootMargin?: string;
+        threshold?: number;
+        load?(element: HTMLElement | HTMLCanvasElement): void;
+    }
+
+    interface Observer {
+        observe(): void;
+    }
+
     const prototype: {
     };
 }
 
+declare function lozad(selector?: string, options?: lozad.Option): lozad.Observer;
+
 export as namespace lozad;
 
 export = lozad;
diff --git a/types/material-ui/index.d.ts b/types/material-ui/index.d.ts
index 22b5d1711f..5ae63560cc 100644
--- a/types/material-ui/index.d.ts
+++ b/types/material-ui/index.d.ts
@@ -1440,6 +1440,7 @@ declare namespace __MaterialUI {
         hintText?: React.ReactNode;
         iconStyle?: React.CSSProperties;
         id?: string;
+        name?: string;
         labelStyle?: React.CSSProperties;
         multiple?: boolean;
         onBlur?: React.FocusEventHandler<{}>;
diff --git a/types/nightwatch/index.d.ts b/types/nightwatch/index.d.ts
index 3a7e81d0fa..a32a07b3dd 100644
--- a/types/nightwatch/index.d.ts
+++ b/types/nightwatch/index.d.ts
@@ -4,8 +4,6 @@
 //                 Connor Schlesiger <https://github.com/schlesiger>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/* tslint:disable:max-line-length */
-
 export interface NightwatchCustomPageObjects {
     page: {};
 }
@@ -887,7 +885,7 @@ export interface NightwatchAPI {
      * @param callback: Optional callback function to be called when the command finishes.
      * @returns The value of the attribute
      */
-    getAttribute(selector: string, attribute: string, callback?: (result: NightwatchCallbackResult) => void): this;
+    getAttribute(selector: string, attribute: string, callback?: (this: NightwatchAPI, result: NightwatchCallbackResult) => void): this;
 
     /**
      * Retrieve a single cookie visible to the current page. The cookie is returned as a cookie JSON object, as defined here.
@@ -906,7 +904,7 @@ export interface NightwatchAPI {
      * @param callback: The callback function which will receive the response as an argument.
      * @returns The cookie object as a selenium cookie JSON object or null if the cookie wasn't found.
      */
-    getCookie(name: string, callback?: (result: NightwatchCallbackResult) => void): this;
+    getCookie(name: string, callback?: (this: NightwatchAPI, result: NightwatchCallbackResult) => void): this;
 
     /**
      * Retrieve all cookies visible to the current page. The cookies are returned as an array of cookie JSON object,
@@ -924,7 +922,7 @@ export interface NightwatchAPI {
      * @param callback: The callback function which will receive the response as an argument.
      * @returns A list of cookies
      */
-    getCookies(callback?: (result: NightwatchCallbackResult) => void): this;
+    getCookies(callback?: (this: NightwatchAPI, result: NightwatchCallbackResult) => void): this;
 
     /**
      * Retrieve the value of a css property for a given DOM element. Uses elementIdCssProperty protocol command.
@@ -944,7 +942,7 @@ export interface NightwatchAPI {
      * @param callback: Optional callback function to be called when the command finishes.
      * @returns The value of the css property
      */
-    getCssProperty(selector: string, cssProperty: string, callback?: (result: NightwatchCallbackResult) => void): this;
+    getCssProperty(selector: string, cssProperty: string, callback?: (this: NightwatchAPI, result: NightwatchCallbackResult) => void): this;
 
     /**
      * Determine an element's size in pixels. Uses elementIdSize protocol command.
@@ -964,7 +962,7 @@ export interface NightwatchAPI {
      * @param callback: Optional callback function to be called when the command finishes.
      * @returns The width and height of the element in pixels
      */
-    getElementSize(selector: string, callback?: (result: NightwatchCallbackResult) => void): this;
+    getElementSize(selector: string, callback?: (this: NightwatchAPI, result: NightwatchCallbackResult) => void): this;
 
     /**
      * Determine an element's location on the page. The point (0, 0) refers to the upper-left corner of the page.
@@ -985,7 +983,7 @@ export interface NightwatchAPI {
      * @param callback: Optional callback function to be called when the command finishes.
      * @returns The X and Y coordinates for the element on the page
      */
-    getLocation(selector: string, callback?: (result: NightwatchCallbackResult) => void): this;
+    getLocation(selector: string, callback?: (this: NightwatchAPI, result: NightwatchCallbackResult) => void): this;
 
     /**
      * Determine an element's location on the screen once it has been scrolled into view. Uses elementIdLocationInView protocol command.
@@ -1005,7 +1003,7 @@ export interface NightwatchAPI {
      * @param callback: Optional callback function to be called when the command finishes.
      * @returns The X and Y coordinates for the element on the page.
      */
-    getLocationInView(selector: string, callback?: (result: NightwatchCallbackResult) => void): this;
+    getLocationInView(selector: string, callback?: (this: NightwatchAPI, result: NightwatchCallbackResult) => void): this;
 
     /**
      * Gets a log from selenium
@@ -1059,7 +1057,7 @@ export interface NightwatchAPI {
      * @param callback: Optional callback function to be called when the command finishes.
      * @returns The element's tag name, as a lowercase string.
      */
-    getTagName(selector: string, callback?: (result: NightwatchCallbackResult) => void): this;
+    getTagName(selector: string, callback?: (this: NightwatchAPI, result: NightwatchCallbackResult) => void): this;
 
     /**
      * Returns the visible text for the element. Uses elementIdText protocol command.
@@ -1078,7 +1076,7 @@ export interface NightwatchAPI {
      * @param callback: Optional callback function to be called when the command finishes.
      * @returns The element's visible text.
      */
-    getText(selector: string, callback?: (result: NightwatchCallbackResult) => void): this;
+    getText(selector: string, callback?: (this: NightwatchAPI, result: NightwatchCallbackResult) => void): this;
 
     /**
      * Returns the title of the current page. Uses title protocol command.
@@ -1095,7 +1093,7 @@ export interface NightwatchAPI {
      * @param callback: Optional callback function to be called when the command finishes.
      * @returns The page title.
      */
-    getTitle(callback?: (result: NightwatchCallbackResult) => void): this;
+    getTitle(callback?: (this: NightwatchAPI, result?: string) => void): this;
 
     /**
      * Returns a form element current value. Uses elementIdValue protocol command.
@@ -1114,7 +1112,7 @@ export interface NightwatchAPI {
      * @param callback: Optional callback function to be called when the command finishes.
      * @returns The element's value.
      */
-    getValue(selector: string, callback?: (result: NightwatchCallbackResult) => void): this;
+    getValue(selector: string, callback?: (this: NightwatchAPI, result: NightwatchCallbackResult) => void): this;
 
     /**
      * This command is an alias to url and also a convenience method when called without any arguments in the sense that it performs a call to .url() with passing the value of launch_url
@@ -1180,7 +1178,7 @@ export interface NightwatchAPI {
      * @param selector: The CSS/Xpath selector used to locate the element.
      * @param callback: Optional callback function to be called when the command finishes.
      */
-    isVisible(selector: string, callback?: (result: NightwatchCallbackResult) => void): this;
+    isVisible(selector: string, callback?: (this: NightwatchAPI, result: NightwatchCallbackResult) => void): this;
 
     /**
      * Maximizes the current window.
@@ -1559,7 +1557,9 @@ export interface NightwatchAPI {
      * ```
      * @param selector: The selector (CSS / Xpath) used to locate the element.
      * @param time: The number of milliseconds to wait. The runner performs repeated checks every 500 ms.
-     * @param abortOnFailure: By the default if the element is not found the test will fail. Set this to false if you wish for the test to continue even if the assertion fails. To set this globally you can define a property `abortOnNightwatchAssertionsFailure` in your globals.
+     * @param abortOnFailure: By the default if the element is not found the test will fail.
+     * Set this to false if you wish for the test to continue even if the assertion fails.
+     * To set this globally you can define a property `abortOnNightwatchAssertionsFailure` in your globals.
      * @param callback: Optional callback function to be called when the command finishes.
      * @param message: Optional message to be shown in the output; the message supports two placeholders: %s for current selector and %d for the time (e.g. Element %s was not in the page for %d ms).
      */
@@ -1847,7 +1847,8 @@ export interface NightwatchAPI {
     /**
      * Send a sequence of key strokes to the active element. The sequence is defined in the same format as the sendKeys command.
      * An object map with available keys and their respective UTF-8 characters, as defined on W3C WebDriver draft spec, is loaded onto the main Nightwatch instance as client.Keys.
-     * Rather than the setValue, the modifiers are not released at the end of the call. The state of the modifier keys is kept between calls, so mouse interactions can be performed while modifier keys are depressed.
+     * Rather than the setValue, the modifiers are not released at the end of the call.
+     * The state of the modifier keys is kept between calls, so mouse interactions can be performed while modifier keys are depressed.
      * @param keysToSend: The keys sequence to be sent.
      * @param callback: Optional callback function to be called when the command finishes.
      */
@@ -1862,8 +1863,10 @@ export interface NightwatchAPI {
     mouseButtonClick(button: string, callback?: () => void): this;
 
     /**
-     * Click and hold the left mouse button (at the coordinates set by the last moveto command). Note that the next mouse-related command that should follow is mouseButtonUp . Any other mouse command (such as click or another call to buttondown) will yield undefined behaviour.
-     * Can be used for implementing drag-and-drop. The button can be (0, 1, 2) or ('left', 'middle', 'right'). It defaults to left mouse button, and if you don't pass in a button but do pass in a callback, it will handle it correctly.
+     * Click and hold the left mouse button (at the coordinates set by the last moveto command). Note that the next mouse-related command that should follow is mouseButtonUp .
+     * Any other mouse command (such as click or another call to buttondown) will yield undefined behaviour.
+     * Can be used for implementing drag-and-drop. The button can be (0, 1, 2) or ('left', 'middle', 'right').
+     * It defaults to left mouse button, and if you don't pass in a button but do pass in a callback, it will handle it correctly.
      * @param button: The mouse button
      * @param callback: Optional callback function to be called when the command finishes.
      */
@@ -1871,14 +1874,16 @@ export interface NightwatchAPI {
 
     /**
      * Releases the mouse button previously held (where the mouse is currently at). Must be called once for every mouseButtonDown command issued.
-     * Can be used for implementing drag-and-drop. The button can be (0, 1, 2) or ('left', 'middle', 'right'). It defaults to left mouse button, and if you don't pass in a button but do pass in a callback, it will handle it correctly.
+     * Can be used for implementing drag-and-drop. The button can be (0, 1, 2) or ('left', 'middle', 'right').
+     * It defaults to left mouse button, and if you don't pass in a button but do pass in a callback, it will handle it correctly.
      * @param button: The mouse button
      * @param callback: Optional callback function to be called when the command finishes.
      */
     mouseButtonUp(button: string, callback?: () => void): this;
 
     /**
-     * Move the mouse by an offset of the specificed element. If no element is specified, the move is relative to the current mouse cursor. If an element is provided but no offset, the mouse will be moved to the center of the element.
+     * Move the mouse by an offset of the specificed element. If no element is specified, the move is relative to the current mouse cursor.
+     * If an element is provided but no offset, the mouse will be moved to the center of the element.
      * If the element is not visible, it will be scrolled into view.
      * @param element: Opaque ID assigned to the element to move to. If not specified or is null, the offset is relative to current position of the mouse.
      * @param xofset: X offset to move to, relative to the top-left corner of the element. If not specified, the mouse will move to the middle of the element.
@@ -1997,14 +2002,16 @@ export interface NightwatchAPI {
 
     /**
      * Configure the amount of time that a particular type of operation can execute for before they are aborted and a |Timeout| error is returned to the client.
-     * @param typeOfOperation: The type of operation to set the timeout for. Valid values are: "script" for script timeouts, "implicit" for modifying the implicit wait timeout and "page load" for setting a page load timeout.
+     * @param typeOfOperation: The type of operation to set the timeout for.
+     * Valid values are: "script" for script timeouts, "implicit" for modifying the implicit wait timeout and "page load" for setting a page load timeout.
      * @param ms: The amount of time, in milliseconds, that time-limited commands are permitted to run.
      * @param callback: Optional callback function to be called when the command finishes.
      */
     timeouts(typeOfOperation: string, ms: number, callback?: () => void): this;
 
     /**
-     * Set the amount of time, in milliseconds, that asynchronous scripts executed by /session/:sessionId/execute_async are permitted to run before they are aborted and a |Timeout| error is returned to the client.
+     * Set the amount of time, in milliseconds, that asynchronous scripts executed by /session/:sessionId/execute_async are permitted
+     * to run before they are aborted and a |Timeout| error is returned to the client.
      * @param ms: The amount of time, in milliseconds, that time-limited commands are permitted to run.
      * @param callback: Optional callback function to be called when the command finishes.
      */
@@ -2087,7 +2094,8 @@ export interface NightwatchAPI {
     windowMaximize(handleOrName?: string, callback?: () => void): this;
 
     /**
-     * Change or get the position of the specified window. If the second argument is a function it will be used as a callback and the call will perform a get request to retrieve the existing window position.
+     * Change or get the position of the specified window. If the second argument is a function it will be used as a callback and the call
+     * will perform a get request to retrieve the existing window position.
      * @param windowHandle:
      * @param: offsetX:
      * @param: offsetY:
@@ -2199,5 +2207,3 @@ export interface Nightwatch {
     api: NightwatchAPI;
     client: NightwatchClient;
 }
-
-/* tslint:enable:max-line-length */
diff --git a/types/nightwatch/nightwatch-tests.ts b/types/nightwatch/nightwatch-tests.ts
index a40c8c466a..548dcee9bd 100644
--- a/types/nightwatch/nightwatch-tests.ts
+++ b/types/nightwatch/nightwatch-tests.ts
@@ -7,6 +7,9 @@ const test: NightwatchTests = {
       .waitForElementVisible('body', 1000)
       .setValue('input[type=text]', 'nightwatch')
       .waitForElementVisible('button[name=btnG]', 1000)
+      .getTitle(function(result) {
+        this.assert.equal(typeof result, 'string');
+      })
       .click('button[name=btnG]')
       .pause(1000)
       .assert.containsText('#main', 'Night Watch')
diff --git a/types/nightwatch/tslint.json b/types/nightwatch/tslint.json
index b1439230db..495d29983d 100644
--- a/types/nightwatch/tslint.json
+++ b/types/nightwatch/tslint.json
@@ -1,7 +1,5 @@
 {
     "extends": "dtslint/dt.json",
     "rules": {
-        // TODO
-        "no-any-union": false
     }
 }
diff --git a/types/node-cache/index.d.ts b/types/node-cache/index.d.ts
index 558882a086..069bd4fb32 100644
--- a/types/node-cache/index.d.ts
+++ b/types/node-cache/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/tcs-de/nodecache
 // Definitions by: Ilya Mochalov <https://github.com/chrootsu>
 //                 Daniel Thunell <https://github.com/dthunell>
+//                 Ulf Seltmann <https://github.com/useltmann>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />
@@ -89,8 +90,16 @@ declare namespace NodeCache {
 
 		ttl(
 			key: Key,
-			cb?: Callback<boolean>,
-			ttl?: number
+			cb?: Callback<boolean>
+		): boolean;
+
+		getTtl(
+			key: Key,
+		): number|undefined;
+
+		getTtl(
+			key: Key,
+			cb?: Callback<boolean>
 		): boolean;
 
 		/**
@@ -130,6 +139,7 @@ declare namespace NodeCache {
 		checkperiod?: number;
 		useClones?: boolean;
 		errorOnMissing?: boolean;
+		deleteOnExpire?: boolean;
 	}
 
 	interface Stats {
@@ -225,7 +235,7 @@ declare class NodeCache extends events.EventEmitter implements NodeCache.NodeCac
 	): number;
 
 	/**
-	 * reset or redefine the ttl of a key. If `ttl` is not passed or set to 0 it's similar to `.del()`
+	 * reset or redefine the ttl of a key. If `ttl` is not passed or set to 0 `stdTtl` is used. if set lt 0 it's similar to `.del()`
 	 */
 	ttl(
 		key: Key,
@@ -234,9 +244,17 @@ declare class NodeCache extends events.EventEmitter implements NodeCache.NodeCac
 	): boolean;
 
 	ttl(
+		key: Key,
+		cb?: Callback<boolean>
+	): boolean;
+
+	getTtl(
+		key: Key
+	): number|undefined;
+
+	getTtl(
 		key: Key,
 		cb?: Callback<boolean>,
-		ttl?: number
 	): boolean;
 
 	/**
diff --git a/types/node-cache/node-cache-tests.ts b/types/node-cache/node-cache-tests.ts
index 66c2fb4176..ebf1b88688 100644
--- a/types/node-cache/node-cache-tests.ts
+++ b/types/node-cache/node-cache-tests.ts
@@ -83,7 +83,7 @@ interface TypeSample {
 	result = cache.getStats();
 }
 
-/* tslint:disable void-return no-void-expression */
+/* tslint-:disable void-return no-void-expression
 {
 	let cache: NodeCache;
 	let result: void;
@@ -95,4 +95,4 @@ interface TypeSample {
 	let result: void;
 	result = cache.close();
 }
-/* tslint:enable void-return */
+ tslint-:enable void-return */
diff --git a/types/plotly.js/index.d.ts b/types/plotly.js/index.d.ts
index a34dbf2ab8..81286fe0a4 100644
--- a/types/plotly.js/index.d.ts
+++ b/types/plotly.js/index.d.ts
@@ -94,23 +94,30 @@ export function downloadImage(root: Root, opts: DownloadImgopts): Promise<string
 // Layout
 export interface Layout {
 	title: string;
+	titlefont: Partial<Font>;
 	autosize: boolean;
 	showlegend: boolean;
-	xaxis: Partial<Axis>;
-	yaxis: Partial<Axis>;
-	yaxis2: Partial<Axis>;
-	yaxis3: Partial<Axis>;
-	yaxis4: Partial<Axis>;
-	yaxis5: Partial<Axis>;
-	yaxis6: Partial<Axis>;
-	yaxis7: Partial<Axis>;
-	yaxis8: Partial<Axis>;
-	yaxis9: Partial<Axis>;
+	paper_bgcolor: Color;
+    plot_bgcolor: Color;
+    separators: string;
+    hidesources: boolean;
+    xaxis: Partial<LayoutAxis>;
+	yaxis: Partial<LayoutAxis>;
+	yaxis2: Partial<LayoutAxis>;
+	yaxis3: Partial<LayoutAxis>;
+	yaxis4: Partial<LayoutAxis>;
+	yaxis5: Partial<LayoutAxis>;
+	yaxis6: Partial<LayoutAxis>;
+	yaxis7: Partial<LayoutAxis>;
+	yaxis8: Partial<LayoutAxis>;
+	yaxis9: Partial<LayoutAxis>;
 	margin: Partial<Margin>;
 	height: number;
 	width: number;
-	hovermode: "closest" | "x" | "y" | false;
-	'xaxis.range': [Datum, Datum];
+	hovermode: 'closest' | 'x' | 'y' | false;
+	hoverlabel: Partial<Label>;
+	calendar: Calendar;
+    'xaxis.range': [Datum, Datum];
 	'xaxis.range[0]': Datum;
 	'xaxis.range[1]': Datum;
 	'yaxis.range': [Datum, Datum];
@@ -120,47 +127,112 @@ export interface Layout {
 	'xaxis.type': AxisType;
 	'xaxis.autorange': boolean;
 	'yaxis.autorange': boolean;
-	dragmode: "lasso" | "pan" | "select" | "zoom";
+	ternary: {}; // TODO
+    geo: {}; // TODO
+    mapbox: {}; // TODO
+	radialaxis: {}; // TODO
+    angularaxis: {}; // TODO
+    direction: 'clockwise' | 'counterclockwise';
+    dragmode: 'zoom' | 'pan' | 'select' | 'lasso' | 'orbit' | 'turntable';
+    orientation: number;
+    annotations: {}; // TODO
 	shapes: Array<Partial<Shape>>;
-	legend: Partial<Legend>;
+    images: {}; // TODO
+    updatemenus: {}; // TODO
+    sliders: {}; // TODO
+    legend: Partial<Legend>;
 	font: Partial<Font>;
+	scene: Partial<Scene>;
 }
 
-export interface Legend {
-	traceorder: "grouped" | "normal" | "reversed";
+export interface Legend extends Label {
+	traceorder: 'grouped' | 'normal' | 'reversed';
 	x: number;
 	y: number;
-	font: Partial<Font>;
-	bgcolor: string;
-	bordercolor: string;
 	borderwidth: number;
-	orientation: "v" | "h";
+	orientation: 'v' | 'h';
 	tracegroupgap: number;
 	xanchor: 'auto' | 'left' | 'center' | 'right';
 	yanchor: 'auto' | 'top' | 'middle' | 'bottom';
 }
 
-export type AxisType = "date" | "log" | "linear";
+export type AxisType = '-' | 'linear' | 'log' | 'date' | 'category';
 
 export interface Axis {
-	title: string;
-	showgrid: boolean;
-	fixedrange: boolean;
-	rangemode: "tozero" | 'normal' | 'nonnegative';
-	domain: number[];
-	type: AxisType;
-	tickformat: string;
-	hoverformat: string;
-	exponentformat: "none" | "e" | "E" | "power" | "SI" | "B";
-	rangeslider: Partial<RangeSlider>;
-	rangeselector: Partial<RangeSelector>;
-	range: [Datum, Datum];
-	showticklabels: boolean;
-	autotick: boolean;
-	zeroline: boolean;
-	autorange: boolean | 'reversed';
-	side: "top" | "bottom" | "left" | "right";
-	overlaying: "free" | "/^x([2-9]|[1-9][0-9]+)?$/" | "/^y([2-9]|[1-9][0-9]+)?$/";
+    visible: boolean;
+    color: Color;
+    title: string;
+    titlefont: Partial<Font>;
+    type: AxisType;
+    autorange: true | false | 'reversed';
+    rangemode: 'normal' | 'tozero' | 'nonnegative';
+    range: any[];
+    tickmode: 'auto' | 'linear' | 'array';
+    nticks: number;
+    tick0: number | string;
+    dtick: number | string;
+    tickvals: any[];
+    ticktext: string[];
+    ticks: 'outside' | 'inside' | '';
+    mirror: true | 'ticks' | false | 'all' | 'allticks';
+    ticklen: number;
+    tickwidth: number;
+    tickcolor: Color;
+    showticklabels: boolean;
+    showspikes: boolean;
+    spikecolor: Color;
+    spikethickness: number;
+    categoryorder: 'trace' | 'category ascending' | 'category descending' | 'array';
+    categoryarray: any[];
+    tickfont: Partial<Font>;
+    tickangle: number;
+    tickprefix: string;
+    showtickprefix: 'all' | 'first' | 'last' | 'none';
+    ticksuffix: string;
+    showticksuffix: 'all' | 'first' | 'last' | 'none';
+    showexponent: 'all' | 'first' | 'last' | 'none';
+    exponentformat: 'none' | 'e' | 'E' | 'power' | 'SI' | 'B';
+    separatethousands: boolean;
+    tickformat: string;
+    hoverformat: string;
+    showline: boolean;
+    linecolor: Color;
+    linewidth: number;
+    showgrid: boolean;
+    gridcolor: Color;
+    gridwidth: number;
+    zeroline: boolean;
+    zerolinecolor: Color;
+    zerolinewidth: number;
+    calendar: Calendar;
+}
+
+export type Calendar = 'gregorian' | 'chinese' | 'coptic' | 'discworld' | 'ethiopian' | 'hebrew' | 'islamic' | 'julian' | 'mayan' |
+    'nanakshahi' | 'nepali' | 'persian' | 'jalali' | 'taiwan' | 'thai' | 'ummalqura';
+
+export interface LayoutAxis extends Axis {
+    fixedrange: boolean;
+    scaleanchor: '/^x([2-9]|[1-9][0-9]+)?$/' | '/^y([2-9]|[1-9][0-9]+)?$/';
+    scaleratio: number;
+    constrain: 'range' | 'domain';
+    constraintoward: 'left' | 'center' | 'right' | 'top' | 'middle' | 'bottom';
+    spikedash: string;
+    spikemode: string;
+    anchor: 'free' | '/^x([2-9]|[1-9][0-9]+)?$/' | '/^y([2-9]|[1-9][0-9]+)?$/';
+    side: 'top' | 'bottom' | 'left' | 'right';
+    overlaying: 'free' | '/^x([2-9]|[1-9][0-9]+)?$/' | '/^y([2-9]|[1-9][0-9]+)?$/';
+    layer: 'above traces' | 'below traces';
+    domain: number[];
+    position: number;
+    rangeslider: Partial<RangeSlider>;
+    rangeselector: Partial<RangeSelector>;
+}
+
+export interface SceneAxis extends Axis {
+    spikesides: boolean;
+    showbackground: boolean;
+    backgroundcolor: Color;
+    showaxeslabels: boolean;
 }
 
 export interface ShapeLine {
@@ -212,7 +284,7 @@ export type Color = string | Array<string | undefined | null> | Array<Array<stri
 
 // Bar Scatter
 export interface ScatterData {
-	type: 'bar' | 'scatter' | 'scattergl';
+	type: 'bar' | 'scatter' | 'scattergl' | 'scatter3d';
 	x: Datum[] | Datum[][];
 	y: Datum[] | Datum[][];
 	z: Datum[] | Datum[][] | Datum[][][];
@@ -234,13 +306,13 @@ export interface ScatterData {
 	'marker.maxdisplayed': number;
 	'marker.sizeref': number;
 	'marker.sizemin': number;
-	'marker.sizemode': "diameter" | "area";
+	'marker.sizemode': 'diameter' | 'area';
 	'marker.showscale': boolean;
-	'marker.line': {}; // TODO
+	'marker.line': Partial<ScatterMarkerLine>;
 	'marker.colorbar': {}; // TODO
-	mode: "lines" | "markers" | "text" | "lines+markers" | "text+markers" | "text+lines" | "text+lines+markers" | "none";
-	hoveron: "points" | "fills";
-	hoverinfo: "text";
+	mode: 'lines' | 'markers' | 'text' | 'lines+markers' | 'text+markers' | 'text+lines' | 'text+lines+markers' | 'none';
+	hoveron: 'points' | 'fills';
+	hoverinfo: 'text';
 	fill: 'none' | 'tozeroy' | 'tozerox' | 'tonexty' | 'tonextx' | 'toself' | 'tonext';
 	fillcolor: string;
 	legendgroup: string;
@@ -250,16 +322,34 @@ export interface ScatterData {
 
 export interface ScatterMarker {
 	symbol: string | string[]; // Drawing.symbolList
-	color: Color;
+	color: Color | number[];
+	colorscale: string | string[];
+	cauto: boolean;
+	cmax: boolean;
+	cmin: boolean;
+	autocolorscale: boolean;
+    reversescale: boolean;
 	opacity: number | number[];
 	size: number | number[];
 	maxdisplayed: number;
 	sizeref: number;
 	sizemin: number;
-	sizemode: "diameter" | "area";
+	sizemode: 'diameter' | 'area';
 	showscale: boolean;
-	line: {}; // TODO
+	line: Partial<ScatterMarkerLine>;
 	colorbar: {}; // TODO
+    gradient: {}; // TODO
+}
+
+export interface ScatterMarkerLine {
+    width: number | number[];
+    color: Color;
+    colorscale: string | string[];
+    cauto: boolean;
+    cmax: number;
+    cmin: number;
+    autocolorscale: boolean;
+    reversescale: boolean;
 }
 
 export interface ScatterLine {
@@ -380,16 +470,73 @@ export interface RangeSelectorButton {
 	label: string;
 }
 
-export interface RangeSelector {
+export interface RangeSelector extends Label {
 	buttons: Array<Partial<RangeSelectorButton>>;
 	visible: boolean;
 	x: number;
 	xanchor: 'auto' | 'left' | 'center' | 'right';
 	y: number;
 	yanchor: 'auto' | 'top' | 'middle' | 'bottom';
-	bgcolor: string;
 	activecolor: string;
-	bordercolor: string;
 	borderwidth: number;
+}
+
+export interface Camera {
+	up: Partial<Point>;
+	center: Partial<Point>;
+	eye: Partial<Point>;
+}
+
+export interface Label {
+	bgcolor: string;
+	bordercolor: string;
 	font: Partial<Font>;
 }
+
+export interface Annotations extends Point, Label {
+	visible: boolean;
+	ax: number;
+	ay: number;
+	xanchor: 'auto' | 'left' | 'center' | 'right';
+	xshift: number;
+	yanchor: 'auto' | 'top' | 'middle' | 'bottom';
+	yshift: number;
+	text: string;
+	textangle: string;
+	width: number;
+	height: number;
+	opacity: number;
+	align: 'left' | 'center' | 'right';
+	valign: 'top' | 'middle' | 'bottom';
+	borderpad: number;
+	borderwidth: number;
+	showarrow: boolean;
+	arrowcolor: string;
+	arrowhead: number;
+	arrowsize: number;
+	arrowwidth: number;
+	standoff: number;
+	hovertext: string;
+	hoverlabel: Partial<Label>;
+	captureevents: boolean;
+}
+
+export interface Scene {
+	bgcolor: string;
+	camera: Partial<Camera>;
+	domain: Partial<Domain>;
+	aspectmode: 'auto' | 'cube' | 'data' | 'manual';
+	aspectratio: Partial<Point>;
+	xaxis: Partial<SceneAxis>;
+	yaxis: Partial<SceneAxis>;
+	zaxis: Partial<SceneAxis>;
+	dragmode: 'orbit' | 'turntable' | 'zoom' | 'pan' | false;
+	hovermode: 'closest' | false;
+	annotations: Partial<Annotations> | Array<Partial<Annotations>>;
+	captureevents: boolean;
+}
+
+export interface Domain {
+    x: number[];
+    y: number[];
+}
diff --git a/types/puppeteer/index.d.ts b/types/puppeteer/index.d.ts
index b6220485fb..ee88557e15 100644
--- a/types/puppeteer/index.d.ts
+++ b/types/puppeteer/index.d.ts
@@ -58,7 +58,7 @@ export interface Mouse {
    * @param y The y position.
    * @param options The click options.
    */
-  click(x: number, y: number, options: ClickOptions): Promise<void>;
+  click(x: number, y: number, options?: ClickOptions): Promise<void>;
   /**
    * Dispatches a `mousedown` event.
    * @param options The mouse press options.
@@ -251,6 +251,12 @@ export interface EmulateOptions {
 
 export type EvaluateFn = string | ((...args: any[]) => any);
 
+export type LoadEvent =
+  | "load"
+  | "domcontentloaded"
+  | "networkidle0"
+  | "networkidle2";
+
 /** The navigation options. */
 export interface NavigationOptions {
   /**
@@ -262,7 +268,7 @@ export interface NavigationOptions {
    * When to consider navigation succeeded.
    * @default load Navigation is consider when the `load` event is fired.
    */
-  waitUntil?: "load" | "domcontentloaded" | "networkidle0" | "networkidle2";
+  waitUntil?: LoadEvent | LoadEvent[];
 }
 
 export type PDFFormat =
@@ -667,7 +673,8 @@ export interface FrameBase {
    */
   $eval(
     selector: string,
-    fn: (...args: any[]) => void
+    fn: (element: ElementHandle | null, ...args: any[]) => any,
+    ...args: any[]
   ): Promise<any>;
 
   /**
@@ -680,7 +687,7 @@ export interface FrameBase {
    */
   $$eval(
     selector: string,
-    fn: (...args: any[]) => void,
+    fn: (elements: ElementHandle[], ...args: any[]) => any,
     ...args: any[]
   ): Promise<any>;
 
diff --git a/types/react-loadable/index.d.ts b/types/react-loadable/index.d.ts
index 480ca7765f..6220b23ea6 100644
--- a/types/react-loadable/index.d.ts
+++ b/types/react-loadable/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for react-loadable 4.0
+// Type definitions for react-loadable 5.3
 // Project: https://github.com/thejameskyle/react-loadable#readme
 // Definitions by: Diogo Franco <https://github.com/Kovensky>, Oden S. <https://github.com/odensc>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -36,6 +36,31 @@ export interface CommonOptions {
      * After the specified time in milliseconds passes, the component's `timedOut` prop will be set to true.
      */
     timeout?: number | false | null;
+
+    /**
+     * Optional array of module paths that `Loadable.Capture`'s `report` function will be applied on during
+     * server-side rendering. This helps the server know which modules were imported/used during SSR.
+     * ```ts
+     * Loadable({
+     *   loader: () => import('./my-component'),
+     *   modules: ['./my-component'],
+     * });
+     * ```
+     */
+    modules?: string[];
+
+    /**
+     * An optional function which returns an array of Webpack module ids which you can get
+     * with require.resolveWeak. This is used by the client (inside `Loadable.preloadReady`) to
+     * guarantee each webpack module is preloaded before the first client render.
+     * ```ts
+     * Loadable({
+     *  loader: () => import('./Foo'),
+     *  webpack: () => [require.resolveWeak('./Foo')],
+     * });
+     * ```
+     */
+    webpack?: () => number[];
 }
 
 export interface OptionsWithoutRender<Props> extends CommonOptions {
@@ -112,9 +137,47 @@ export interface LoadableComponent {
     preload(): void;
 }
 
+export interface LoadableCaptureProps {
+    /**
+     * Function called for every moduleName that is rendered via React Loadable.
+     */
+    report: (moduleName: string) => void;
+}
+
 export interface Loadable {
     <Props, Exports extends object>(options: Options<Props, Exports>): React.ComponentType<Props> & LoadableComponent;
     Map<Props, Exports extends { [key: string]: any }>(options: OptionsWithMap<Props, Exports>): React.ComponentType<Props> & LoadableComponent;
+
+    /**
+     * This will call all of the LoadableComponent.preload methods recursively until they are all
+     * resolved. Allowing you to preload all of your dynamic modules in environments like the server.
+     * ```ts
+     * Loadable.preloadAll().then(() => {
+     *   app.listen(3000, () => {
+     *     console.log('Running on http://localhost:3000/');
+     *   });
+     * });
+     * ```
+     */
+    preloadAll(): Promise<void>;
+
+    /**
+     * Check for modules that are already loaded in the browser and call the matching
+     * `LoadableComponent.preload` methods.
+     * ```ts
+     * window.main = () => {
+     *   Loadable.preloadReady().then(() => {
+     *     ReactDOM.hydrate(
+     *       <App/>,
+     *       document.getElementById('app'),
+     *     );
+     *   });
+     * };
+     * ```
+     */
+    preloadReady(): Promise<void>;
+
+    Capture: React.ComponentType<LoadableCaptureProps>;
 }
 
 declare const LoadableExport: Loadable;
diff --git a/types/react-navigation/index.d.ts b/types/react-navigation/index.d.ts
index 8883d98da4..02ff37bcb1 100644
--- a/types/react-navigation/index.d.ts
+++ b/types/react-navigation/index.d.ts
@@ -349,7 +349,8 @@ export interface NavigationDrawerScreenOptions extends NavigationScreenOptions {
       any
     > | null));
   drawerLabel?:
-    React.ReactElement<any>
+    string
+    | React.ReactElement<any>
     | ((options: { tintColor: (string | null), focused: boolean }) => (React.ReactElement<
       any
     > | null));
@@ -593,7 +594,9 @@ export interface TabViewConfig {
 }
 
 // From navigators/TabNavigator.js
-export interface TabNavigatorConfig extends NavigationTabRouterConfig, TabViewConfig { }
+export interface TabNavigatorConfig extends NavigationTabRouterConfig, TabViewConfig {
+  initialLayout?: { height: number, width: number };
+}
 
 // From navigators/TabNavigator.js
 export function TabNavigator(
diff --git a/types/react-navigation/react-navigation-tests.tsx b/types/react-navigation/react-navigation-tests.tsx
index e8573bac89..619c07c545 100644
--- a/types/react-navigation/react-navigation-tests.tsx
+++ b/types/react-navigation/react-navigation-tests.tsx
@@ -146,6 +146,11 @@ const tabNavigatorConfig: TabNavigatorConfig = {
     tabBarOptions: { activeBackgroundColor: "blue" },
 };
 
+const tabNavigatorConfigWithInitialLayout: TabNavigatorConfig = {
+  ...tabNavigatorConfig,
+  initialLayout: { height: 0, width: 100 },
+};
+
 const BasicTabNavigator = TabNavigator(
     routeConfigMap,
     tabNavigatorConfig,
diff --git a/types/react-redux/index.d.ts b/types/react-redux/index.d.ts
index 8e2556ec6c..2a015389da 100644
--- a/types/react-redux/index.d.ts
+++ b/types/react-redux/index.d.ts
@@ -120,28 +120,28 @@ export interface Connect {
         mapStateToProps: MapStateToPropsParam<TStateProps, TOwnProps, State>,
         mapDispatchToProps: null | undefined,
         mergeProps: null | undefined,
-        options: Options<TStateProps, TOwnProps>
+        options: Options<State, TStateProps, TOwnProps>
     ): InferableComponentEnhancerWithProps<DispatchProp<any> & TStateProps, TOwnProps>;
 
-    <no_state = {}, TDispatchProps = {}, TOwnProps = {}>(
+    <TStateProps = {}, TDispatchProps = {}, TOwnProps = {}>(
         mapStateToProps: null | undefined,
         mapDispatchToProps: MapDispatchToPropsParam<TDispatchProps, TOwnProps>,
         mergeProps: null | undefined,
-        options: Options<no_state, TOwnProps>
+        options: Options<{}, TStateProps, TOwnProps>
     ): InferableComponentEnhancerWithProps<TDispatchProps, TOwnProps>;
 
     <TStateProps = {}, TDispatchProps = {}, TOwnProps = {}, State = {}>(
         mapStateToProps: MapStateToPropsParam<TStateProps, TOwnProps, State>,
         mapDispatchToProps: MapDispatchToPropsParam<TDispatchProps, TOwnProps>,
         mergeProps: null | undefined,
-        options: Options<TStateProps, TOwnProps>
+        options: Options<State, TStateProps, TOwnProps>
     ): InferableComponentEnhancerWithProps<TStateProps & TDispatchProps, TOwnProps>;
 
     <TStateProps = {}, TDispatchProps = {}, TOwnProps = {}, TMergedProps = {}, State = {}>(
         mapStateToProps: MapStateToPropsParam<TStateProps, TOwnProps, State>,
         mapDispatchToProps: MapDispatchToPropsParam<TDispatchProps, TOwnProps>,
         mergeProps: MergeProps<TStateProps, TDispatchProps, TOwnProps, TMergedProps>,
-        options: Options<TStateProps, TOwnProps, TMergedProps>
+        options: Options<State, TStateProps, TOwnProps, TMergedProps>
     ): InferableComponentEnhancerWithProps<TMergedProps, TOwnProps>;
 }
 
diff --git a/types/react-redux/react-redux-tests.tsx b/types/react-redux/react-redux-tests.tsx
index af77473473..393c4d09da 100644
--- a/types/react-redux/react-redux-tests.tsx
+++ b/types/react-redux/react-redux-tests.tsx
@@ -247,22 +247,26 @@ namespace MapStateAndDispatchAndMerge {
 }
 
 namespace MapStateAndOptions {
+    interface State { state: string; }
     interface OwnProps { foo: string }
     interface StateProps { bar: number }
     interface DispatchProps { dispatch: Dispatch<any> }
 
     class TestComponent extends Component<OwnProps & StateProps & DispatchProps> {}
 
-    const mapStateToProps = () => ({
+    const mapStateToProps = (state: State) => ({
         bar: 1
     })
 
-    const Test = connect(
+    const areStatePropsEqual = (next: StateProps, current: StateProps) => true;
+
+    const Test = connect<StateProps, DispatchProps, OwnProps, State>(
         mapStateToProps,
         null,
         null,
         {
-            pure: true
+            pure: true,
+            areStatePropsEqual,
         }
     )(TestComponent)
 
diff --git a/types/react-swipeable/index.d.ts b/types/react-swipeable/index.d.ts
index b0036ae119..1608258c64 100644
--- a/types/react-swipeable/index.d.ts
+++ b/types/react-swipeable/index.d.ts
@@ -1,39 +1,42 @@
-// Type definitions for react-swipeable 4.0
+// Type definitions for react-swipeable 4.2
 // Project: https://www.npmjs.com/package/react-swipeable
 // Definitions by: Giedrius Grabauskas <https://github.com/GiedriusGrabauskas>
 //                 Konstantin Vasilev <https://github.com/mctep>
+//                 Hiroki Horiuchi <https://github.com/horiuchi>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
 import * as React from 'react';
 
-declare class ReactSwipeable extends React.Component<ReactSwipeable.SwipeableProps> {}
+declare class ReactSwipeable<T extends Element = HTMLElement> extends React.Component<ReactSwipeable.SwipeableProps<T>> {}
 
 declare namespace ReactSwipeable {
-    type OnSwipingCallback = (event: React.TouchEvent<HTMLElement>, deltaX: number, deltaY: number, absX: number, absY: number, velocity: number) => void;
-    type OnSwipedCallback = (event: React.TouchEvent<HTMLElement>, deltaX: number, deltaY: number, isFlick: boolean, velocity: number) => void;
-    type OnSwipedDirectionCallback = (event: React.TouchEvent<HTMLElement>, delta: number, isFlick: boolean) => void;
-    type OnSwipingDirectionCallback = (event: React.TouchEvent<HTMLElement>, delta: number) => void;
-    type OnTapCallback = (event: React.TouchEvent<HTMLElement>) => void;
+    type OnSwipingCallback<T extends Element = HTMLElement> = (event: React.TouchEvent<T>, deltaX: number, deltaY: number, absX: number, absY: number, velocity: number) => void;
+    type OnSwipedCallback<T extends Element = HTMLElement> = (event: React.TouchEvent<T>, deltaX: number, deltaY: number, isFlick: boolean, velocity: number) => void;
+    type OnSwipedDirectionCallback<T extends Element = HTMLElement> = (event: React.TouchEvent<T>, delta: number, isFlick: boolean) => void;
+    type OnSwipingDirectionCallback<T extends Element = HTMLElement> = (event: React.TouchEvent<T>, delta: number) => void;
+    type OnTapCallback<T extends Element = HTMLElement> = (event: React.TouchEvent<T>) => void;
 
-    interface SwipeableProps extends React.ClassAttributes<ReactSwipeable>, React.HTMLAttributes<HTMLElement> {
-        onSwiped?: OnSwipedCallback;
-        onSwiping?: OnSwipingCallback;
-        onSwipingUp?: OnSwipingDirectionCallback;
-        onSwipingRight?: OnSwipingDirectionCallback;
-        onSwipingDown?: OnSwipingDirectionCallback;
-        onSwipingLeft?: OnSwipingDirectionCallback;
-        onSwipedUp?: OnSwipedDirectionCallback;
-        onSwipedRight?: OnSwipedDirectionCallback;
-        onSwipedDown?: OnSwipedDirectionCallback;
-        onSwipedLeft?: OnSwipedDirectionCallback;
-        onTap?: OnTapCallback;
+    interface SwipeableProps<T extends Element = HTMLElement> extends React.ClassAttributes<ReactSwipeable<T>>, React.HTMLAttributes<T> {
+        onSwiped?: OnSwipedCallback<T>;
+        onSwiping?: OnSwipingCallback<T>;
+        onSwipingUp?: OnSwipingDirectionCallback<T>;
+        onSwipingRight?: OnSwipingDirectionCallback<T>;
+        onSwipingDown?: OnSwipingDirectionCallback<T>;
+        onSwipingLeft?: OnSwipingDirectionCallback<T>;
+        onSwipedUp?: OnSwipedDirectionCallback<T>;
+        onSwipedRight?: OnSwipedDirectionCallback<T>;
+        onSwipedDown?: OnSwipedDirectionCallback<T>;
+        onSwipedLeft?: OnSwipedDirectionCallback<T>;
+        onTap?: OnTapCallback<T>;
         flickThreshold?: number;
         delta?: number;
         preventDefaultTouchmoveEvent?: boolean;
         stopPropagation?: boolean;
         nodeName?: string;
         trackMouse?: boolean;
+        disabled?: boolean;
+        innerRef?: React.Ref<T>;
         children?: React.ReactNode;
     }
 }
diff --git a/types/react-swipeable/react-swipeable-tests.tsx b/types/react-swipeable/react-swipeable-tests.tsx
index 61093a203e..ed5df52e54 100644
--- a/types/react-swipeable/react-swipeable-tests.tsx
+++ b/types/react-swipeable/react-swipeable-tests.tsx
@@ -35,6 +35,8 @@ class SampleComponent extends React.PureComponent<Swipeable.SwipeableProps> {
         stopPropagation
         nodeName="swipe"
         trackMouse
+        disabled
+        innerRef="swipe-ref"
         onClick={this.handleClick}
       >
         <div>
@@ -44,3 +46,16 @@ class SampleComponent extends React.PureComponent<Swipeable.SwipeableProps> {
     );
   }
 }
+
+class DivSwipeable extends Swipeable<HTMLDivElement> {}
+const TestComponent: React.StatelessComponent = (_) => {
+    const handleSwiped = (event: React.TouchEvent<HTMLDivElement>) => {};
+    return (
+        <DivSwipeable
+            nodeName="div"
+            onSwiped={handleSwiped}
+        >
+            <div>this is sample code.</div>
+        </DivSwipeable>
+    );
+};
diff --git a/types/react-swipeable/tsconfig.json b/types/react-swipeable/tsconfig.json
index 0d676ade9b..a720949edf 100644
--- a/types/react-swipeable/tsconfig.json
+++ b/types/react-swipeable/tsconfig.json
@@ -6,8 +6,8 @@
             "dom"
         ],
         "noImplicitAny": true,
-        "noImplicitThis": false,
-        "strictNullChecks": false,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
@@ -22,4 +22,4 @@
         "index.d.ts",
         "react-swipeable-tests.tsx"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/react-toastr/index.d.ts b/types/react-toastr/index.d.ts
new file mode 100644
index 0000000000..2de77a6d7e
--- /dev/null
+++ b/types/react-toastr/index.d.ts
@@ -0,0 +1,20 @@
+// Type definitions for react-toastr 3.0
+// 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
+
+import { Component, ReactHTML } from 'react';
+
+export class ToastContainer extends Component<{
+    toastMessageFactory: any;
+    className?: string;
+}> {
+    error: (message: string, title: string, optionsOverride?: {}) => void;
+    info: (message: string, title: string, optionsOverride?: {}) => void;
+    success: (message: string, title: string, optionsOverride?: {}) => void;
+    warning: (message: string, title: string, optionsOverride?: {}) => void;
+    clear: () => void;
+}
+export const ToastMessageAnimated: keyof ReactHTML;
+export const ToastMessagejQuery: keyof ReactHTML;
diff --git a/types/react-toastr/react-toastr-tests.tsx b/types/react-toastr/react-toastr-tests.tsx
new file mode 100644
index 0000000000..75d6527730
--- /dev/null
+++ b/types/react-toastr/react-toastr-tests.tsx
@@ -0,0 +1,22 @@
+import * as React from 'react';
+import { ToastContainer, ToastMessageAnimated } from 'react-toastr';
+
+const toastMessageFactory = React.createFactory(ToastMessageAnimated);
+
+class Test extends React.Component {
+    ref: ToastContainer;
+
+    toastRef = (ref: ToastContainer) => {
+        this.ref = ref;
+    }
+
+    render() {
+        return (
+            <ToastContainer
+                ref={this.toastRef}
+                toastMessageFactory={toastMessageFactory}
+                className="toast-top-right"
+            />
+        );
+    }
+}
diff --git a/types/react-toastr/tsconfig.json b/types/react-toastr/tsconfig.json
new file mode 100644
index 0000000000..1fbbfde4af
--- /dev/null
+++ b/types/react-toastr/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "jsx": "react"
+    },
+    "files": [
+        "index.d.ts",
+        "react-toastr-tests.tsx"
+    ]
+}
diff --git a/types/react-toastr/tslint.json b/types/react-toastr/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-toastr/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/redux-immutable-state-invariant/index.d.ts b/types/redux-immutable-state-invariant/index.d.ts
index b81b6cc47f..6ad2a0e588 100644
--- a/types/redux-immutable-state-invariant/index.d.ts
+++ b/types/redux-immutable-state-invariant/index.d.ts
@@ -3,8 +3,6 @@
 // Definitions by: Remo H. Jansen <https://github.com/remojansen>, Ben Rogers <https://github.com/highflying>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference types="redux" />
-
 import * as Redux from "redux";
 
 type isImmutableDefault = (value: any) => boolean;
diff --git a/types/stripe/index.d.ts b/types/stripe/index.d.ts
index 1f5ac99223..c8d228a612 100644
--- a/types/stripe/index.d.ts
+++ b/types/stripe/index.d.ts
@@ -1,10 +1,11 @@
-// Type definitions for stripe 4.8
+// Type definitions for stripe 4.9
 // Project: https://github.com/stripe/stripe-node/
 // Definitions by: William Johnston <https://github.com/wjohnsto>
 //                 Peter Harris <https://github.com/codeanimal>
 //                 Sampson Oliver <https://github.com/sampsonjoliver>
 //                 Linus Unnebäck <https://github.com/LinusU>
 //                 Brannon Jones <https://github.com/brannon>
+//                 Kyle Kamperschroer <https://github.com/kkamperschroer>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />
@@ -735,7 +736,7 @@ declare namespace Stripe {
              * The application fee (if any) for the charge. See the Connect documentation
              * for details. [Expandable]
              */
-            application_fee?: string;
+            application_fee?: string | applicationFees.IApplicationFee;
 
             /**
              * ID of the balance transaction that describes the impact of this charge on
@@ -4258,7 +4259,10 @@ declare namespace Stripe {
              */
             current_period_start: number;
 
-            customer: string;
+            /**
+             * ID of the customer who owns the subscription. [Expandable]
+             */
+            customer: string | customers.ICustomer;
 
             /**
              * Describes the current discount applied to this subscription, if there is one. When billing, a discount applied to a
diff --git a/types/stripe/stripe-tests.ts b/types/stripe/stripe-tests.ts
index f0687aa9f1..0df4ec257c 100644
--- a/types/stripe/stripe-tests.ts
+++ b/types/stripe/stripe-tests.ts
@@ -82,9 +82,15 @@ stripe.charges.create({
 
 stripe.charges.retrieve("ch_15fvyXEe31JkLCeQOo0SwFk9", function (err, charge) {
     // asynchronously called
+    if (typeof charge.application_fee === "object") {
+        charge.application_fee.amount;
+    }
 });
 stripe.charges.retrieve("ch_15fvyXEe31JkLCeQOo0SwFk9").then(function (charge) {
     // asynchronously called
+    if (typeof charge.application_fee === "object") {
+        charge.application_fee.amount;
+    }
 });
 
 stripe.charges.update(
@@ -1083,9 +1089,15 @@ stripe.subscriptions.create({ plan: "platypi-dev", customer: "cus_5rfJKDJkuxzh5Q
 
 stripe.subscriptions.retrieve("sub_8QwCiwZ9tmMSpt", function(err, subscription) {
     // asynchronously called
+    if (typeof subscription.customer === "object") {
+        subscription.customer.email;
+    }
 });
 stripe.subscriptions.retrieve("sub_8QwCiwZ9tmMSpt").then(function(subscription) {
     // asynchronously called
+    if (typeof subscription.customer === "object") {
+        subscription.customer.email;
+    }
 });
 
 stripe.subscriptions.update("sub_8QwCiwZ9tmMSpt", { plan: "platypi" }, function(err, subscription) {
diff --git a/types/tinymce/index.d.ts b/types/tinymce/index.d.ts
index 65c33f4adb..3719b35784 100644
--- a/types/tinymce/index.d.ts
+++ b/types/tinymce/index.d.ts
@@ -826,7 +826,7 @@ export namespace dom {
 
     parseStyle(cssText: string): {};
 
-    remove<T>(node: string, keepChildren?: boolean): Element | T[];
+    remove<T>(node: string | Element, keepChildren?: boolean): Element | T[];
 
     removeAllAttribs(e: Element): void;
 
diff --git a/types/xrm/index.d.ts b/types/xrm/index.d.ts
index 31bdd6776a..3f6cac4711 100644
--- a/types/xrm/index.d.ts
+++ b/types/xrm/index.d.ts
@@ -7,16 +7,28 @@
 //                  Tully H <https://github.com/clownwilleatme>
 //                  Scott Durow <https://github.com/scottdurow>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.4
 
 declare var Xrm: Xrm.XrmStatic;
-declare function GetGlobalContext(): Xrm.Context;
+
+/**
+ * Gets the global context.
+ * The method provides access to the global context without going through the form context.
+ *
+ * It is preferreed to use {@link Xrm.Utility.getGlobalContext Xrm.Utility.getGlobalContext()} instead.
+ * @see {@link Xrm.Utility.getGlobalContext}
+ */
+declare function GetGlobalContext(): Xrm.GlobalContext;
 
 interface Window {
     Xrm: Xrm.XrmStatic;
-    GetGlobalContext(): Xrm.Context;
+    GetGlobalContext(): Xrm.GlobalContext;
 }
 
+/**
+ * Xrm Namespace
+ * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference External Link: Client API Reference}
+ */
 declare namespace Xrm {
     /**
      * Static xRM object.
@@ -24,7 +36,8 @@ declare namespace Xrm {
     interface XrmStatic {
         /**
          * Provides a namespace container for the context, data and ui objects.
-         * @deprecated: Deprecated in v9. See {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated}
+         * @deprecated Deprecated in v9.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
          */
         Page: Page;
 
@@ -34,55 +47,88 @@ declare namespace Xrm {
 
         /**
          * Provides a container for useful functions not directly related to the current page.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-utility External Link: Xrm.Utility (Client API reference)}
          */
         Utility: Utility;
 
         /**
          * Provides methods to create and manage records in the mobile clients (for phones tablets).
+         * @deprecated Use {@link Xrm.WebApi} instead.
          */
         Mobile: Mobile;
 
         /**
-         * Provides methods to display a web page in the side pane of web client.
+         * Provides a method to display a web page in the side pane of the Customer Engagement form.
          *
-         * @see {@link https://msdn.microsoft.com/en-us/library/mt790281.aspx} for details.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-panel External Link: Xrm.Panel}
          */
         Panel: Panel;
 
         /**
          * Provides properties and methods to use Web API to create and manage records and execute Web API actions and functions in Customer Engagement.
          *
-         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-webapi} for details
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-webapi External Link: Xrm.WebApi (Client API reference)}
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/use-microsoft-dynamics-365-web-api External Link: Use the Customer Engagement Web API}
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/webapi/get-started-web-api-client-side-javascript External Link: Get started with the Customer Engagement Web API (client-side JavaScript)}
          */
         WebApi: WebApi;
 
         /**
          * Provides methods to use native device capabilities of mobile devices.
          *
-         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-device} for details
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-device External Link: Xrm.Device (Client API reference)}
          */
         Device: Device;
 
         /**
          * Provides methods to encode strings.
-         *
-         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-encoding} for details
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-encoding External Link: Xrm.Encoding (Client API reference)}
          */
         Encoding: Encoding;
     }
 
     /**
-     * Client Types for Xrm.Page.context.getClient().
+     * Client Types for {@link ClientContext.getClient clientContext.getClient()}.
+     * @see {@link XrmEnum.Client}
      */
-    type Client = "Web" | "Outlook" | "Mobile";
+    type Client = "Web" | "Outlook" | "Mobile" | "UnifiedServiceDesk";
 
     /**
-     * Client States for Xrm.Page.context.getClientState().
+     * Client States for {@link ClientContext.getClientState clientContext.getClientState()}.
+     * @see {@link XrmEnum.ClientState}
      */
     type ClientState = "Online" | "Offline";
 
     /**
-     * Themes for Xrm.Page.context.getCurrentTheme().
+     * Display States for setDisplayState() on {@link Controls.ProcessControl.setDisplayState Processes} and {@link Controls.Tab.setDisplayState Tabs}.
+     * @see {@link XrmEnum.DisplayState}
+     */
+    type DisplayState = "collapsed" | "expanded";
+
+    /**
+     * The {@link Entity.save Entity}'s Save Mode
+     * @see {@link XrmEnum.EntitySaveMode}
+     * @see {@link Entity}
+     * @see {@link Entity.save}
+     */
+    type EntitySaveMode = "saveandclose" | "saveandnew";
+
+    /**
+     * Form Notification Levels for {@link Ui.setFormNotification formContext.ui.setFormNotification()}.
+     * @see {@link XrmEnum.FormNotificationLevel}
+     */
+    type FormNotificationLevel = "ERROR" | "INFO" | "WARNING";
+
+    /**
+     * Submit Mode for {@link Attributes.Attribute.setSubmitMode} Attributes.Attribute.setSubmitMode().
+     * @see {@link XrmEnum.SubmitMode}
+     */
+    type SubmitMode = "always" | "dirty" | "never";
+
+    /**
+     * Themes for {@link GlobalContext.getCurrentTheme globalContext.getCurrentTheme()}.
+     * @remarks getCurrentTheme() does not work with Dynamics CRM for tablets or in the unified interface.
+     * @see {@link XrmEnum.Theme}
      */
     type Theme = "default" | "Office12Blue" | "Office14Silver";
 
@@ -92,15 +138,13 @@ declare namespace Xrm {
     interface ClientContext {
         /**
          * Returns a value to indicate which client the script is executing in.
-         *
-         * @return The client, as either "Web", "Outlook", or "Mobile"
+         * @returns The client, as either "Web", "Outlook", or "Mobile"
          */
         getClient(): Client;
 
         /**
          * Gets client's current state.
-         *
-         * @return The client state, as either "Online" or "Offline"
+         * @returns The client state, as either "Online" or "Offline"
          */
         getClientState(): ClientState;
 
@@ -266,8 +310,9 @@ declare namespace Xrm {
 
     /**
      * Interface for the xRM application context.
+     * GetGlobalContext()
      */
-    interface Context {
+    interface GlobalContext {
         /**
          * The client's context instance.
          */
@@ -285,18 +330,18 @@ declare namespace Xrm {
 
         /**
          * Returns information about the advanced configuration settings for the organization.
-         * @param setting  Name of the configuration setting.
+         * @param setting Name of the configuration setting.
+         * @see {@link XrmEnum.AdvancedConfigSettingOption}
          */
         getAdvancedConfigSetting(setting: "MaxChildIncidentNumber" | "MaxIncidentMergeNumber"): number;
 
         /**
          * Gets client's base URL for Dynamics CRM
-         *
-         * @return The client's base URL
-         *
-         * @remarks For Dynamics CRM On-Premises:               http(s)://server/org
-         *          For Dynamics CRM Online:                    https://org.crm.dynamics.com
-         *          For Dynamics CRM for Outlook (Offline):     http://localhost:2525
+         * @returns The client's base URL
+         * @example
+         * * For Dynamics CRM On-Premises:               http(s)://server/org
+         * * For Dynamics CRM Online:                    https://org.crm.dynamics.com
+         * * For Dynamics CRM for Outlook (Offline):     http://localhost:2525
          */
         getClientUrl(): string;
 
@@ -310,93 +355,100 @@ declare namespace Xrm {
          */
         getCurrentAppProperties(): Async.PromiseLike<AppProperties>;
 
+        /**
+         * Returns the URL of the current business app in Customer Engagement.
+         * @example
+         * * Online        https://**org**.crm.dynamics.com/main.aspx?appid=**GUID**
+         * * OnPrem        https://**server**\/**org**\/main.aspx?appid=**GUID**
+         * @returns A string containing the url of the current business app.
+         */
+        getCurrentAppUrl(): string;
+
         /**
          * Gets current styling theme.
-         *
-         * @return The name of the current theme, as either "default", "Office12Blue", or "Office14Silver"
-         *
-         * @remarks This function does not work with Dynamics CRM for tablets.
+         * @remarks This function does not work with Dynamics CRM for tablets or in the unified interface.
+         * @returns The name of the current theme, as either "default", "Office12Blue", or "Office14Silver"
          */
         getCurrentTheme(): Theme;
 
         /**
          * Gets whether automatic save is enabled.
-         * @deprecated: Deprecated in v9. See {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated}
-         * @return true if automatic saving is enabled, otherwise false.
+         * @deprecated Deprecated in v9. Use {@link Xrm.OrganizationSettings.isAutoSaveEnabled globalContext.organizationSettings.isAutoSaveEnabled} instead.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
+         * @returns true if automatic saving is enabled, otherwise false.
          */
         getIsAutoSaveEnabled(): boolean;
 
         /**
          * Gets organization's LCID (language code).
-         * @deprecated: Deprecated in v9. See {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated}
-         * @return The organization language code.
-         *
-         * @see  {@link http://msdn.microsoft.com/en-us/library/ms912047(WinEmbedded.10).aspx|Microsoft Locale ID Values}
+         * @deprecated Deprecated in v9. Use {@link Xrm.OrganizationSettings.languageId globalContext.organizationSettings.languageId} instead.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
+         * @returns The organization language code.
+         * @see {@link http://msdn.microsoft.com/en-us/library/ms912047(WinEmbedded.10).aspx External Link: Microsoft Locale ID Values}
          */
         getOrgLcid(): number;
 
         /**
          * Gets organization's unique name.
-         * @deprecated: Deprecated in v9. See {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated}
-         * @return The organization's unique name.
-         *
-         * @remarks This value can be found on the Developer Resources page within Dynamics CRM
+         * @remarks This value can be found on the Developer Resources page within Dynamics CRM.
+         * @deprecated Deprecated in v9. Use {@link Xrm.OrganizationSettings.uniqueName} globalContext.organizationSettings.uniqueName instead.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
+         * @returns The organization's unique name.
          */
         getOrgUniqueName(): string;
 
         /**
          * Gets query string parameters.
-         *
-         * @return The query string parameters, in a dictionary object representing name and value pairs.
-         * @deprecated: Deprecated in v9 (Still applicable in Web Client). See {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated}
+         * @returns The query string parameters, in a dictionary object representing name and value pairs.
+         * @deprecated Deprecated in v9 (Still applicable in Web Client).
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
          */
         getQueryStringParameters(): { [index: string]: any };
 
         /**
          * Returns the difference between the local time and Coordinated Universal Time (UTC).
-         *
-         * @return The time zone offset, in minutes.
+         * @returns The time zone offset, in minutes.
          */
         getTimeZoneOffsetMinutes(): number;
 
         /**
          * Gets user's unique identifier.
-         * @deprecated: Deprecated in v9. See {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated}
-         * @return The user's identifier in Guid format.
-         *
-         * @remarks Example: "{B05EC7CE-5D51-DF11-97E0-00155DB232D0}"
+         * @deprecated Deprecated in v9.  Use {@link Xrm.UserSettings.userId globalContext.userSettings.userId} instead.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
+         * @returns The user's identifier in Guid format.
+         * @example Example: "{B05EC7CE-5D51-DF11-97E0-00155DB232D0}"
          */
         getUserId(): string;
 
         /**
          * Gets user's LCID (language code).
-         * @deprecated: Deprecated in v9. See {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated}
-         * @return The user's language code.
-         *
-         * @see  {@link http://msdn.microsoft.com/en-us/library/ms912047(WinEmbedded.10).aspx|Microsoft Locale ID Values}
+         * @deprecated Deprecated in v9. Use {@link Xrm.UserSettings.languageId globalContext.userSetings.languageId} instead.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
+         * @returns The user's language code.
+         * @see {@link http://msdn.microsoft.com/en-us/library/ms912047(WinEmbedded.10).aspx External Link: Microsoft Locale ID Values}
          */
         getUserLcid(): number;
 
         /**
          * Gets the name of the current user.
-         * @deprecated: Deprecated in v9. See {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated}
-         * @return The user's name.
+         * @deprecated Deprecated in v9. Use {@link Xrm.UserSettings.userName globalContext.userSettings.userName} instead.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
+         * @returns The user's name.
          */
         getUserName(): string;
 
         /**
          * Gets all user security roles.
-         * @deprecated: Deprecated in v9. See {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated}
-         * @return An array of user role identifiers, in Guid format.
-         *
-         * @remarks Example: ["cf4cc7ce-5d51-df11-97e0-00155db232d0"]
+         * @deprecated Deprecated in v9.  Use {@link Xrm.UserSettings.securityRoles globalContext.userSettings.securityRoles} instead.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
+         * @returns An array of user role identifiers, in Guid format.
+         * @example Example: ["cf4cc7ce-5d51-df11-97e0-00155db232d0"]
          */
         getUserRoles(): string[];
 
         /**
          * Returns the version number of the Dynamics 365 server.
-         *
-         * @return The version number
+         * @returns The version number
          */
         getVersion(): string;
 
@@ -407,19 +459,176 @@ declare namespace Xrm {
 
         /**
          * Prefixes the current organization's unique name to a string; typically a URL path.
-         *
          * @param sPath Local pathname of the resource.
-         * @return A path string with the organization name.
-         *
-         * @remarks Format: "/"+ OrgName + sPath
+         * @returns A path string with the organization name. Format: "/"+ OrgName + sPath
          */
         prependOrgName(sPath: string): string;
     }
 
+    namespace Events {
+        /**
+         * Interface for save event arguments.
+         */
+        interface SaveEventArguments {
+            /**
+             * @summary Gets save mode, as an integer.
+             * @returns The save mode.
+             * @description Gets save mode, as an integer.<BR>
+             * **Values returned are**:
+             * * 1      Save
+             * * 2      Save and Close
+             * * 59     Save and New
+             * * 70     AutoSave (Where enabled; can be used with an OnSave handler to conditionally disable auto-saving)
+             * * 58     Save as Completed (Activities)
+             * * 5      Deactivate
+             * * 6      Reactivate
+             * * 47     Assign (All user- or team-owned entities)
+             * * 7      Send (Email)
+             * * 16     Qualify (Lead)
+             * * 15     Disqualify (Lead)
+             */
+            getSaveMode(): XrmEnum.SaveMode;
+
+            /**
+             * Returns a boolean value to indicate if the record's save has been prevented.
+             * @returns true if saving is prevented, otherwise false.
+             */
+            isDefaultPrevented(): boolean;
+
+            /**
+             * Prevents the save operation from being submitted to the server.
+             * All remaining "on save" handlers will continue execution.
+             */
+            preventDefault(): void;
+        }
+
+        /**
+         * Interface for process stage change event arguments.
+         */
+        interface StageChangeEventArguments {
+            /**
+             * Gets the direction of the stage change.
+             * @returns The direction: "next" or "previous"
+             */
+            getDirection(): ProcessFlow.StageChangeDirection;
+
+            /**
+             * Gets the destination stage object
+             * @returns The stage object. For switching between entities, returns the previous stage object
+             */
+            getStage(): ProcessFlow.Stage;
+        }
+
+        /**
+         * Interface for process stage selected event arguments.
+         */
+        interface StageSelectedEventArguments {
+            /**
+             * Gets the selected stage object
+             * @returns The stage object
+             */
+            getStage(): ProcessFlow.Stage;
+        }
+
+        /**
+         * Interface for the event context.
+         * In the API documentation, this is sometimes refferred to as the executionContext.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/clientapi-execution-context External Link: Client API execution context}
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/execution-context External Link: Execution context (Client API reference)}
+         */
+        interface EventContext {
+            /**
+             * Gets the Xrm context.
+             * @returns The Xrm context.
+             */
+            getContext(): GlobalContext;
+
+            /**
+             * Gets the handler's depth, which is the order in which the handler is executed.
+             * @returns The depth, a 0-based index.
+             */
+            getDepth(): number;
+
+            /**
+             * Gets a reference to the object for which event occurred.
+             * @returns The event source.
+             */
+            getEventSource(): Attributes.Attribute | Controls.Control | Entity;
+
+            /**
+             * Gets a reference to the currnet form context
+             * @returns The {@link FormContext form context}
+             */
+            getFormContext(): FormContext;
+
+            /**
+             * @summary Gets the shared variable with the specified key.
+             * @param T Generic type parameter.
+             * @param key The key.
+             * @returns The shared variable.
+             * @desc Gets the shared variable with the specified key.
+             * Used to pass values between handlers of an event.
+             */
+            getSharedVariable<T>(key: string): T;
+
+            /**
+             * @summary Sets a shared variable.
+             * @param T Generic type parameter.
+             * @param key The key.
+             * @param value The value.
+             * @desc Sets the shared variable with the specified key.
+             * Used to pass values between handlers of an event.
+             */
+            setSharedVariable<T>(key: string, value: T): void;
+        }
+
+        /**
+         * Interface for a save event context
+         */
+        interface SaveEventContext extends EventContext {
+            /**
+             * Gets save-event arguments.
+             * @returns The event arguments.  Returns null for all but the "save" event.
+             */
+            getEventArgs(): SaveEventArguments;
+        }
+
+        /**
+         * Interface for a process stage change event context
+         */
+        interface StageChangeEventContext extends EventContext {
+            /**
+             * Gets process stage change event arguments.
+             * @returns The event arguments.
+             */
+            getEventArgs(): StageChangeEventArguments;
+        }
+
+        interface StageSelectedEventContext extends EventContext {
+            /**
+             * Gets process stage selected event arguments.
+             * @returns The event arguments.
+             */
+            getEventArgs(): StageSelectedEventArguments;
+        }
+
+        /**
+         * Type for a context-sensitive handler.
+         * @param context The context.
+         */
+        type ContextSensitiveHandler = (context: EventContext) => void;
+
+        /**
+         * Type for a process status change handler.
+         * @param status The process status.
+         */
+        type ProcessStatusChangeHandler = (status: ProcessFlow.ProcessStatus) => void;
+    }
+
     /**
      * Defines save options to control how appointment, recurring appointment, or service activity records are processed.
      *
-     * @see {@link https://msdn.microsoft.com/en-us/library/dn481607.aspx#Anchor_2} for details.
+     * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/formcontext-data/save External Link: save(Client API reference)}
      */
     interface SaveOptions {
         /**
@@ -430,29 +639,28 @@ declare namespace Xrm {
     }
 
     /**
-     * Interface for the Xrm.Page.data object.
+     * Interface for the formContext.data object.
+     * @note NTOE NOTE
+     * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/formcontext-data External Link: formContext.data (Client API reference)}
      */
     interface Data {
         /**
          * Asynchronously refreshes data on the form, without reloading the page.
-         *
          * @param save true to save the record, after the refresh.
-         * @return Returns an asynchronous promise.
+         * @returns Returns an asynchronous promise.
          */
         refresh(save: boolean): Async.PromiseLike<undefined>;
 
         /**
          * Asynchronously saves the record.
-         *
-         * @return Returns an asynchronous promise.
+         * @returns Returns an asynchronous promise.
          */
         save(): Async.PromiseLike<undefined>;
 
         /**
          * Asynchronously saves the record  with the option to set callback functions to be executed after the save operation is completed.
-         *
          * @param saveOptions Options to control how appointment, recurring appointment, or service activity records are processed.
-         * @return Returns an asynchronous promise.
+         * @returns Returns an asynchronous promise.
          */
         save(saveOptions: SaveOptions): Async.PromiseLike<undefined>;
 
@@ -460,158 +668,146 @@ declare namespace Xrm {
          * Collection of non-entity data on the form.
          * Items in this collection are of the same type as the attributes collection, but they are not attributes of the form entity.
          * In V9 this is only available in the Unified Client
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/attributes External Link: Attributes (Client API reference)}
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/collections External Link: Collections (Client API reference)}
+         * @see {@link Attributes}
          */
-        attributes: Collection.ItemCollection<Page.Attribute>;
+        attributes: Collection.ItemCollection<Attributes.Attribute>;
 
         /**
-         * The record context of the form.
+         * The record context of the form, {@link Entity formContext.data.entity}
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/formcontext-data-entity External Link: formContext.data.entity (Client API reference)}
          */
-        entity: Page.Entity;
+        entity: Entity;
 
         /**
-         * The process API for Xrm.Page.data.
+         * The process API for {@link ProcessFlow.ProcessManager formContext.ui.process}.
          * @remarks This member may be undefined when Process Flows are not used by the current entity.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/formcontext-data-process External Link: formContext.data.process (Client API reference)}
          */
-        process: Page.data.ProcessManager;
+        process: ProcessFlow.ProcessManager;
     }
 
     /**
-     * Interface for Page context
+     * Interface for formContext
+     * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/executioncontext/getformcontext External Link: getFormContext (Client API reference)}
      */
-    interface Page {
-        /**
-         * Provides methods to retrieve information specific to an organization, a user, or parameters passed to a page.
-         * @deprecated: Deprecated in v9. See {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated}
-         */
-        context: Context;
-
+    interface FormContext {
         /**
          * Provides methods to work with the form.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/formcontext-data External Link: formContext.data (Client API reference)}
          */
         data: Data;
 
         /**
          * Contains properties and methods to retrieve information about the user interface as well as collections for several subcomponents of the form.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/formcontext-ui External Link: formContext.ui (Client API reference)}
          */
         ui: Ui;
 
         /**
          * Gets all attributes.
-         *
-         * @return An array of attributes.
+         * @returns An array of attributes.
          */
-        getAttribute(): Page.Attribute[];
+        getAttribute(): Attributes.Attribute[];
 
         /**
          * Gets an attribute matching attributeName.
-         *
-         * @tparam T   An Attribute type.
+         * @param T An Attribute type.
          * @param attributeName Name of the attribute.
-         * @return The attribute.
+         * @returns The attribute.
          */
-        getAttribute<T extends Page.Attribute>(attributeName: string): T;
+        getAttribute<T extends Attributes.Attribute>(attributeName: string): T;
 
         /**
          * Gets an attribute matching attributeName.
-         *
          * @param attributeName Name of the attribute.
-         * @return The attribute.
+         * @returns The attribute.
          */
-        getAttribute(attributeName: string): Page.Attribute;
+        getAttribute(attributeName: string): Attributes.Attribute;
 
         /**
          * Gets an attribute by index.
-         *
          * @param index The attribute index.
-         * @return The attribute.
+         * @returns The attribute.
          */
-        getAttribute(index: number): Page.Attribute;
+        getAttribute(index: number): Attributes.Attribute;
 
         /**
          * Gets an attribute.
-         *
          * @param delegateFunction A matching delegate function
-         * @return An array of attribute.
+         * @returns An array of attribute.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/collections External Link: Collections (Client API reference)}
          */
-        getAttribute(delegateFunction: Collection.MatchingDelegate<Page.Attribute>): Page.Attribute[];
+        getAttribute(delegateFunction: Collection.MatchingDelegate<Attributes.Attribute>): Attributes.Attribute[];
 
         /**
          * Gets all controls.
-         *
-         * @return An array of controls.
+         * @returns An array of controls.
          */
-        getControl(): Page.Control[];
+        getControl(): Controls.Control[];
 
         /**
          * Gets a control matching controlName.
-         *
          * @param T A Control type
          * @param controlName Name of the control.
-         *
-         * @return The control.
+         * @returns The control.
          */
-        getControl<T extends Page.Control>(controlName: string): T;
+        getControl<T extends Controls.Control>(controlName: string): T;
 
         /**
          * Gets a control matching controlName.
-         *
-         * @param controlName Name of the control.
-         * @return The control.
+         * @param controlName   Name of the control.
+         * @returns The control.
          */
-        getControl(controlName: string): Page.Control;
+        getControl(controlName: string): Controls.Control;
 
         /**
          * Gets a control by index.
-         *
          * @param T A Control type
          * @param index The control index.
-         *
-         * @return The control.
+         * @returns The control.
          */
-        getControl<T extends Page.Control>(index: number): T;
+        getControl<T extends Controls.Control>(index: number): T;
 
         /**
          * Gets a control by index.
-         *
          * @param index The control index.
-         * @return The control.
+         * @returns The control.
          */
-        getControl(index: number): Page.Control;
+        getControl(index: number): Controls.Control;
 
         /**
          * Gets a control.
-         *
          * @param delegateFunction A matching delegate function.
-         * @return An array of control.
+         * @returns An array of control.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/collections External Link: Collections (Client API reference)}
          */
-        getControl(delegateFunction: Collection.MatchingDelegate<Page.Control>): Page.Control[];
+        getControl(delegateFunction: Collection.MatchingDelegate<Controls.Control>): Controls.Control[];
     }
 
     /**
-     * Interface for the Xrm.Page.ui object.
+     * Interface for the formContext.ui object.
+     * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/formcontext-ui External Link: formContext.ui (Client API reference)}
      */
     interface Ui {
         /**
          * Displays a form level notification. Any number of notifications can be displayed and will remain until removed using clearFormNotification.
          * The height of the notification area is limited so each new message will be added to the top.
-         *
          * @param message The text of the notification message.
          * @param level The level of the notification which defines how the message will be displayed, such as the icon.
+         * ERROR: Notification will use the system error icon.
+         * WARNING: Notification will use the system warning icon.
+         * INFO: Notification will use the system info icon.
          * @param uniqueId Unique identifier for the notification which is used with clearFormNotification to remove the notification.
-         *
-         * @return true if it succeeds, otherwise false.
-         *
-         * @remarks     Values for level are:    ERROR   Notification will use the system error icon.
-         *                                       WARNING Notification will use the system warning icon.
-         *                                       INFO    Notification will use the system info icon.
+         * @returns true if it succeeds, otherwise false.
          */
-        setFormNotification(message: string, level: Page.ui.FormNotificationLevel, uniqueId: string): boolean;
+        setFormNotification(message: string, level: FormNotificationLevel, uniqueId: string): boolean;
 
         /**
          * Clears the form notification described by uniqueId.
-         *
          * @param uniqueId Unique identifier.
-         * @return True if it succeeds, otherwise false.
+         * @returns True if it succeeds, otherwise false.
          */
         clearFormNotification(uniqueId: string): boolean;
 
@@ -622,40 +818,34 @@ declare namespace Xrm {
 
         /**
          * Gets form type.
-         *
-         * @return The form type.
-         *
-         * @remarks     Values returned are: 0  Undefined
-         *                                   1  Create
-         *                                   2  Update
-         *                                   3  Read Only
-         *                                   4  Disabled
-         *                                   6  Bulk Edit
-         *              Deprecated values are 5 (Quick Create), and 11 (Read Optimized)
+         * @returns The form type.
+         * @remarks **Values returned are**:
+         * * 0  Undefined
+         * * 1  Create
+         * * 2  Update
+         * * 3  Read Only
+         * * 4  Disabled
+         * * 6  Bulk Edit
+         * * Deprecated values are 5 (Quick Create), and 11 (Read Optimized)
          */
         getFormType(): XrmEnum.FormType;
 
         /**
          * Gets view port height.
-         *
-         * @return The view port height, in pixels.
-         *
+         * @returns The view port height, in pixels.
          * @remarks This method does not work with Microsoft Dynamics CRM for tablets.
          */
         getViewPortHeight(): number;
 
         /**
          * Gets view port width.
-         *
-         * @return The view port width, in pixels.
-         *
+         * @returns The view port width, in pixels.
          * @remarks This method does not work with Microsoft Dynamics CRM for tablets.
          */
         getViewPortWidth(): number;
 
         /**
          * Re-evaluates the ribbon's configured EnableRules.
-         *
          * @remarks This method does not work with Microsoft Dynamics CRM for tablets.
          */
         refreshRibbon(): void;
@@ -663,36 +853,38 @@ declare namespace Xrm {
         /**
          * The business process flow API, used to interact with the business process flow control in a form.
          */
-        process: Page.ui.ProcessManager;
+        process: Controls.ProcessControl;
 
         /**
          * A reference to the collection of controls on the form.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/collections External Link: Collections (Client API reference)}
          */
-        controls: Collection.ItemCollection<Page.Control>;
+        controls: Collection.ItemCollection<Controls.Control>;
 
         /**
          * The form selector API.
-         *
          * @remarks This API does not exist with Microsoft Dynamics CRM for tablets.
          */
-        formSelector: Page.FormSelector;
+        formSelector: Controls.FormSelector;
 
         /**
          * The navigation API.
-         *
          * @remarks This API does not exist with Microsoft Dynamics CRM for tablets.
          */
-        navigation: Page.Navigation;
+        navigation: Controls.Navigation;
 
         /**
          * A reference to the collection of tabs on the form.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/collections External Link: Collections (Client API reference)}
          */
-        tabs: Collection.ItemCollection<Page.Tab>;
+        tabs: Collection.ItemCollection<Controls.Tab>;
 
         /**
          * A collection of all the quick view controls on a form using the new form rendering engine (also called "turbo forms").
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/formcontext-ui-quickforms ExternalLink: formContext.ui.quickForms (Client API reference)}
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/formcontext-ui External Link: formContext.ui (Client API reference)}
          */
-        quickForms: Collection.ItemCollection<Page.ui.QuickForm>;
+        quickForms: Collection.ItemCollection<Controls.QuickFormControl>;
     }
 
     /**
@@ -727,6 +919,7 @@ declare namespace Xrm {
 
     /**
      * Interface for the Xrm.Utility API
+     * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-utility External Link: Xrm.Utility (Client API reference)}
      */
     interface Utility {
         /**
@@ -737,8 +930,8 @@ declare namespace Xrm {
         /**
          * Returns the valid state transitions for the specified entity type and state code.
          * TODO: No info on the return type is available
-         * @param entityName The logical name of the entity.
-         * @param stateCode The state code to find out the allowed status transition values.
+         * @param entityName    The logical name of the entity.
+         * @param stateCode     The state code to find out the allowed status transition values.
          */
         getAllowedStatusTransitions(entityName: string, stateCode: number): Async.PromiseLike<any>;
 
@@ -751,8 +944,9 @@ declare namespace Xrm {
 
         /**
          * The method provides access to the global context without going through the form context.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-utility/getglobalcontext External Link: getGlobalContext (Client API reference)}
          */
-        getGlobalContext(): Context;
+        getGlobalContext(): GlobalContext;
 
         /**
          * Returns the localized string for a given key associated with the specified web resource.
@@ -766,6 +960,9 @@ declare namespace Xrm {
          * Invokes an action based on the specified parameters
          * @param name Name of the process action to invoke.
          * @param parameters An object containing input parameters for the action. You define an object using key:value pairs of items, where key is of String type.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-utility/invokeprocessaction External Link: invokeProcessAction (Client API reference)}
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/customize/actions External Link: Actions overview}
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/create-own-actions External Link: Create your own actions}
          */
         invokeProcessAction(name: string, parameters: Collection.Dictionary<any>): Async.PromiseLike<any>;
 
@@ -773,12 +970,13 @@ declare namespace Xrm {
          * Opens a lookup control to select one or more items.
          * @param lookupOptions Defines the options for opening the lookup dialog
          */
-        lookupObjects(lookupOptions: LookupOptions): Async.PromiseLike<Page.LookupValue>;
+        lookupObjects(lookupOptions: LookupOptions): Async.PromiseLike<LookupValue>;
 
         /**
          * Refreshes the parent grid containing the specified record.
+         * @param lookupOptions: The lookup value of the parent object to refresh.
          */
-        refreshParentGrid(lookupOptions: Page.LookupValue): void;
+        refreshParentGrid(lookupOptions: LookupValue): void;
 
         /**
          * Displays a progress dialog with the specified message.
@@ -789,8 +987,8 @@ declare namespace Xrm {
 
         /**
          * Displays an alert dialog, with an "OK" button.
-         * @deprecated: Deprecated in v9. Use Xrm.Navigation. See {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated}
-         *
+         * @deprecated Deprecated in v9. Use {@link Xrm.Navigation.openAlertDialog} instead.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
          * @param message The message.
          * @param onCloseCallback The "OK" callback.
          */
@@ -798,8 +996,8 @@ declare namespace Xrm {
 
         /**
          * Displays a confirmation dialog, with "OK" and "Cancel" buttons.
-         * @deprecated: Deprecated in v9. Use Xrm.Navigation. See {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated}
-         *
+         * @deprecated Deprecated in v9. Use {@link Xrm.Navigation.openConfirmDialog} instead.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
          * @param message The message.
          * @param yesCloseCallback The "OK" callback.
          * @param noCloseCallback The "Cancel" callback.
@@ -808,30 +1006,31 @@ declare namespace Xrm {
 
         /**
          * Query if 'entityType' is an Activity entity.
-         * @deprecated: Deprecated in v9. See {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated}
-         * @param entityType  Type of the entity.
-         *
-         * @return true if the entity is an Activity, false if not.
+         * @deprecated Deprecated in v9. Use {@link Xrm.Utility.getEntityMetadata  Xrm.Utility.getEntityMetadata(entityName, ["IsActivity"])} instead.
+         * @remarks The isActivityType method is synchronous so it was suitable for ribbon rules.
+         * However, the replacement method, getEntityMetadata, is asynchronous, and is not suitable for ribbon rules.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
+         * @param entityType Type of the entity.
+         * @returns true if the entity is an Activity, false if not.
          */
         isActivityType(entityType: string): boolean;
 
         /**
          * Opens quick create.
-         * @deprecated: Deprecated in v9. Use Xrm.Navigation. See {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated}
-         * @param entityLogicalName The logical name of the entity to create.
-         * @param createFromEntity (Optional) Designates a record that will provide default values
-         *                         based on mapped attribute values.
-         * @param parameters (Optional) A dictionary object that passes extra query string
-         *                   parameters to the form. Invalid query string parameters will cause an
-         *                   error.
-         * @return Returns an asynchronous promise.
+         * @deprecated Deprecated in v9. Use {@link Xrm.Navigation.openForm} instead with the option {useQuickCreateForm:true}.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
+         * @param entityLogicalName  The logical name of the entity to create.
+         * @param createFromEntity (Optional) Designates a record that will provide default values based on mapped attribute values.
+         * @param parameters (Optional) A dictionary object that passes extra query string parameters to the form. Invalid query string parameters will cause an error.
+         * @returns Returns an asynchronous promise.
          */
-        openQuickCreate(entityLogicalName: string, createFromEntity?: Page.LookupValue, parameters?: Utility.OpenParameters):
+        openQuickCreate(entityLogicalName: string, createFromEntity?: LookupValue, parameters?: Utility.OpenParameters):
             Async.PromiseLike<Async.OpenQuickCreateSuccessCallbackObject>;
 
         /**
          * Opens an entity form.
-         * @deprecated: Deprecated in v9. Use Xrm.Navigation. See {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated}
+         * @deprecated Deprecated in v9. Use {@link Xrm.Navigation.openForm} instead.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
          * @param name The entity's logical name.
          * @param id (Optional) The unique identifier for the record.
          * @param parameters (Optional) A dictionary object that passes extra query string parameters to the form.
@@ -841,24 +1040,22 @@ declare namespace Xrm {
 
         /**
          * Opens an HTML Web Resource in a new browser window.
-         * @deprecated: Deprecated in v9. See {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated}
-         * @param webResourceName Name of the HTML web resource. Can be used to pass URL
-         *                        parameters.  See Remarks.
-         * @param webResourceData (Optional) Data to pass into the Web Resource's data parameter.
-         *                        It is advised to use encodeURIcomponent() to encode the value.
+         * @deprecated Deprecated in v9. Use {@link Xrm.Navigation.openWebResource} instead.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
+         * @param webResourceName Name of the HTML web resource. Can be used to pass URL parameters.  See Remarks.
+         * @param webResourceData (Optional) Data to pass into the Web Resource's data parameter. It is advised to use encodeURIcomponent() to encode the value.
          * @param width (Optional) The width of the new window.
          * @param height (Optional) The height of the new window.
-         *
-         * @return A Window reference, containing the opened Web Resource.
-         *
-         * @remarks This function will not work with Microsoft Dynamics CRM for tablets.
-         *          Valid WebResource URL Parameters:   typename
-         *                                              type
-         *                                              id
-         *                                              orgname
-         *                                              userlcid
-         *                                              data (identical to this method's webResourceData parameter)
-         *                                              formid
+         * @returns A Window reference, containing the opened Web Resource.
+         * @remarks This function will not work with Microsoft Dynamics CRM for tablets.<BR>
+         * **Valid WebResource URL Parameters**:
+         * * typename
+         * * type
+         * * id
+         * * orgname
+         * * userlcid
+         * * data (identical to this method's webResourceData parameter)
+         * * formid
          */
         openWebResource(webResourceName: string, webResourceData?: string, width?: number, height?: number): Window;
     }
@@ -869,39 +1066,41 @@ declare namespace Xrm {
     interface Mobile {
         /**
          * Provides methods to create and manage records in the mobile clients while working in the offline mode.
-         *
-         * @see {@link https://msdn.microsoft.com/en-us/library/mt787123.aspx} for details.
+         * @see {@link https://msdn.microsoft.com/en-us/library/mt787123.aspx External Link: Xrm.Mobile.offline (client-side reference)}
+         * @deprecated Use {@link Xrm.WebApi.offline} instead.  Xrm.WebApi.offline is implemented differently than Xrm.Mobile.offline
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
          */
         offline: MobileOffline;
     }
 
     /**
      * Interface for the Mobile.offline methods to create and manage records in the mobile clients while working in the offline mode.
-     *
-     * @see {@link https://msdn.microsoft.com/en-us/library/mt787123.aspx} for details.
+     * @deprecated Use {@link Xrm.WebApi.offline} instead.  Xrm.WebApi.offline is implemented differently than Xrm.Mobile.offline
+     * @see {@link https://msdn.microsoft.com/en-us/library/mt787123.aspx External Link: Xrm.Mobile.offline (client-side reference)}
+     * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
      */
     interface MobileOffline {
         /**
          * Returns whether an entity is offline enabled.
-         *
          * @param entityType The logical name of the entity.
-         * @return True if the entity is offline enabled; otherwise False.
+         * @returns True if the entity is offline enabled; otherwise False.
+         * @deprecated Use {@link Xrm.WebApi.isAvailableOffline} instead.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
          */
         isOfflineEnabled(entityType: string): boolean;
 
         /**
          * Creates an entity record in mobile clients while working in the offline mode.
-         *
          * @param entityType The logical name of the entity.
          * @param data A dictionary object containing key : value pairs for the record to create.
-         *
-         * @return Returns an asynchronous promise.
-         *
-         * @remarks  You cannot create intersect and activity party entities.
-         *           Only the following attribute types are supported in offline mode:
-         *             BigInt, Boolean, Customer, DateTime, Decimal, Double, EntityName
-         *             Integer, Lookup, Memo, Money, Owner, Picklist, String, State
+         * @returns Returns an asynchronous promise.
+         * @remarks  You cannot create intersect and activity party entities.<BR>
+         *           Only the following attribute types are supported in offline mode:<BR>
+         *             BigInt, Boolean, Customer, DateTime, Decimal, Double, EntityName<BR>
+         *             Integer, Lookup, Memo, Money, Owner, Picklist, String, State<BR>
          *             Status, UniqueIdentifier
+         * @deprecated Use {@link Xrm.WebApi.createRecord} instead.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
          */
         createRecord(entityType: string, data: { [attributeName: string]: any }): Async.PromiseLike<Async.OfflineOperationSuccessCallbackObject>;
 
@@ -911,15 +1110,16 @@ declare namespace Xrm {
          * @param entityType The logical name of the entity.
          * @param id GUID of the record to retrieve.
          * @param options (Optional) OData system query options to retrieve your data. Supports $select and $expand
-         *                 Example: ?$select=name&$expand=primarycontactid($select=contactid,fullname)
-         *
-         * @return Returns an asynchronous promise.
-         *
-         * @remarks  Only $select option can be specified within $expand.
-         *           Only the following attribute types are supported in offline mode:
-         *             BigInt, Boolean, Customer, DateTime, Decimal, Double, EntityName
-         *             Integer, Lookup, Memo, Money, Owner, Picklist, String, State
+         * @example <caption>Example options</caption>
+         * options: ?$select=name&$expand=primarycontactid($select=contactid,fullname)
+         * @returns Returns an asynchronous promise.
+         * @remarks  Only $select option can be specified within $expand.<BR>
+         *           Only the following attribute types are supported in offline mode:<BR>
+         *             BigInt, Boolean, Customer, DateTime, Decimal, Double, EntityName<BR>
+         *             Integer, Lookup, Memo, Money, Owner, Picklist, String, State<BR>
          *             Status, UniqueIdentifier
+         * @deprecated Use {@link Xrm.WebApi.retrieveRecord} instead.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
          */
         retrieveRecord(entityType: string, id: string, options: string): Async.PromiseLike<Async.OfflineOperationSuccessCallbackObject>;
 
@@ -929,66 +1129,64 @@ declare namespace Xrm {
          * @param entityType The logical name of the entity.
          * @param options (Optional) The logical name of the enti
          * @param maxPageSize (Optional) A positive number to indicates the number of entity records to be returned per page.
-         *                    If you do not specify this parameter, the default value is passed as 5000.
-         *                    If the number of records being retrieved is more than maxPageSize, an @odata.nextLink property
-         *                    will be returned, and you can use the value of the @odata.nextLink property with a new GET
-         *                    request to return next set of records.
-         *
-         * @return Returns an asynchronous promise.
-         *
+         * * If you do not specify this parameter, the default value is passed as 5000.
+         * * If the number of records being retrieved is more than maxPageSize, an @odata.nextLink property
+         * will be returned, and you can use the value of the @odata.nextLink property with a new GET
+         * request to return next set of records.
+         * @returns Returns an asynchronous promise.
          * @remarks  A maximum of 5000 related records can be retrieved when using $expand.
-         *           Only $select option can be specified within $expand.
-         *           $skip query option is not supported.
-         *           Only the following attribute types are supported in offline mode:
-         *             BigInt, Boolean, Customer, DateTime, Decimal, Double, EntityName
-         *             Integer, Lookup, Memo, Money, Owner, Picklist, String, State
+         * * Only $select option can be specified within $expand.
+         * * $skip query option is not supported.
+         * * Only the following attribute types are supported in offline mode:<BR>
+         *             BigInt, Boolean, Customer, DateTime, Decimal, Double, EntityName<BR>
+         *             Integer, Lookup, Memo, Money, Owner, Picklist, String, State<BR>
          *             Status, UniqueIdentifier
+         * @deprecated Use {@link Xrm.WebApi.retrieveMultipleRecords} instead.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
          */
         retrieveMultipleRecords(entityType: string, options: string, maxPageSize: number): Async.PromiseLike<Array<{ [key: string]: any }>>;
 
         /**
          * Updates an entity record in mobile clients while working in the offline mode.
-         *
          * @param entityType The logical name of the entity.
          * @param id GUID of the record to update.
          * @param data A dictionary object containing key : value pairs for the record to update.
-         *
-         * @return Returns an asynchronous promise.
-         *
-         * @remarks  You cannot update intersect and activity party entities.
-         *           Only the following attribute types are supported in offline mode:
-         *             BigInt, Boolean, Customer, DateTime, Decimal, Double, EntityName
-         *             Integer, Lookup, Memo, Money, Owner, Picklist, String, State
+         * @returns Returns an asynchronous promise.
+         * @remarks  You cannot update intersect and activity party entities.<BR>
+         *           Only the following attribute types are supported in offline mode:<BR>
+         *             BigInt, Boolean, Customer, DateTime, Decimal, Double, EntityName<BR>
+         *             Integer, Lookup, Memo, Money, Owner, Picklist, String, State<BR>
          *             Status, UniqueIdentifier
+         * @deprecated Use {@link Xrm.WebApi.updateRecord} instead.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
          */
         updateRecord(entityType: string, id: string, data: { [attributeName: string]: any }): Async.PromiseLike<Async.OfflineOperationSuccessCallbackObject>;
 
         /**
          * Deletes an entity record in mobile clients while working in the offline mode.
-         *
          * @param entityType The logical name of the entity.
          * @param id GUID of the record to delete.
-         *
-         * @return Returns an asynchronous promise.
-         *
+         * @returns Returns an asynchronous promise.
          * @remarks  You cannot delete intersect and activity party entities.
+         * @deprecated Use {@link Xrm.WebApi.deleteRecord} instead.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
          */
         deleteRecord(entityType: string, id: string): Async.PromiseLike<Async.OfflineOperationSuccessCallbackObject>;
     }
 
     /**
      * Interface for the Xrm.Panel API
+     * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-panel External Link: Xrm.Panel}
      */
     interface Panel {
         /**
-         * Displays the web page represented by a URL in the static area in the side pane, which appears on all pages in the web client.
-         *
+         * Displays the web page represented by a URL in the static area in the side pane, which appears on all pages in the Customer Engagement web client.
          * @param url URL of the page to be loaded in the side pane static area.
          * @param title Title of the side pane static area.
-         *
          * @remarks  This method is only supported for the web client.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-panel/loadpanel External Link: loadPanel (Client-side reference)}
          */
-        LoadPanel(url: string, title: string): void;
+        loadPanel(url: string, title: string): void;
     }
 
     /**
@@ -1017,7 +1215,7 @@ declare namespace Xrm {
             /**
              * A lookup value which identifies the record which has been created.
              */
-            savedEntityReference: Page.LookupValue;
+            savedEntityReference: LookupValue;
         }
 
         /**
@@ -1055,7 +1253,8 @@ declare namespace Xrm {
              * @param onrejected The callback to execute when the Promise is rejected.
              * @returns A Promise for the completion of which ever callback is executed.
              */
-            then<U>(onFulfilled?: (value: T) => U | PromiseLike<U>, onRejected?: (error: any) => U | PromiseLike<U>): PromiseLike<U>;
+            then<U>(onFulfilled?: (value: T) => U | PromiseLike<U>, onRejected?: (error: any) => U | PromiseLike<U>):
+                PromiseLike<U>;
             then<U>(onFulfilled?: (value: T) => U | PromiseLike<U>, onRejected?: (error: any) => void): PromiseLike<U>;
 
             /**
@@ -1086,17 +1285,14 @@ declare namespace Xrm {
     namespace Collection {
         /**
          * Called for each item in an array
-         *
          * @param item The item.
          * @param index Zero-based index of the item array.
-         *
-         * @return true if the item matches, false if it does not.
+         * @returns true if the item matches, false if it does not.
          */
         type MatchingDelegate<T> = (item: T, index?: number) => boolean;
 
         /**
          * Called for each item in an array
-         *
          * @param item The item.
          * @param index Zero-based index of the item array.
          */
@@ -1104,7 +1300,6 @@ declare namespace Xrm {
 
         /**
          * Interface for an item collection.
-         *
          * @param T Generic type parameter.
          */
         interface Dictionary<T> {
@@ -1112,385 +1307,1182 @@ declare namespace Xrm {
             [index: number]: T;
         }
 
+        /**
+         * Collections are structures to provide access to data that represent an array, but without the ability to modify the data in the array.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/collections External Link: Collections (Client API reference)}
+         */
         type ItemCollection<T> = Dictionary<T> & {
             /**
              * Applies an operation to all items in this collection.
-             *
              * @param delegate An iterative delegate function
              */
             forEach(delegate: IterativeDelegate<T>): void;
 
             /**
              * Gets the item using a delegate matching function
-             *
              * @param delegate A matching delegate function
-             *
-             * @return A T[] whose members have been validated by delegate.
+             * @returns A T[] whose members have been validated by delegate.
              */
             get(delegate: MatchingDelegate<T>): T[];
 
             /**
              * Gets the item given by the index.
-             *
              * @param itemNumber The item number to get.
-             *
-             * @return The T in the itemNumber-th place.
+             * @returns The T in the itemNumber-th place.
              */
             get(itemNumber: number): T;
 
             /**
              * Gets the item given by the index.
-             *
              * @param itemNumber The item number to get.
-             *
-             * @return The T in the itemNumber-th place.
-             *
-             * @see {@link Xrm.Page.Control.getName()} for Control-naming schemes.
+             * @returns The T in the itemNumber-th place.
+             * @see {@link Controls.Control.getName Controls.Control.getName()} for Control-naming schemes.
              */
             get<TSubType extends T>(itemNumber: number): TSubType;
 
             /**
              * Gets the item given by the key.
-             *
              * @param itemName The item name to get.
-             *
-             * @return The T matching the key itemName.
-             *
-             * @see {@link Xrm.Page.Control.getName()} for Control-naming schemes.
+             * @returns The T matching the key itemName.
+             * @see {@link Controls.Control.getName Controls.Control.getName()} for Control-naming schemes.
              */
             get(itemName: string): T;
 
             /**
              * Gets the item given by the key.
-             *
              * @param itemName The item name to get.
-             *
-             * @return The T matching the key itemName.
-             *
-             * @see {@link Xrm.Page.Control.getName()} for Control-naming schemes.
+             * @returns The T matching the key itemName.
+             * @see {@link Controls.Control.getName Controls.Control.getName()} for Control-naming schemes.
              */
             get<TSubType extends T>(attributeName: string): TSubType;
 
             /**
              * Gets the entire array of T.
-             *
-             * @return A T[].
+             * @returns A T[].
              */
             get(): T[];
 
             /**
              * Gets the length of the collection.
-             *
-             * @return The length.
+             * @returns The length.
              */
             getLength(): number;
         };
     }
 
     /**
-     * The Xrm.Page API
-     *
-     * @see {@link http://msdn.microsoft.com/en-us/library/gg328255.aspx|Documentation} for details.
+     * Interface for Page context
+     * @deprecated Use {@link Xrm.Events.EventContext.getFormContext formContext} instead.
+     * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}a
+     */
+    interface Page extends FormContext {
+        /**
+         * Provides methods to retrieve information specific to an organization, a user, or parameters passed to a page.
+         * @deprecated Deprecated in v9.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
+         */
+        context: GlobalContext;
+    }
+
+    /**
+     * Xrm.Page namespace has been deprecated
+     * @deprecated Use {@link Xrm.Events.EventContext.getFormContext formContext} instead.
+     * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
      */
     namespace Page {
         /**
-         * Requirement Level for Xrm.Page.Attribute.getRequiredLevel() and Xrm.Page.Attribute.setRequiredLevel().
+         * @deprecated Use {@link Xrm.Controls.AddControlNotificationOptions} instead.
          */
-        type RequirementLevel = "none" | "recommended" | "required";
+        interface AddControlNotificationOptions extends Controls.AddControlNotificationOptions { }
+
+        /**
+         * Interface to define the actions on a control notification
+         * @deprecated Use {@link Xrm.Controls.ControlNotificationAction} instead.
+         */
+        interface ControlNotificationAction extends Controls.ControlNotificationAction { }
+
+        /**
+         * Interface for an entity's form selector item.
+         * @deprecated Use {@link Xrm.Controls.FormItem} instead.
+         */
+        interface FormItem extends Controls.FormItem { }
+
+        /**
+         * Interface for the form selector API.
+         * @deprecated Use {@link Xrm.Controls.FormSelector} instead.
+         */
+        interface FormSelector extends Controls.FormSelector { }
+
+        /**
+         * Interface for Xrm.Page.ui.navigation.
+         * @deprecated Use {@link Xrm.Controls.Navigation} instead.
+         */
+        interface Navigation extends Controls.Navigation { }
+
+        /**
+         * Interface for a navigation item.
+         * @see {@link UiElement}
+         * @see {@link UiFocusable}
+         * @deprecated Use {@link Xrm.Controls.NavigationItem} instead.
+         */
+        interface NavigationItem extends Controls.NavigationItem { }
+
+        /**
+         * Constants to use with the addNotification method of form controls
+         * @deprecated Use {@link Xrm.Controls.NotificationLevel} instead.
+         */
+        type NotificationLevel = Controls.NotificationLevel;
+        /**
+         * Requirement Level for Xrm.Page.Attribute.getRequiredLevel() and Xrm.Page.Attribute.setRequiredLevel().
+         * @deprecated Use {@link Xrm.Attributes.RequirementLevel} instead.
+         */
+        type RequirementLevel = Attributes.RequirementLevel;
 
         /**
          * Save Modes for Xrm.Page.Entity.save().
+         * @deprecated Use {@link Xrm.EntitySaveMode} instead.
          */
-        type SaveMode = "saveandclose" | "saveandnew";
+        type SaveMode = EntitySaveMode;
 
         /**
          * Status for Xrm.Page.Stage.getStatus().
+         * @deprecated Use {@link Xrm.ProcessFlow.StageStatus} instead.
          */
-        type StageStatus = "active" | "inactive";
+        type StageStatus = ProcessFlow.StageStatus;
 
         /**
          * Status for Xrm.Page.Process.getStatus().
+         * @deprecated Use {@link Xrm.ProcessFlow.ProcessStatus} instead
          */
-        type ProcessStatus = "active" | "aborted" | "finished";
+        type ProcessStatus = ProcessFlow.ProcessStatus;
 
         /**
          * Submit Mode for Xrm.Page.Attribute.getSubmitMode() and Xrm.Page.Attribute.setSubmitMode().
+         * @deprecated Use {@link Xrm.SubmitMode} instead.
          */
-        type SubmitMode = "always" | "dirty" | "never";
+        type SubmitMode = Xrm.SubmitMode;
 
         /**
          * Control type for Xrm.Page.ui.QuickForm.getControlType().
+         * @deprecated Use {@link Xrm.Controls.ControlQuickFormType} instead.
+         *
          */
-        type ControlQuickFormType = "quickform";
+        type ControlQuickFormType = Controls.ControlQuickFormType;
 
         /**
          * Control types for Xrm.Page.Control.getControlType().
+         * @deprecated Use {@link Xrm.Controls.ControlType} instead.
          */
-        type ControlType = "standard" | "iframe" | "lookup" | "optionset" | "subgrid" | "webresource" | "notes" | "timercontrol" | "kbsearch" | "timelinewall" | ControlQuickFormType;
+        type ControlType = Controls.ControlType;
 
         /**
          * Date attribute formats for Xrm.Page.Attribute.getFormat(), used by DateAttribute.
+         * @deprecated Use {@link Xrm.Attributes.DateAttributeFormat} instead.
          */
-        type DateAttributeFormat = "date" | "datetime";
+        type DateAttributeFormat = Attributes.DateAttributeFormat;
 
         /**
          * Integer attribute formats for Xrm.Page.Attribute.getFormat(), used by NumberAttribute.
+         * @deprecated Use {@link Xrm.Attributes.IntegerAttributeFormat} instead.
          */
-        type IntegerAttributeFormat = "duration" | "none";
+        type IntegerAttributeFormat = Attributes.IntegerAttributeFormat;
 
         /**
          * OptionSet attribute formats for Xrm.Page.Attribute.getFormat(), used by OptionSetAttribute.
+         * @deprecated Use {@link Xrm.Attributes.OptiopnSetAttributeFormat} instead.
          */
-        type OptionSetAttributeFormat = "language" | "timezone";
+        type OptionSetAttributeFormat = Attributes.OptionSetAttributeFormat;
 
         /**
          * String attribute formats for Xrm.Page.Attribute.getFormat(), used by StringAttribute.
+         * @deprecated Use {@link Xrm.Attributes.StringAttributeFormat} instead.
          */
-        type StringAttributeFormat = "email" | "phone" | "text" | "textarea" | "tickersymbol" | "url";
+        type StringAttributeFormat = Attributes.StringAttributeFormat;
 
         /**
          * Attribute types for Xrm.ui.ProcessMonitor Xrm.Page.Attribute.setDisplayState().
+         * @deprecated Use {@link Xrm.Attributes.AttributeType} instead.
          */
-        type AttributeType = "boolean" | "datetime" | "decimal" | "double" | "integer" | "lookup" | "memo" | "money" | "optionset" | "string";
+        type AttributeType = Attributes.AttributeType;
 
         /**
          * Direction types for a process stage change event
+         * @deprecated Use {@link Xrm.ProcessFlow.StageChangeDirection} instead.
          */
-        type StageChangeDirection = "Next" | "Previous";
+        type StageChangeDirection = ProcessFlow.StageChangeDirection;
 
         /**
          * Attribute formats for Xrm.Page.Attribute.getFormat().
+         * @deprecated Use {@link Xrm.Attributes.AttributeFormat} instead.
          */
-        type AttributeFormat = DateAttributeFormat | IntegerAttributeFormat | OptionSetAttributeFormat | StringAttributeFormat;
+        type AttributeFormat = Attributes.AttributeFormat;
 
         /**
          * Interface for a CRM Business Process Flow instance.
+         * @deprecated Use {@link Xrm.ProcessFlow.Process} instead.
          */
-        interface Process {
-            /**
-             * Returns the unique identifier of the process.
-             *
-             * @return The identifier for this process, in GUID format.
-             *
-             * @remarks  Example: "{825CB223-A651-DF11-AA8B-00155DBA3804}".
-             */
-            getId(): string;
-
-            /**
-             * Returns the name of the process.
-             *
-             * @return The name.
-             */
-            getName(): string;
-
-            /**
-             * Returns an collection of stages in the process.
-             *
-             * @return The stages.
-             */
-            getStages(): Collection.ItemCollection<Stage>;
-
-            /**
-             * Returns a boolean value to indicate if the process is rendered.
-             *
-             * @return true if the process is rendered, false if not.
-             */
-            isRendered(): boolean;
-        }
+        interface Process extends ProcessFlow.Process { }
 
         /**
          * Interface for CRM Business Process Flow stages.
+         * @deprecated Use {@link Xrm.ProcessFlow.Stage} instead.
          */
-        interface Stage {
-            /**
-             * Returns an object with a getValue method which will return the integer value of the business process flow
-             * category.
-             *
-             * @return The stage category.
-             */
-            getCategory(): { getValue(): XrmEnum.StageCategory };
+        interface Stage extends ProcessFlow.Stage { }
 
-            /**
-             * Returns the logical name of the entity associated with the stage.
-             *
-             * @return The entity name.
-             */
-            getEntityName(): string;
-
-            /**
-             * Returns the unique identifier of the stage.
-             *
-             * @return The identifier of the Stage, in GUID format.
-             *
-             * @remarks  Example: "{825CB223-A651-DF11-AA8B-00155DBA3804}".
-             */
-            getId(): string;
-
-            /**
-             * Returns the name of the stage.
-             *
-             * @return The name.
-             */
-            getName(): string;
-
-            /**
-             * Returns the status of the stage.
-             *
-             * @return The status.
-             *
-             * @remarks  This method will return either "active" or "inactive".
-             */
-            getStatus(): StageStatus;
-
-            /**
-             * Returns a collection of steps in the stage.
-             *
-             * @return An array of Step.
-             */
-            getSteps(): Step[];
-        }
-
-        interface Step {
-            /**
-             * Returns the logical name of the attribute associated to the step.
-             *
-             * @return The attribute.
-             *
-             * @remarks  Some steps don’t contain an attribute value.
-             */
-            getAttribute(): string;
-
-            /**
-             * Returns the name of the step.
-             *
-             * @return The name.
-             */
-            getName(): string;
-
-            /**
-             * Returns whether the step is required in the business process flow.
-             *
-             * @return true if required, false if not.
-             *
-             * @remarks     Returns true if the step is marked as required in the Business Process Flow editor; otherwise, false.
-             *              There is no connection between this value and the values you can change in the Xrm.Page.data.entity
-             *              attribute RequiredLevel methods.
-             */
-            isRequired(): boolean;
-        }
+        /**
+         * Interface for CRM Business Process Flow steps.
+         * @deprecated Use {@link Xrm.ProcessFlow.Step} instead.
+         */
+        interface Step extends ProcessFlow.Step { }
 
         /**
          * Interface for the event context.
+         * @deprecated Use {@link Xrm.Events.EventContext} instead.
          */
-        interface EventContext {
-            /**
-             * Gets the Xrm context.
-             *
-             * @return The Xrm context.
-             */
-            getContext(): Context;
-
-            /**
-             * Gets the handler's depth, which is the order in which the handler is executed.
-             *
-             * @return The depth, a 0-based index.
-             */
-            getDepth(): number;
-
-            /**
-             * Returns the event arguments for the event context
-             * Get event args returns null for read operations
-             *
-             * @return The event arguments or null
-             */
-            getEventArgs(): SaveEventArguments | StageChangeEventArguments | StageSelectedEventArguments;
-
-            /**
-             * Gets a reference to the object for which event occurred.
-             *
-             * @return The event source.
-             */
-            getEventSource(): Attribute | Control | Entity;
-
-            /**
-             * Gets a reference to the currnet form context
-             *
-             * @return  The form context
-             */
-            getFormContext(): Page;
-
-            /**
-             * Gets the shared variable with the specified key.
-             *
-             * @param T Generic type parameter.
-             * @param key The key.
-             *
-             * @return The shared variable.
-             *
-             * @remarks Used to pass values between handlers of an event.
-             */
-            getSharedVariable<T>(key: string): T;
-
-            /**
-             * Sets a shared variable.
-             *
-             * @param T Generic type parameter.
-             * @param key The key.
-             * @param value The value.
-             *
-             * @remarks Used to pass values between handlers of an event.
-             */
-            setSharedVariable<T>(key: string, value: T): void;
-        }
+        interface EventContext extends Events.EventContext { }
 
         /**
          * Interface for a save event context
+         * @deprecated Use {@link Xrm.Events.SaveEventContext} instead.
          */
-        interface SaveEventContext extends EventContext {
-            /**
-             * Gets save-event arguments.
-             *
-             * @return The event arguments.
-             *
-             * @remarks Returns null for all but the "save" event.
-             */
-            getEventArgs(): SaveEventArguments;
-        }
+        interface SaveEventContext extends Events.SaveEventContext { }
 
         /**
          * Interface for a process stage change event context
+         * @deprecated Use {@link Xrm.Events.StageChangeEventContext} instead.
          */
-        interface StageChangeEventContext extends EventContext {
-            /**
-             * Gets process stage change event arguments.
-             *
-             * @return The event arguments.
-             *
-             */
-            getEventArgs(): StageChangeEventArguments;
-        }
+        interface StageChangeEventContext extends Events.StageChangeEventContext { }
 
-        interface StageSelectedEventContext extends EventContext {
-            /**
-             * Gets process stage selected event arguments.
-             *
-             * @return The event arguments.
-             *
-             */
-            getEventArgs(): StageSelectedEventArguments;
-        }
+        /**
+         * Interface for a process stage select event context
+         * @deprecated  Use {@link Xrm.Events.StageSelectedEventContext} instead.
+         */interface StageSelectedEventContext extends Events.StageSelectedEventContext { }
 
         /**
          * Type for a context-sensitive handler.
          * @param context The context.
+         * @deprecated Use {@link Xrm.Events.ContextSensitiveHandler} instead.
          */
-        type ContextSensitiveHandler = (context: EventContext) => void;
+        type ContextSensitiveHandler = Events.ContextSensitiveHandler;
 
         /**
          * Type for a process status change handler.
          * @param status The process status.
+         * @deprecated Use {@link Xrm.Events.ProcessStatusChangeHandler} instead.
          */
-        type ProcessStatusChangeHandler = (status: ProcessStatus) => void;
+        type ProcessStatusChangeHandler = Events.ProcessStatusChangeHandler;
+
+        /**
+         * Interface for UI elements with labels.
+         * @deprecated Use {@link Xrm.Controls.UiLabelElement} instead.
+         */
+        interface UiLabelElement extends Controls.UiLabelElement { }
+
+        /**
+         * Interface for UI elements which can have the visibility value read.
+         * @deprecated Use {@link Xrm.Controls.UiCanGetVisibleElement} instead.
+         */
+        interface UiCanGetVisibleElement extends Controls.UiCanGetVisibleElement { }
+
+        /**
+         * Interface for UI elements which can have the visibility value updated.
+         * @deprecated Use {@link Xrm.Controls.UiCanSetVisibleElement} instead.
+         */
+        interface UiCanSetVisibleElement extends Controls.UiCanSetVisibleElement { }
+
+        /**
+         * Base interface for standard UI elements.
+         * @deprecated Use {@link Xrm.Controls.UiStandardElement} instead.
+         */
+        interface UiStandardElement extends Controls.UiStandardElement { }
+
+        /**
+         * Interface for focusable UI elements.
+         * @deprecated Use {@link Xrm.Controls.UiFocusable} instead.
+         */
+        interface UiFocusable extends Controls.UiFocusable { }
+
+        /**
+         * Interface for controls which methods provide immediate feedback or take actions as user types in a control.
+         * Contains methods which can be used to perform data validations in a control even before the user commits (saves) the value in a form.
+         * @deprecated Use {@link Xrm.Controls.UiKeyPressable} instead.
+         */
+        interface UiKeyPressable extends Controls.UiKeyPressable { }
+
+        /**
+         * Interface for Result value of AutoCompleteResultSet
+         * @deprecated Use {@link Xrm.Controls.AutoCompleteResult} instead.
+         */
+        interface AutoCompleteResult extends Controls.AutoCompleteResult { }
+
+        /**
+         * Interface for command of AutoCompleteResultSet.  This is displayed at the bottom of the auto complete view
+         * @deprecated Use {@link Xrm.Controls.AutoCompleteCommand} instead.
+         */
+        interface AutoCompleteCommand extends Controls.AutoCompleteCommand { }
+
+        /**
+         * Interface for showAutoComplete argument
+         * @deprecated Use {@link Xrm.Controls.AutoCompleteResultSet} instead.
+         */
+        interface AutoCompleteResultSet extends Controls.AutoCompleteResultSet { }
+
+        /**
+         * Interface for a Lookup value.
+         * @deprecated Use {@link Xrm.LookupValue} instead.
+         */
+        interface LookupValue extends Xrm.LookupValue { }
+
+        /**
+         * Interface for an OptionSet value.
+         * @deprecated Use {@link Xrm.OptionSetValue} instead.
+         */
+        interface OptionSetValue extends Xrm.OptionSetValue { }
+
+        /**
+         * Interface for a privilege.
+         * @deprecated Use {@link Xrm.Privilege} instead.
+         */
+        interface Privilege extends Xrm.Privilege { }
+
+        /**
+         * Interface for an Entity attribute.
+         * @deprecated Use {@link Xrm.Attributes.Attribute} instead.
+         */
+        interface Attribute extends Attributes.Attribute { }
+
+        /**
+         * Interface for a Number attribute.
+         * @see {@link Attribute}
+         * @deprecated Use {@link Xrm.Attributes.NumberAttribute} instead.
+         */
+        interface NumberAttribute extends Attributes.NumberAttribute { }
+
+        /**
+         * Interface for a String attribute.
+         * @see {@link Attribute}
+         * @deprecated Use {@link Xrm.Attributes.StringAttribute} instead.
+         */
+        interface StringAttribute extends Attributes.StringAttribute { }
+
+        /**
+         * Common interface for enumeration attributes (OptionSet and Boolean).
+         * @see {@link Attribute}
+         * @deprecated Use {@link Xrm.Attributes.EnumAttribute} instead.
+         */
+        interface EnumAttribute extends Attributes.EnumAttribute { }
+
+        /**
+         * Interface for a Boolean attribute.
+         * @see {@link EnumAttribute}
+         * @deprecated Use {@link Xrm.Attributes.BooleanAttribute} instead.
+         */
+        interface BooleanAttribute extends Attributes.BooleanAttribute { }
+
+        /**
+         * Interface for a Date attribute.
+         * @see {@link Attribute}
+         * @deprecated Use {@link Xrm.Attributes.DateAttribute} instead.
+         */
+        interface DateAttribute extends Attributes.DateAttribute { }
+
+        /**
+         * Interface an OptionSet attribute.
+         * @see {@link EnumAttribute}
+         * @deprecated Use {@link Xrm.Attributes.OptionSetAttribute} instead.
+         */
+        interface OptionSetAttribute extends Attributes.OptionSetAttribute { }
+
+        /**
+         * Interface a Lookup attribute.
+         * @see {@link Attribute}
+         * @deprecated Use {@link Xrm.Attributes.LookupAttribute} instead.
+         */
+        interface LookupAttribute extends Attributes.LookupAttribute { }
+
+        /**
+         * Interface for the form's record context, Xrm.Page.data.entity
+         * @deprecated Use {@link Xrm.Entity} instead.
+         */
+        interface Entity extends Xrm.Entity { }
+
+        /**
+         * Interface for save event arguments.
+         * @deprecated Use {@link Xrm.Events.SaveEventContext} instead.
+         */
+        interface SaveEventArguments extends Events.SaveEventContext { }
+
+        /**
+         * Interface for process stage change event arguments.
+         * @deprecated Use {@link Xrm.Events.StageChangeEventArguments} instead.
+         */
+        interface StageChangeEventArguments extends Events.StageChangeEventArguments { }
+
+        /**
+         * Interface for process stage selected event arguments.
+         * @deprecated Use {@link Xrm.Events.StageSelectedEventArguments} instead.
+         */
+        interface StageSelectedEventArguments extends Events.StageSelectedEventArguments { }
+
+        /**
+         * Interface for Xrm.Page.ui controls.
+         * @see {@link UiElement}
+         * @deprecated Use {@link Xrm.Controls.Control} instead.
+         */
+        interface Control extends Controls.Control { }
+
+        /**
+         * Interface for a standard control.
+         * @see {@link Control}
+         * @deprecated Use {@link Xrm.Controls.StandardControl} instead.
+         */
+        interface StandardControl extends Controls.StandardControl { }
+
+        /**
+         * Interface for Auto Lookup Control.
+         * This is not an Entity Lookup, but a control that supports AutoComplete / KeyPress Events (Text or Number)
+         * @remarks This interface is not supported for CRM mobile clients (phones or tablets) and the interactive service hub.  It is only available for Updated entities.
+         * @see {@link StandardControl}
+         * @deprecated Use {@link Xrm.Controls.AutoLookupControl} instead.
+         */
+        interface AutoLookupControl extends Controls.AutoLookupControl { }
+
+        /**
+         * Interface for a String control.
+         * @see {@link StandardControl}
+         * @deprecated Use {@link Xrm.Controls.StringControl} instead.
+         */
+        interface StringControl extends Controls.StringControl { }
+
+        /**
+         * Interface for a Number control.
+         * @see {@link StandardControl}
+         * @deprecated Use {@link Xrm.Controls.NumberControl} instead.
+         */
+        interface NumberControl extends AutoLookupControl { }
+
+        /**
+         * Interface for a Date control.
+         * @see {@link StandardControl}
+         * @deprecated Use {@link Xrm.Controls.DateControl} instead.
+         */
+        interface DateControl extends StandardControl { }
+
+        /**
+         * Interface for a Lookup control.
+         * @see {@link StandardControl}
+         * @deprecated Use {@link Xrm.Controls.LookupControl} instead.
+         */
+        interface LookupControl extends Controls.LookupControl { }
+
+        /**
+         * Interface for an OptionSet control.
+         * @see {@link StandardControl}
+         * @deprecated Use {@link Xrm.Controls.OptionSetControl} instead.
+         */
+        interface OptionSetControl extends Controls.OptionSetControl { }
+
+        /**
+         * Interface for a CRM grid control.
+         *
+         * @see {@link Control}
+         * @deprecated  Use {@link Xrm.Controls.GridControl} instead.
+         */
+        interface GridControl extends Controls.GridControl { }
+
+        /**
+         * Interface for a framed control, which is either a Web Resource or an Iframe.
+         * @see {@link Control}
+         * @remarks     An Iframe control provides additional methods, so use {@link IframeControl} where
+         *              appropriate.  Silverlight controls should use {@link SilverlightControl}.
+         * @deprecated  Use {@link Xrm.Controls.FramedControl} instead.
+         */
+        interface FramedControl extends Controls.FramedControl { }
+
+        /**
+         * Interface for an Iframe control.
+         * @see {@link FramedControl}
+         * @deprecated  Use {@link Xrm.Controls.IframeControl} instead.
+         */
+        interface IframeControl extends Controls.IframeControl { }
+
+        /**
+         * Interface for a Silverlight control.
+         * @see {@link Control}
+         * @deprecated Use {@link Xrm.Controls.SilverlightControl} instead.
+         */
+        interface SilverlightControl extends Controls.SilverlightControl { }
+
+        /**
+         * Interface for a Timeline control.
+         * @see {@link Control}
+         * @deprecated Use {@link Xrm.Controls.TimelineWall} instead.
+         */
+        interface TimelineWall extends Controls.TimelineWall { }
+
+        /**
+         * Interface for a form tab.
+         * @see {@link UiElement}
+         * @see {@link UiFocusable}
+         * @deprecated Use {@link Xrm.Controls.Tab} instead.
+         */
+        interface Tab extends Controls.Tab { }
+
+        /**
+         * Interface for a form section.
+         * @see {@link UiElement}
+         * @deprecated Use {@link Xrm.Controls.Section} instead.
+         */
+        interface Section extends Controls.Section { }
+
+        /**
+         * Module for the Xrm.Page.data API.
+         * @deprecated Use {@link Xrm.Form.data formContext.data} has been deprecated.
+         */
+        namespace data {
+            /**
+             * Interface for the Xrm.Page.data.process API.
+             * @deprecated Use {@link Xrm.ProcessFlow.ProcessManager} instead.
+             */
+            interface ProcessManager extends ProcessFlow.ProcessManager {
+            }
+
+            /**
+             * Called when method to get active processes is complete
+             * @param status The result of the get active processes operation.
+             * @remarks **Returns object with the following key-value pairs**:
+             * * CreatedOn
+             * * ProcessDefinitionID
+             * * ProcessDefinitionName
+             * * ProcessInstanceID
+             * * ProcessInstanceName
+             * * StatusCodeName
+             * @deprecated Use {@link Xrm.ProcessFlow.GetProcessInstancesDelegate} instead.
+             */
+            type GetProcessInstancesDelegate = ProcessFlow.GetProcessInstancesDelegate;
+
+            /**
+             * Called when method to set active process is complete
+             * @param status The result of the set active process operation.
+             * @remarks **Values returned are**:
+             * * success        (The operation succeeded.)
+             * * invalid        (The processInstanceId isn’t valid or the process isn’t enabled.)
+             * @deprecated Use {@link Xrm.ProcessFlow.SetProcessInstanceDelegate} instead.
+             */
+            type SetProcessInstanceDelegate = ProcessFlow.SetProcessInstanceDelegate;
+
+            /**
+             * Called when process change methods have completed.
+             * @param status The result of the process change operation.
+             * @remarks **Values returned are**:
+             * * success        (The operation succeeded.)
+             * * crossEntity    (The previous stage is for a different entity.)
+             * * beginning      (The active stage is the first stage of the active path.)
+             * * invalid        (The operation failed because the selected stage isn’t the same as the active stage.)
+             * * unreachable    (The stage exists on a different path.)
+             * @deprecated Use {@link Xrm.ProcessFlow.ProcessCallbackDelegate} instead.
+             */
+            type ProcessCallbackDelegate = ProcessFlow.ProcessCallbackDelegate;
+
+            /**
+             * Called when process set status method has completed.
+             * @param status The new status of the process instance
+             * @remarks **Values returned are**:
+             * * active
+             * * aborted
+             * * finished
+             * @deprecated Use {@link Xrm.ProcessFlow.ProcessSetStatusDelegate} instead.
+             */
+            type ProcessSetStatusDelegate = ProcessFlow.ProcessSetStatusDelegate;
+
+            /**
+             * Represents a key-value pair, where the key is the Process Flow's ID, and the value is the name thereof.
+             * @deprecated Use {@link Xrm.ProcessFlow.ProcessDictionary} instead.
+             */
+            interface ProcessDictionary extends ProcessFlow.ProcessDictionary { }
+        }
+
+        /**
+         * Contains properties and methods to retrieve information about the user interface as well as collections for several subcomponents of the form.
+         * @deprecated Use {@link Xrm.Form.ui formContext.ui} instead.
+         */
+        namespace ui {
+            /**
+             * Form Notification Levels for Xrm.Ui.setFormNotification().
+             * @deprecated Use {@link Xrm.FormNotificationLevel} instead.
+             */
+            type FormNotificationLevel = Xrm.FormNotificationLevel;
+
+            /**
+             * Display States for Xrm.ui.ProcessMonitor.setDisplayState().
+             * @deprecated Use {@link Xrm.DisplayState} instead.
+             */
+            type DisplayState = Xrm.DisplayState;
+
+            /**
+             * Interface for Xrm.Page.ui.process API
+             * @deprecated Use {@link Xrm.Controls.ProcessControl} instead.
+             */
+            interface ProcessManager extends Controls.ProcessControl { }
+
+            /**
+             * Interface for a grid.  Use Grid methods to access information about data in the grid. Grid is returned by the
+             * GridControl.getGrid method.
+             * @deprecated Use {@link Xrm.Controls.Grid} instead.
+             */
+            interface Grid extends Controls.Grid { }
+
+            /**
+             * Interface for a grid row.  Use the GridRow.getData method to access the GridRowData. A collection of GridRow is
+             * returned by Grid.getRows and Grid.getSelectedRows methods.
+             * In V9 - this is essentailly a form context.
+             * @deprecated Use {@link Xrm.Controls.Grid.GridRow} instead.
+             */
+            interface GridRow extends Controls.Grid.GridRow { }
+
+            /**
+             * Interface for grid row data.  Use the GridRowData.getEntity method to access the GridEntity. GridRowData is
+             * returned by the GridRow.getData method.
+             * @deprecated Use {@link Xrm.Controls.Grid.GridRowData} instead.
+             */
+            interface GridRowData extends Controls.Grid.GridRowData { }
+
+            /**
+             * Interface for a grid entity.  Use the GridEntity methods to access data about the specific records in the rows.
+             * GridEntity is returned by the GridRowData.getEntity method.
+             * @deprecated Use {@link Xrm.Controls.Grid.GridRowData} instead.v
+             */
+            interface GridEntity extends Controls.Grid.GridEntity { }
+
+            /**
+             * Interface for the view selector.  Use the ViewSelector methods to get or set information about the view selector
+             * of the grid control.
+             * @deprecated Use {@link Xrm.Controls.ViewSelector} instead.
+             */
+            interface ViewSelector extends Controls.ViewSelector { }
+
+            /**
+             * Interface for a view selector item. This object contains data that identifies a view. Use this as a parameter to
+             * the ViewSelector.setCurrentView method.
+             * @deprecated Use {@link Xrm.Controls.ViewSelectorItem} instead.
+             */
+            interface ViewSelectorItem extends Controls.ViewSelectorItem { }
+
+            /**
+             * Interface for a quick view control instance on a form.
+             * @see {@link https://msdn.microsoft.com/en-us/library/mt736908.aspx External Link: Xrm.Page.ui quickForms (client-side reference)}
+             * @deprecated Use {@link Xrm.Controls.ViewSelectorItem} instead.
+             */
+            interface QuickForm extends Controls.QuickFormControl { }
+        }
+    }
+
+    /**
+     * Interface for a Lookup value.
+     */
+    interface LookupValue {
+        /**
+         * The identifier.
+         */
+        id: string;
+
+        /**
+         * The name
+         */
+        name?: string;
+
+        /**
+         * Type of the entity.
+         */
+        entityType: string;
+    }
+
+    /**
+     * Interface for an OptionSet value.
+     */
+    interface OptionSetValue {
+        /**
+         * The label text.
+         */
+        text: string;
+
+        /**
+         * The value, as a number
+         */
+        value: number;
+    }
+
+    /**
+     * A collection of types and methods for working with formContext attributes.
+     * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/attributes External Link: Attributes (Client API reference)}
+     * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/collections External Link: Collections (Client API reference)}
+     */
+    namespace Attributes {
+        /**
+         * Requirement Level for {@link Attributes.Attribute.getRequiredLevel Attributes.Attribute.getRequiredLevel()} and
+         * {@link Attributes.Attribute.setRequiredLevel Attributes.Attribute.setRequiredLevel()}.
+         * @see {@link XrmEnum.AttributeRequirementLevel}
+         */
+        type RequirementLevel = "none" | "recommended" | "required";
+
+        /**
+         * Date attribute formats for Attributes.Attribute.getFormat(), used by {@link Attributes.DateAttribute DateAttribute}.
+         * @see {@link XrmEnum.DateAttributeFormat}
+         */
+        type DateAttributeFormat = "date" | "datetime";
+
+        /**
+         * Integer attribute formats for Attributes.Attribute.getFormat(), used by {@link Attributes.NumberAttribute NumberAttribute}.
+         * @see {@link XrmEnum.IntegerAttributeFormat}
+         */
+        type IntegerAttributeFormat = "duration" | "none";
+
+        /**
+         * OptionSet attribute formats for Attributes.Attribute.getFormat(), used by {@link Attributes.OptionSetAttribute OptionSetAttribute}.
+         * @see {@link XrmEnum.OptionSetAttributeFormat}
+         */
+        type OptionSetAttributeFormat = "language" | "timezone";
+
+        /**
+         * String attribute formats for Attributes.Attribute.getFormat(), used by {@link Attributes.StringAttribute StringAttribute}.
+         * @see {@link XrmEnum.StringAttributeFormat}
+         */
+        type StringAttributeFormat = "email" | "phone" | "text" | "textarea" | "tickersymbol" | "url";
+
+        /**
+         * Attribute types for {@link Attributes.Attribute.setDisplayState()}.
+         * @see {@link XrmEnum.AttributeType}
+         */
+        type AttributeType = "boolean" | "datetime" | "decimal" | "double" | "integer" |
+            "lookup" | "memo" | "money" | "multioptionset" | "optionset" | "string";
+
+        /**
+         * Attribute formats for {@link Attributes.Attribute.getFormat Attributes.Attribute.getFormat()}.
+         * @see {@link XrmEnum.DateAttributeFormat}
+         * @see {@link XrmEnum.IntegerAttributeFormat}
+         * @see {@link XrmEnum.OptionSetAttributeFormat}
+         * @see {@link XrmEnum.StringAttributeFormat}
+         */
+        type AttributeFormat = DateAttributeFormat | IntegerAttributeFormat | OptionSetAttributeFormat | StringAttributeFormat;
+
+        /**
+         * Interface for an Entity attribute.
+         */
+        interface Attribute {
+            /**
+             * Adds a handler to be called when the attribute's value is changed.
+             * @param handler The function reference.
+             */
+            addOnChange(handler: Events.ContextSensitiveHandler): void;
+
+            /**
+             * Fire all "on change" event handlers.
+             */
+            fireOnChange(): void;
+
+            /**
+             * Gets attribute type.
+             * @returns The attribute's type name.<BR><BR>
+             * **Values returned are**:
+             * * boolean
+             * * datetime
+             * * decimal
+             * * double
+             * * integer
+             * * lookup
+             * * memo
+             * * money
+             * * optionset
+             * * string
+             */
+            getAttributeType(): string;
+
+            /**
+             * Gets the attribute format.
+             * @returns The format of the attribute.<BR><BR>
+             * **Values returned are**:
+             * * date           (datetime)
+             * * datetime       (datetime)
+             * * duration       (integer)
+             * * email          (string)
+             * * language       (optionset)
+             * * none           (integer)
+             * * phone          (string)
+             * * text           (string)
+             * * textarea       (string)
+             * * tickersymbol   (string)
+             * * timezone       (optionset)
+             * * url            (string)
+             * @see {@link getAttributeType}
+             */
+            getFormat(): AttributeFormat;
+
+            /**
+             * Gets a boolean value indicating whether this Attribute has unsaved changes.
+             * @returns true if there are unsaved changes, otherwise false.
+             */
+            getIsDirty(): boolean;
+
+            /**
+             * Gets the logical name of the attribute.
+             * @returns The logical name.
+             */
+            getName(): string;
+
+            /**
+             * Gets a reference to the record context of this attribute.
+             * @returns The parent record context.
+             */
+            getParent(): Entity;
+
+            /**
+             * Gets the current level of requirement for the attribute.
+             * @returns The required level, as either "none", "required", or "recommended"
+             */
+            getRequiredLevel(): RequirementLevel;
+
+            /**
+             * Gets current submit mode for the attribute.
+             * @returns The submit mode, as either "always", "never", or "dirty"
+             * @remarks The default value is "dirty"
+             */
+            getSubmitMode(): SubmitMode;
+
+            /**
+             * Gets the current user's privileges for the attribute.
+             * @returns The user privileges.
+             */
+            getUserPrivilege(): Privilege;
+
+            /**
+             * Removes the handler from the "on change" event.
+             * @param handler The handler.
+             */
+            removeOnChange(handler: Events.ContextSensitiveHandler): void;
+
+            /**
+             * Sets the required level.
+             * @param requirementLevel The requirement level, as either "none", "required", or "recommended"
+             * @see {@link XrmEnum.AttributeRequirementLevel}
+             */
+            setRequiredLevel(requirementLevel: RequirementLevel): void;
+
+            /**
+             * Sets the submit mode.
+             * @param submitMode The submit mode, as either "always", "never", or "dirty".
+             * @default submitMode "dirty"
+             * @see {@link XrmEnum.AttributeRequirementLevel}
+             */
+            setSubmitMode(submitMode: SubmitMode): void;
+
+            /**
+             * A collection of all the controls on the form that interface with this attribute.
+             * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/collections External Link: Collections (Client API reference)}
+             */
+            controls: Collection.ItemCollection<Controls.Control>;
+
+            /**
+             * Gets the value.
+             * @returns The value.
+             */
+            getValue(): any;
+
+            /**
+             * Sets the value.
+             * @param value The value.
+             */
+            setValue(value: any): void;
+        }
+
+        /**
+         * Interface for a Number attribute.
+         * @see {@link Attribute}
+         */
+        interface NumberAttribute extends Attribute {
+            /**
+             * Gets the attribute format.
+             * @returns The format of the attribute.
+             * Values returned are: duration, none
+             */
+            getFormat(): IntegerAttributeFormat;
+
+            /**
+             * Gets the maximum value allowed.
+             * @returns The maximum value allowed.
+             */
+            getMax(): number;
+
+            /**
+             * Gets the minimum value allowed.
+             * @returns The minimum value allowed.
+             */
+            getMin(): number;
+
+            /**
+             * Gets the attribute's configured precision.
+             * @returns The total number of allowed decimal places.
+             */
+            getPrecision(): number;
+
+            /**
+             * Gets the value.
+             * @returns The value.
+             */
+            getValue(): number;
+
+            /**
+             * Sets the value.
+             * @param value The value.
+             * @remarks Attributes on Quick Create Forms will not save values set with this method.
+             */
+            setValue(value: number): void;
+
+            /**
+             * A collection of all the controls on the form that interface with this attribute.
+             * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/collections External Link: Collections (Client API reference)}
+             */
+            controls: Collection.ItemCollection<Controls.NumberControl>;
+        }
+
+        /**
+         * Interface for a String attribute.
+         * @see {@link Attribute}
+         */
+        interface StringAttribute extends Attribute {
+            /**
+             * Gets the attribute format.
+             * @returns The format of the attribute.
+             * Values returned are: email, phone, text, textarea, tickersymbol, url
+             */
+            getFormat(): StringAttributeFormat;
+
+            /**
+             * Gets maximum length allowed.
+             * @returns The maximum length allowed.
+             * @remarks The email form's "Description" attribute does not have the this method.
+             */
+            getMaxLength(): number;
+
+            /**
+             * Gets the value.
+             *
+             * @returns The value.
+             */
+            getValue(): string;
+
+            /**
+             * Sets the value.
+             * @param value The value.
+             * @remarks A String field with the {@link Attribute.getFormat|email} format enforces email
+             *          address formatting. Attributes on Quick Create Forms will not save values set
+             *          with this method.
+             */
+            setValue(value: string): void;
+
+            /**
+             * A collection of all the controls on the form that interface with this attribute.
+             * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/collections External Link: Collections (Client API reference)}
+             */
+            controls: Collection.ItemCollection<Controls.StringControl>;
+        }
+
+        /**
+         * Common interface for enumeration attributes (OptionSet and Boolean).
+         * @see {@link Attribute}
+         */
+        interface EnumAttribute extends Attribute {
+            /**
+             * Gets the initial value of the attribute.
+             * @returns The initial value.
+             * @remarks Valid for OptionSet and boolean attribute types
+             */
+            getInitialValue(): number | boolean;
+        }
+
+        /**
+         * Interface for a Boolean attribute.
+         * @see {@link EnumAttribute}
+         */
+        interface BooleanAttribute extends EnumAttribute {
+            /**
+             * Gets the initial value of the attribute.
+             * @returns The initial value.
+             * @remarks Valid for OptionSet and boolean attribute types
+             */
+            getInitialValue(): boolean;
+
+            /**
+             * Gets the value.
+             * @returns true if it succeeds, false if it fails.
+             */
+            getValue(): boolean;
+
+            /**
+             * Sets the value.
+             * @param value The value.
+             * @remarks Attributes on Quick Create Forms will not save values set with this method.
+             */
+            setValue(value: boolean): void;
+        }
+
+        /**
+         * Interface for a Date attribute.
+         *
+         * @see {@link Attribute}
+         */
+        interface DateAttribute extends Attribute {
+            /**
+             * Gets the attribute format.
+             *
+             * @returns The format of the attribute.
+             * Values returned are: date, datetime
+             */
+            getFormat(): DateAttributeFormat;
+
+            /**
+             * Gets the value.
+             * @returns The value.
+             */
+            getValue(): Date;
+
+            /**
+             * Sets the value.
+             * @param value The value.
+             * @remarks Attributes on Quick Create Forms will not save values set with this method.
+             */
+            setValue(value: Date): void;
+
+            /**
+             * A collection of all the controls on the form that interface with this attribute.
+             * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/collections External Link: Collections (Client API reference)}
+             */
+            controls: Collection.ItemCollection<Controls.DateControl>;
+        }
+
+        /**
+         * Interface an OptionSet attribute.
+         * @see {@link EnumAttribute}
+         */
+        interface OptionSetAttribute extends EnumAttribute {
+            /**
+             * Gets the attribute format.
+             * @returns The format of the attribute.
+             * Values returned are: language, timezone
+             */
+            getFormat(): OptionSetAttributeFormat;
+
+            /**
+             * Gets the initial value of the attribute.
+             * @returns The initial value.
+             * @remarks Valid for OptionSet and boolean attribute types
+             */
+            getInitialValue(): number;
+
+            /**
+             * Gets the option matching a value.
+             * @param value The enumeration value of the option desired.
+             * @returns The option.
+             */
+            getOption(value: number): OptionSetValue;
+
+            /**
+             * Gets the option matching a label.
+             * @param label The label of the option desired.
+             * @returns The option.
+             */
+            getOption(label: string): OptionSetValue;
+
+            /**
+             * Gets all of the options.
+             * @returns An array of options.
+             */
+            getOptions(): OptionSetValue[];
+
+            /**
+             * Gets selected option.
+             * @returns The selected option.
+             */
+            getSelectedOption(): OptionSetValue;
+
+            /**
+             * Gets the label of the currently selected option.
+             * @returns The current value's label.
+             */
+            getText(): string;
+
+            /**
+             * Gets the value.
+             * @returns The value.
+             */
+            getValue(): number;
+
+            /**
+             * Sets the value.
+             * @param value The value.
+             * @remarks     The getOptions() method returns option values as strings. You must use parseInt
+             *              to convert them to numbers before you can use those values to set the value of an
+             *              OptionSet attribute. Attributes on Quick Create Forms will not save values set
+             *              with this method.
+             */
+            setValue(value: number): void;
+
+            /**
+             * A collection of all the controls on the form that interface with this attribute.
+             * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/collections External Link: Collections (Client API reference)}
+             */
+            controls: Collection.ItemCollection<Controls.OptionSetControl>;
+        }
+
+        /**
+         * Interface a Lookup attribute.
+         *
+         * @see {@link Attribute}
+         */
+        interface LookupAttribute extends Attribute {
+            /**
+             * Gets a boolean value indicating whether the Lookup is a multi-value PartyList.
+             * @returns true the attribute is a PartyList, otherwise false.
+             */
+            getIsPartyList(): boolean;
+
+            /**
+             * Gets the value.
+             * @returns An array of LookupValue.
+             */
+            getValue(): LookupValue[];
+
+            /**
+             * Sets the value.
+             * @param value The value.
+             * @remarks Attributes on Quick Create Forms will not save values set with this method.
+             */
+            setValue(value: LookupValue[]): void;
+
+            /**
+             * A collection of all the controls on the form that interface with this attribute.
+             * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/collections External Link: Collections (Client API reference)}
+             */
+            controls: Collection.ItemCollection<Controls.LookupControl>;
+        }
+    }
+
+    /**
+     * A collection of types and methods for working with formContext controls.
+     * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/collections External Link: Collections (Client API reference)}
+     */
+    namespace Controls {
+        /**
+         * Control type for formContext.ui.quickForms.getControlType().
+         */
+        type ControlQuickFormType = "quickform";
+
+        /**
+         * Control types for {@link Controls.Control.getControlType Controls.Control.getControlType()}.
+         * @see {@link XrmEnum.StandardControlType}
+         */
+        type ControlType = "standard" | "iframe" | "lookup" | "optionset" |
+            "subgrid" | "webresource" | "notes" | "timercontrol" | "kbsearch" |
+            "timelinewall" | ControlQuickFormType;
 
         /**
          * Interface for UI elements with labels.
@@ -1498,14 +2490,12 @@ declare namespace Xrm {
         interface UiLabelElement {
             /**
              * Gets the label.
-             *
-             * @return The label.
+             * @returns The label.
              */
             getLabel(): string;
 
             /**
              * Sets the label.
-             *
              * @param label The label.
              */
             setLabel(label: string): void;
@@ -1517,8 +2507,7 @@ declare namespace Xrm {
         interface UiCanGetVisibleElement {
             /**
              * Gets the visibility state.
-             *
-             * @return true if the tab is visible, otherwise false.
+             * @returns true if the tab is visible, otherwise false.
              */
             getVisible(): boolean;
         }
@@ -1529,7 +2518,6 @@ declare namespace Xrm {
         interface UiCanSetVisibleElement {
             /**
              * Sets the visibility state.
-             *
              * @param visible true to show, false to hide.
              */
             setVisible(visible: boolean): void;
@@ -1541,7 +2529,6 @@ declare namespace Xrm {
         interface UiStandardElement extends UiCanGetVisibleElement, UiLabelElement {
             /**
              * Sets the visibility state.
-             *
              * @param visible true to show, false to hide.
              */
             setVisible(visible: boolean): void;
@@ -1565,10 +2552,11 @@ declare namespace Xrm {
             /**
              * Use this to add a function as an event handler for the keypress event so that the function is called when you type a character in the specific text or number field.
              * For a sample JavaScript code that uses the addOnKeyPress method to configure the auto-completion experience, see Sample: Auto-complete in CRM controls.
-             * @deprecated: Deprecated in v9. See {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated}
+             * @deprecated Deprecated in v9.
+             * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
              * @param handler The function reference.
              */
-            addOnKeyPress(handler: ContextSensitiveHandler): void;
+            addOnKeyPress(handler: Events.ContextSensitiveHandler): void;
 
             /**
              * Use this to manually fire an event handler that you created for a specific text or number field to be executed on the keypress event.
@@ -1577,11 +2565,12 @@ declare namespace Xrm {
 
             /**
              * Use this to remove an event handler for a text or number field that you added using addOnKeyPress.
-             * @deprecated: Deprecated in v9. See {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated}
+             * @deprecated Deprecated in v9.
+             * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
              * Remarks:  If an anonymous function is set using addOnKeyPress, it can’t be removed using this method.
              * @param handler The function reference.
              */
-            removeOnKeyPress(handler: ContextSensitiveHandler): void;
+            removeOnKeyPress(handler: Events.ContextSensitiveHandler): void;
         }
 
         /**
@@ -1645,964 +2634,33 @@ declare namespace Xrm {
         }
 
         /**
-         * Interface for a Lookup value.
-         */
-        interface LookupValue {
-            /**
-             * The identifier.
-             */
-            id: string;
-
-            /**
-             * The name
-             */
-            name?: string;
-
-            /**
-             * Type of the entity.
-             */
-            entityType: string;
-        }
-
-        /**
-         * Interface for an OptionSet value.
-         */
-        interface OptionSetValue {
-            /**
-             * The label text.
-             */
-            text: string;
-
-            /**
-             * The value, as a number
-             */
-            value: number;
-        }
-
-        /**
-         * Interface for a privilege.
-         */
-        interface Privilege {
-            /**
-             * True if the user can read.
-             */
-            canRead: boolean;
-
-            /**
-             * True if the user can update.
-             */
-            canUpdate: boolean;
-
-            /**
-             * True if the user can create.
-             */
-            canCreate: boolean;
-        }
-
-        /**
-         * Interface for an Entity attribute.
-         */
-        interface Attribute {
-            /**
-             * Adds a handler to be called when the attribute's value is changed.
-             *
-             * @param handler The function reference.
-             */
-            addOnChange(handler: ContextSensitiveHandler): void;
-
-            /**
-             * Fire all "on change" event handlers.
-             */
-            fireOnChange(): void;
-
-            /**
-             * Gets attribute type.
-             *
-             * @return The attribute's type name.
-             *
-             * @remarks Values returned are: boolean
-             *                               datetime
-             *                               decimal
-             *                               double
-             *                               integer
-             *                               lookup
-             *                               memo
-             *                               money
-             *                               optionset
-             *                               string
-             */
-            getAttributeType(): string;
-
-            /**
-             * Gets the attribute format.
-             *
-             * @return The format of the attribute.
-             *
-             * @see {@link getAttributeType()}
-             *
-             * @remarks Values returned are: date           (datetime)
-             *                               datetime       (datetime)
-             *                               duration       (integer)
-             *                               email          (string)
-             *                               language       (optionset)
-             *                               none           (integer)
-             *                               phone          (string)
-             *                               text           (string)
-             *                               textarea       (string)
-             *                               tickersymbol   (string)
-             *                               timezone       (optionset)
-             *                               url            (string)
-             */
-            getFormat(): AttributeFormat;
-
-            /**
-             * Gets a boolean value indicating whether this Attribute has unsaved changes.
-             *
-             * @return true if there are unsaved changes, otherwise false.
-             */
-            getIsDirty(): boolean;
-
-            /**
-             * Gets the logical name of the attribute.
-             *
-             * @return The logical name.
-             */
-            getName(): string;
-
-            /**
-             * Gets a reference to the record context of this attribute.
-             *
-             * @return The parent record context.
-             */
-            getParent(): Entity;
-
-            /**
-             * Gets the current level of requirement for the attribute.
-             *
-             * @return The required level, as either "none", "required", or "recommended"
-             */
-            getRequiredLevel(): RequirementLevel;
-
-            /**
-             * Gets current submit mode for the attribute.
-             *
-             * @return The submit mode, as either "always", "never", or "dirty"
-             *
-             * @remarks The default value is "dirty"
-             */
-            getSubmitMode(): SubmitMode;
-
-            /**
-             * Gets the current user's privileges for the attribute.
-             *
-             * @return The user privileges.
-             */
-            getUserPrivilege(): Privilege;
-
-            /**
-             * Removes the handler from the "on change" event.
-             *
-             * @param handler The handler.
-             */
-            removeOnChange(handler: ContextSensitiveHandler): void;
-
-            /**
-             * Sets the required level.
-             *
-             * @param requirementLevel The requirement level, as either "none", "required", or "recommended"
-             */
-            setRequiredLevel(requirementLevel: RequirementLevel): void;
-
-            /**
-             * Sets the submit mode.
-             *
-             * @param submitMode The submit mode, as either "always", "never", or "dirty".
-             *
-             * @remarks The default value is "dirty"
-             */
-            setSubmitMode(submitMode: SubmitMode): void;
-
-            /**
-             * A collection of all the controls on the form that interface with this attribute.
-             */
-            controls: Collection.ItemCollection<Control>;
-
-            /**
-             * Gets the value.
-             *
-             * @return The value.
-             */
-            getValue(): any;
-
-            /**
-             * Sets the value.
-             *
-             * @param value The value.
-             */
-            setValue(value: any): void;
-        }
-
-        /**
-         * Interface for a Number attribute.
+         * Interface for controls.
          *
-         * @sa  Attribute
-         */
-        interface NumberAttribute extends Attribute {
-            /**
-             * Gets the attribute format.
-             *
-             * @return The format of the attribute.
-             *
-             * @remarks Values returned are: duration
-             *                               none
-             */
-            getFormat(): IntegerAttributeFormat;
-
-            /**
-             * Gets the maximum value allowed.
-             *
-             * @return The maximum value allowed.
-             */
-            getMax(): number;
-
-            /**
-             * Gets the minimum value allowed.
-             *
-             * @return The minimum value allowed.
-             */
-            getMin(): number;
-
-            /**
-             * Gets the attribute's configured precision.
-             *
-             * @return The total number of allowed decimal places.
-             */
-            getPrecision(): number;
-
-            /**
-             * Gets the value.
-             *
-             * @return The value.
-             */
-            getValue(): number;
-
-            /**
-             * Sets the value.
-             *
-             * @param value The value.
-             *
-             * @remarks Attributes on Quick Create Forms will not save values set with this method.
-             */
-            setValue(value: number): void;
-
-            /**
-             * A collection of all the controls on the form that interface with this attribute.
-             */
-            controls: Collection.ItemCollection<NumberControl>;
-        }
-
-        /**
-         * Interface for a String attribute.
-         *
-         * @sa  Attribute
-         */
-        interface StringAttribute extends Attribute {
-            /**
-             * Gets the attribute format.
-             *
-             * @return The format of the attribute.
-             *
-             * @remarks Values returned are: email
-             *                               phone
-             *                               text
-             *                               textarea
-             *                               tickersymbol
-             *                               url
-             */
-            getFormat(): StringAttributeFormat;
-
-            /**
-             * Gets maximum length allowed.
-             *
-             * @return The maximum length allowed.
-             *
-             * @remarks The email form's "Description" attribute does not have the this method.
-             */
-            getMaxLength(): number;
-
-            /**
-             * Gets the value.
-             *
-             * @return The value.
-             */
-            getValue(): string;
-
-            /**
-             * Sets the value.
-             *
-             * @param value The value.
-             *
-             * @remarks     A String field with the {@link Attribute.getFormat|email} format enforces email
-             *              address formatting. Attributes on Quick Create Forms will not save values set
-             *              with this method.
-             */
-            setValue(value: string): void;
-
-            /**
-             * A collection of all the controls on the form that interface with this attribute.
-             */
-            controls: Collection.ItemCollection<StringControl>;
-        }
-
-        /**
-         * Common interface for enumeration attributes (OptionSet and Boolean).
-         *
-         * @sa  Attribute
-         */
-        interface EnumAttribute extends Attribute {
-            /**
-             * Gets the initial value of the attribute.
-             *
-             * @return The initial value.
-             *
-             * @remarks Valid for OptionSet and boolean attribute types
-             */
-            getInitialValue(): number | boolean;
-        }
-
-        /**
-         * Interface for a Boolean attribute.
-         *
-         * @sa  EnumAttribute
-         */
-        interface BooleanAttribute extends EnumAttribute {
-            /**
-             * Gets the initial value of the attribute.
-             *
-             * @return The initial value.
-             *
-             * @remarks Valid for OptionSet and boolean attribute types
-             */
-            getInitialValue(): boolean;
-
-            /**
-             * Gets the value.
-             *
-             * @return true if it succeeds, false if it fails.
-             */
-            getValue(): boolean;
-
-            /**
-             * Sets the value.
-             *
-             * @param value The value.
-             *
-             * @remarks  Attributes on Quick Create Forms will not save values set with this method.
-             */
-            setValue(value: boolean): void;
-        }
-
-        /**
-         * Interface for a Date attribute.
-         *
-         * @sa  Attribute
-         */
-        interface DateAttribute extends Attribute {
-            /**
-             * Gets the attribute format.
-             *
-             * @return The format of the attribute.
-             *
-             * @remarks Values returned are: date
-             *                               datetime
-             */
-            getFormat(): DateAttributeFormat;
-
-            /**
-             * Gets the value.
-             *
-             * @return The value.
-             */
-            getValue(): Date;
-
-            /**
-             * Sets the value.
-             *
-             * @param value The value.
-             *
-             * @remarks  Attributes on Quick Create Forms will not save values set with this method.
-             */
-            setValue(value: Date): void;
-
-            /**
-             * A collection of all the controls on the form that interface with this attribute.
-             */
-            controls: Collection.ItemCollection<DateControl>;
-        }
-
-        /**
-         * Interface an OptionSet attribute.
-         *
-         * @sa  EnumAttribute
-         */
-        interface OptionSetAttribute extends EnumAttribute {
-            /**
-             * Gets the attribute format.
-             *
-             * @return The format of the attribute.
-             *
-             * @remarks Values returned are: language
-             *                               timezone
-             */
-            getFormat(): OptionSetAttributeFormat;
-
-            /**
-             * Gets the initial value of the attribute.
-             *
-             * @return The initial value.
-             *
-             * @remarks Valid for OptionSet and boolean attribute types
-             */
-            getInitialValue(): number;
-
-            /**
-             * Gets the option matching a value.
-             *
-             * @param value The enumeration value of the option desired.
-             *
-             * @return The option.
-             */
-            getOption(value: number): OptionSetValue;
-
-            /**
-             * Gets the option matching a label.
-             *
-             * @param  label The label of the option desired.
-             *
-             * @return The option.
-             */
-            getOption(label: string): OptionSetValue;
-
-            /**
-             * Gets all of the options.
-             *
-             * @return An array of options.
-             */
-            getOptions(): OptionSetValue[];
-
-            /**
-             * Gets selected option.
-             *
-             * @return The selected option.
-             */
-            getSelectedOption(): OptionSetValue;
-
-            /**
-             * Gets the label of the currently selected option.
-             *
-             * @return The current value's label.
-             */
-            getText(): string;
-
-            /**
-             * Gets the value.
-             *
-             * @return The value.
-             */
-            getValue(): number;
-
-            /**
-             * Sets the value.
-             *
-             * @param value The value.
-             *
-             * @remarks     The getOptions() method returns option values as strings. You must use parseInt
-             *              to convert them to numbers before you can use those values to set the value of an
-             *              OptionSet attribute. Attributes on Quick Create Forms will not save values set
-             *              with this method.
-             */
-            setValue(value: number): void;
-
-            /**
-             * A collection of all the controls on the form that interface with this attribute.
-             */
-            controls: Collection.ItemCollection<OptionSetControl>;
-        }
-
-        /**
-         * Interface a Lookup attribute.
-         *
-         * @sa  Attribute
-         */
-        interface LookupAttribute extends Attribute {
-            /**
-             * Gets a boolean value indicating whether the Lookup is a multi-value PartyList.
-             *
-             * @return true the attribute is a PartyList, otherwise false.
-             */
-            getIsPartyList(): boolean;
-
-            /**
-             * Gets the value.
-             *
-             * @return An array of LookupValue.
-             */
-            getValue(): LookupValue[];
-
-            /**
-             * Sets the value.
-             *
-             * @param value The value.
-             *
-             * @remarks Attributes on Quick Create Forms will not save values set with this method.
-             */
-            setValue(value: LookupValue[]): void;
-
-            /**
-             * A collection of all the controls on the form that interface with this attribute.
-             */
-            controls: Collection.ItemCollection<LookupControl>;
-        }
-
-        /**
-         * Interface for the form's record context, Xrm.Page.data.entity
-         */
-        interface Entity {
-            /**
-             * Adds a handler to be called when the record is saved.
-             *
-             * @param handler The handler.
-             */
-            addOnSave(handler: ContextSensitiveHandler): void;
-
-            /**
-             * Gets an serialized-XML string representing data that will be passed to the server upon saving
-             * the record.
-             *
-             * @return The XML in string format.
-             *
-             * @remarks     This function does not work with Microsoft Dynamics CRM for tablets. Example:
-             *              "<account><name>Contoso</name><accountnumber>55555</accountnumber><telephone2>425
-             *              555-1234</telephone2></account>".
-             */
-            getDataXml(): string;
-
-            /**
-             * Gets entity's logical name.
-             *
-             * @return The logical name.
-             */
-            getEntityName(): string;
-
-            /**
-             * Gets the record's unique identifier.
-             *
-             * @return The identifier, in Guid format.
-             *
-             * @remarks  Example: "{825CB223-A651-DF11-AA8B-00155DBA3804}".
-             */
-            getId(): string;
-
-            /**
-             * Gets a boolean value indicating whether the record has unsaved changes.
-             *
-             * @return true if there are unsaved changes, otherwise false.
-             */
-            getIsDirty(): boolean;
-
-            /**
-             * Gets the record's primary attribute value.
-             *
-             * @return The primary attribute value.
-             *
-             * @remarks The value for this attribute is used when links to the record are displayed.
-             */
-            getPrimaryAttributeValue(): string;
-
-            /**
-             * Removes the handler from the "on save" event.
-             *
-             * @param handler The handler.
-             */
-            removeOnSave(handler: ContextSensitiveHandler): void;
-
-            /**
-             * Saves the record.
-             * @deprecated: Deprecated in v9. See {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated}
-             * @remarks  When using quick create forms in the web application the saveandnew option is not
-             *           applied. It will always work as if saveandclose were used. Quick create forms in
-             *           Microsoft Dynamics CRM for tablets will apply the saveandnew behavior.
-             */
-            save(): void;
-
-            /**
-             * Saves the record with the given save mode.
-             * @deprecated: Deprecated in v9. See {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated}
-             * @param saveMode (Optional) the save mode to save, as either "saveandclose" or
-             *                 "saveandnew".
-             */
-            save(saveMode: SaveMode): void;
-
-            /**
-             * The collection of attributes for the record.
-             */
-            attributes: Collection.ItemCollection<Attribute>;
-        }
-
-        /**
-         * Interface for save event arguments.
-         */
-        interface SaveEventArguments {
-            /**
-             * Gets save mode, as an integer.
-             *
-             * @return The save mode.
-             *
-             * @remarks Values returned are: 1      Save
-             *                               2      Save and Close
-             *                               59     Save and New
-             *                               70     AutoSave (Where enabled; can be used with an OnSave handler
-             *                                                to conditionally disable auto-saving)
-             *                               58     Save as Completed (Activities)
-             *                               5      Deactivate
-             *                               6      Reactivate
-             *                               47     Assign (All user- or team-owned entities)
-             *                               7      Send (Email)
-             *                               16     Qualify (Lead)
-             *                               15     Disqualify (Lead)
-             */
-            getSaveMode(): XrmEnum.SaveMode;
-
-            /**
-             * Returns a boolean value to indicate if the record's save has been prevented.
-             *
-             * @return true if saving is prevented, otherwise false.
-             */
-            isDefaultPrevented(): boolean;
-
-            /**
-             * Prevents the save operation from being submitted to the server.
-             *
-             * @remarks All remaining "on save" handlers will continue execution.
-             */
-            preventDefault(): void;
-        }
-
-        /**
-         * Interface for process stage change event arguments.
-         */
-        interface StageChangeEventArguments {
-            /**
-             * Gets the direction of the stage change.
-             *
-             * @return The direction.
-             *
-             * @remarks Values returned are: "next" or "previous"
-             */
-            getDirection(): StageChangeDirection;
-
-            /**
-             * Gets the destination stage object
-             *
-             * @return The stage object
-             *
-             * @remarks For switching between entities, returns the previous stage object
-             */
-            getStage(): Stage;
-        }
-
-        /**
-         * Interface for process stage selected event arguments.
-         */
-        interface StageSelectedEventArguments {
-            /**
-             * Gets the selected stage object
-             *
-             * @return The stage object
-             */
-            getStage(): Stage;
-        }
-
-        /**
-         * Module for the Xrm.Page.data API.
-         */
-        namespace data {
-            /**
-             * Interface for the Xrm.Page.data.process API.
-             */
-            interface ProcessManager {
-                /**
-                 * Returns a Process object representing the active process.
-                 *
-                 * @return current active process.
-                 */
-                getActiveProcess(): Process;
-
-                /**
-                 * Set a Process as the active process.
-                 *
-                 * @param processId The Id of the process to make the active process.
-                 * @param callbackFunction (Optional) a function to call when the operation is complete.
-                 */
-                setActiveProcess(processId: string, callbackFunction?: ProcessCallbackDelegate): void;
-
-                /**
-                 * Returns all process instances for the entity record that the calling user has access to.
-                 *
-                 * @param callbackFunction (Optional) a function to call when the operation is complete.
-                 */
-                getProcessInstances(callbackFunction: GetProcessInstancesDelegate): void;
-
-                /**
-                 * Sets a process instance as the active instance
-                 *
-                 * @param processInstanceId The Id of the process instance to make the active instance.
-                 * @param callbackFunction (Optional) a function to call when the operation is complete.
-                 */
-                setActiveProcessInstance(processInstanceId: string, callbackFunction: SetProcessInstanceDelegate): void;
-
-                /**
-                 * Returns a Stage object representing the active stage.
-                 *
-                 * @return current active stage.
-                 */
-                getActiveStage(): Stage;
-
-                /**
-                 * Set a stage as the active stage.
-                 *
-                 * @param stageId the Id of the stage to make the active stage.
-                 * @param callbackFunction (Optional) a function to call when the operation is complete.
-                 */
-                setActiveStage(stageId: string, callbackFunction?: ProcessCallbackDelegate): void;
-
-                /**
-                 * Use this method to get a collection of stages currently in the active path with methods to interact with the
-                 * stages displayed in the business process flow control. The active path represents stages currently rendered in
-                 * the process control based on the branching rules and current data in the record.
-                 *
-                 * @return A collection of all completed stages, the currently active stage, and the predicted set of future stages
-                 *          based on satisfied conditions in the branching rule. This may be a subset of the stages returned with
-                 *          Xrm.Page.data.process.getActiveProcess because it will only include those stages which represent a valid
-                 *          transition from the current stage based on branching that has occurred in the process.
-                 */
-                getActivePath(): Collection.ItemCollection<Stage>;
-
-                /**
-                 * Use this method to asynchronously retrieve the enabled business process flows that the user can switch to for an
-                 * entity.
-                 *
-                 * @param callbackFunction The callback function must accept a parameter that contains an object with
-                 *                         dictionary properties where the name of the property is the Id of the
-                 *                         business process flow and the value of the property is the name of the
-                 *                         business process flow.
-                 *                         The enabled processes are filtered according to the user’s privileges. The
-                 *                         list of enabled processes is the same ones a user can see in the UI if they
-                 *                         want to change the process manually.
-                 */
-                getEnabledProcesses(callbackFunction: (enabledProcesses: ProcessDictionary) => void): void;
-
-                /**
-                 * Use this method to get the currently selected stage.
-                 *
-                 * @return The currently selected stage.
-                 */
-                getSelectedStage(): Stage;
-
-                /**
-                 * Use this to add a function as an event handler for the OnStageChange event so that it will be called when the
-                 * business process flow stage changes.
-                 * @param handler The function will be added to the bottom of the event
-                 *                handler pipeline. The execution context is automatically
-                 *                set to be the first parameter passed to the event handler.
-                 *                Use a reference to a named function rather than an
-                 *                anonymous function if you may later want to remove the
-                 *                event handler.
-                 */
-                addOnStageChange(handler: ContextSensitiveHandler): void;
-
-                /**
-                 * Use this to add a function as an event handler for the OnProcessStatusChange event so that it will be called when the
-                 * business process flow status changes.
-                 * @param handler The function will be added to the bottom of the event
-                 *                handler pipeline. The execution context is automatically
-                 *                set to be the first parameter passed to the event handler.
-                 *                Use a reference to a named function rather than an
-                 *                anonymous function if you may later want to remove the
-                 *                event handler.
-                 */
-                addOnProcessStatusChange(handler: ProcessStatusChangeHandler): void;
-
-                /**
-                 * Use this to add a function as an event handler for the OnStageSelected event so that it will be called
-                 * when a business process flow stage is selected.
-                 *
-                 * @param handler The function will be added to the bottom of the event
-                 *                handler pipeline. The execution context is automatically
-                 *                set to be the first parameter passed to the event handler.
-                 *                Use a reference to a named function rather than an
-                 *                anonymous function if you may later want to remove the
-                 *                event handler.
-                 */
-                addOnStageSelected(handler: ContextSensitiveHandler): void;
-
-                /**
-                 * Use this to remove a function as an event handler for the OnProcessStatusChange event.
-                 *
-                 * @param handler If an anonymous function is set using the addOnProcessStatusChange method it
-                 *                cannot be removed using this method.
-                 */
-                removeOnProcessStatusChange(handler: ProcessStatusChangeHandler): void;
-
-                /**
-                 * Use this to remove a function as an event handler for the OnStageChange event.
-                 *
-                 * @param handler If an anonymous function is set using the addOnStageChange method it
-                 *                cannot be removed using this method.
-                 */
-                removeOnStageChange(handler: ContextSensitiveHandler): void;
-
-                /**
-                 * Use this to remove a function as an event handler for the OnStageChange event.
-                 *
-                 * @param handler If an anonymous function is set using the addOnStageChange method it
-                 *                cannot be removed using this method.
-                 */
-                removeOnStageSelected(handler: ContextSensitiveHandler): void;
-
-                /**
-                 * Progresses to the next stage.
-                 *
-                 * @param callbackFunction (Optional) A function to call when the operation is complete.
-                 *
-                 */
-                moveNext(callbackFunction?: ProcessCallbackDelegate): void;
-
-                /**
-                 * Moves to the previous stage.
-                 *
-                 * @param callbackFunction (Optional) A function to call when the operation is complete.
-                 *                                                          .
-                 */
-                movePrevious(callbackFunction?: ProcessCallbackDelegate): void;
-
-                /**
-                 * Use this method to get the unique identifier of the process instance
-                 *
-                 * @return The unique identifier of the process instance
-                 */
-                getInstanceId(): string;
-
-                /**
-                 * Use this method to get the name of the process instance
-                 *
-                 * @return The name of the process instance
-                 */
-                getInstanceName(): string;
-
-                /**
-                 * Use this method to get the current status of the process instance
-                 *
-                 * @return The current status of the process
-                 */
-                getStatus(): ProcessStatus;
-
-                /**
-                 * Use this method to set the current status of the process instance
-                 *
-                 * @param status The new status for the process
-                 * @param callbackFunction (Optional) a function to call when the operation is complete.
-                 */
-                setStatus(status: ProcessStatus, callbackFunction: ProcessSetStatusDelegate): void;
-            }
-
-            /**
-             * Called when method to get active processes is complete
-             *
-             * @param status The result of the get active processes operation.
-             *
-             * @remarks     Returns object with the following key-value pairs:
-             *                          CreatedOn
-             *                          ProcessDefinitionID
-             *                          ProcessDefinitionName
-             *                          ProcessInstanceID
-             *                          ProcessInstanceName
-             *                          StatusCodeName
-             */
-            type GetProcessInstancesDelegate = (object: ProcessDictionary) => void;
-
-            /**
-             * Called when method to set active process is complete
-             *
-             * @param status The result of the set active process operation.
-             *
-             * @remarks     Values returned are: success        (The operation succeeded.)
-             *                                   invalid        (The processInstanceId isn’t valid or the process isn’t enabled.)
-             */
-            type SetProcessInstanceDelegate = (status: string) => void;
-
-            /**
-             * Called when process change methods have completed.
-             *
-             * @param status The result of the process change operation.
-             *
-             * @remarks     Values returned are: success        (The operation succeeded.)
-             *                                   crossEntity    (The previous stage is for a different entity.)
-             *                                   beginning      (The active stage is the first stage of the active path.)
-             *                                   invalid        (The operation failed because the selected stage isn’t the same
-             *                                   as the active stage.)
-             *                                   unreachable    (The stage exists on a different path.)
-             */
-            type ProcessCallbackDelegate = (status: string) => void;
-
-            /**
-             * Called when process set status method has completed.
-             *
-             * @param status The new status of the process instance
-             *
-             * @remarks     Values returned are: active
-             *                                   aborted
-             *                                   finished
-             */
-            type ProcessSetStatusDelegate = (status: ProcessStatus) => void;
-
-            /**
-             * Represents a key-value pair, where the key is the Process Flow's ID, and the value is the name thereof.
-             */
-            interface ProcessDictionary { [index: string]: string; }
-        }
-
-        /**
-         * Interface for Xrm.Page.ui controls.
-         *
-         * @sa  UiElement
+         * @see {@link UiElement}
          */
         interface Control extends UiLabelElement, UiCanGetVisibleElement {
             /**
              * Gets the controls type.
-             *
-             * @return The control type.
-             *
-             * @remarks Values returned are: standard
-             *                               iframe
-             *                               lookup
-             *                               optionset
-             *                               subgrid
-             *                               webresource
-             *                               notes
-             *                               timercontrol
-             *                               kbsearch (CRM Online Only, use parature.d.ts)
-             *                               quickform (see ui.QuickForm)
-             *                               customcontrol: <namespace>.<name> (A custom control for mobile phone and tablet clients).
-             *                               customsubgrid: <namespace>.<name> (A custom dataset control for mobile phone and tablet clients).
+             * @returns The control type.<BR><BR>
+             * **Values returned are**:
+             * * standard
+             * * iframe
+             * * lookup
+             * * optionset
+             * * subgrid
+             * * webresource
+             * * notes
+             * * timercontrol
+             * * kbsearch (CRM Online Only, use parature.d.ts)
+             * * quickform (see ui.QuickForm)
+             * * customcontrol: <namespace>.<name> (A custom control for mobile phone and tablet clients).
+             * * customsubgrid: <namespace>.<name> (A custom dataset control for mobile phone and tablet clients).
              */
             getControlType(): ControlType | string;
 
             /**
              * Gets the name of the control on the form.
-             *
-             * @return The name of the control.
-             *
+             * @returns The name of the control.
              * @remarks     The name assigned to a control is not determined until the form loads. Changes to
              *              the form may change the name assigned to a given control.
              *              When you use the control getName method the name of the first control will be the
@@ -2618,51 +2676,66 @@ declare namespace Xrm {
 
             /**
              * Gets a reference to the Section parent of the control.
-             *
-             * @return The parent Section.
+             * @returns The parent Section.
              */
             getParent(): Section;
         }
 
+        /**
+         * Interface for {@link Ui.navigation formContext.ui.navigation}.
+         */
+        interface Navigation {
+            /**
+             * A reference to the collection of available navigation items.
+             * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/collections External Link: Collections (Client API reference)}
+             */
+            items: Collection.ItemCollection<NavigationItem>;
+        }
+
+        /**
+         * Interface for a navigation item.
+         * @see {@link UiElement}
+         * @see {@link UiFocusable}
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/formcontext-ui-navigation External Link: formContext.ui.navigation item (Client API reference)}
+         */
+        interface NavigationItem extends UiStandardElement, UiFocusable {
+            /**
+             * Gets the name of the item.
+             * @returns The identifier.
+             */
+            getId(): string;
+        }
+
         /**
          * Interface for a standard control.
-         *
-         * @sa  Control
+         * @see {@link Control}
          */
         interface StandardControl extends Control, UiStandardElement, UiFocusable {
             /**
              * Clears the notification identified by uniqueId.
-             *
              * @param uniqueId (Optional) Unique identifier.
-             *
-             * @return true if it succeeds, false if it fails.
-             *
+             * @returns true if it succeeds, false if it fails.
              * @remarks If the uniqueId parameter is not used, the current notification shown will be removed.
              */
             clearNotification(uniqueId?: string): boolean;
 
             /**
              * Gets a boolean value, indicating whether the control is disabled.
-             *
-             * @return true if it is disabled, otherwise false.
+             * @returns true if it is disabled, otherwise false.
              */
             getDisabled(): boolean;
 
             /**
              * Sets the state of the control to either enabled, or disabled.
-             *
              * @param disabled true to disable, false to enable.
              */
             setDisabled(disabled: boolean): void;
 
             /**
              * Sets a control-local notification message.
-             *
              * @param message The message.
              * @param uniqueId Unique identifier.
-             *
-             * @return true if it succeeds, false if it fails.
-             *
+             * @returns true if it succeeds, false if it fails.
              * @remarks     When this method is used on Microsoft Dynamics CRM for tablets a red "X" icon
              *              appears next to the control. Tapping on the icon will display the message.
              */
@@ -2675,28 +2748,25 @@ declare namespace Xrm {
 
             /**
              * Gets the control's bound attribute.
-             *
-             * @tparam T   An Attribute type.
-             *
-             * @return The attribute.
+             * @template T An Attribute type.
+             * @returns The attribute.
              */
-            getAttribute<T extends Attribute>(): T;
+            getAttribute<T extends Attributes.Attribute>(): T;
 
             /**
              * Gets the control's bound attribute.
-             *
-             * @return The attribute.
+             * @returns The attribute.
              */
-            getAttribute(): Attribute;
+            getAttribute(): Attributes.Attribute;
         }
 
         /**
          * Interface for Auto Lookup Control.
          * This is not an Entity Lookup, but a control that supports AutoComplete / KeyPress Events (Text or Number)
-         *
          * @remarks This interface is not supported for CRM mobile clients (phones or tablets) and the interactive service hub.  It is only available for Updated entities.
-         *
-         * @sa  StandardControl
+         * @deprecated Deprecated in v9.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
+         * @see {@link StandardControl}
          */
         interface AutoLookupControl extends StandardControl, UiKeyPressable {
             /**
@@ -2709,14 +2779,16 @@ declare namespace Xrm {
 
             /**
              * Hides the auto-completion drop-down list configured for a specific text field
-             * @deprecated: Deprecated in v9. See {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated}
+             * @deprecated Deprecated in v9.
+             * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
              */
             hideAutoComplete(): void;
 
             /**
              * Shows upt to 10 matching strings in a drop-down list as users press keys to type charactrer in a specific text field.
              * On selecting an item in the drop-down list, the value in the text field changes to the selected item, the drop-down list disappears, and the OnChange event for the text field is invoked
-             * @deprecated: Deprecated in v9. See {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated}
+             * @deprecated Deprecated in v9.
+             * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
              * @param resultSet The results to show
              */
             showAutoComplete(resultSet: AutoCompleteResultSet): void;
@@ -2724,55 +2796,47 @@ declare namespace Xrm {
 
         /**
          * Interface for a String control.
-         *
-         * @sa  StandardControl
+         * @see {@link StandardControl}
          */
         interface StringControl extends AutoLookupControl {
             /**
              * Gets the control's bound attribute.
-             *
-             * @return The attribute.
+             * @returns The attribute.
              */
-            getAttribute(): StringAttribute;
+            getAttribute(): Attributes.StringAttribute;
         }
 
         /**
          * Interface for a Number control.
-         *
-         * @sa  StandardControl
+         * @see {@link StandardControl}
          */
         interface NumberControl extends AutoLookupControl {
             /**
              * Gets the control's bound attribute.
-             *
-             * @return The attribute.
+             * @returns The attribute.
              */
-            getAttribute(): NumberAttribute;
+            getAttribute(): Attributes.NumberAttribute;
         }
 
         /**
          * Interface for a Date control.
-         *
-         * @sa  StandardControl
+         * @see {@link StandardControl}
          */
         interface DateControl extends StandardControl {
             /**
              * Gets the control's bound attribute.
-             *
-             * @return The attribute.
+             * @returns The attribute.
              */
-            getAttribute(): DateAttribute;
+            getAttribute(): Attributes.DateAttribute;
 
             /**
              * Gets the status of the time-of-day component of the Date control.
-             *
-             * @return true if the time is shown, otherwise false.
+             * @returns true if the time is shown, otherwise false.
              */
             getShowTime(): boolean;
 
             /**
              * Sets the visibility of the time component of the Date control.
-             *
              * @param showTimeValue true to show, false to hide the time value.
              */
             setShowTime(showTimeValue: boolean): void;
@@ -2780,30 +2844,24 @@ declare namespace Xrm {
 
         /**
          * Interface for a Lookup control.
-         *
-         * @sa  StandardControl
+         * @see {@link StandardControl}
          */
         interface LookupControl extends StandardControl {
             /**
              * Adds a handler to the "pre search" event of the Lookup control.
-             *
              * @param handler The handler.
              */
-            addPreSearch(handler: ContextSensitiveHandler): void;
+            addPreSearch(handler: Events.ContextSensitiveHandler): void;
 
             /**
              * Adds an additional custom filter to the lookup, with the "AND" filter operator.
              * Can only be used within a "pre search" event handler
-             *
-             * @sa addPreSearch
-             *
-             * @param filter Specifies the filter, as a serialized FetchXML
-             *                                          "filter" node.
+             * @see {@link addPreSearch}
+             * @param filter Specifies the filter, as a serialized FetchXML "filter" node.
              * @param entityLogicalName (Optional) The logical name of the entity.
-             *
              * @remarks     If entityLogicalName is not specified, the filter will be applied to all entities
              *              valid for the Lookup control.
-             *              Example filter: <filter type="and">
+             * @example     Example filter: <filter type="and">
              *                              <condition attribute="address1_city" operator="eq" value="Redmond" />
              *                              </filter>
              */
@@ -2811,51 +2869,43 @@ declare namespace Xrm {
 
             /**
              * Adds a custom view for the Lookup dialog.
-             *
              * @param viewId Unique identifier for the view, in Guid format.
              * @param entityName Name of the entity.
              * @param viewDisplayName Name of the view to display.
              * @param fetchXml The FetchXML query for the view's contents, serialized as a string.
              * @param layoutXml The Layout XML, serialized as a string.
              * @param isDefault true, to treat this view as default.
-             *
              * @remarks Cannot be used on "Owner" Lookup controls.
              *          The viewId is never saved to CRM, but must be unique across available views.  Generating
-             *          a new value can be accomplished with a {@link http://www.guidgen.com/|Guid generator}.
-             *          Example viewId value: "{00000000-0000-0000-0000-000000000001}"
-             *          Layout XML Reference: {@link http://msdn.microsoft.com/en-us/library/gg334522.aspx}.
+             *          a new value can be accomplished with a {@link http://www.guidgen.com/ Guid generator(external link)}.
+             * @example Example viewId value: "{00000000-0000-0000-0000-000000000001}"
+             * @see {@link http://msdn.microsoft.com/en-us/library/gg334522.aspx External Link: Layout XML Reference}
              */
             addCustomView(viewId: string, entityName: string, viewDisplayName: string, fetchXml: string, layoutXml: string, isDefault: boolean): void;
 
             /**
              * Gets the control's bound attribute.
-             *
-             * @return The attribute.
+             * @returns The attribute.
              */
-            getAttribute(): LookupAttribute;
+            getAttribute(): Attributes.LookupAttribute;
 
             /**
              * Gets the unique identifier of the default view.
-             *
-             * @return The default view, in Guid format.
-             *
-             * @remarks Example: "{00000000-0000-0000-0000-000000000000}"
+             * @returns The default view, in Guid format.
+             * @example Example return: "{00000000-0000-0000-0000-000000000000}"
              */
             getDefaultView(): string;
 
             /**
              * Removes the handler from the "pre search" event of the Lookup control.
-             *
              * @param handler The handler.
              */
             removePreSearch(handler: () => void): void;
 
             /**
              * Sets the Lookup's default view.
-             *
              * @param viewGuid Unique identifier for the view.
-             *
-             * @remarks Example viewGuid value: "{00000000-0000-0000-0000-000000000000}"
+             * @example Example viewGuid value: "{00000000-0000-0000-0000-000000000000}"
              */
             setDefaultView(viewGuid: string): void;
 
@@ -2873,7 +2923,7 @@ declare namespace Xrm {
         /**
          * Interface for an OptionSet control.
          *
-         * @sa  StandardControl
+         * @see {@link StandardControl}
          */
         interface OptionSetControl extends StandardControl {
             /**
@@ -2895,9 +2945,9 @@ declare namespace Xrm {
             /**
              * Gets the control's bound attribute.
              *
-             * @return The attribute.
+             * @returns The attribute.
              */
-            getAttribute(): OptionSetAttribute;
+            getAttribute(): Attributes.OptionSetAttribute;
 
             /**
              * Removes the option matching the value.
@@ -2910,7 +2960,7 @@ declare namespace Xrm {
         /**
          * Interface for a CRM grid control.
          *
-         * @sa  Control
+         * @see {@link Control}
          */
         interface GridControl extends Control {
             /**
@@ -2923,277 +2973,73 @@ declare namespace Xrm {
             /**
              * This method returns context information about the GridControl.
              *
-             * @return The context type.
+             * @returns The context type.
              */
             getContextType(): XrmEnum.GridControlContext;
 
             /**
              * Use this method to get the logical name of the entity data displayed in the grid.
              *
-             * @return The entity name.
+             * @returns The entity name.
              */
             getEntityName(): string;
 
             /**
              * Use this method to get access to the Grid available in the GridControl.
-             *
-             * @return The grid.
+             * @returns The grid.
              */
-            getGrid(): ui.Grid;
+            getGrid(): Grid;
 
             /**
              * Use this method to get access to the ViewSelector available for the GridControl when it is configured to display views.
-             *
-             * @return The view selector.
+             * @returns The view selector.
              */
-            getViewSelector(): ui.ViewSelector;
+            getViewSelector(): ViewSelector;
 
             /**
              * Refreshes the sub grid.
-             *
              * @remarks Not available during the "on load" event of the form.
              */
             refresh(): void;
 
             /**
              * Use this method to remove event handlers from the GridControl's OnLoad event.
-             *
              * @param handler The handler.
              */
             removeOnLoad(handler: () => void): void;
         }
 
         /**
-         * Interface for a framed control, which is either a Web Resource or an Iframe.
-         *
-         * @sa  Control
-         *
-         * @remarks     An Iframe control provides additional methods, so use {@link IframeControl} where
-         *              appropriate.  Silverlight controls should use {@link SilverlightControl}.
+         * Interface for a grid.  Use Grid methods to access information about data in the grid. Grid is returned by the
+         * GridControl.getGrid method.
          */
-        interface FramedControl extends Control {
+        interface Grid {
             /**
-             * Gets the DOM element containing the control.
-             *
-             * @return The container object.
-             *
-             * @remarks Unavailable for Microsoft Dynamics CRM for tablets.
+             * Returns a collection of every GridRow in the Grid.
+             * @returns The rows.
+             * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/collections External Link: Collections (Client API reference)}
              */
-            getObject(): HTMLIFrameElement;
+            getRows(): Collection.ItemCollection<Grid.GridRow>;
 
             /**
-             * Gets the URL value of the control.
-             *
-             * @return The source URL.
-             *
-             * @remarks Unavailable for Microsoft Dynamics CRM for tablets.
+             * Returns a collection of every selected GridRow in the Grid.
+             * @returns The selected rows.
+             * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/collections External Link: Collections (Client API reference)}
              */
-            getSrc(): string;
+            getSelectedRows(): Collection.ItemCollection<Grid.GridRow>;
 
             /**
-             * Sets the URL value of the control.
-             *
-             * @param src The source URL.
-             *
-             * @remarks Unavailable for Microsoft Dynamics CRM for tablets.
+             * Returns the total number of records in the Grid.
+             * @returns The total record count.
              */
-            setSrc(src: string): void;
+            getTotalRecordCount(): number;
         }
 
-        /**
-         * Interface for an Iframe control.
-         *
-         * @sa  FramedControl
-         */
-        interface IframeControl extends FramedControl, UiCanSetVisibleElement {
-            /**
-             * Gets initial URL defined for the Iframe.
-             *
-             * @return The initial URL.
-             *
-             * @remarks Unavailable for Microsoft Dynamics CRM for tablets.
-             */
-            getInitialUrl(): string;
-        }
-
-        /**
-         * Interface for a Silverlight control.
-         *
-         * @sa  Control
-         */
-        interface SilverlightControl extends Control {
-            /**
-             * Gets the query string value passed to Silverlight.
-             *
-             * @return The data.
-             *
-             * @remarks Unavailable for Microsoft Dynamics CRM for tablets.
-             */
-            getData(): string;
-
-            /**
-             * Sets the query string value passed to Silverlight.
-             *
-             * @param data The data.
-             *
-             * @remarks Unavailable for Microsoft Dynamics CRM for tablets.
-             */
-            setData(data: string): void;
-
-            /**
-             * Gets the DOM element containing the control.
-             *
-             * @return The container object.
-             *
-             * @remarks Unavailable for Microsoft Dynamics CRM for tablets.
-             */
-            getObject(): HTMLObjectElement;
-        }
-
-        /**
-         * Interface for a Timeline control.
-         *
-         * @sa  Control
-         */
-        interface TimelineWall extends Control {
-            /**
-             * Refreshes the data displayed in a timelinewall and timer control.
-             *
-             */
-            refresh(): void;
-        }
-
-        /**
-         * Interface for a form tab.
-         *
-         * @sa  UiElement
-         * @sa  UiFocusable
-         */
-        interface Tab extends UiStandardElement, UiFocusable {
-            /**
-             * Gets display state of the tab.
-             *
-             * @return The display state, as either "expanded" or "collapsed"
-             */
-            getDisplayState(): ui.DisplayState;
-
-            /**
-             * Gets the name of the tab.
-             *
-             * @return The name.
-             */
-            getName(): string;
-
-            /**
-             * Gets a reference to the Xrm.Page.ui parent of the tab.
-             *
-             * @return The parent.
-             */
-            getParent(): Ui;
-
-            /**
-             * Sets display state of the tab.
-             *
-             * @param displayState Display state of the tab, as either "expanded" or "collapsed"
-             */
-            setDisplayState(displayState: ui.DisplayState): void;
-
-            /**
-             * A reference to the collection of form sections within this tab.
-             */
-            sections: Collection.ItemCollection<Section>;
-        }
-
-        /**
-         * Interface for a form section.
-         *
-         * @sa  UiElement
-         */
-        interface Section extends UiStandardElement {
-            /**
-             * Gets the name of the section.
-             *
-             * @return The name.
-             */
-            getName(): string;
-
-            /**
-             * Gets a reference to the Xrm.Page.Tab parent of this item.
-             *
-             * @return The parent.
-             */
-            getParent(): Tab;
-
-            /**
-             * A reference to the collection of controls within this tab.
-             */
-            controls: Collection.ItemCollection<Control>;
-        }
-
-        /**
-         * Module for Xrm.Page.ui API.
-         */
-        namespace ui {
-            /**
-             * Form Notification Levels for Xrm.Ui.setFormNotification().
-             */
-            type FormNotificationLevel = "ERROR" | "INFO" | "WARNING";
-
-            /**
-             * Display States for Xrm.ui.ProcessMonitor.setDisplayState().
-             */
-            type DisplayState = "collapsed" | "expanded";
-
-            /**
-             * Interface for Xrm.Page.ui.process API
-             */
-            interface ProcessManager {
-                /**
-                 * Sets display state of the process flow control.
-                 *
-                 * @param displayState Display state of the process flow control, as either "expanded" or "collapsed"
-                 */
-                setDisplayState(displayState: DisplayState): void;
-
-                /**
-                 * Sets the visibility state.
-                 *
-                 * @param visible true to show, false to hide.
-                 */
-                setVisible(visible: boolean): void;
-            }
-
-            /**
-             * Interface for a grid.  Use Grid methods to access information about data in the grid. Grid is returned by the
-             * GridControl.getGrid method.
-             */
-            interface Grid {
-                /**
-                 * Returns a collection of every GridRow in the Grid.
-                 *
-                 * @return The rows.
-                 */
-                getRows(): Collection.ItemCollection<GridRow>;
-
-                /**
-                 * Returns a collection of every selected GridRow in the Grid.
-                 *
-                 * @return The selected rows.
-                 */
-                getSelectedRows(): Collection.ItemCollection<GridRow>;
-
-                /**
-                 * Returns the total number of records in the Grid.
-                 *
-                 * @return The total record count.
-                 */
-                getTotalRecordCount(): number;
-            }
-
+        namespace Grid {
             /**
              * Interface for a grid row.  Use the GridRow.getData method to access the GridRowData. A collection of GridRow is
              * returned by Grid.getRows and Grid.getSelectedRows methods.
-             * In V9 - this is essentailly a form context.
+             * In V9 - this is essentailly a form context
              */
             interface GridRow {
                 /**
@@ -3203,7 +3049,7 @@ declare namespace Xrm {
                 /**
                  * Returns the GridRowData for the GridRow.
                  * @deprecated Deprecated in V9 - use data field instead
-                 * @return The data.
+                 * @returns The data.
                  */
                 getData(): GridRowData;
             }
@@ -3215,8 +3061,8 @@ declare namespace Xrm {
             interface GridRowData {
                 /**
                  * Returns the GridEntity for the GridRowData.
-                 *
-                 * @return The entity.
+                 * @returns The entity.
+                 * @deprecated Use GridRow.data.entity instead of using GridRow.getData().getEntity().
                  */
                 getEntity(): GridEntity;
             }
@@ -3224,232 +3070,254 @@ declare namespace Xrm {
             /**
              * Interface for a grid entity.  Use the GridEntity methods to access data about the specific records in the rows.
              * GridEntity is returned by the GridRowData.getEntity method.
+             *
+             * @deprecated Use GridRow.data.entity instead.
              */
             interface GridEntity {
                 /**
                  * Returns the logical name for the record in the row.
                  *
-                 * @return The entity name.
+                 * @returns The entity name.
+                 * @deprecated Use GridRow.data.entity.getEntityName() instead.
                  */
                 getEntityName(): string;
 
                 /**
                  * Returns a LookupValue that references this record.
                  *
-                 * @return The entity reference.
+                 * @returns The entity reference.
+                 * @deprecated Use GridRow.data.entity.getEntityReference() instead.
                  */
                 getEntityReference(): LookupValue;
 
                 /**
                  * Returns the id for the record in the row.
                  *
-                 * @return The identifier of the GridEntity, in GUID format.
-                 *
-                 * @remarks Example return: "{00000000-0000-0000-0000-000000000000}"
+                 * @returns The identifier of the GridEntity, in GUID format.
+                 * @example Example return: "{00000000-0000-0000-0000-000000000000}"
+                 * @deprecated Use GridRow.data.entity.getId() instead.
                  */
                 getId(): string;
 
                 /**
                  * Returns the primary attribute value for the record in the row.  (Commonly the name.)
                  *
-                 * @return The primary attribute value.
+                 * @returns The primary attribute value.
+                 * @deprecated Use GridRow.data.entity.getPrimaryAttributeValue() instead.
                  */
                 getPrimaryAttributeValue(): string;
             }
-
-            /**
-             * Interface for the view selector.  Use the ViewSelector methods to get or set information about the view selector
-             * of the grid control.
-             */
-            interface ViewSelector {
-                /**
-                 * Use this method to get a reference to the current view.
-                 *
-                 * @return The current view.
-                 */
-                getCurrentView(): ViewSelectorItem;
-
-                /**
-                 * Use this method to determine whether the view selector is visible.
-                 *
-                 * @return true if visible, false if not.
-                 */
-                isVisible(): boolean;
-
-                /**
-                 * Use this method to set the current view.
-                 *
-                 * @param viewSelectorItem The view selector item.
-                 */
-                setCurrentView(viewSelectorItem: ViewSelectorItem): void;
-            }
-
-            /**
-             * Interface for a view selector item. This object contains data that identifies a view. Use this as a parameter to
-             * the ViewSelector.setCurrentView method.
-             */
-            interface ViewSelectorItem {
-                /**
-                 * Returns a LookupValue that references this view.
-                 *
-                 * @return The entity reference.
-                 */
-                getEntityReference(): LookupValue;
-            }
-
-            /**
-             * Interface for a quick view control instance on a form.
-             *
-             * @see {@link https://msdn.microsoft.com/en-us/library/mt736908.aspx#bkmk_isLoaded} for details.
-             */
-            interface QuickForm extends Control, UiLabelElement, UiCanGetVisibleElement {
-                /**
-                 * Gets the constituent controls in a quick view control.
-                 *
-                 * @return An array of controls.
-                 *
-                 * @remarks Constituent controls in a quick view control are read only.
-                 */
-                getControl(): Control[];
-
-                /**
-                 * Gets the constituent controls in a quick view control.
-                 *
-                 * @param T A Control type
-                 * @param controlName Name of the control.
-                 *
-                 * @return The control.
-                 *
-                 * @remarks Constituent controls in a quick view control are read only.
-                 */
-                getControl<T extends Control>(controlName: string): T;
-
-                /**
-                 * Gets the constituent controls in a quick view control.
-                 *
-                 * @param controlName Name of the control.
-                 *
-                 * @return The control.
-                 *
-                 * @remarks Constituent controls in a quick view control are read only.
-                 */
-                getControl(controlName: string): Control;
-
-                /**
-                 * Gets a control by index.
-                 *
-                 * @param T A Control type
-                 * @param index The control index.
-                 *
-                 * @return The control.
-                 *
-                 * @remarks Constituent controls in a quick view control are read only.
-                 */
-                getControl<T extends Control>(index: number): T;
-
-                /**
-                 * Gets a control by index.
-                 *
-                 * @param index The control index.
-                 *
-                 * @return The control.
-                 *
-                 * @remarks Constituent controls in a quick view control are read only.
-                 */
-                getControl(index: number): Control;
-
-                /**
-                 * Gets the controls type.
-                 *
-                 * @return Returns a string value that categorizes quick view controls.
-                 */
-                getControlType(): ControlQuickFormType;
-
-                /**
-                 * Returns whether the data binding for the constituent controls in a quick view control is complete.
-                 *
-                 * @return  True is the data binding for a constituent control is complete, otherwise false.
-                 *          because the quick view form that the control is bound to may not have loaded completely.
-                 *          As a result, using the getAttribute or any data-related methods on a constituent control might not work.
-                 *          The isLoaded method for the quick view control helps determine the data binding status for constituent controls in a quick view control.
-                 *
-                 *  @remarks The data binding for the constituent controls in a quick view control may not be complete during the main form OnLoad event
-                 */
-                isLoaded(): boolean;
-
-                /**
-                 * Refreshes the data displayed in a quick view control.
-                 */
-                refresh(): void;
-            }
         }
 
         /**
-         * Interface for a navigation item.
-         *
-         * @sa  UiElement
-         * @sa  UiFocusable
+         * Interface for a framed control, which is either a Web Resource or an Iframe.
+         * @see {@link Control}
+         * @remarks     An Iframe control provides additional methods, so use {@link IframeControl} where
+         *              appropriate.  Silverlight controls should use {@link SilverlightControl}.
          */
-        interface NavigationItem extends UiStandardElement, UiFocusable {
+        interface FramedControl extends Control {
             /**
-             * Gets the name of the item.
-             *
-             * @return The identifier.
+             * Gets the DOM element containing the control.
+             * @returns The container object.
+             * @remarks Unavailable for Microsoft Dynamics CRM for tablets.
              */
-            getId(): string;
+            getObject(): HTMLIFrameElement;
+
+            /**
+             * Gets the URL value of the control.
+             * @returns The source URL.
+             * @remarks Unavailable for Microsoft Dynamics CRM for tablets.
+             */
+            getSrc(): string;
+
+            /**
+             * Sets the URL value of the control.
+             * @param src The source URL.
+             * @remarks Unavailable for Microsoft Dynamics CRM for tablets.
+             */
+            setSrc(src: string): void;
         }
 
         /**
-         * Interface for Xrm.Page.ui.navigation.
+         * Interface for an Iframe control.
+         * @see {@link FramedControl}
          */
-        interface Navigation {
+        interface IframeControl extends FramedControl, UiCanSetVisibleElement {
             /**
-             * A reference to the collection of available navigation items.
+             * Gets initial URL defined for the Iframe.
+             * @returns The initial URL.
+             * @remarks Unavailable for Microsoft Dynamics CRM for tablets.
              */
-            items: Collection.ItemCollection<NavigationItem>;
+            getInitialUrl(): string;
         }
 
         /**
-         * Interface for an entity's form selector item.
+         * Interface for a quick view control instance on a form.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/formcontext-ui-quickforms External Link: formContext.ui.quickForms (Client API reference)}
          */
-        interface FormItem {
+        interface QuickFormControl extends Control, UiLabelElement, UiCanGetVisibleElement {
             /**
-             * Gets the unique identifier of the form.
-             *
-             * @return The identifier, in Guid format.
+             * Gets the constituent controls in a quick view control.
+             * @returns An array of controls.
+             * @remarks Constituent controls in a quick view control are read only.
              */
-            getId(): string;
+            getControl(): Control[];
 
             /**
-             * Gets the label for the form.
-             *
-             * @return The label.
+             * Gets the constituent controls in a quick view control.
+             * @param T A Control type
+             * @param controlName Name of the control.
+             * @returns The control.
+             * @remarks Constituent controls in a quick view control are read only.
              */
-            getLabel(): string;
+            getControl<T extends Control>(controlName: string): T;
 
             /**
-             * Navigates the user to this form.
+             * Gets the constituent controls in a quick view control.
+             * @param controlName Name of the control.
+             * @returns The control.
+             * @remarks Constituent controls in a quick view control are read only.
              */
-            navigate(): void;
+            getControl(controlName: string): Control;
+
+            /**
+             * Gets a control by index.
+             * @param T A Control type
+             * @param index The control index.
+             * @returns The control.
+             * @remarks Constituent controls in a quick view control are read only.
+             */
+            getControl<T extends Control>(index: number): T;
+
+            /**
+             * Gets a control by index.
+             * @param index The control index.
+             * @returns The control.
+             * @remarks Constituent controls in a quick view control are read only.
+             */
+            getControl(index: number): Control;
+
+            /**
+             * Gets the controls type.
+             * @returns Returns a string value ("quickform") that categorizes quick view controls.
+             */
+            getControlType(): ControlQuickFormType;
+
+            /**
+             * Returns whether the data binding for the constituent controls in a quick view control is complete.
+             * @returns  True is the data binding for a constituent control is complete, otherwise false.
+             *          because the quick view form that the control is bound to may not have loaded completely.
+             *          As a result, using the getAttribute or any data-related methods on a constituent control might not work.
+             *          The isLoaded method for the quick view control helps determine the data binding status for constituent controls in a quick view control.
+             * @remarks The data binding for the constituent controls in a quick view control may not be complete during the main form OnLoad event
+             */
+            isLoaded(): boolean;
+
+            /**
+             * Refreshes the data displayed in a quick view control.
+             */
+            refresh(): void;
         }
 
         /**
-         * Interface for the form selector API.
+         * Interface for a Silverlight control.
+         * @see {@link Control}
+         * @deprecated The Silverlight WebResource is deprecated on the web client, and is not supported on the new Unified Interface in v9.
+         * Instead of silverlight, use custom controls created using the HTML web resources with HTML5 to create UI components to visualize and interact with data.
          */
-        interface FormSelector {
+        interface SilverlightControl extends Control {
             /**
-             * Gets current form.
-             *
-             * @return The current item.
-             *
-             * @remarks When only one form is available this method will return null.
+             * Gets the query string value passed to Silverlight.
+             * @returns The data.
+             * @remarks Unavailable for Microsoft Dynamics CRM for tablets.
              */
-            getCurrentItem(): FormItem;
+            getData(): string;
 
             /**
-             * A reference to the collection of available forms.
+             * Sets the query string value passed to Silverlight.
+             * @param data The data.
+             * @remarks Unavailable for Microsoft Dynamics CRM for tablets.
              */
-            items: Collection.ItemCollection<FormItem>;
+            setData(data: string): void;
+
+            /**
+             * Gets the DOM element containing the control.
+             * @returns The container object.
+             * @remarks Unavailable for Microsoft Dynamics CRM for tablets.
+             */
+            getObject(): HTMLObjectElement;
+        }
+
+        /**
+         * Interface for a Timeline control.
+         * @see {@link Control}
+         */
+        interface TimelineWall extends Control {
+            /**
+             * Refreshes the data displayed in a timelinewall and timer control.
+             */
+            refresh(): void;
+        }
+
+        /**
+         * Interface for a form tab.
+         * @see {@link UiElement}
+         * @see {@link UiFocusable}
+         */
+        interface Tab extends UiStandardElement, UiFocusable {
+            /**
+             * Gets display state of the tab.
+             * @returns The display state, as either "expanded" or "collapsed"
+             */
+            getDisplayState(): DisplayState;
+
+            /**
+             * Gets the name of the tab.
+             * @returns The name.
+             */
+            getName(): string;
+
+            /**
+             * Gets a reference to the {@link FormContext.ui formContext.ui} parent of the tab.
+             * @returns The parent.
+             */
+            getParent(): Ui;
+
+            /**
+             * Sets display state of the tab.
+             * @param displayState Display state of the tab, as either "expanded" or "collapsed"
+             */
+            setDisplayState(displayState: DisplayState): void;
+
+            /**
+             * A reference to the collection of form sections within this tab.
+             * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/collections External Link: Collections (Client API reference)}
+             */
+            sections: Collection.ItemCollection<Section>;
+        }
+
+        /**
+         * Interface for a form section.
+         * @see {@link UiElement}
+         */
+        interface Section extends UiStandardElement {
+            /**
+             * Gets the name of the section.
+             * @returns The name.
+             */
+            getName(): string;
+
+            /**
+             * Gets a reference to the parent {@link Tab}.
+             * @returns The parent.
+             */
+            getParent(): Tab;
+
+            /**
+             * A reference to the collection of controls within this tab.
+             * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/collections External Link: Collections (Client API reference)}
+             */
+            controls: Collection.ItemCollection<Control>;
         }
 
         interface AddControlNotificationOptions {
@@ -3494,26 +3362,558 @@ declare namespace Xrm {
              */
             actions: Array<() => void>;
         }
+
+        interface ProcessControl extends UiCanGetVisibleElement, UiCanSetVisibleElement {
+            /**
+             * Sets display state of the process flow control.
+             * @param displayState Display state of the process flow control, as either "expanded" or "collapsed"
+             */
+            setDisplayState(displayState: DisplayState): void;
+
+            /**
+             * Gets the display state of the process flow control.
+             */
+            getDisplayState(): DisplayState;
+
+            /**
+             * Reflow the UI of the process control
+             * @param updateUI Specify true to update the UI of the process control; false otherwise.
+             * @param parentStage ID of the parent stage.
+             * @param nextStage ID of the next stage.
+             */
+            reflow(updateUI: boolean, parentStage: string, nextStage: string): void;
+        }
+
+        /**
+         * Interface for an entity's form selector item.
+         */
+        interface FormItem {
+            /**
+             * Gets the unique identifier of the form.
+             * @returns The identifier, in Guid format.
+             */
+            getId(): string;
+
+            /**
+             * Gets the label for the form.
+             * @returns The label.
+             */
+            getLabel(): string;
+
+            /**
+             * Navigates the user to this form.
+             */
+            navigate(): void;
+        }
+
+        /**
+         * Interface for the form selector API.
+         */
+        interface FormSelector {
+            /**
+             * Gets current form.
+             * @returns The current item.
+             * @remarks When only one form is available this method will return null.
+             */
+            getCurrentItem(): FormItem;
+
+            /**
+             * A reference to the collection of available forms.
+             * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/collections External Link: Collections (Client API reference)}
+             */
+            items: Collection.ItemCollection<FormItem>;
+        }
+
+        /**
+         * Interface for the view selector.  Use the ViewSelector methods to get or set information about the view selector
+         * of the grid control.
+         */
+        interface ViewSelector {
+            /**
+             * Use this method to get a reference to the current view.
+             * @returns The current view.
+             */
+            getCurrentView(): ViewSelectorItem;
+
+            /**
+             * Use this method to determine whether the view selector is visible.
+             * @returns true if visible, false if not.
+             */
+            isVisible(): boolean;
+
+            /**
+             * Use this method to set the current view.
+             * @param viewSelectorItem The view selector item.
+             */
+            setCurrentView(viewSelectorItem: ViewSelectorItem): void;
+        }
+
+        /**
+         * Interface for a view selector item. This object contains data that identifies a view. Use this as a parameter to
+         * the ViewSelector.setCurrentView method.
+         */
+        interface ViewSelectorItem {
+            /**
+             * Returns a LookupValue that references this view.
+             * @returns The entity reference.
+             */
+            getEntityReference(): LookupValue;
+        }
+    }
+
+    /**
+     * Interface for the form's record context, {@link Data.entity formContext.data.entity}
+     * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/formcontext-data-entity External Link: formContext.data.entity (Client API reference)}
+     */
+    interface Entity {
+        /**
+         * Adds a handler to be called when the record is saved.
+         * @param handler The handler.
+         */
+        addOnSave(handler: Events.ContextSensitiveHandler): void;
+
+        /**
+         * Gets an serialized-XML string representing data that will be passed to the server upon saving the record.
+         * @returns The XML in string format.
+         * @remarks This function does not work with Microsoft Dynamics CRM for tablets.
+         * @example "<account><name>Contoso</name><accountnumber>55555</accountnumber><telephone2>425
+         *          555-1234</telephone2></account>".
+         */
+        getDataXml(): string;
+
+        /**
+         * Gets entity's logical name.
+         * @returns  The logical name.
+         */
+        getEntityName(): string;
+
+        /**
+         * Gets the record's unique identifier.
+         * @returns The identifier, in Guid format.
+         * @example Example: "{825CB223-A651-DF11-AA8B-00155DBA3804}".
+         */
+        getId(): string;
+
+        /**
+         * Gets a boolean value indicating whether the record has unsaved changes.
+         * @returns true if there are unsaved changes, otherwise false.
+         */
+        getIsDirty(): boolean;
+
+        /**
+         * Gets the record's primary attribute value.
+         * @returns The primary attribute value.
+         * @remarks The value for this attribute is used when links to the record are displayed.
+         */
+        getPrimaryAttributeValue(): string;
+
+        /**
+         * Removes the handler from the "on save" event.
+         * @param handler The handler.
+         */
+        removeOnSave(handler: Events.ContextSensitiveHandler): void;
+
+        /**
+         * Saves the record.
+         * @deprecated Deprecated in v9.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
+         * @remarks  When using quick create forms in the web application the saveandnew option is not
+         *           applied. It will always work as if saveandclose were used. Quick create forms in
+         *           Microsoft Dynamics CRM for tablets will apply the saveandnew behavior.
+         */
+        save(): void;
+
+        /**
+         * Saves the record with the given save mode.
+         * @deprecated Deprecated in v9.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
+         * @param saveMode (Optional) the save mode to save, as either "saveandclose" or "saveandnew".
+         */
+        save(saveMode: EntitySaveMode): void;
+
+        /**
+         * The collection of attributes for the record.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/attributes External Link: Attributes (Client API reference)}
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/collections External Link: Collections (Client API reference)}
+         */
+        attributes: Collection.ItemCollection<Attributes.Attribute>;
+    }
+
+    namespace ProcessFlow {
+        /**
+         * Direction types for a process stage change event
+         * @see {@link XrmEnum.StageChangeDirection}
+         */
+        type StageChangeDirection = "Next" | "Previous";
+
+        /**
+         * Status for {@link ProcessFlow.Stage.getStatus Stage.getStatus()}.
+         * @see {@link XrmEnum.StageStatus}
+         */
+        type StageStatus = "active" | "inactive";
+
+        /**
+         * Status for {@link ProcessFlow.Process.getStatus Process.getStatus()}.
+         * @see {@link XrmEnum.ProcessStatus}
+         */
+        type ProcessStatus = "active" | "aborted" | "finished";
+
+        /**
+         * Interface for a CRM Business Process Flow instance.
+         */
+        interface Process {
+            /**
+             * Returns the unique identifier of the process.
+             * @returns The identifier for this process, in GUID format.
+             * @example Example: "{825CB223-A651-DF11-AA8B-00155DBA3804}".
+             */
+            getId(): string;
+
+            /**
+             * Returns the name of the process.
+             * @returns The name.
+             */
+            getName(): string;
+
+            /**
+             * Returns an collection of stages in the process.
+             * @returns The stages.
+             * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/collections External Link: Collections (Client API reference)}
+             */
+            getStages(): Collection.ItemCollection<Stage>;
+
+            /**
+             * Returns a boolean value to indicate if the process is rendered.
+             * @returns true if the process is rendered, false if not.
+             */
+            isRendered(): boolean;
+        }
+
+        /**
+         * Interface for CRM Business Process Flow stages.
+         */
+        interface Stage {
+            /**
+             * Returns an object with a getValue method which will return the integer value of the business process flow
+             * category.
+             * @returns The stage category.
+             */
+            getCategory(): { getValue(): XrmEnum.StageCategory };
+
+            /**
+             * Returns the logical name of the entity associated with the stage.
+             * @returns The entity name.
+             */
+            getEntityName(): string;
+
+            /**
+             * Returns the unique identifier of the stage.
+             * @returns The identifier of the Stage, in GUID format.
+             * @example Example: "{825CB223-A651-DF11-AA8B-00155DBA3804}".
+             */
+            getId(): string;
+
+            /**
+             * Returns the name of the stage.
+             * @returns The name.
+             */
+            getName(): string;
+
+            /**
+             * Returns the status of the stage.
+             * @returns The status, either "active" or "inactive".
+             */
+            getStatus(): StageStatus;
+
+            /**
+             * Returns a collection of steps in the stage.
+             * @returns An array of Step.
+             */
+            getSteps(): Step[];
+        }
+
+        interface Step {
+            /**
+             * Returns the logical name of the attribute associated to the step.
+             * @returns The attribute.
+             * @remarks Some steps don’t contain an attribute value.
+             */
+            getAttribute(): string;
+
+            /**
+             * Returns the name of the step.
+             * @returns The name.
+             */
+            getName(): string;
+
+            /**
+             * Returns whether the step is required in the business process flow.
+             * @returns true if required, false if not.
+             * @remarks     Returns true if the step is marked as required in the Business Process Flow editor; otherwise, false.
+             *              There is no connection between this value and the values you can change in the formContext.data.entity
+             *              attribute RequiredLevel methods.
+             */
+            isRequired(): boolean;
+        }
+
+        /**
+         * Interface for the formContext.data.process API.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/formcontext-data-process External Link: formContext.data.process (Client API reference)}
+         */
+        interface ProcessManager {
+            /**
+             * Returns a Process object representing the active process.
+             * @returns current active process.
+             */
+            getActiveProcess(): Process;
+
+            /**
+             * Set a Process as the active process.
+             * @param processId The Id of the process to make the active process.
+             * @param callbackFunction (Optional) a function to call when the operation is complete.
+             */
+            setActiveProcess(processId: string, callbackFunction?: ProcessCallbackDelegate): void;
+
+            /**
+             * Returns all process instances for the entity record that the calling user has access to.
+             * @param callbackFunction (Optional) a function to call when the operation is complete.
+             */
+            getProcessInstances(callbackFunction: GetProcessInstancesDelegate): void;
+
+            /**
+             * Sets a process instance as the active instance
+             * @param processInstanceId The Id of the process instance to make the active instance.
+             * @param callbackFunction (Optional) a function to call when the operation is complete.
+             */
+            setActiveProcessInstance(processInstanceId: string, callbackFunction: SetProcessInstanceDelegate): void;
+
+            /**
+             * Returns a Stage object representing the active stage.
+             * @returns current active stage.
+             */
+            getActiveStage(): Stage;
+
+            /**
+             * Set a stage as the active stage.
+             * @param stageId the Id of the stage to make the active stage.
+             * @param callbackFunction (Optional) a function to call when the operation is complete.
+             */
+            setActiveStage(stageId: string, callbackFunction?: ProcessCallbackDelegate): void;
+
+            /**
+             * Use this method to get a collection of stages currently in the active path with methods to interact with the
+             * stages displayed in the business process flow control. The active path represents stages currently rendered in
+             * the process control based on the branching rules and current data in the record.
+             * @returns A collection of all completed stages, the currently active stage, and the predicted set of future stages
+             *          based on satisfied conditions in the branching rule. This may be a subset of the stages returned with
+             *          formContext.data.process.getActiveProcess because it will only include those stages which represent a valid
+             *          transition from the current stage based on branching that has occurred in the process.
+             * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/collections External Link: Collections (Client API reference)}
+             */
+            getActivePath(): Collection.ItemCollection<Stage>;
+
+            /**
+             * Use this method to asynchronously retrieve the enabled business process flows that the user can switch to for an
+             * entity.
+             * @param callbackFunction The callback function must accept a parameter that contains an object with
+             *                         dictionary properties where the name of the property is the Id of the
+             *                         business process flow and the value of the property is the name of the
+             *                         business process flow.
+             *                         The enabled processes are filtered according to the user’s privileges. The
+             *                         list of enabled processes is the same ones a user can see in the UI if they
+             *                         want to change the process manually.
+             */
+            getEnabledProcesses(callbackFunction: (enabledProcesses: ProcessDictionary) => void): void;
+
+            /**
+             * Use this method to get the currently selected stage.
+             * @returns The currently selected stage.
+             */
+            getSelectedStage(): Stage;
+
+            /**
+             * Use this to add a function as an event handler for the OnStageChange event so that it will be called when the
+             * business process flow stage changes.
+             * @param handler The function will be added to the bottom of the event
+             *                handler pipeline. The execution context is automatically
+             *                set to be the first parameter passed to the event handler.
+             *                Use a reference to a named function rather than an
+             *                anonymous function if you may later want to remove the
+             *                event handler.
+             */
+            addOnStageChange(handler: Events.ContextSensitiveHandler): void;
+
+            /**
+             * Use this to add a function as an event handler for the OnProcessStatusChange event so that it will be called when the
+             * business process flow status changes.
+             * @param handler The function will be added to the bottom of the event
+             *                handler pipeline. The execution context is automatically
+             *                set to be the first parameter passed to the event handler.
+             *                Use a reference to a named function rather than an
+             *                anonymous function if you may later want to remove the
+             *                event handler.
+             */
+            addOnProcessStatusChange(handler: Events.ProcessStatusChangeHandler): void;
+
+            /**
+             * Use this to add a function as an event handler for the OnStageSelected event so that it will be called
+             * when a business process flow stage is selected.
+             * @param handler The function will be added to the bottom of the event
+             *                handler pipeline. The execution context is automatically
+             *                set to be the first parameter passed to the event handler.
+             *                Use a reference to a named function rather than an
+             *                anonymous function if you may later want to remove the
+             *                event handler.
+             */
+            addOnStageSelected(handler: Events.ContextSensitiveHandler): void;
+
+            /**
+             * Use this to remove a function as an event handler for the OnProcessStatusChange event.
+             * @param handler If an anonymous function is set using the addOnProcessStatusChange method it
+             *                cannot be removed using this method.
+             */
+            removeOnProcessStatusChange(handler: Events.ProcessStatusChangeHandler): void;
+
+            /**
+             * Use this to remove a function as an event handler for the OnStageChange event.
+             * @param handler If an anonymous function is set using the addOnStageChange method it
+             *                cannot be removed using this method.
+             */
+            removeOnStageChange(handler: Events.ContextSensitiveHandler): void;
+
+            /**
+             * Use this to remove a function as an event handler for the OnStageChange event.
+             * @param handler If an anonymous function is set using the addOnStageChange method it
+             *                cannot be removed using this method.
+             */
+            removeOnStageSelected(handler: Events.ContextSensitiveHandler): void;
+
+            /**
+             * Progresses to the next stage.
+             * @param callbackFunction (Optional) A function to call when the operation is complete.
+             */
+            moveNext(callbackFunction?: ProcessCallbackDelegate): void;
+
+            /**
+             * Moves to the previous stage.
+             * @param callbackFunction (Optional) A function to call when the operation is complete.
+             */
+            movePrevious(callbackFunction?: ProcessCallbackDelegate): void;
+
+            /**
+             * Use this method to get the unique identifier of the process instance
+             * @returns The unique identifier of the process instance
+             */
+            getInstanceId(): string;
+
+            /**
+             * Use this method to get the name of the process instance
+             * @returns The name of the process instance
+             */
+            getInstanceName(): string;
+
+            /**
+             * Use this method to get the current status of the process instance
+             * @returns The current status of the process
+             */
+            getStatus(): ProcessStatus;
+
+            /**
+             * Use this method to set the current status of the process instance
+             * @param status The new status for the process
+             * @param callbackFunction (Optional) a function to call when the operation is complete.
+             */
+            setStatus(status: ProcessStatus, callbackFunction: ProcessSetStatusDelegate): void;
+        }
+
+        /**
+         * Called when method to get active processes is complete
+         * @param status The result of the get active processes operation.
+         * @remarks **Returns object with the following key-value pairs**:
+         * * CreatedOn
+         * * ProcessDefinitionID
+         * * ProcessDefinitionName
+         * * ProcessInstanceID
+         * * ProcessInstanceName
+         * * StatusCodeName
+         */
+        type GetProcessInstancesDelegate = (object: ProcessDictionary) => void;
+
+        /**
+         * Called when method to set active process is complete
+         * @param status The result of the set active process operation.
+         * @remarks **Values returned are**:
+         * * success        (The operation succeeded.)
+         * * invalid        (The processInstanceId isn’t valid or the process isn’t enabled.)
+         */
+        type SetProcessInstanceDelegate = (status: string) => void;
+
+        /**
+         * Called when process change methods have completed.
+         * @param status The result of the process change operation.
+         * @remarks **Values returned are**:
+         * * success        (The operation succeeded.)
+         * * crossEntity    (The previous stage is for a different entity.)
+         * * beginning      (The active stage is the first stage of the active path.)
+         * * invalid        (The operation failed because the selected stage isn’t the same as the active stage.)
+         * * unreachable    (The stage exists on a different path.)
+         */
+        type ProcessCallbackDelegate = (status: string) => void;
+
+        /**
+         * Called when process set status method has completed.
+         * @param status The new status of the process instance: active, aborted, or finished
+         */
+        type ProcessSetStatusDelegate = (status: ProcessStatus) => void;
+
+        /**
+         * Represents a key-value pair, where the key is the Process Flow's ID, and the value is the name thereof.
+         */
+        interface ProcessDictionary {
+            [index: string]: string;
+        }
+    }
+
+    /**
+     * Interface for a user attribute privilege.
+     */
+    interface Privilege {
+        /**
+         * True if the user can read.
+         */
+        canRead: boolean;
+
+        /**
+         * True if the user can update.
+         */
+        canUpdate: boolean;
+
+        /**
+         * True if the user can create.
+         */
+        canCreate: boolean;
     }
 
     /**
      * An definition module for URL-based, CRM component parameters.
-     *
-     * @see {@link http://msdn.microsoft.com/en-us/library/gg328483.aspx} for details.
+     * @see {@link http://msdn.microsoft.com/en-us/library/gg328483.aspx External Link: Open forms, views, dialogs, and reports with a URL}
      */
     namespace Url {
         /**
          * Command Bar Display options for Xrm.Url.FormOpenParameters.cmdbar, Xrm.Url.ViewOpenParameters.cmdbar, and Xrm.Utility.FormOpenParameters.cmdbar.
+         * @see {@link XrmEnum.CmdBarDisplay}
          */
-
         type CmdBarDisplay = "true" | "false";
+
         /**
          * Navigation Bar Display options for Xrm.Url.FormOpenParameters.navbar, Xrm.Url.ViewOpenParameters.navbar, and Xrm.Utility.FormOpenParameters.navbar.
+         * @see {@link XrmEnum.NavBarDisplay}
          */
         type NavBarDisplay = "entity" | "off" | "on";
 
         /**
          * Report Open Action options for Xrm.Url.ReportOpenParameters.actions.
+         * @see {@link XrmEnum.ReportAction}
          */
         type ReportAction = "filter" | "run";
 
@@ -3521,9 +3921,7 @@ declare namespace Xrm {
          * Interface for defining parameters on a request to open a form with main.aspx (as with
          * window.open). Useful for parsing the keys and values into a string of the format:
          * "&key=value".
-         *
-         * @see {@link http://msdn.microsoft.com/en-us/library/gg328483.aspx} for details.
-         *
+         * @see {@link http://msdn.microsoft.com/en-us/library/gg328483.aspx External Link: Open forms, views, dialogs, and reports with a URL}
          * @remarks  A member for "pagetype" is not provided.  The value "entityrecord" is required in
          *           the URL, for forms. Example:  "pagetype=entityrecord"
          */
@@ -3537,24 +3935,24 @@ declare namespace Xrm {
              * Additional parameters can be provided to the request. This can only be used to provide
              * default field values for the form, or pass data to custom parameters that have been
              * customized for the form.  See example below for setting the selected form.
-             *
-             * @remarks Example:  encodeURIComponent("formid={8c9f3e6f-7839-e211-831e-00155db7d98f}");
+             * @example Example:  encodeURIComponent("formid={8c9f3e6f-7839-e211-831e-00155db7d98f}");
              */
             extraqs?: string;
 
             /**
              * Controls whether the command bar is displayed.
-             * Accepted values are: "true"    (The command bar is displayed.)
-             *                      "false"   (The command bar is not displayed.)
+             * @remarks **Accepted values are**:
+             * * "true"    (The command bar is displayed.)
+             * * "false"   (The command bar is not displayed.)
              */
             cmdbar?: CmdBarDisplay;
 
             /**
              * Controls whether the Navigation bar is displayed on the form.
-             * Accepted values are: "on"      (The navigation bar is displayed.)
-             *                      "off"     (The navigation bar is not displayed.)
-             *                      "entity"  (On an entity form, only the navigation options for related
-             *                                entities are available.)
+             * @remarks **Accepted values are**:
+             * * "on"      (The navigation bar is displayed.)
+             * * "off"     (The navigation bar is not displayed.)
+             * * "entity"  (On an entity form, only the navigation options for related entities are available.)
              */
             navbar?: NavBarDisplay;
         }
@@ -3563,9 +3961,7 @@ declare namespace Xrm {
          * Interface for defining parameters on a request to open a view with main.aspx (as with
          * window.open). Useful for parsing the keys and values into a string of the format:
          * "&key=value".
-         *
-         * @see {@link http://msdn.microsoft.com/en-us/library/gg328483.aspx} for details.
-         *
+         * @see {@link http://msdn.microsoft.com/en-us/library/gg328483.aspx External Link: Open forms, views, dialogs, and reports with a URL}
          * @remarks  A member for "pagetype" is not provided.  The value "entitylist" is required in
          *           the URL, for views. Example:  "pagetype=entitylist"
          */
@@ -3583,25 +3979,26 @@ declare namespace Xrm {
 
             /**
              * The type of view identified by {@link viewid}.
-             *
-             * @remarks  Accepted values are:    1039    System View
-             *                                   4230    User View.
+             * @remarks **Accepted values are**:
+             * * 1039    System View
+             * * 4230    User View.
              */
             viewtype: XrmEnum.ViewType;
 
             /**
              * Controls whether the command bar is displayed.
-             * Accepted values are: "true"    (The command bar is displayed.)
-             *                      "false"   (The command bar is not displayed.)
+             * @remarks **Accepted values are**:
+             * * "true"    (The command bar is displayed.)
+             * * "false"   (The command bar is not displayed.)
              */
             cmdbar?: CmdBarDisplay;
 
             /**
              * Controls whether the Navigation bar is displayed on the form.
-             * Accepted values are: "on"      (The navigation bar is displayed.)
-             *                      "off"     (The navigation bar is not displayed.)
-             *                      "entity"  (On an entity form, only the navigation options for related
-             *                                entities are available.)
+             * @remarks **Accepted values are**:
+             * * "on"      (The navigation bar is displayed.)
+             * * "off"     (The navigation bar is not displayed.)
+             * * "entity"  (On an entity form, only the navigation options for related entities are available.)
              */
             navbar?: NavBarDisplay;
         }
@@ -3610,8 +4007,7 @@ declare namespace Xrm {
          * Interface for defining parameters of a request to open a dialog with rundialog.aspx (as with
          * window.open).  Useful for parsing the keys and values into a string of the format:
          * "&key=value".
-         *
-         * @see {@link http://msdn.microsoft.com/en-us/library/gg328483.aspx} for details.
+         * @see {@link http://msdn.microsoft.com/en-us/library/gg328483.aspx External Link: Open forms, views, dialogs, and reports with a URL}
          */
         interface DialogOpenParameters {
             /**
@@ -3636,14 +4032,14 @@ declare namespace Xrm {
          * window.open).  Useful for parsing out the keys and values into a string of the format:
          * "&key=value"
          *
-         * @see {@link http://msdn.microsoft.com/en-us/library/gg328483.aspx} for details.
+         * @see {@link http://msdn.microsoft.com/en-us/library/gg328483.aspx External Link: Open forms, views, dialogs, and reports with a URL}
          */
         interface ReportOpenParameters {
             /**
              * The action to perform, as either "run" or "filter".
-             *
-             * @remarks  "run"       Executes the report with default filters.
-             *           "filter"    Presents the user with the filter editor, and a "Run Report" button.
+             * @remarks **Actions**:
+             * * "run"       Executes the report with default filters.
+             * * "filter"    Presents the user with the filter editor, and a "Run Report" button.
              */
             action: ReportAction;
 
@@ -3663,7 +4059,7 @@ declare namespace Xrm {
     /**
      * The Xrm.Utility API
      *
-     * @see {@link http://msdn.microsoft.com/en-us/library/gg328255.aspx|Documentation} for details.
+     * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-utility External Link: Xrm.Utility (Client API reference)}
      */
     namespace Utility {
         /**
@@ -3690,17 +4086,18 @@ declare namespace Xrm {
 
             /**
              * Controls whether the Navigation bar is displayed on the form.
-             * Accepted values are: "on"      (The navigation bar is displayed.)
-             *                      "off"     (The navigation bar is not displayed.)
-             *                      "entity"  (On an entity form, only the navigation options for related
-             *                                entities are available.)
+             * @remarks **Accepted values are**:
+             * * "on"      (The navigation bar is displayed.)
+             * * "off"     (The navigation bar is not displayed.)
+             * * "entity"  (On an entity form, only the navigation options for related entities are available.)
              */
             navbar?: Url.NavBarDisplay;
 
             /**
              * Controls whether the command bar is displayed.
-             * Accepted values are: "true"    (The command bar is displayed.)
-             *                      "false"   (The command bar is not displayed.)
+             * @remarks **Accepted values are**:
+             * * "true"    (The command bar is displayed.)
+             * * "false"   (The command bar is not displayed.)
              */
             cmdbar?: Url.CmdBarDisplay;
         }
@@ -3718,8 +4115,7 @@ declare namespace Xrm {
 
     /**
      * Namespace to hold Xrm.Navigation related types
-     *
-     * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-navigation} for details
+     * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-navigation External Link: Xrm.Navigation (Client API reference)}
      */
     namespace Navigation {
         interface AlertStrings {
@@ -3750,12 +4146,12 @@ declare namespace Xrm {
             subtitle?: string;
 
             /**
-             *  (Optional) The title to be displyed in the confirmation dialog.
+             * (Optional) The title to be displyed in the confirmation dialog.
              */
-            title: string;
+            title?: string;
 
             /**
-             *  The message to be displyed in the alert dialog.
+             * The message to be displyed in the alert dialog.
              */
             text: string;
         }
@@ -3773,7 +4169,7 @@ declare namespace Xrm {
 
         interface OpenWebresourceOptions extends DialogSizeOptions {
             /**
-             *  Indicates whether to open the web resource in a new window.
+             * Indicates whether to open the web resource in a new window.
              */
             openInNewWindow: boolean;
         }
@@ -3839,7 +4235,7 @@ declare namespace Xrm {
             /**
              * Designates a record that will provide default values based on mapped attribute values.The lookup object has the following String properties: entityType, id, and name (optional).
              */
-            createFromEntity?: Page.LookupValue;
+            createFromEntity?: LookupValue;
             /**
              * ID of the entity record to display the form for.
              */
@@ -3866,9 +4262,9 @@ declare namespace Xrm {
             isOfflineSyncError?: boolean;
             /**
              * Controls whether the navigation bar is displayed and whether application navigation is available using the areas and subareas defined in the sitemap.Valid vlaues are: "on", "off", or "entity".
-             *      on: The navigation bar is displayed.This is the default behavior if the navBar parameter is not used.
-             *      off: The navigation bar is not displayed.People can navigate using other user interface elements or the back and forward buttons.
-             *      entity: On an entity form, only the navigation options for related entities are available.After navigating to a related entity, a back button is displayed in the navigation bar to allow returning to the original record.
+             * * on: The navigation bar is displayed.This is the default behavior if the navBar parameter is not used.
+             * * off: The navigation bar is not displayed.People can navigate using other user interface elements or the back and forward buttons.
+             * * entity: On an entity form, only the navigation options for related entities are available.After navigating to a related entity, a back button is displayed in the navigation bar to allow returning to the original record.
              */
             navBar?: Url.NavBarDisplay;
             /**
@@ -3877,8 +4273,8 @@ declare namespace Xrm {
             openInNewWindow?: boolean;
             /**
              * Specify one of the following values for the window position of the form on the screen:
-             *                  1:center
-             *                  2:side
+             * * 1:center
+             * * 2:side
              */
             windowPosition?: XrmEnum.WindowPositions;
             /**
@@ -3922,14 +4318,14 @@ declare namespace Xrm {
             navigationPropertyName?: string;
             /**
              * Relationship type.Specify one of the following values:
-             *                       0:OneToMany
-             *                       1:ManyToMany
+             * * 0:OneToMany
+             * * 1:ManyToMany
              */
-            relationshipType?: XrmEnum.RelationshipType;	//
+            relationshipType?: XrmEnum.RelationshipType;    //
             /**
              * Role type in relationship.Specify one of the following values:
-             *       1:Referencing
-             *       2:AssociationEntity
+             * * 1:Referencing
+             * * 2:AssociationEntity
              */
             roleType?: XrmEnum.RoleType;
         }
@@ -3941,7 +4337,7 @@ declare namespace Xrm {
     interface Navigation {
         /**
          * Displays an alert dialog containing a message and a button.
-         * @param  alertStrings The strings to be used in the alert dialog.
+         * @param alertStrings The strings to be used in the alert dialog.
          * @param alertOptions The height and width options for alert dialog
          */
         openAlertDialog(alertStrings: Navigation.AlertStrings, alertOptions: Navigation.DialogSizeOptions): Async.PromiseLike<any>;
@@ -3973,7 +4369,7 @@ declare namespace Xrm {
         /**
          * Opens a URL, including file URLs.
          * @param url URL to open.
-         * @param openUrlOptions  Options to open the URL
+         * @param openUrlOptions Options to open the URL
          */
         openUrl(url: string, openUrlOptions?: Navigation.DialogSizeOptions): void;
 
@@ -3981,7 +4377,7 @@ declare namespace Xrm {
          * Opens an HTML web resource.
          * @param webResourceName Name of the HTML web resource.
          * @param windowOptions (Optional) Window options for opening the web resource.
-         *                      It is advised to use encodeURIcomponent() to encode the value.
+         *                                                 It is advised to use encodeURIcomponent() to encode the value.
          */
         openWebResource(webResourceName: string, windowOptions?: Navigation.OpenWebresourceOptions, data?: string): void;
     }
@@ -3995,6 +4391,9 @@ declare namespace Xrm {
          */
         interface EntityMetadata {
             ActivityTypeMask: number;
+            /**
+             * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/collections External Link: Collections (Client API reference)}
+             */
             Attributes: Collection.ItemCollection<AttributeMetadata>;
             AutoRouteToOwnerQueue: boolean;
             CanEnableSyncToExternalSearchIndex: boolean;
@@ -4050,13 +4449,18 @@ declare namespace Xrm {
             RecurrenceBaseEntityLogicalName: string;
             PrimaryImageAttribute: string;
         }
+
         /**
          * Type to hold Labels as part of the EntityMetadata
          */
         interface Label {
+            /**
+             * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/collections External Link: Collections (Client API reference)}
+             */
             LocalizedLabels: Collection.ItemCollection<LocalizedLabel>;
             UserLocalizedLabel: LocalizedLabel;
         }
+
         /**
          * Type to hold a Label as part of the EntityMetadata
          */
@@ -4064,18 +4468,26 @@ declare namespace Xrm {
             Label: string;
             LanguageCode: number;
         }
+
         /**
          * Type to hold the Attribute metadata as part of the EntityMetadata
          */
         interface AttributeMetadata {
             defaultFormValue: number;
+            /**
+             * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/collections External Link: Collections (Client API reference)}
+             */
             options: Collection.ItemCollection<string>;
             logicalName: string;
             displayName: string;
             attributeType: XrmEnum.AttributeTypeCode;
             entityLogicalName: string;
+            /**
+             * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/collections External Link: Collections (Client API reference)}
+             */
             optionSet: Collection.ItemCollection<OptionMetadata>;
         }
+
         /**
          * Type to hold the optionset metadata as part of the EntityMetadata
          */
@@ -4095,7 +4507,7 @@ declare namespace Xrm {
 
     /**
      * Namespace to hold Xrm.Device related types
-     * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-device} for details
+     * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-device External Link: Xrm.Device (Client API reference)}
      */
     namespace Device {
         /**
@@ -4162,6 +4574,7 @@ declare namespace Xrm {
 
         /**
          * Posible file types for Xrm.Device.pickFile options
+         * @see {@link XrmEnum.DevicePickFileType}
          */
         type PickFileTypes = "audio" | "video" | "image";
 
@@ -4186,47 +4599,41 @@ declare namespace Xrm {
 
     /**
      * Interface for Xrm.Device API
-     * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-device} for details
+     * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-device External Link: Xrm.Device (Client API reference)}
      */
     interface Device {
         /**
          * Invokes the device microphone to record audio.
-         *
          * @returns On success, returns Base64 encoded file
          */
         captureAudio(): Async.PromiseLike<Device.CaptureFileResponse>;
 
         /**
          * Invokes the device camera to capture an image.
-         *
          * @returns On success, returns Base64 encoded file
          */
         captureImage(imageOptions: Device.CaptureImageOptions): Async.PromiseLike<Device.CaptureFileResponse>;
 
         /**
          * Invokes the device camera to capture video.
-         *
          * @returns On success, returns Base64 encoded file
          */
         captureVideo(): Async.PromiseLike<Device.CaptureFileResponse>;
 
         /**
          * Invokes the device camera to scan the barcode information, such as a product number.
-         *
          * @returns On success, Barcode value is returned as a String
          */
         getBarcodeValue(): Async.PromiseLike<string>;
 
         /**
          * Returns the current location using the device geolocation capability.
-         *
          * @returns On success, returns current geolocation information
          */
         getCurrentPosition(): Async.PromiseLike<Device.GetCurrentPositionResponse>;
 
         /**
          * Opens a dialog box to select files from your computer (web client) or mobile device (mobile clients).
-         *
          * @returns On success, returns an array of files
          */
         pickFile(pickFileOptions: Device.PickFileOptions): Async.PromiseLike<Device.CaptureFileResponse[]>;
@@ -4234,23 +4641,19 @@ declare namespace Xrm {
 
     /**
      * Interface for Xrm.Encoding API
-     * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-encoding} for details
+     * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-encoding External Link: Xrm.Encoding (Client API reference)}
      */
     interface Encoding {
         /**
          * Applies attribute encoding to a string.
-         *
          * @param arg String to be encoded.
-         *
          * @returns Encoded string.
          */
         xmlAttributeEncode(arg: string): string;
 
         /**
          * Applies XML encoding to a string.
-         *
          * @param arg String to be encoded.
-         *
          * @returns Encoded string.
          */
         xmlEncode(arg: string): string;
@@ -4258,14 +4661,12 @@ declare namespace Xrm {
 
     /**
      * Provides properties and methods to use Web API to create and manage records and execute Web API actions and functions in Customer Engagement.
-     * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-webapi} for details
+     * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-webapi External Link: Xrm.WebApi (Client API reference)}
      */
-    interface WebApi extends WebApiBase {
+    interface WebApi extends WebApiOffline {
         /**
          * Returns a boolean value indicating whether an entity is offline enabled.
-         *
-         * @param entityLogicalName Logical name of the entity. For example: "account".
-         *
+         * @param entityLogicalName    Logical name of the entity. For example: "account".
          * @returns true if the entity is offline enabled; otherwise false.
          */
         isAvailableOffline(entityLogicalName: string): boolean;
@@ -4273,55 +4674,103 @@ declare namespace Xrm {
         /**
          * Provides methods to use Web API to create and manage records and execute Web API actions and functions in Customer Engagement when connected to the Customer Engagement server (online mode).
          */
-        online: WebApi;
+        online: WebApiOnline;
 
         /**
          * Provides methods to create and manage records in the Dynamics 365 Customer Engagement mobile clients while working in the offline mode.
-         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-webapi/offline} for details
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-webapi/offline}
          */
-        offline: WebApi;
+        offline: WebApiOffline;
     }
 
     /**
-     * Interface for the Xrm.WebApi API
+     * Interface for the Xrm.WebApi.online API
+     * Execute and ExecuteMultiple are only available when online, not offline.
      */
-    interface WebApiBase {
+    interface WebApiOnline extends WebApiOffline {
+        /**
+         * Execute a single action, function, or CRUD operation.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-webapi/execute External Link: execute (Client API reference)}
+         * @param request Object that will be passed to the Web API endpoint to execute an action, function, or CRUD request.
+         * @remarks The object exposes a getMetadata method that lets you define the metadata for the action, function or CRUD request you want to execute.<BR>
+         * **The getMetadata method has the following parameters**:
+         *   - boundParameter: (Optional) String. The name of the bound parameter for the action or function to execute.
+         *       * Specify undefined if you are executing a CRUD request.
+         *       * Specify null if the action or function to execute is not bound to any entity.
+         *       * Specify entity logical name or entity set name in case the action or function to execute is bound to one.
+         *   - operationName: (Optional). String. Name of the action, function, or one of the following values if you are executing a CRUD request: "Create", "Retrieve", "RetrieveMultiple", "Update", or "Delete".
+         *   - operationType: (Optional). Number. Indicates the type of operation you are executing; specify one of the following values:
+         *       * 0: Action
+         *       * 1: Function
+         *       * 2: CRUD
+         *   - parameterTypes: Object. The metadata for parameter types. The object has the following attributes:
+         *   - enumProperties: (Optional) Object. The metadata for enum types. The object has two string attributes: name and value
+         *   - structuralProperty: Number. The category of the parameter type. Specify one of the following values:
+         *       * 0: Unknown
+         *       * 1: PrimitiveType
+         *       * 2: ComplexType
+         *       * 3: EnumerationType
+         *       * 4: Collection
+         *       * 5: EntityType
+         *   - typeName: String. The fully qualified name of the parameter type.
+         */
+        execute(request: any): Async.PromiseLike<ExecuteResponse>;
+
+        /**
+         * Execute a collection of action, function, or CRUD operations.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-webapi/executemultiple External Link: executeMultiple (Client API reference)}
+         * @param request   An array of one of one of the following types:
+         *    -objects where each object is an action, function, or CRUD request that you want to execute
+         *        * against the Web API endpoint. Each object exposes a getMetadata method that lets you define
+         *        the metadata for the action, function or CRUD request you want to execute. This is the same
+         *        object that you pass in the execute method. For information about the object, see execute.
+         *    -change set (an array of objects), where each object in the change set is as defined above.
+         *        * In this case, all the request objects specified in the change set will get executed in a
+         *        transaction.
+         */
+        executeMultiple(request: any[]): Async.PromiseLike<ExecuteResponse[]>;
+    }
+
+    /**
+     * Interface for the Xrm.WebApi.offline API
+     */
+    interface WebApiOffline {
         /**
          * Creates an entity record
-         *
          * @param entityLogicalName Logical name of the entity you want to create. For example: "account".
          * @param record A JSON object defining the attributes and values for the new entity record.
-         *
-         * @return On success, returns a promise object containing the attributes specified earlier in the description of the successCallback parameter.
+         * @returns On success, returns a promise object containing the attributes specified earlier in the description of the successCallback parameter.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-webapi/createrecord External Link: createRecord (Client API reference)}
          */
         createRecord(entityLogicalName: string, record: any): Async.PromiseLike<string>;
 
         /**
          * Deletes an entity record.
-         *
          * @param entityLogicalName The entity logical name of the record you want to delete. For example: "account".
          * @param id GUID of the entity record you want to delete.
-         *
-         * @return On success, returns a promise object containing the attributes specified earlier in the description of the successCallback parameter.
+         * @returns On success, returns a promise object containing the attributes specified earlier in the description of the successCallback parameter.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-webapi/deleterecord External Link: deleteRecord (Client API reference)}
          */
         deleteRecord(entityLogicalName: string, id: string): Async.PromiseLike<string>;
 
         /**
          * Retrieves an entity record.
-         *
          * @param entityLogicalName The entity logical name of the record you want to retrieve. For example: "account".
          * @param id GUID of the entity record you want to retrieve.
          * @param options (Optional) OData system query options, $select and $expand, to retrieve your data.
-         *                 -Use the $select system query option to limit the properties returned by including a comma-separated list of property names.
-         *                  This is an important performance best practice. If properties aren’t specified using $select, all properties will be returned.
-         *                 -Use the $expand system query option to control what data from related entities is returned.
-         *                  If you just include the name of the navigation property, you’ll receive all the properties for related records.
-         *                  You can limit the properties returned for related records using the $select system query option in parentheses
-         *                  after the navigation property name. Use this for both single-valued and collection-valued navigation properties.
-         *                  You can also specify multiple query options by using & to separate the query options. For example:
-         *                  $select=name&$expand=primarycontactid($select=contactid,fullname)
-         *
-         * @return On success, returns a promise containing a JSON object with the retrieved attributes and their values.
+         * - Use the $select system query option to limit the properties returned by including a comma-separated
+         *   list of property names. This is an important performance best practice. If properties aren’t
+         *   specified using $select, all properties will be returned.
+         * - Use the $expand system query option to control what data from related entities is returned. If you
+         *   just include the name of the navigation property, you’ll receive all the properties for related
+         *   records. You can limit the properties returned for related records using the $select system query
+         *   option in parentheses after the navigation property name. Use this for both single-valued and
+         *   collection-valued navigation properties.
+         * - You can also specify multiple query options by using & to separate the query options.
+         * @example <caption>options example:</caption>
+         * options: $select=name&$expand=primarycontactid($select=contactid,fullname)
+         * @returns On success, returns a promise containing a JSON object with the retrieved attributes and their values.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-webapi/retrieverecord External Link: retrieveRecord (Client API reference)}
          */
         retrieveRecord(entityLogicalName: string, id: string, options: string): Async.PromiseLike<any>;
 
@@ -4329,18 +4778,17 @@ declare namespace Xrm {
          * Retrieves a collection of entity records.
          * @param entityLogicalName The entity logical name of the records you want to retrieve. For example: "account".
          * @param options (Optional) OData system query options or FetchXML query to retrieve your data.
-         *                Following system query options are supported: $select, $top, $filter, $expand, and $orderby.
-         *                To specify a FetchXML query, use the fetchXml attribute to specify the query.
-         *                NOTE: You must always use the $select system query option to limit the properties returned for an entity record
-         *                by including a comma-separated list of property names. This is an important performance best practice.
-         *                If properties aren’t specified using $select, all properties will be returned.
-         *                You can specify multiple system query options by using & to separate the query options.
+         * * Following system query options are supported: $select, $top, $filter, $expand, and $orderby.
+         * * To specify a FetchXML query, use the fetchXml attribute to specify the query.
+         * * NOTE: You must always use the $select system query option to limit the properties returned for an entity
+         * record by including a comma-separated list of property names. This is an important performance best practice.
+         * * If properties aren’t specified using $select, all properties will be returned.
+         * * You can specify multiple system query options by using & to separate the query options.
          * @param maxPageSize (Optional) Specify a positive number that indicates the number of entity records to be returned per page.
-         *                    If you do not specify this parameter, the default value is passed as 5000.
-         *                    If the number of records being retrieved is more than the specified maxPageSize value, nextLink attribute in the returned
-         *                    Promise object will contain a link to retrieve the next set of entities.
-         *
-         * @return  On success, returns a promise object containing the attributes specified earlier in the description of the successCallback parameter.
+         * * If you do not specify this parameter, the default value is passed as 5000. If the number of records being retrieved is more than the specified
+         * maxPageSize value, nextLink attribute in the returned promise object will contain a link to retrieve the next set of entities.
+         * @returns On success, returns a promise object containing the attributes specified earlier in the description of the successCallback parameter.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-webapi/retrievemultiplerecords External Link: retrieveMultipleRecords (Client API reference)}
          */
         retrieveMultipleRecords(entityLogicalName: string, options?: string, maxPageSize?: number): Async.PromiseLike<RetrieveMultipleResult>;
 
@@ -4349,30 +4797,10 @@ declare namespace Xrm {
          * @param entityLogicalName The entity logical name of the record you want to update. For example: "account".
          * @param id GUID of the entity record you want to update.
          * @param Data A JSON object containing key: value pairs, where key is the property of the entity and value is the value of the property you want update.
-         *
-         * @return On success, returns a promise object containing the attributes specified earlier in the description of the successCallback parameter.
+         * @returns On success, returns a promise object containing the attributes specified earlier in the description of the successCallback parameter.
+         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-webapi/updaterecord External Link: updateRecord (Client API reference)}
          */
         updateRecord(entityLogicalName: string, id: string, data: any): Async.PromiseLike<any>;
-
-        /**
-         * Execute a single action, function, or CRUD operation.
-         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-webapi/execute} for more info
-         * @param request Object that will be passed to the Web API endpoint to execute an action, function, or CRUD request.
-         */
-        execute(request: any): Async.PromiseLike<ExecuteResponse>;
-
-        /**
-         * Execute a collection of action, function, or CRUD operations.
-         * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-webapi/executemultiple} for more info
-         * @param request An array of one of one of the following types:
-         *                 -objects where each object is an action, function, or CRUD request that you want to execute
-         *                     against the Web API endpoint. Each object exposes a getMetadata method that lets you
-         *                     define the metadata for the action, function or CRUD request you want to execute.
-         *                     This is the same object that you pass in the execute method. For information about the object, see execute.
-         *                 -Change set (an array of objects), where each object in the change set is as defined above.
-         *                     In this case, all the request objects specified in the change set will get executed in a transaction.
-         */
-        executeMultiple(request: any[]): Async.PromiseLike<ExecuteResponse[]>;
     }
 
     /**
@@ -4414,11 +4842,13 @@ declare namespace Xrm {
          */
         ok: boolean;
         /**
-         * Numeric value in the response status code.For example: 200
+         * Numeric value in the response status code.
+         * @example 200
          */
         status: number;
         /**
-         * Description of the response status code.For example: OK
+         * Description of the response status code.
+         * @example "OK"
          */
         statusText: string;
         /**
@@ -4442,7 +4872,15 @@ declare namespace XrmEnum {
         Update = 2,
         ReadOnly = 3,
         Disabled = 4,
-        BulkEdit = 6
+        BulkEdit = 6,
+        /**
+         * @deprecated QuickCreate has been deprecated
+         */
+        QuickCreate = 5,
+        /**
+         * @deprecated ReadOptimized has been deprecated.
+         */
+        ReadOptimized = 11
     }
 
     /**
@@ -4569,4 +5007,235 @@ declare namespace XrmEnum {
         Tablet = 3,
         Phone = 4
     }
+
+    /**
+     * Constant Enum: Client Types for {@link ClientContext.getClient clientContext.getClient()}.
+     * @see {@link Xrm.Client}
+     */
+    const enum Client {
+        Web = "Web",
+        Outlook = "Outlook",
+        Mobile = "Mobile",
+        UnifiedServiceDesk = "UnifiedServiceDesk",
+        USD = "UnifiedServiceDesk"
+    }
+
+    /**
+     * Constant Enum: Client States for {@link ClientContext.getClientState clientContext.getClientState()}.
+     * @see {@link Xrm.ClientState}
+     */
+    const enum ClientState {
+        Online = "Online",
+        Offline = "Offline"
+    }
+
+    /**
+     * Constant Enum: Display States for setDisplayState() on {@link Controls.ProcessControl.setDisplayState Processes} and {@link Controls.Tab.setDisplayState Tabs}.
+     * @see {@link Xrm.DisplayState}
+     */
+    const enum DisplayState {
+        Expanded = "expanded",
+        Collapsed = "collapsed"
+    }
+
+    /**
+     * Constant Enum: {@link Entity.save Entity} Save Modes
+     * @see {@link Xrm.EntitySaveMode}
+     * @see {@link Entity}
+     * @see {@link Entity.save}
+     */
+    const enum EntitySaveMode {
+        SaveAndClose = "saveandclose",
+        SaveAndNew = "saveandnew"
+    }
+
+    /**
+     * Constant Enum: Form Notification Levels for {@link Ui.setFormNotification formContext.ui.setFormNotification()}.
+     * @see {@link Xrm.FormNotificationLevel}
+     */
+    const enum FormNotificationLevel {
+        Error = "ERROR",
+        Info = "INFO",
+        Warning = "Warning"
+    }
+
+    /**
+     * Constant Enum: Submit Modes for {@link Attributes.Attribute.setSubmitMode} Attributes.Attribute.setSubmitMode().
+     * @see {@link Xrm.SubmitMode}
+     */
+    const enum SubmitMode {
+        Always = "always",
+        Dirty = "dirty",
+        Never = "never"
+    }
+
+    /**
+     * Constant Enum: Themes for {@link GlobalContext.getCurrentTheme globalContext.getCurrentTheme()}.
+     * @remarks getCurrentTheme() does not work with Dynamics CRM for tablets or in the unified interface.
+     */
+    const enum Theme {
+        Default = "default",
+        Office12Blue = "Office12Blue",
+        Office14Silver = "Office14Silver"
+    }
+
+    /**
+     * Constant Enum: Settings for {@link GlobalContext.getAdvancedConfigSetting globalContext.getAdvancedConfigSetting(setting)}
+     */
+    const enum AdvancedConfigSettingOption {
+        MaxChildIncidentNumber = "MaxChildIncidentNumber",
+        MaxIncidentMergeNumber = "MaxIncidentMergeNumber"
+    }
+
+    /**
+     * Constant Enum: Requirement Level for {@link Attributes.Attribute.getRequiredLevel Attributes.Attribute.getRequiredLevel()} and
+     * {@link Attributes.Attribute.setRequiredLevel Attributes.Attribute.setRequiredLevel()}.
+     * @see {@link Xrm.Attributes.RequirementLevel}
+     */
+    const enum AttributeRequirementLevel {
+        None = "none",
+        Recommended = "recommended",
+        Required = "required"
+    }
+
+    /**
+     * Constant Enum: Date attribute formats for Attributes.Attribute.getFormat(), used by {@link Attributes.DateAttribute DateAttribute}.
+     * @see {@link Xrm.Attributes.DateAttributeFormat}
+     */
+    const enum DateAttributeFormat {
+        Date = "date",
+        DateTime = "datetime"
+    }
+
+    /**
+     * Constant Enum: Integer attribute formats for Attributes.Attribute.getFormat(), used by {@link Attributes.NumberAttribute NumberAttribute}.
+     * @see {@link Xrm.Attributes.IntegerAttributeFormat}
+     */
+    const enum IntegerAttributeFormat {
+        Duration = "duration",
+        None = "none"
+    }
+
+    /**
+     * Constant Enum: OptionSet attribute formats for Attributes.Attribute.getFormat(), used by {@link Attributes.OptionSetAttribute OptionSetAttribute}.
+     * @see {@link Xrm.Attributes.OptionSetAttributeFormat}
+     */
+    const enum OptionSetAttributeFormat {
+        Language = "language",
+        TimeZone = "timezone"
+    }
+
+    /**
+     * Constant Enum: String attribute formats for Attributes.Attribute.getFormat(), used by {@link Attributes.StringAttribute StringAttribute}.
+     * @see {@link Xrm.Attributes.StringAttributeFormat}
+     */
+    const enum StringAttributeFormat {
+        Email = "email",
+        Phone = "phone",
+        Text = "text",
+        TextArea = "textarea",
+        TickerSymbol = "tickersymbol",
+        URL = "url"
+    }
+
+    /**
+     * Constant Enum: Attribute types for {@link Attributes.Attribute.setDisplayState()}.
+     * @see {@link Xrm.Attributes.AttributeType}
+     */
+    const enum AttributeType {
+        Boolean = "boolean",
+        DateTime = "datetime",
+        Decimal = "decimal",
+        Double = "double",
+        Integer = "integer",
+        Lookup = "lookup",
+        Memo = "memo",
+        Money = "money",
+        OptionSet = "optionset",
+        String = "string"
+    }
+
+    /**
+     * Constant Enum: Control types for {@link Controls.Control.getControlType Controls.Control.getControlType()}.
+     * @see {@link Xrm.Controls.ControlType}
+     */
+    const enum StandardControlType {
+        Standard = "standard",
+        IFrame = "iframe",
+        Lookup = "lookup",
+        OptionSet = "optionset",
+        SubGrid = "subgrid",
+        WebResource = "webresource",
+        Notes = "notes",
+        TimerControl = "timercontrol",
+        KBSearch = "kbsearch",
+        TimeLineWall = "timelinewall",
+        QuickForm = "quickform"
+    }
+
+    /**
+     * Constant Enum: Direction types for a process stage change event
+     * @see {@link ProcessFlow.StageChangeDirection}
+     */
+    const enum StageChangeDirection {
+        Next = "Next",
+        Previous = "Previous"
+    }
+
+    /**
+     * Constant Enum: Status for {@link ProcessFlow.Stage.getStatus Stage.getStatus()}.
+     * @see {@link ProcessFlow.StageStatus}
+     */
+    const enum StageStatus {
+        Active = "active",
+        Inactive = "inactive"
+    }
+
+    /**
+     * Constant Enum: Status for {@link ProcessFlow.Process.getStatus Process.getStatus()}.
+     * @see {@link ProcessFlow.ProcessStatus}
+     */
+    const enum ProcessStatus {
+        Active = "active",
+        Aborted = "aborted",
+        Finished = "finished"
+    }
+
+     /**
+      * Constant Enum: Command Bar Display options for Xrm.Url.FormOpenParameters.cmdbar, Xrm.Url.ViewOpenParameters.cmdbar, and Xrm.Utility.FormOpenParameters.cmdbar.
+      * @see {@link Xrm.Url.CmdBarDisplay}
+      */
+    const enum CmdBarDisplay {
+        True = "true",
+        False = "false"
+    }
+
+    /**
+     * Constant Enum: Navigation Bar Display options for Xrm.Url.FormOpenParameters.navbar, Xrm.Url.ViewOpenParameters.navbar, and Xrm.Utility.FormOpenParameters.navbar.
+     * @see {@link Xrm.Url.NavBarDisplay}
+     */
+    const enum NavBarDisplay {
+        Entity = "entity",
+        On = "on",
+        Off = "off"
+    }
+
+    /**
+     * Constant Enum: Report Open Action options for Xrm.Url.ReportOpenParameters.actions.
+     * @see {@link Xrm.Url.ReportAction}
+     */
+    const enum ReportAction {
+        Filter = "filter",
+        Run = "run"
+    }
+
+    /**
+     * Constant Enum: Posible file types for Xrm.Device.pickFile options
+     * @see {@link Xrm.Device.PickFileTypes}
+     */
+    const enum DevicePickFileType {
+        Audio = "audio",
+        Video = "vidoe",
+        Image = "image"
+    }
 }
diff --git a/types/xrm/tslint.json b/types/xrm/tslint.json
index f4cc3f2d22..6164356b33 100644
--- a/types/xrm/tslint.json
+++ b/types/xrm/tslint.json
@@ -18,6 +18,7 @@
             "double"
         ],
         "jsdoc-format": true,
-        "no-unnecessary-generics": false
+        "no-unnecessary-generics": false,
+        "no-empty-interface": false
     }
 }