diff --git a/.changeset/cuddly-toes-drop.md b/.changeset/cuddly-toes-drop.md
deleted file mode 100644
index 4e7b693..0000000
--- a/.changeset/cuddly-toes-drop.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"codemirror-json-schema": minor
----
-
-More robust conditional types support (thanks @thomasjahoda!)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2609ade..b88d9ee 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # codemirror-json-schema
 
+## 0.8.0
+
+### Minor Changes
+
+- [#138](https://github.com/jsonnext/codemirror-json-schema/pull/138) [`aa27ad7`](https://github.com/jsonnext/codemirror-json-schema/commit/aa27ad740fec447069bacd1d817e1d32fbbf8d90) Thanks [@thomasjahoda](https://github.com/thomasjahoda)! - More robust conditional types support (thanks @thomasjahoda!)
+
 ## 0.7.9
 
 ### Patch Changes
diff --git a/docs/README.md b/docs/README.md
index d922ff5..3ab5b89 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -74,7 +74,7 @@ Full featured cm6 extension for json, including `@codemirror/lang-json`
 
 #### Defined in
 
-[json/bundled.ts:15](https://github.com/jsonnext/codemirror-json-schema/blob/ef7f336/src/json/bundled.ts#L15)
+[json/bundled.ts:15](https://github.com/jsonnext/codemirror-json-schema/blob/aa27ad7/src/json/bundled.ts#L15)
 
 ## Codemirror Extensions
 
@@ -108,7 +108,7 @@ provides a JSON schema enabled autocomplete extension for codemirror
 
 #### Defined in
 
-[features/completion.ts:973](https://github.com/jsonnext/codemirror-json-schema/blob/ef7f336/src/features/completion.ts#L973)
+[features/completion.ts:1062](https://github.com/jsonnext/codemirror-json-schema/blob/aa27ad7/src/features/completion.ts#L1062)
 
 ___
 
@@ -144,7 +144,7 @@ provides a JSON schema enabled tooltip extension for codemirror
 
 #### Defined in
 
-[features/hover.ts:46](https://github.com/jsonnext/codemirror-json-schema/blob/ef7f336/src/features/hover.ts#L46)
+[features/hover.ts:46](https://github.com/jsonnext/codemirror-json-schema/blob/aa27ad7/src/features/hover.ts#L46)
 
 ___
 
@@ -178,7 +178,7 @@ Helper for simpler class instantiaton
 
 #### Defined in
 
-[features/validation.ts:46](https://github.com/jsonnext/codemirror-json-schema/blob/ef7f336/src/features/validation.ts#L46)
+[features/validation.ts:46](https://github.com/jsonnext/codemirror-json-schema/blob/aa27ad7/src/features/validation.ts#L46)
 
 ## Utilities
 
@@ -201,7 +201,7 @@ retrieve a Map of all the json pointers in a document
 
 #### Defined in
 
-[utils/json-pointers.ts:85](https://github.com/jsonnext/codemirror-json-schema/blob/ef7f336/src/utils/json-pointers.ts#L85)
+[utils/json-pointers.ts:89](https://github.com/jsonnext/codemirror-json-schema/blob/aa27ad7/src/utils/json-pointers.ts#L89)
 
 ___
 
@@ -226,7 +226,7 @@ retrieve a JSON pointer for a given position in the editor
 
 #### Defined in
 
-[utils/json-pointers.ts:68](https://github.com/jsonnext/codemirror-json-schema/blob/ef7f336/src/utils/json-pointers.ts#L68)
+[utils/json-pointers.ts:72](https://github.com/jsonnext/codemirror-json-schema/blob/aa27ad7/src/utils/json-pointers.ts#L72)
 
 ___
 
@@ -253,7 +253,7 @@ Mimics the behavior of `json-source-map`'s `parseJSONDocument` function using co
 
 #### Defined in
 
-[parsers/json-parser.ts:29](https://github.com/jsonnext/codemirror-json-schema/blob/ef7f336/src/parsers/json-parser.ts#L29)
+[parsers/json-parser.ts:29](https://github.com/jsonnext/codemirror-json-schema/blob/aa27ad7/src/parsers/json-parser.ts#L29)
 
 ___
 
@@ -280,7 +280,7 @@ Return parsed data and json pointers for a given codemirror EditorState
 
 #### Defined in
 
-[parsers/json-parser.ts:11](https://github.com/jsonnext/codemirror-json-schema/blob/ef7f336/src/parsers/json-parser.ts#L11)
+[parsers/json-parser.ts:11](https://github.com/jsonnext/codemirror-json-schema/blob/aa27ad7/src/parsers/json-parser.ts#L11)
 
 ## Functions
 
@@ -300,7 +300,7 @@ Return parsed data and json pointers for a given codemirror EditorState
 
 #### Defined in
 
-[features/state.ts:25](https://github.com/jsonnext/codemirror-json-schema/blob/ef7f336/src/features/state.ts#L25)
+[features/state.ts:25](https://github.com/jsonnext/codemirror-json-schema/blob/aa27ad7/src/features/state.ts#L25)
 
 ___
 
@@ -322,7 +322,7 @@ ___
 
 #### Defined in
 
-[utils/json-pointers.ts:31](https://github.com/jsonnext/codemirror-json-schema/blob/ef7f336/src/utils/json-pointers.ts#L31)
+[utils/json-pointers.ts:31](https://github.com/jsonnext/codemirror-json-schema/blob/aa27ad7/src/utils/json-pointers.ts#L31)
 
 ___
 
@@ -342,7 +342,7 @@ ___
 
 #### Defined in
 
-[features/validation.ts:36](https://github.com/jsonnext/codemirror-json-schema/blob/ef7f336/src/features/validation.ts#L36)
+[features/validation.ts:36](https://github.com/jsonnext/codemirror-json-schema/blob/aa27ad7/src/features/validation.ts#L36)
 
 ___
 
@@ -363,7 +363,7 @@ ___
 
 #### Defined in
 
-[utils/json-pointers.ts:18](https://github.com/jsonnext/codemirror-json-schema/blob/ef7f336/src/utils/json-pointers.ts#L18)
+[utils/json-pointers.ts:18](https://github.com/jsonnext/codemirror-json-schema/blob/aa27ad7/src/utils/json-pointers.ts#L18)
 
 ___
 
@@ -383,7 +383,7 @@ ___
 
 #### Defined in
 
-[features/state.ts:29](https://github.com/jsonnext/codemirror-json-schema/blob/ef7f336/src/features/state.ts#L29)
+[features/state.ts:29](https://github.com/jsonnext/codemirror-json-schema/blob/aa27ad7/src/features/state.ts#L29)
 
 ___
 
@@ -404,7 +404,7 @@ ___
 
 #### Defined in
 
-[features/state.ts:19](https://github.com/jsonnext/codemirror-json-schema/blob/ef7f336/src/features/state.ts#L19)
+[features/state.ts:19](https://github.com/jsonnext/codemirror-json-schema/blob/aa27ad7/src/features/state.ts#L19)
 
 ## Type Aliases
 
@@ -421,7 +421,7 @@ ___
 
 #### Defined in
 
-[features/hover.ts:19](https://github.com/jsonnext/codemirror-json-schema/blob/ef7f336/src/features/hover.ts#L19)
+[features/hover.ts:19](https://github.com/jsonnext/codemirror-json-schema/blob/aa27ad7/src/features/hover.ts#L19)
 
 ___
 
@@ -431,7 +431,7 @@ ___
 
 #### Defined in
 
-[features/hover.ts:21](https://github.com/jsonnext/codemirror-json-schema/blob/ef7f336/src/features/hover.ts#L21)
+[features/hover.ts:21](https://github.com/jsonnext/codemirror-json-schema/blob/aa27ad7/src/features/hover.ts#L21)
 
 ___
 
@@ -450,7 +450,7 @@ ___
 
 #### Defined in
 
-[features/hover.ts:25](https://github.com/jsonnext/codemirror-json-schema/blob/ef7f336/src/features/hover.ts#L25)
+[features/hover.ts:25](https://github.com/jsonnext/codemirror-json-schema/blob/aa27ad7/src/features/hover.ts#L25)
 
 ___
 
@@ -467,7 +467,7 @@ ___
 
 #### Defined in
 
-[types.ts:6](https://github.com/jsonnext/codemirror-json-schema/blob/ef7f336/src/types.ts#L6)
+[types.ts:6](https://github.com/jsonnext/codemirror-json-schema/blob/aa27ad7/src/types.ts#L6)
 
 ___
 
@@ -486,7 +486,7 @@ ___
 
 #### Defined in
 
-[types.ts:11](https://github.com/jsonnext/codemirror-json-schema/blob/ef7f336/src/types.ts#L11)
+[types.ts:11](https://github.com/jsonnext/codemirror-json-schema/blob/aa27ad7/src/types.ts#L11)
 
 ___
 
@@ -496,7 +496,7 @@ ___
 
 #### Defined in
 
-[types.ts:20](https://github.com/jsonnext/codemirror-json-schema/blob/ef7f336/src/types.ts#L20)
+[types.ts:20](https://github.com/jsonnext/codemirror-json-schema/blob/aa27ad7/src/types.ts#L20)
 
 ## Variables
 
@@ -506,4 +506,4 @@ ___
 
 #### Defined in
 
-[features/state.ts:6](https://github.com/jsonnext/codemirror-json-schema/blob/ef7f336/src/features/state.ts#L6)
+[features/state.ts:6](https://github.com/jsonnext/codemirror-json-schema/blob/aa27ad7/src/features/state.ts#L6)
diff --git a/docs/classes/JSONCompletion.md b/docs/classes/JSONCompletion.md
index 5ae3731..484a6b6 100644
--- a/docs/classes/JSONCompletion.md
+++ b/docs/classes/JSONCompletion.md
@@ -18,7 +18,7 @@
 - [applySnippetCompletion](JSONCompletion.md#applysnippetcompletion)
 - [collectTypes](JSONCompletion.md#collecttypes)
 - [doComplete](JSONCompletion.md#docomplete)
-- [expandSchemaProperty](JSONCompletion.md#expandschemaproperty)
+- [doCompleteForSchema](JSONCompletion.md#docompleteforschema)
 - [extendedRegExp](JSONCompletion.md#extendedregexp)
 - [getAppliedValue](JSONCompletion.md#getappliedvalue)
 - [getInsertTextForGuessedValue](JSONCompletion.md#getinserttextforguessedvalue)
@@ -28,15 +28,16 @@
 - [getInsertTextForString](JSONCompletion.md#getinserttextforstring)
 - [getInsertTextForValue](JSONCompletion.md#getinserttextforvalue)
 - [getPropertyCompletions](JSONCompletion.md#getpropertycompletions)
-- [getReferenceSchema](JSONCompletion.md#getreferenceschema)
 - [getSchemas](JSONCompletion.md#getschemas)
 - [getValueCompletions](JSONCompletion.md#getvaluecompletions)
 - [getValueFromLabel](JSONCompletion.md#getvaluefromlabel)
 
 ### Properties
 
+- [laxSchema](JSONCompletion.md#laxschema)
 - [mode](JSONCompletion.md#mode)
 - [opts](JSONCompletion.md#opts)
+- [originalSchema](JSONCompletion.md#originalschema)
 - [parser](JSONCompletion.md#parser)
 - [schema](JSONCompletion.md#schema)
 
@@ -54,7 +55,7 @@
 
 #### Defined in
 
-[features/completion.ts:63](https://github.com/jsonnext/codemirror-json-schema/blob/ef7f336/src/features/completion.ts#L63)
+[features/completion.ts:87](https://github.com/jsonnext/codemirror-json-schema/blob/aa27ad7/src/features/completion.ts#L87)
 
 ## Methods
 
@@ -75,7 +76,7 @@
 
 #### Defined in
 
-[features/completion.ts:784](https://github.com/jsonnext/codemirror-json-schema/blob/ef7f336/src/features/completion.ts#L784)
+[features/completion.ts:856](https://github.com/jsonnext/codemirror-json-schema/blob/aa27ad7/src/features/completion.ts#L856)
 
 ---
 
@@ -97,7 +98,7 @@
 
 #### Defined in
 
-[features/completion.ts:713](https://github.com/jsonnext/codemirror-json-schema/blob/ef7f336/src/features/completion.ts#L713)
+[features/completion.ts:785](https://github.com/jsonnext/codemirror-json-schema/blob/aa27ad7/src/features/completion.ts#L785)
 
 ---
 
@@ -118,7 +119,7 @@
 
 #### Defined in
 
-[features/completion.ts:759](https://github.com/jsonnext/codemirror-json-schema/blob/ef7f336/src/features/completion.ts#L759)
+[features/completion.ts:831](https://github.com/jsonnext/codemirror-json-schema/blob/aa27ad7/src/features/completion.ts#L831)
 
 ---
 
@@ -138,7 +139,7 @@
 
 #### Defined in
 
-[features/completion.ts:794](https://github.com/jsonnext/codemirror-json-schema/blob/ef7f336/src/features/completion.ts#L794)
+[features/completion.ts:866](https://github.com/jsonnext/codemirror-json-schema/blob/aa27ad7/src/features/completion.ts#L866)
 
 ---
 
@@ -160,7 +161,7 @@
 
 #### Defined in
 
-[features/completion.ts:687](https://github.com/jsonnext/codemirror-json-schema/blob/ef7f336/src/features/completion.ts#L687)
+[features/completion.ts:756](https://github.com/jsonnext/codemirror-json-schema/blob/aa27ad7/src/features/completion.ts#L756)
 
 ---
 
@@ -180,7 +181,7 @@
 
 #### Defined in
 
-[features/completion.ts:251](https://github.com/jsonnext/codemirror-json-schema/blob/ef7f336/src/features/completion.ts#L251)
+[features/completion.ts:301](https://github.com/jsonnext/codemirror-json-schema/blob/aa27ad7/src/features/completion.ts#L301)
 
 ---
 
@@ -201,7 +202,7 @@
 
 #### Defined in
 
-[features/completion.ts:801](https://github.com/jsonnext/codemirror-json-schema/blob/ef7f336/src/features/completion.ts#L801)
+[features/completion.ts:873](https://github.com/jsonnext/codemirror-json-schema/blob/aa27ad7/src/features/completion.ts#L873)
 
 ---
 
@@ -221,34 +222,28 @@
 
 #### Defined in
 
-[features/completion.ts:67](https://github.com/jsonnext/codemirror-json-schema/blob/ef7f336/src/features/completion.ts#L67)
+[features/completion.ts:92](https://github.com/jsonnext/codemirror-json-schema/blob/aa27ad7/src/features/completion.ts#L92)
 
 ---
 
-### expandSchemaProperty
+### doCompleteForSchema
 
-▸ `Private` **expandSchemaProperty**\<`T`\>(`property`, `schema`): `T`
-
-#### Type parameters
-
-| Name | Type                            |
-| :--- | :------------------------------ |
-| `T`  | extends `JSONSchema7Definition` |
+▸ `Private` **doCompleteForSchema**(`ctx`, `rootSchema`): `CompletionResult`
 
 #### Parameters
 
-| Name       | Type          |
-| :--------- | :------------ |
-| `property` | `T`           |
-| `schema`   | `JSONSchema7` |
+| Name         | Type                |
+| :----------- | :------------------ |
+| `ctx`        | `CompletionContext` |
+| `rootSchema` | `JSONSchema7`       |
 
 #### Returns
 
-`T`
+`CompletionResult`
 
 #### Defined in
 
-[features/completion.ts:887](https://github.com/jsonnext/codemirror-json-schema/blob/ef7f336/src/features/completion.ts#L887)
+[features/completion.ts:124](https://github.com/jsonnext/codemirror-json-schema/blob/aa27ad7/src/features/completion.ts#L124)
 
 ---
 
@@ -268,7 +263,7 @@
 
 #### Defined in
 
-[features/completion.ts:950](https://github.com/jsonnext/codemirror-json-schema/blob/ef7f336/src/features/completion.ts#L950)
+[features/completion.ts:1038](https://github.com/jsonnext/codemirror-json-schema/blob/aa27ad7/src/features/completion.ts#L1038)
 
 ---
 
@@ -293,7 +288,7 @@
 
 #### Defined in
 
-[features/completion.ts:925](https://github.com/jsonnext/codemirror-json-schema/blob/ef7f336/src/features/completion.ts#L925)
+[features/completion.ts:1013](https://github.com/jsonnext/codemirror-json-schema/blob/aa27ad7/src/features/completion.ts#L1013)
 
 ---
 
@@ -314,7 +309,7 @@
 
 #### Defined in
 
-[features/completion.ts:506](https://github.com/jsonnext/codemirror-json-schema/blob/ef7f336/src/features/completion.ts#L506)
+[features/completion.ts:570](https://github.com/jsonnext/codemirror-json-schema/blob/aa27ad7/src/features/completion.ts#L570)
 
 ---
 
@@ -334,13 +329,13 @@
 
 #### Defined in
 
-[features/completion.ts:528](https://github.com/jsonnext/codemirror-json-schema/blob/ef7f336/src/features/completion.ts#L528)
+[features/completion.ts:593](https://github.com/jsonnext/codemirror-json-schema/blob/aa27ad7/src/features/completion.ts#L593)
 
 ---
 
 ### getInsertTextForProperty
 
-▸ `Private` **getInsertTextForProperty**(`key`, `addValue`, `rawWord`, `propertySchema?`): `string`
+▸ `Private` **getInsertTextForProperty**(`key`, `addValue`, `rawWord`, `rootSchema`, `propertySchema?`): `string`
 
 #### Parameters
 
@@ -349,6 +344,7 @@
 | `key`             | `string`                |
 | `addValue`        | `boolean`               |
 | `rawWord`         | `string`                |
+| `rootSchema`      | `JSONSchema7`           |
 | `propertySchema?` | `JSONSchema7Definition` |
 
 #### Returns
@@ -357,7 +353,7 @@
 
 #### Defined in
 
-[features/completion.ts:361](https://github.com/jsonnext/codemirror-json-schema/blob/ef7f336/src/features/completion.ts#L361)
+[features/completion.ts:422](https://github.com/jsonnext/codemirror-json-schema/blob/aa27ad7/src/features/completion.ts#L422)
 
 ---
 
@@ -378,7 +374,7 @@
 
 #### Defined in
 
-[features/completion.ts:478](https://github.com/jsonnext/codemirror-json-schema/blob/ef7f336/src/features/completion.ts#L478)
+[features/completion.ts:541](https://github.com/jsonnext/codemirror-json-schema/blob/aa27ad7/src/features/completion.ts#L541)
 
 ---
 
@@ -399,7 +395,7 @@
 
 #### Defined in
 
-[features/completion.ts:494](https://github.com/jsonnext/codemirror-json-schema/blob/ef7f336/src/features/completion.ts#L494)
+[features/completion.ts:558](https://github.com/jsonnext/codemirror-json-schema/blob/aa27ad7/src/features/completion.ts#L558)
 
 ---
 
@@ -420,24 +416,24 @@
 
 #### Defined in
 
-[features/completion.ts:532](https://github.com/jsonnext/codemirror-json-schema/blob/ef7f336/src/features/completion.ts#L532)
+[features/completion.ts:597](https://github.com/jsonnext/codemirror-json-schema/blob/aa27ad7/src/features/completion.ts#L597)
 
 ---
 
 ### getPropertyCompletions
 
-▸ `Private` **getPropertyCompletions**(`schema`, `ctx`, `node`, `collector`, `addValue`, `rawWord`): `void`
+▸ `Private` **getPropertyCompletions**(`rootSchema`, `ctx`, `node`, `collector`, `addValue`, `rawWord`): `void`
 
 #### Parameters
 
-| Name        | Type                  |
-| :---------- | :-------------------- |
-| `schema`    | `JSONSchema7`         |
-| `ctx`       | `CompletionContext`   |
-| `node`      | `SyntaxNode`          |
-| `collector` | `CompletionCollector` |
-| `addValue`  | `boolean`             |
-| `rawWord`   | `string`              |
+| Name         | Type                  |
+| :----------- | :-------------------- |
+| `rootSchema` | `JSONSchema7`         |
+| `ctx`        | `CompletionContext`   |
+| `node`       | `SyntaxNode`          |
+| `collector`  | `CompletionCollector` |
+| `addValue`   | `boolean`             |
+| `rawWord`    | `string`              |
 
 #### Returns
 
@@ -445,41 +441,20 @@
 
 #### Defined in
 
-[features/completion.ts:260](https://github.com/jsonnext/codemirror-json-schema/blob/ef7f336/src/features/completion.ts#L260)
-
----
-
-### getReferenceSchema
-
-▸ `Private` **getReferenceSchema**(`schema`, `ref`): `Record`\<`string`, `any`\>
-
-#### Parameters
-
-| Name     | Type          |
-| :------- | :------------ |
-| `schema` | `JSONSchema7` |
-| `ref`    | `string`      |
-
-#### Returns
-
-`Record`\<`string`, `any`\>
-
-#### Defined in
-
-[features/completion.ts:906](https://github.com/jsonnext/codemirror-json-schema/blob/ef7f336/src/features/completion.ts#L906)
+[features/completion.ts:310](https://github.com/jsonnext/codemirror-json-schema/blob/aa27ad7/src/features/completion.ts#L310)
 
 ---
 
 ### getSchemas
 
-▸ `Private` **getSchemas**(`schema`, `ctx`): `JSONSchema7Definition`[]
+▸ `Private` **getSchemas**(`rootSchema`, `ctx`): `JSONSchema7Definition`[]
 
 #### Parameters
 
-| Name     | Type                |
-| :------- | :------------------ |
-| `schema` | `JSONSchema7`       |
-| `ctx`    | `CompletionContext` |
+| Name         | Type                |
+| :----------- | :------------------ |
+| `rootSchema` | `JSONSchema7`       |
+| `ctx`        | `CompletionContext` |
 
 #### Returns
 
@@ -487,22 +462,22 @@
 
 #### Defined in
 
-[features/completion.ts:816](https://github.com/jsonnext/codemirror-json-schema/blob/ef7f336/src/features/completion.ts#L816)
+[features/completion.ts:888](https://github.com/jsonnext/codemirror-json-schema/blob/aa27ad7/src/features/completion.ts#L888)
 
 ---
 
 ### getValueCompletions
 
-▸ `Private` **getValueCompletions**(`schema`, `ctx`, `types`, `collector`): `undefined` \| \{ `valuePrefix`: `string` }
+▸ `Private` **getValueCompletions**(`rootSchema`, `ctx`, `types`, `collector`): `undefined` \| \{ `valuePrefix`: `string` }
 
 #### Parameters
 
-| Name        | Type                  |
-| :---------- | :-------------------- |
-| `schema`    | `JSONSchema7`         |
-| `ctx`       | `CompletionContext`   |
-| `types`     | `Object`              |
-| `collector` | `CompletionCollector` |
+| Name         | Type                  |
+| :----------- | :-------------------- |
+| `rootSchema` | `JSONSchema7`         |
+| `ctx`        | `CompletionContext`   |
+| `types`      | `Object`              |
+| `collector`  | `CompletionCollector` |
 
 #### Returns
 
@@ -510,7 +485,7 @@
 
 #### Defined in
 
-[features/completion.ts:542](https://github.com/jsonnext/codemirror-json-schema/blob/ef7f336/src/features/completion.ts#L542)
+[features/completion.ts:607](https://github.com/jsonnext/codemirror-json-schema/blob/aa27ad7/src/features/completion.ts#L607)
 
 ---
 
@@ -530,17 +505,30 @@
 
 #### Defined in
 
-[features/completion.ts:946](https://github.com/jsonnext/codemirror-json-schema/blob/ef7f336/src/features/completion.ts#L946)
+[features/completion.ts:1034](https://github.com/jsonnext/codemirror-json-schema/blob/aa27ad7/src/features/completion.ts#L1034)
 
 ## Properties
 
+### laxSchema
+
+• `Private` **laxSchema**: `null` \| `JSONSchema7` = `null`
+
+Inlined (expanded) top-level $ref if present.
+Does not contain any required properties and allows any additional properties everywhere.
+
+#### Defined in
+
+[features/completion.ts:81](https://github.com/jsonnext/codemirror-json-schema/blob/aa27ad7/src/features/completion.ts#L81)
+
+---
+
 ### mode
 
 • `Private` **mode**: `JSONMode` = `MODES.JSON`
 
 #### Defined in
 
-[features/completion.ts:60](https://github.com/jsonnext/codemirror-json-schema/blob/ef7f336/src/features/completion.ts#L60)
+[features/completion.ts:82](https://github.com/jsonnext/codemirror-json-schema/blob/aa27ad7/src/features/completion.ts#L82)
 
 ---
 
@@ -550,7 +538,17 @@
 
 #### Defined in
 
-[features/completion.ts:63](https://github.com/jsonnext/codemirror-json-schema/blob/ef7f336/src/features/completion.ts#L63)
+[features/completion.ts:87](https://github.com/jsonnext/codemirror-json-schema/blob/aa27ad7/src/features/completion.ts#L87)
+
+---
+
+### originalSchema
+
+• `Private` **originalSchema**: `null` \| `JSONSchema7` = `null`
+
+#### Defined in
+
+[features/completion.ts:72](https://github.com/jsonnext/codemirror-json-schema/blob/aa27ad7/src/features/completion.ts#L72)
 
 ---
 
@@ -560,7 +558,7 @@
 
 #### Defined in
 
-[features/completion.ts:61](https://github.com/jsonnext/codemirror-json-schema/blob/ef7f336/src/features/completion.ts#L61)
+[features/completion.ts:83](https://github.com/jsonnext/codemirror-json-schema/blob/aa27ad7/src/features/completion.ts#L83)
 
 ---
 
@@ -568,6 +566,8 @@
 
 • `Private` **schema**: `null` \| `JSONSchema7` = `null`
 
+Inlined (expanded) top-level $ref if present.
+
 #### Defined in
 
-[features/completion.ts:59](https://github.com/jsonnext/codemirror-json-schema/blob/ef7f336/src/features/completion.ts#L59)
+[features/completion.ts:76](https://github.com/jsonnext/codemirror-json-schema/blob/aa27ad7/src/features/completion.ts#L76)
diff --git a/docs/classes/JSONHover.md b/docs/classes/JSONHover.md
index da7efe5..8ca76dc 100644
--- a/docs/classes/JSONHover.md
+++ b/docs/classes/JSONHover.md
@@ -35,7 +35,7 @@
 
 #### Defined in
 
-[features/hover.ts:88](https://github.com/jsonnext/codemirror-json-schema/blob/ef7f336/src/features/hover.ts#L88)
+[features/hover.ts:88](https://github.com/jsonnext/codemirror-json-schema/blob/aa27ad7/src/features/hover.ts#L88)
 
 ## Methods
 
@@ -57,7 +57,7 @@
 
 #### Defined in
 
-[features/hover.ts:203](https://github.com/jsonnext/codemirror-json-schema/blob/ef7f336/src/features/hover.ts#L203)
+[features/hover.ts:203](https://github.com/jsonnext/codemirror-json-schema/blob/aa27ad7/src/features/hover.ts#L203)
 
 ---
 
@@ -77,7 +77,7 @@
 
 #### Defined in
 
-[features/hover.ts:136](https://github.com/jsonnext/codemirror-json-schema/blob/ef7f336/src/features/hover.ts#L136)
+[features/hover.ts:136](https://github.com/jsonnext/codemirror-json-schema/blob/aa27ad7/src/features/hover.ts#L136)
 
 ---
 
@@ -99,7 +99,7 @@
 
 #### Defined in
 
-[features/hover.ts:95](https://github.com/jsonnext/codemirror-json-schema/blob/ef7f336/src/features/hover.ts#L95)
+[features/hover.ts:95](https://github.com/jsonnext/codemirror-json-schema/blob/aa27ad7/src/features/hover.ts#L95)
 
 ---
 
@@ -120,7 +120,7 @@
 
 #### Defined in
 
-[features/hover.ts:162](https://github.com/jsonnext/codemirror-json-schema/blob/ef7f336/src/features/hover.ts#L162)
+[features/hover.ts:162](https://github.com/jsonnext/codemirror-json-schema/blob/aa27ad7/src/features/hover.ts#L162)
 
 ## Properties
 
@@ -130,7 +130,7 @@
 
 #### Defined in
 
-[features/hover.ts:87](https://github.com/jsonnext/codemirror-json-schema/blob/ef7f336/src/features/hover.ts#L87)
+[features/hover.ts:87](https://github.com/jsonnext/codemirror-json-schema/blob/aa27ad7/src/features/hover.ts#L87)
 
 ---
 
@@ -140,7 +140,7 @@
 
 #### Defined in
 
-[features/hover.ts:88](https://github.com/jsonnext/codemirror-json-schema/blob/ef7f336/src/features/hover.ts#L88)
+[features/hover.ts:88](https://github.com/jsonnext/codemirror-json-schema/blob/aa27ad7/src/features/hover.ts#L88)
 
 ---
 
@@ -150,4 +150,4 @@
 
 #### Defined in
 
-[features/hover.ts:86](https://github.com/jsonnext/codemirror-json-schema/blob/ef7f336/src/features/hover.ts#L86)
+[features/hover.ts:86](https://github.com/jsonnext/codemirror-json-schema/blob/aa27ad7/src/features/hover.ts#L86)
diff --git a/docs/classes/JSONValidation.md b/docs/classes/JSONValidation.md
index 4e840b7..99ddfc8 100644
--- a/docs/classes/JSONValidation.md
+++ b/docs/classes/JSONValidation.md
@@ -36,7 +36,7 @@
 
 #### Defined in
 
-[features/validation.ts:77](https://github.com/jsonnext/codemirror-json-schema/blob/ef7f336/src/features/validation.ts#L77)
+[features/validation.ts:77](https://github.com/jsonnext/codemirror-json-schema/blob/aa27ad7/src/features/validation.ts#L77)
 
 ## Constructors
 
@@ -52,7 +52,7 @@
 
 #### Defined in
 
-[features/validation.ts:67](https://github.com/jsonnext/codemirror-json-schema/blob/ef7f336/src/features/validation.ts#L67)
+[features/validation.ts:67](https://github.com/jsonnext/codemirror-json-schema/blob/aa27ad7/src/features/validation.ts#L67)
 
 ## Methods
 
@@ -72,7 +72,7 @@
 
 #### Defined in
 
-[features/validation.ts:108](https://github.com/jsonnext/codemirror-json-schema/blob/ef7f336/src/features/validation.ts#L108)
+[features/validation.ts:108](https://github.com/jsonnext/codemirror-json-schema/blob/aa27ad7/src/features/validation.ts#L108)
 
 ---
 
@@ -92,7 +92,7 @@
 
 #### Defined in
 
-[features/validation.ts:82](https://github.com/jsonnext/codemirror-json-schema/blob/ef7f336/src/features/validation.ts#L82)
+[features/validation.ts:82](https://github.com/jsonnext/codemirror-json-schema/blob/aa27ad7/src/features/validation.ts#L82)
 
 ## Properties
 
@@ -102,7 +102,7 @@
 
 #### Defined in
 
-[features/validation.ts:65](https://github.com/jsonnext/codemirror-json-schema/blob/ef7f336/src/features/validation.ts#L65)
+[features/validation.ts:65](https://github.com/jsonnext/codemirror-json-schema/blob/aa27ad7/src/features/validation.ts#L65)
 
 ---
 
@@ -112,7 +112,7 @@
 
 #### Defined in
 
-[features/validation.ts:67](https://github.com/jsonnext/codemirror-json-schema/blob/ef7f336/src/features/validation.ts#L67)
+[features/validation.ts:67](https://github.com/jsonnext/codemirror-json-schema/blob/aa27ad7/src/features/validation.ts#L67)
 
 ---
 
@@ -122,7 +122,7 @@
 
 #### Defined in
 
-[features/validation.ts:66](https://github.com/jsonnext/codemirror-json-schema/blob/ef7f336/src/features/validation.ts#L66)
+[features/validation.ts:66](https://github.com/jsonnext/codemirror-json-schema/blob/aa27ad7/src/features/validation.ts#L66)
 
 ---
 
@@ -132,4 +132,4 @@
 
 #### Defined in
 
-[features/validation.ts:63](https://github.com/jsonnext/codemirror-json-schema/blob/ef7f336/src/features/validation.ts#L63)
+[features/validation.ts:63](https://github.com/jsonnext/codemirror-json-schema/blob/aa27ad7/src/features/validation.ts#L63)
diff --git a/docs/interfaces/JSONCompletionOptions.md b/docs/interfaces/JSONCompletionOptions.md
index 5a3b17c..c949f35 100644
--- a/docs/interfaces/JSONCompletionOptions.md
+++ b/docs/interfaces/JSONCompletionOptions.md
@@ -17,7 +17,7 @@
 
 #### Defined in
 
-[features/completion.ts:55](https://github.com/jsonnext/codemirror-json-schema/blob/ef7f336/src/features/completion.ts#L55)
+[features/completion.ts:57](https://github.com/jsonnext/codemirror-json-schema/blob/aa27ad7/src/features/completion.ts#L57)
 
 ---
 
@@ -27,4 +27,4 @@
 
 #### Defined in
 
-[features/completion.ts:54](https://github.com/jsonnext/codemirror-json-schema/blob/ef7f336/src/features/completion.ts#L54)
+[features/completion.ts:56](https://github.com/jsonnext/codemirror-json-schema/blob/aa27ad7/src/features/completion.ts#L56)
diff --git a/docs/interfaces/JSONValidationOptions.md b/docs/interfaces/JSONValidationOptions.md
index 4616703..6b7d81e 100644
--- a/docs/interfaces/JSONValidationOptions.md
+++ b/docs/interfaces/JSONValidationOptions.md
@@ -32,7 +32,7 @@
 
 #### Defined in
 
-[features/validation.ts:30](https://github.com/jsonnext/codemirror-json-schema/blob/ef7f336/src/features/validation.ts#L30)
+[features/validation.ts:30](https://github.com/jsonnext/codemirror-json-schema/blob/aa27ad7/src/features/validation.ts#L30)
 
 ---
 
@@ -42,7 +42,7 @@
 
 #### Defined in
 
-[features/validation.ts:31](https://github.com/jsonnext/codemirror-json-schema/blob/ef7f336/src/features/validation.ts#L31)
+[features/validation.ts:31](https://github.com/jsonnext/codemirror-json-schema/blob/aa27ad7/src/features/validation.ts#L31)
 
 ---
 
@@ -52,4 +52,4 @@
 
 #### Defined in
 
-[features/validation.ts:29](https://github.com/jsonnext/codemirror-json-schema/blob/ef7f336/src/features/validation.ts#L29)
+[features/validation.ts:29](https://github.com/jsonnext/codemirror-json-schema/blob/aa27ad7/src/features/validation.ts#L29)
diff --git a/package.json b/package.json
index 98a0c9c..8d2eb38 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "codemirror-json-schema",
   "license": "MIT",
-  "version": "0.7.9",
+  "version": "0.8.0",
   "description": "Codemirror 6 extensions that provide full JSONSchema support for `@codemirror/lang-json` and `codemirror-json5`",
   "contributors": [
     {