diff --git a/package-lock.json b/package-lock.json
index db4b974..f52b6ed 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,6 +11,7 @@
       "dependencies": {
         "dockerfile-ast": "0.6.1",
         "dockerfile-utils": "0.15.0",
+        "vscode-languageserver-textdocument": "1.0.8",
         "vscode-languageserver-types": "3.17.3"
       },
       "devDependencies": {
diff --git a/package.json b/package.json
index 8cb5335..b7d022f 100644
--- a/package.json
+++ b/package.json
@@ -22,6 +22,7 @@
   "dependencies": {
     "dockerfile-ast": "0.6.1",
     "dockerfile-utils": "0.15.0",
+    "vscode-languageserver-textdocument": "1.0.8",
     "vscode-languageserver-types": "3.17.3"
   },
   "main": "./lib/main.js",
diff --git a/src/dockerAssist.ts b/src/dockerAssist.ts
index 1d0c7d2..c3ffa84 100644
--- a/src/dockerAssist.ts
+++ b/src/dockerAssist.ts
@@ -4,8 +4,9 @@
 * ------------------------------------------------------------------------------------------ */
 'use strict';
 
+import { TextDocument } from 'vscode-languageserver-textdocument'; 
 import {
-    TextDocument, TextEdit, Range, Position,
+    TextEdit, Range, Position,
     CompletionItem, CompletionItemKind, CompletionItemTag, InsertTextFormat
 } from 'vscode-languageserver-types';
 import { Util, KEYWORDS } from './docker';
diff --git a/src/dockerCommands.ts b/src/dockerCommands.ts
index ede87a8..3a557a4 100644
--- a/src/dockerCommands.ts
+++ b/src/dockerCommands.ts
@@ -4,7 +4,8 @@
  * ------------------------------------------------------------------------------------------ */
 'use strict';
 
-import { TextDocument, Command, Diagnostic, Range, TextEdit } from 'vscode-languageserver-types';
+import { TextDocument } from 'vscode-languageserver-textdocument'; 
+import { Command, Diagnostic, Range, TextEdit } from 'vscode-languageserver-types';
 import { ValidationCode } from 'dockerfile-utils';
 import { CommandIds } from './main';
 
diff --git a/src/dockerFolding.ts b/src/dockerFolding.ts
index bb30d21..065c674 100644
--- a/src/dockerFolding.ts
+++ b/src/dockerFolding.ts
@@ -4,7 +4,8 @@
 * ------------------------------------------------------------------------------------------ */
 'use strict';
 
-import { Position, Range, TextDocument, FoldingRange, FoldingRangeKind, uinteger } from 'vscode-languageserver-types';
+import { TextDocument } from 'vscode-languageserver-textdocument'; 
+import { Position, Range, FoldingRange, FoldingRangeKind, uinteger } from 'vscode-languageserver-types';
 import { DockerfileParser } from 'dockerfile-ast';
 
 export class DockerFolding {
diff --git a/src/dockerFormatter.ts b/src/dockerFormatter.ts
index 58e24f7..4cdac70 100644
--- a/src/dockerFormatter.ts
+++ b/src/dockerFormatter.ts
@@ -4,8 +4,9 @@
 * ------------------------------------------------------------------------------------------ */
 'use strict';
 
+import { TextDocument } from 'vscode-languageserver-textdocument'; 
 import {
-    TextDocument, TextEdit, Position, Range, FormattingOptions,
+    TextEdit, Position, Range, FormattingOptions,
 } from 'vscode-languageserver-types';
 import { DockerfileParser } from 'dockerfile-ast';
 
diff --git a/src/dockerHighlight.ts b/src/dockerHighlight.ts
index a69a983..47bb230 100644
--- a/src/dockerHighlight.ts
+++ b/src/dockerHighlight.ts
@@ -4,8 +4,9 @@
  * ------------------------------------------------------------------------------------------ */
 'use strict';
 
+import { TextDocument } from 'vscode-languageserver-textdocument'; 
 import {
-    TextDocument, Position, DocumentHighlight, DocumentHighlightKind
+    Position, DocumentHighlight, DocumentHighlightKind
 } from 'vscode-languageserver-types';
 import { DockerfileParser, From } from 'dockerfile-ast';
 import { DockerDefinition } from './dockerDefinition';
diff --git a/src/dockerSemanticTokens.ts b/src/dockerSemanticTokens.ts
index 1e2df4d..1b92cd1 100644
--- a/src/dockerSemanticTokens.ts
+++ b/src/dockerSemanticTokens.ts
@@ -4,7 +4,8 @@
  * ------------------------------------------------------------------------------------------ */
 'use strict';
 
-import { Range, TextDocument, Position, SemanticTokens, SemanticTokenTypes, SemanticTokenModifiers } from 'vscode-languageserver-types';
+import { TextDocument } from 'vscode-languageserver-textdocument'; 
+import { Range, Position, SemanticTokens, SemanticTokenTypes, SemanticTokenModifiers } from 'vscode-languageserver-types';
 import { DockerfileParser, Keyword, Comment, Instruction, Line, Healthcheck, ModifiableInstruction, From, Onbuild, PropertyInstruction, Argument, Variable } from 'dockerfile-ast';
 import { Dockerfile } from 'dockerfile-ast';
 import { Util } from './docker';
diff --git a/src/dockerSignatures.ts b/src/dockerSignatures.ts
index 33b52b6..ed5c635 100644
--- a/src/dockerSignatures.ts
+++ b/src/dockerSignatures.ts
@@ -2,8 +2,9 @@
  * Copyright (c) Remy Suen. All rights reserved.
  * Licensed under the MIT License. See License.txt in the project root for license information.
  * ------------------------------------------------------------------------------------------ */
+import { TextDocument } from 'vscode-languageserver-textdocument';
 import {
-    TextDocument, Position, SignatureHelp, SignatureInformation
+    Position, SignatureHelp, SignatureInformation
 } from 'vscode-languageserver-types';
 import { PlainTextDocumentation } from './dockerPlainText';
 import {
diff --git a/src/languageService.ts b/src/languageService.ts
index b026f45..0073833 100644
--- a/src/languageService.ts
+++ b/src/languageService.ts
@@ -3,8 +3,9 @@
  * Licensed under the MIT License. See License.txt in the project root for license information.
  * ------------------------------------------------------------------------------------------ */
 import { DockerfileLanguageService, ILogger, Capabilities, CompletionItemCapabilities, FormatterSettings } from "./main";
+import { TextDocument } from 'vscode-languageserver-textdocument'; 
 import {
-    TextDocument, Position, CompletionItem, Range, CodeActionContext, Command, TextDocumentIdentifier, SemanticTokens, Location, DocumentHighlight, SymbolInformation, SignatureHelp, DocumentLink, TextEdit, Hover, FormattingOptions, Diagnostic, MarkupKind, FoldingRange, CompletionItemTag
+    Position, CompletionItem, Range, CodeActionContext, Command, TextDocumentIdentifier, SemanticTokens, Location, DocumentHighlight, SymbolInformation, SignatureHelp, DocumentLink, TextEdit, Hover, FormattingOptions, Diagnostic, MarkupKind, FoldingRange, CompletionItemTag
 } from "vscode-languageserver-types";
 import * as DockerfileUtils from 'dockerfile-utils';
 import { DockerAssist } from "./dockerAssist";
diff --git a/test/dockerAssist.test.ts b/test/dockerAssist.test.ts
index fe67ee5..15d164f 100644
--- a/test/dockerAssist.test.ts
+++ b/test/dockerAssist.test.ts
@@ -4,8 +4,9 @@
  * ------------------------------------------------------------------------------------------ */
 import * as assert from "assert";
 
+import { TextDocument } from 'vscode-languageserver-textdocument'; 
 import {
-    TextDocument, Position, CompletionItem, CompletionItemKind, InsertTextFormat, MarkupContent, MarkupKind, CompletionItemTag, TextEdit
+    Position, CompletionItem, CompletionItemKind, InsertTextFormat, MarkupContent, MarkupKind, CompletionItemTag, TextEdit
 } from 'vscode-languageserver-types';
 import { KEYWORDS } from '../src/docker';
 import { MarkdownDocumentation } from '../src/dockerMarkdown';