diff --git a/src/Microsoft.OpenApi.OData.Reader/Common/Utils.cs b/src/Microsoft.OpenApi.OData.Reader/Common/Utils.cs
index 8f27b9d7..233876ef 100644
--- a/src/Microsoft.OpenApi.OData.Reader/Common/Utils.cs
+++ b/src/Microsoft.OpenApi.OData.Reader/Common/Utils.cs
@@ -9,7 +9,7 @@
 using System.Linq;
 using Microsoft.OData.Edm;
 using Microsoft.OData.Edm.Vocabularies;
-using Microsoft.OpenApi.Any;
+using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.Models.Interfaces;
@@ -159,7 +159,7 @@ internal static void AddCustomAttributesToExtensions(this IDictionary<string, IO
             {
                 foreach (var item in attributesValueMap)
                 {
-                    extensions.TryAdd(item.Key, new OpenApiAny(item.Value));
+                    extensions.TryAdd(item.Key, new JsonNodeExtension(item.Value));
                 }
             }
         }
diff --git a/src/Microsoft.OpenApi.OData.Reader/Edm/ODataContext.cs b/src/Microsoft.OpenApi.OData.Reader/Edm/ODataContext.cs
index 4128d676..376b9891 100644
--- a/src/Microsoft.OpenApi.OData.Reader/Edm/ODataContext.cs
+++ b/src/Microsoft.OpenApi.OData.Reader/Edm/ODataContext.cs
@@ -8,7 +8,7 @@
 using System.Linq;
 using Microsoft.OData.Edm;
 using Microsoft.OData.Edm.Vocabularies;
-using Microsoft.OpenApi.Any;
+using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.OData.Common;
@@ -172,7 +172,7 @@ internal void AppendTag(OpenApiTag tagItem)
         /// <param name="extensionName">The extension name.</param>
         /// <param name="extensionValue">The extension value to set.</param>
         /// <param name="initialValueFactory">The tag default value factory.</param>
-        internal void AddExtensionToTag(string tagName, string extensionName, OpenApiAny extensionValue, Func<OpenApiTag> initialValueFactory)
+        internal void AddExtensionToTag(string tagName, string extensionName, JsonNodeExtension extensionValue, Func<OpenApiTag> initialValueFactory)
         {
             Utils.CheckArgumentNullOrEmpty(tagName, nameof(tagName));
             Utils.CheckArgumentNullOrEmpty(extensionName, nameof(extensionName));
diff --git a/src/Microsoft.OpenApi.OData.Reader/EdmModelOpenApiExtensions.cs b/src/Microsoft.OpenApi.OData.Reader/EdmModelOpenApiExtensions.cs
index a1af2a25..c68d3abe 100644
--- a/src/Microsoft.OpenApi.OData.Reader/EdmModelOpenApiExtensions.cs
+++ b/src/Microsoft.OpenApi.OData.Reader/EdmModelOpenApiExtensions.cs
@@ -6,7 +6,7 @@
 using System.Collections.Generic;
 using Microsoft.OData.Edm;
 using Microsoft.OData.Edm.Validation;
-using Microsoft.OpenApi.Any;
+using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.OData.Common;
@@ -48,7 +48,7 @@ public static OpenApiDocument ConvertToOpenApi(this IEdmModel model, OpenApiConv
 				document.Extensions ??= new Dictionary<string, IOpenApiExtension>();
 				foreach (var error in errors)
 				{
-					document.Extensions.Add(Constants.xMsEdmModelError + index++, new OpenApiAny(error.ToString()));
+					document.Extensions.Add(Constants.xMsEdmModelError + index++, new JsonNodeExtension(error.ToString()));
 				}
 
 				return document;
diff --git a/src/Microsoft.OpenApi.OData.Reader/Generator/OpenApiInfoGenerator.cs b/src/Microsoft.OpenApi.OData.Reader/Generator/OpenApiInfoGenerator.cs
index 195893ef..70d0f4c5 100644
--- a/src/Microsoft.OpenApi.OData.Reader/Generator/OpenApiInfoGenerator.cs
+++ b/src/Microsoft.OpenApi.OData.Reader/Generator/OpenApiInfoGenerator.cs
@@ -9,7 +9,7 @@
 using System.Reflection;
 using System.Text.Json.Nodes;
 using Microsoft.OData.Edm;
-using Microsoft.OpenApi.Any;
+using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.OData.Common;
@@ -110,7 +110,7 @@ private static string GetDescription(this ODataContext context)
                 {
                     {
                         "x-ms-generated-by",
-                        new OpenApiAny(new JsonObject
+                        new JsonNodeExtension(new JsonObject
                         {
                             { "toolName", "Microsoft.OpenApi.OData" },
                             { "toolVersion", Assembly.GetExecutingAssembly().GetName().Version?.ToString() }
diff --git a/src/Microsoft.OpenApi.OData.Reader/Generator/OpenApiParameterGenerator.cs b/src/Microsoft.OpenApi.OData.Reader/Generator/OpenApiParameterGenerator.cs
index a30889a3..9e7cb8ab 100644
--- a/src/Microsoft.OpenApi.OData.Reader/Generator/OpenApiParameterGenerator.cs
+++ b/src/Microsoft.OpenApi.OData.Reader/Generator/OpenApiParameterGenerator.cs
@@ -14,10 +14,10 @@
 using System.Diagnostics;
 using System;
 using System.Text.Json.Nodes;
-using Microsoft.OpenApi.Any;
 using Microsoft.OpenApi.Models.References;
 using Microsoft.OpenApi.Models.Interfaces;
 using Microsoft.OpenApi.Interfaces;
+using Microsoft.OpenApi.Extensions;
 
 namespace Microsoft.OpenApi.OData.Generator
 {
@@ -195,7 +195,7 @@ public static IList<OpenApiParameter> CreateKeyParameters(this ODataContext cont
                 };
 
                 parameter.Extensions ??= new Dictionary<string, IOpenApiExtension>();
-                parameter.Extensions.Add(Constants.xMsKeyType, new OpenApiAny(entityType.Name));
+                parameter.Extensions.Add(Constants.xMsKeyType, new JsonNodeExtension(entityType.Name));
                 parameters.Add(parameter);
             }
             else
@@ -221,7 +221,7 @@ public static IList<OpenApiParameter> CreateKeyParameters(this ODataContext cont
                     }
 
                     parameter.Extensions ??= new Dictionary<string, IOpenApiExtension>();
-                    parameter.Extensions.Add(Constants.xMsKeyType, new OpenApiAny(entityType.Name));
+                    parameter.Extensions.Add(Constants.xMsKeyType, new JsonNodeExtension(entityType.Name));
                     parameters.Add(parameter);
                 }
             }
diff --git a/src/Microsoft.OpenApi.OData.Reader/Generator/OpenApiSchemaGenerator.cs b/src/Microsoft.OpenApi.OData.Reader/Generator/OpenApiSchemaGenerator.cs
index af8b756c..f36023f9 100644
--- a/src/Microsoft.OpenApi.OData.Reader/Generator/OpenApiSchemaGenerator.cs
+++ b/src/Microsoft.OpenApi.OData.Reader/Generator/OpenApiSchemaGenerator.cs
@@ -17,7 +17,6 @@
 using Microsoft.OpenApi.MicrosoftExtensions;
 using Microsoft.OpenApi.OData.Vocabulary.Core;
 using System.Text.Json.Nodes;
-using Microsoft.OpenApi.Any;
 using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Models.References;
 using System.Globalization;
@@ -452,7 +451,7 @@ public static Dictionary<string, IOpenApiSchema> CreateStructuredTypePropertiesS
                     // we always want a new copy because it's a reference
                     openApiSchema.Extensions = propertySchema.Extensions is null ? [] : new Dictionary<string, IOpenApiExtension>(propertySchema.Extensions);
                     openApiSchema.Extensions.AddCustomAttributesToExtensions(context, property);
-                    openApiSchema.Extensions.Add(Constants.xMsNavigationProperty, new OpenApiAny(true));
+                    openApiSchema.Extensions.Add(Constants.xMsNavigationProperty, new JsonNodeExtension(true));
                 }
                 properties.Add(property.Name, propertySchema);
             }
@@ -514,7 +513,7 @@ private static OpenApiSchema CreateStructuredTypeSchema(this ODataContext contex
                 {
                     extension = new Dictionary<string, IOpenApiExtension>
                     {
-                        { Constants.xMsDiscriminatorValue, new OpenApiAny("#" + structuredType.FullTypeName()) }
+                        { Constants.xMsDiscriminatorValue, new JsonNodeExtension("#" + structuredType.FullTypeName()) }
                     };
                 }
 
diff --git a/src/Microsoft.OpenApi.OData.Reader/Microsoft.OpenAPI.OData.Reader.csproj b/src/Microsoft.OpenApi.OData.Reader/Microsoft.OpenAPI.OData.Reader.csproj
index 5e07e77d..f401000a 100644
--- a/src/Microsoft.OpenApi.OData.Reader/Microsoft.OpenAPI.OData.Reader.csproj
+++ b/src/Microsoft.OpenApi.OData.Reader/Microsoft.OpenAPI.OData.Reader.csproj
@@ -30,7 +30,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.OData.Edm" Version="8.2.3" />
-    <PackageReference Include="Microsoft.OpenApi" Version="2.0.0-preview.17" />
+    <PackageReference Include="Microsoft.OpenApi" Version="2.0.0-preview.18" />
     <None Include="..\..\README.md" Pack="true" PackagePath="\" />
     <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.13.61">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/src/Microsoft.OpenApi.OData.Reader/Operation/ComplexPropertyBaseOperationHandler.cs b/src/Microsoft.OpenApi.OData.Reader/Operation/ComplexPropertyBaseOperationHandler.cs
index 57dc7acc..2c7f93d8 100644
--- a/src/Microsoft.OpenApi.OData.Reader/Operation/ComplexPropertyBaseOperationHandler.cs
+++ b/src/Microsoft.OpenApi.OData.Reader/Operation/ComplexPropertyBaseOperationHandler.cs
@@ -3,7 +3,7 @@
 //  Licensed under the MIT License (MIT). See LICENSE in the repo root for license information.
 // ------------------------------------------------------------
 
-using Microsoft.OpenApi.Any;
+using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.Models.References;
 using Microsoft.OpenApi.OData.Common;
@@ -41,7 +41,7 @@ protected override void SetTags(OpenApiOperation operation)
             operation.Tags ??= new HashSet<OpenApiTagReference>();
             if (!string.IsNullOrEmpty(tagName))
             {
-                Context.AddExtensionToTag(tagName, Constants.xMsTocType, new OpenApiAny("page"), () => new OpenApiTag()
+                Context.AddExtensionToTag(tagName, Constants.xMsTocType, new JsonNodeExtension("page"), () => new OpenApiTag()
                 {
                     Name = tagName
                 });
diff --git a/src/Microsoft.OpenApi.OData.Reader/Operation/ComplexPropertyGetOperationHandler.cs b/src/Microsoft.OpenApi.OData.Reader/Operation/ComplexPropertyGetOperationHandler.cs
index 51db8e26..f6455b26 100644
--- a/src/Microsoft.OpenApi.OData.Reader/Operation/ComplexPropertyGetOperationHandler.cs
+++ b/src/Microsoft.OpenApi.OData.Reader/Operation/ComplexPropertyGetOperationHandler.cs
@@ -8,7 +8,7 @@
 using System.Net.Http;
 using System.Text.Json.Nodes;
 using Microsoft.OData.Edm;
-using Microsoft.OpenApi.Any;
+using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.Models.Interfaces;
@@ -165,7 +165,7 @@ ComplexPropertySegment is not null &&
                 { "operationName", Context.Settings.PageableOperationName}
             };
             operation.Extensions ??= new Dictionary<string, IOpenApiExtension>();
-            operation.Extensions.Add(Constants.xMsPageable, new OpenApiAny(extension));
+            operation.Extensions.Add(Constants.xMsPageable, new JsonNodeExtension(extension));
 
             base.SetExtensions(operation);
         }
diff --git a/src/Microsoft.OpenApi.OData.Reader/Operation/DollarCountGetOperationHandler.cs b/src/Microsoft.OpenApi.OData.Reader/Operation/DollarCountGetOperationHandler.cs
index 96b6e773..b555fdb9 100644
--- a/src/Microsoft.OpenApi.OData.Reader/Operation/DollarCountGetOperationHandler.cs
+++ b/src/Microsoft.OpenApi.OData.Reader/Operation/DollarCountGetOperationHandler.cs
@@ -9,7 +9,7 @@
 using System.Net.Http;
 using Microsoft.OData.Edm;
 using Microsoft.OData.Edm.Vocabularies;
-using Microsoft.OpenApi.Any;
+using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.Models.References;
 using Microsoft.OpenApi.OData.Common;
@@ -113,7 +113,7 @@ protected override void SetTags(OpenApiOperation operation)
 
             if (tagName != null && Context is not null)
             {
-                Context.AddExtensionToTag(tagName, Constants.xMsTocType, new OpenApiAny("page"), () => new OpenApiTag()
+                Context.AddExtensionToTag(tagName, Constants.xMsTocType, new JsonNodeExtension("page"), () => new OpenApiTag()
                 {
                     Name = tagName
                 });
diff --git a/src/Microsoft.OpenApi.OData.Reader/Operation/EdmActionImportOperationHandler.cs b/src/Microsoft.OpenApi.OData.Reader/Operation/EdmActionImportOperationHandler.cs
index f5b94190..0054295f 100644
--- a/src/Microsoft.OpenApi.OData.Reader/Operation/EdmActionImportOperationHandler.cs
+++ b/src/Microsoft.OpenApi.OData.Reader/Operation/EdmActionImportOperationHandler.cs
@@ -6,7 +6,7 @@
 using System.Collections.Generic;
 using System.Net.Http;
 using Microsoft.OData.Edm;
-using Microsoft.OpenApi.Any;
+using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.OData.Common;
@@ -44,7 +44,7 @@ protected override void SetRequestBody(OpenApiOperation operation)
         protected override void SetExtensions(OpenApiOperation operation)
         {
             operation.Extensions ??= new Dictionary<string, IOpenApiExtension>();
-            operation.Extensions.Add(Constants.xMsDosOperationType, new OpenApiAny("actionImport"));
+            operation.Extensions.Add(Constants.xMsDosOperationType, new JsonNodeExtension("actionImport"));
 
             base.SetExtensions(operation);
         }
diff --git a/src/Microsoft.OpenApi.OData.Reader/Operation/EdmActionOperationHandler.cs b/src/Microsoft.OpenApi.OData.Reader/Operation/EdmActionOperationHandler.cs
index 0aed9470..df3b254b 100644
--- a/src/Microsoft.OpenApi.OData.Reader/Operation/EdmActionOperationHandler.cs
+++ b/src/Microsoft.OpenApi.OData.Reader/Operation/EdmActionOperationHandler.cs
@@ -6,7 +6,7 @@
 using System.Collections.Generic;
 using System.Net.Http;
 using Microsoft.OData.Edm;
-using Microsoft.OpenApi.Any;
+using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.Models.References;
@@ -76,7 +76,7 @@ protected override void SetRequestBody(OpenApiOperation operation)
         protected override void SetExtensions(OpenApiOperation operation)
         {
             operation.Extensions ??= new Dictionary<string, IOpenApiExtension>();
-            operation.Extensions.Add(Constants.xMsDosOperationType, new OpenApiAny("action"));
+            operation.Extensions.Add(Constants.xMsDosOperationType, new JsonNodeExtension("action"));
             base.SetExtensions(operation);
         }
     }
diff --git a/src/Microsoft.OpenApi.OData.Reader/Operation/EdmFunctionImportOperationHandler.cs b/src/Microsoft.OpenApi.OData.Reader/Operation/EdmFunctionImportOperationHandler.cs
index 5c6e6c6a..8ed3a0d2 100644
--- a/src/Microsoft.OpenApi.OData.Reader/Operation/EdmFunctionImportOperationHandler.cs
+++ b/src/Microsoft.OpenApi.OData.Reader/Operation/EdmFunctionImportOperationHandler.cs
@@ -6,7 +6,7 @@
 using System.Collections.Generic;
 using System.Net.Http;
 using Microsoft.OData.Edm;
-using Microsoft.OpenApi.Any;
+using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.OData.Common;
@@ -65,7 +65,7 @@ protected override void SetParameters(OpenApiOperation operation)
         protected override void SetExtensions(OpenApiOperation operation)
         {
             operation.Extensions ??= new Dictionary<string, IOpenApiExtension>();
-            operation.Extensions.Add(Constants.xMsDosOperationType, new OpenApiAny("functionImport"));
+            operation.Extensions.Add(Constants.xMsDosOperationType, new JsonNodeExtension("functionImport"));
             base.SetExtensions(operation);
         }
     }
diff --git a/src/Microsoft.OpenApi.OData.Reader/Operation/EdmFunctionOperationHandler.cs b/src/Microsoft.OpenApi.OData.Reader/Operation/EdmFunctionOperationHandler.cs
index bbe0c4bb..503e3cb0 100644
--- a/src/Microsoft.OpenApi.OData.Reader/Operation/EdmFunctionOperationHandler.cs
+++ b/src/Microsoft.OpenApi.OData.Reader/Operation/EdmFunctionOperationHandler.cs
@@ -6,7 +6,7 @@
 using System.Collections.Generic;
 using System.Net.Http;
 using Microsoft.OData.Edm;
-using Microsoft.OpenApi.Any;
+using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.OData.Common;
@@ -61,7 +61,7 @@ protected override void SetBasicInfo(OpenApiOperation operation)
         protected override void SetExtensions(OpenApiOperation operation)
         {
             operation.Extensions ??= new Dictionary<string, IOpenApiExtension>();
-            operation.Extensions.Add(Constants.xMsDosOperationType, new OpenApiAny("function"));
+            operation.Extensions.Add(Constants.xMsDosOperationType, new JsonNodeExtension("function"));
             base.SetExtensions(operation);
         }
     }
diff --git a/src/Microsoft.OpenApi.OData.Reader/Operation/EdmOperationImportOperationHandler.cs b/src/Microsoft.OpenApi.OData.Reader/Operation/EdmOperationImportOperationHandler.cs
index b537b0b6..aa903706 100644
--- a/src/Microsoft.OpenApi.OData.Reader/Operation/EdmOperationImportOperationHandler.cs
+++ b/src/Microsoft.OpenApi.OData.Reader/Operation/EdmOperationImportOperationHandler.cs
@@ -7,7 +7,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.OData.Edm;
-using Microsoft.OpenApi.Any;
+using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.Models.References;
@@ -150,7 +150,7 @@ protected override void SetTags(OpenApiOperation operation)
             {
                 var tag = CreateTag(EdmOperationImport);
                 tag.Extensions ??= new Dictionary<string, IOpenApiExtension>();
-                tag.Extensions.Add(Constants.xMsTocType, new OpenApiAny("container"));
+                tag.Extensions.Add(Constants.xMsTocType, new JsonNodeExtension("container"));
                 Context?.AppendTag(tag);
 
                 operation.Tags ??= new HashSet<OpenApiTagReference>();
diff --git a/src/Microsoft.OpenApi.OData.Reader/Operation/EdmOperationOperationHandler.cs b/src/Microsoft.OpenApi.OData.Reader/Operation/EdmOperationOperationHandler.cs
index bcc64471..23460f79 100644
--- a/src/Microsoft.OpenApi.OData.Reader/Operation/EdmOperationOperationHandler.cs
+++ b/src/Microsoft.OpenApi.OData.Reader/Operation/EdmOperationOperationHandler.cs
@@ -8,7 +8,7 @@
 using System.Linq;
 using System.Text.Json.Nodes;
 using Microsoft.OData.Edm;
-using Microsoft.OpenApi.Any;
+using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.Models.References;
@@ -163,7 +163,7 @@ protected override void SetTags(OpenApiOperation operation)
                 Name = tagName,
             };
             tag.Extensions ??= new Dictionary<string, IOpenApiExtension>();
-            tag.Extensions.Add(Constants.xMsTocType, new OpenApiAny("container"));
+            tag.Extensions.Add(Constants.xMsTocType, new JsonNodeExtension("container"));
             operation.Tags ??= new HashSet<OpenApiTagReference>();
             operation.Tags.Add(new OpenApiTagReference(tag.Name, _document));
 
@@ -360,7 +360,7 @@ protected override void SetExtensions(OpenApiOperation operation)
                 };
                 
                 operation.Extensions ??= new Dictionary<string, IOpenApiExtension>();
-                operation.Extensions.Add(Constants.xMsPageable, new OpenApiAny(extension));
+                operation.Extensions.Add(Constants.xMsPageable, new JsonNodeExtension(extension));
             }
             base.SetExtensions(operation);
         }
diff --git a/src/Microsoft.OpenApi.OData.Reader/Operation/EntitySetGetOperationHandler.cs b/src/Microsoft.OpenApi.OData.Reader/Operation/EntitySetGetOperationHandler.cs
index e4b36f8e..f0d1f9d1 100644
--- a/src/Microsoft.OpenApi.OData.Reader/Operation/EntitySetGetOperationHandler.cs
+++ b/src/Microsoft.OpenApi.OData.Reader/Operation/EntitySetGetOperationHandler.cs
@@ -9,7 +9,7 @@
 using System.Net.Http;
 using System.Text.Json.Nodes;
 using Microsoft.OData.Edm;
-using Microsoft.OpenApi.Any;
+using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.Models.References;
@@ -81,7 +81,7 @@ protected override void SetExtensions(OpenApiOperation operation)
                     { "operationName", Context.Settings.PageableOperationName}
                 };
                 operation.Extensions ??= new Dictionary<string, IOpenApiExtension>();
-                operation.Extensions.Add(Constants.xMsPageable, new OpenApiAny(extension));
+                operation.Extensions.Add(Constants.xMsPageable, new JsonNodeExtension(extension));
 
                 base.SetExtensions(operation);
             }
diff --git a/src/Microsoft.OpenApi.OData.Reader/Operation/EntitySetOperationHandler.cs b/src/Microsoft.OpenApi.OData.Reader/Operation/EntitySetOperationHandler.cs
index e3a79902..cf6ea4d4 100644
--- a/src/Microsoft.OpenApi.OData.Reader/Operation/EntitySetOperationHandler.cs
+++ b/src/Microsoft.OpenApi.OData.Reader/Operation/EntitySetOperationHandler.cs
@@ -4,7 +4,7 @@
 // ------------------------------------------------------------
 
 using Microsoft.OData.Edm;
-using Microsoft.OpenApi.Any;
+using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.Models.References;
@@ -50,7 +50,7 @@ protected override void SetTags(OpenApiOperation operation)
             operation.Tags ??= new HashSet<OpenApiTagReference>();
             operation.Tags.Add(new OpenApiTagReference(tagName, _document));
 
-            Context?.AddExtensionToTag(tagName, Constants.xMsTocType, new OpenApiAny("page"), () => new OpenApiTag()
+            Context?.AddExtensionToTag(tagName, Constants.xMsTocType, new JsonNodeExtension("page"), () => new OpenApiTag()
 			{
 				Name = tagName
 			});
@@ -62,7 +62,7 @@ protected override void SetTags(OpenApiOperation operation)
         protected override void SetExtensions(OpenApiOperation operation)
         {
             operation.Extensions ??= new Dictionary<string, IOpenApiExtension>();
-            operation.Extensions.Add(Constants.xMsDosOperationType, new OpenApiAny("operation"));
+            operation.Extensions.Add(Constants.xMsDosOperationType, new JsonNodeExtension("operation"));
 
             base.SetExtensions(operation);
         }
diff --git a/src/Microsoft.OpenApi.OData.Reader/Operation/MediaEntityOperationalHandler.cs b/src/Microsoft.OpenApi.OData.Reader/Operation/MediaEntityOperationalHandler.cs
index 9982b020..6ab09dab 100644
--- a/src/Microsoft.OpenApi.OData.Reader/Operation/MediaEntityOperationalHandler.cs
+++ b/src/Microsoft.OpenApi.OData.Reader/Operation/MediaEntityOperationalHandler.cs
@@ -4,7 +4,7 @@
 // ------------------------------------------------------------
 
 using Microsoft.OData.Edm;
-using Microsoft.OpenApi.Any;
+using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.Models.References;
 using Microsoft.OpenApi.OData.Common;
@@ -94,7 +94,7 @@ protected override void SetTags(OpenApiOperation operation)
                 : NavigationSourceSegment?.Identifier + "." + NavigationSourceSegment?.EntityType.Name;
 
 
-            Context?.AddExtensionToTag(tagIdentifier, Constants.xMsTocType, new OpenApiAny("page"), () => new OpenApiTag()
+            Context?.AddExtensionToTag(tagIdentifier, Constants.xMsTocType, new JsonNodeExtension("page"), () => new OpenApiTag()
 			{
 				Name = tagIdentifier
 			});
diff --git a/src/Microsoft.OpenApi.OData.Reader/Operation/NavigationPropertyGetOperationHandler.cs b/src/Microsoft.OpenApi.OData.Reader/Operation/NavigationPropertyGetOperationHandler.cs
index 81a6766d..1438ba8a 100644
--- a/src/Microsoft.OpenApi.OData.Reader/Operation/NavigationPropertyGetOperationHandler.cs
+++ b/src/Microsoft.OpenApi.OData.Reader/Operation/NavigationPropertyGetOperationHandler.cs
@@ -9,7 +9,7 @@
 using System.Net.Http;
 using System.Text.Json.Nodes;
 using Microsoft.OData.Edm;
-using Microsoft.OpenApi.Any;
+using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.Models.Interfaces;
@@ -83,7 +83,7 @@ protected override void SetExtensions(OpenApiOperation operation)
                 };
 
                 operation.Extensions ??= new Dictionary<string, IOpenApiExtension>();
-                operation.Extensions.Add(Constants.xMsPageable, new OpenApiAny(extension));
+                operation.Extensions.Add(Constants.xMsPageable, new JsonNodeExtension(extension));
             }
 
             base.SetExtensions(operation);
diff --git a/src/Microsoft.OpenApi.OData.Reader/Operation/NavigationPropertyOperationHandler.cs b/src/Microsoft.OpenApi.OData.Reader/Operation/NavigationPropertyOperationHandler.cs
index d55a0ec2..58af4dac 100644
--- a/src/Microsoft.OpenApi.OData.Reader/Operation/NavigationPropertyOperationHandler.cs
+++ b/src/Microsoft.OpenApi.OData.Reader/Operation/NavigationPropertyOperationHandler.cs
@@ -4,7 +4,7 @@
 // ------------------------------------------------------------
 
 using Microsoft.OData.Edm;
-using Microsoft.OpenApi.Any;
+using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.Models.Interfaces;
@@ -93,7 +93,7 @@ protected override void SetTags(OpenApiOperation operation)
             if (Context is not null && Path is not null)
             {
                 string name = EdmModelHelper.GenerateNavigationPropertyPathTagName(Path, Context);
-                Context.AddExtensionToTag(name, Constants.xMsTocType, new OpenApiAny("page"), () => new OpenApiTag()
+                Context.AddExtensionToTag(name, Constants.xMsTocType, new JsonNodeExtension("page"), () => new OpenApiTag()
                 {
                     Name = name
                 });
@@ -108,7 +108,7 @@ protected override void SetTags(OpenApiOperation operation)
         protected override void SetExtensions(OpenApiOperation operation)
         {
             operation.Extensions ??= new Dictionary<string, IOpenApiExtension>();
-            operation.Extensions.Add(Constants.xMsDosOperationType, new OpenApiAny("operation"));
+            operation.Extensions.Add(Constants.xMsDosOperationType, new JsonNodeExtension("operation"));
 
             base.SetExtensions(operation);
         }
diff --git a/src/Microsoft.OpenApi.OData.Reader/Operation/ODataTypeCastGetOperationHandler.cs b/src/Microsoft.OpenApi.OData.Reader/Operation/ODataTypeCastGetOperationHandler.cs
index bff2cf5f..6832f3f8 100644
--- a/src/Microsoft.OpenApi.OData.Reader/Operation/ODataTypeCastGetOperationHandler.cs
+++ b/src/Microsoft.OpenApi.OData.Reader/Operation/ODataTypeCastGetOperationHandler.cs
@@ -10,7 +10,7 @@
 using System.Text.Json.Nodes;
 using Microsoft.OData.Edm;
 using Microsoft.OData.Edm.Vocabularies;
-using Microsoft.OpenApi.Any;
+using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.Models.Interfaces;
@@ -273,7 +273,7 @@ protected override void SetTags(OpenApiOperation operation)
 			if (IsSingleElement)
 				Context.AppendTag(new OpenApiTag() { Name = tagName });
 			else
-				Context.AddExtensionToTag(tagName, Constants.xMsTocType, new OpenApiAny("page"), () => new OpenApiTag()
+				Context.AddExtensionToTag(tagName, Constants.xMsTocType, new JsonNodeExtension("page"), () => new OpenApiTag()
 				{
 					Name = tagName
 				});
@@ -390,7 +390,7 @@ protected override void SetExtensions(OpenApiOperation operation)
 			};
 
 			operation.Extensions ??= new Dictionary<string, IOpenApiExtension>();
-			operation.Extensions.Add(Constants.xMsPageable, new OpenApiAny(extension));
+			operation.Extensions.Add(Constants.xMsPageable, new JsonNodeExtension(extension));
 		}
 
 		base.SetExtensions(operation);
diff --git a/src/Microsoft.OpenApi.OData.Reader/Operation/RefGetOperationHandler.cs b/src/Microsoft.OpenApi.OData.Reader/Operation/RefGetOperationHandler.cs
index 06ca60a2..9a2a2ae4 100644
--- a/src/Microsoft.OpenApi.OData.Reader/Operation/RefGetOperationHandler.cs
+++ b/src/Microsoft.OpenApi.OData.Reader/Operation/RefGetOperationHandler.cs
@@ -8,7 +8,7 @@
 using System.Net.Http;
 using System.Text.Json.Nodes;
 using Microsoft.OData.Edm;
-using Microsoft.OpenApi.Any;
+using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.Models.Interfaces;
@@ -77,7 +77,7 @@ protected override void SetExtensions(OpenApiOperation operation)
                     };
 
                 operation.Extensions ??= new Dictionary<string, IOpenApiExtension>();
-                operation.Extensions.Add(Constants.xMsPageable, new OpenApiAny(extension));
+                operation.Extensions.Add(Constants.xMsPageable, new JsonNodeExtension(extension));
             }
 
             base.SetExtensions(operation);
diff --git a/src/Microsoft.OpenApi.OData.Reader/Operation/SingletonOperationHandler.cs b/src/Microsoft.OpenApi.OData.Reader/Operation/SingletonOperationHandler.cs
index e49713cc..c22a9e0f 100644
--- a/src/Microsoft.OpenApi.OData.Reader/Operation/SingletonOperationHandler.cs
+++ b/src/Microsoft.OpenApi.OData.Reader/Operation/SingletonOperationHandler.cs
@@ -4,7 +4,7 @@
 // ------------------------------------------------------------
 
 using Microsoft.OData.Edm;
-using Microsoft.OpenApi.Any;
+using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.Models.References;
@@ -50,7 +50,7 @@ protected override void SetTags(OpenApiOperation operation)
             // For example: "Me.User"
             var tagName = Singleton?.Name + "." + Singleton?.EntityType.Name;
 
-            Context?.AddExtensionToTag(tagName, Constants.xMsTocType, new OpenApiAny("page"), () => new OpenApiTag()
+            Context?.AddExtensionToTag(tagName, Constants.xMsTocType, new JsonNodeExtension("page"), () => new OpenApiTag()
 			{
 				Name = tagName
 			});
@@ -65,7 +65,7 @@ protected override void SetTags(OpenApiOperation operation)
         protected override void SetExtensions(OpenApiOperation operation)
         {
             operation.Extensions ??= new Dictionary<string, IOpenApiExtension>();
-            operation.Extensions.Add(Constants.xMsDosOperationType, new OpenApiAny("operation"));
+            operation.Extensions.Add(Constants.xMsDosOperationType, new JsonNodeExtension("operation"));
 
             base.SetExtensions(operation);
         }
diff --git a/src/Microsoft.OpenApi.OData.Reader/PathItem/NavigationPropertyPathItemHandler.cs b/src/Microsoft.OpenApi.OData.Reader/PathItem/NavigationPropertyPathItemHandler.cs
index f657944f..b92b191a 100644
--- a/src/Microsoft.OpenApi.OData.Reader/PathItem/NavigationPropertyPathItemHandler.cs
+++ b/src/Microsoft.OpenApi.OData.Reader/PathItem/NavigationPropertyPathItemHandler.cs
@@ -10,12 +10,12 @@
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.OData.Common;
 using Microsoft.OpenApi.OData.Edm;
-using Microsoft.OpenApi.Any;
 using Microsoft.OData.Edm.Vocabularies;
 using Microsoft.OpenApi.OData.Vocabulary.Capabilities;
 using System.Text.Json.Nodes;
 using System.Net.Http;
 using Microsoft.OpenApi.Interfaces;
+using Microsoft.OpenApi.Extensions;
 
 namespace Microsoft.OpenApi.OData.PathItem
 {
@@ -349,7 +349,7 @@ protected override void SetExtensions(OpenApiPathItem item)
                 }
 
                 item.Extensions ??= new Dictionary<string, IOpenApiExtension>();
-                item.Extensions.Add(Constants.xMsDosGroupPath, new OpenApiAny(array));   
+                item.Extensions.Add(Constants.xMsDosGroupPath, new JsonNodeExtension(array));   
             }
 
             base.SetExtensions(item);
diff --git a/src/Microsoft.OpenApi.OData.Reader/PathItem/OperationPathItemHandler.cs b/src/Microsoft.OpenApi.OData.Reader/PathItem/OperationPathItemHandler.cs
index b2ea58da..1b5af952 100644
--- a/src/Microsoft.OpenApi.OData.Reader/PathItem/OperationPathItemHandler.cs
+++ b/src/Microsoft.OpenApi.OData.Reader/PathItem/OperationPathItemHandler.cs
@@ -8,7 +8,7 @@
 using System.Net.Http;
 using System.Text.Json.Nodes;
 using Microsoft.OData.Edm;
-using Microsoft.OpenApi.Any;
+using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.OData.Common;
@@ -101,7 +101,7 @@ protected override void SetExtensions(OpenApiPathItem item)
                     }
 
                     item.Extensions ??= new Dictionary<string, IOpenApiExtension>();
-                    item.Extensions.Add(Constants.xMsDosGroupPath, new OpenApiAny(array));
+                    item.Extensions.Add(Constants.xMsDosGroupPath, new JsonNodeExtension(array));
                 }
             }
 
diff --git a/test/Microsoft.OpenAPI.OData.Reader.Tests/Microsoft.OpenAPI.OData.Reader.Tests.csproj b/test/Microsoft.OpenAPI.OData.Reader.Tests/Microsoft.OpenAPI.OData.Reader.Tests.csproj
index 29e1da3d..0c71f14e 100644
--- a/test/Microsoft.OpenAPI.OData.Reader.Tests/Microsoft.OpenAPI.OData.Reader.Tests.csproj
+++ b/test/Microsoft.OpenAPI.OData.Reader.Tests/Microsoft.OpenAPI.OData.Reader.Tests.csproj
@@ -88,7 +88,6 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.OpenApi" Version="2.0.0-preview.17" />
     <PackageReference Include="moq" Version="4.20.72" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
     <PackageReference Include="xunit" Version="2.9.3" />
diff --git a/test/Microsoft.OpenAPI.OData.Reader.Tests/PathItem/ComplexPropertyPathItemHandlerTests.cs b/test/Microsoft.OpenAPI.OData.Reader.Tests/PathItem/ComplexPropertyPathItemHandlerTests.cs
index ade42540..6a61e26c 100644
--- a/test/Microsoft.OpenAPI.OData.Reader.Tests/PathItem/ComplexPropertyPathItemHandlerTests.cs
+++ b/test/Microsoft.OpenAPI.OData.Reader.Tests/PathItem/ComplexPropertyPathItemHandlerTests.cs
@@ -6,7 +6,7 @@
 using System;
 using System.Net.Http;
 using Microsoft.OData.Edm;
-using Microsoft.OpenApi.Any;
+using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.OData.Edm;
@@ -203,7 +203,7 @@ public void CreateComplexPropertyPathItemAddsCustomAttributeValuesToPathExtensio
 		Assert.NotNull(pathItem.Extensions);
 
 		pathItem.Extensions.TryGetValue("x-ms-isHidden", out IOpenApiExtension isHiddenExtension);
-		string isHiddenValue = (isHiddenExtension as OpenApiAny).Node.GetValue<string>();
+		string isHiddenValue = Assert.IsType<JsonNodeExtension>(isHiddenExtension).Node.GetValue<string>();
         Assert.Equal("true", isHiddenValue);
 	}
 
diff --git a/test/Microsoft.OpenAPI.OData.Reader.Tests/PathItem/EntityPathItemHandlerTests.cs b/test/Microsoft.OpenAPI.OData.Reader.Tests/PathItem/EntityPathItemHandlerTests.cs
index e5c7bd88..10fc0f95 100644
--- a/test/Microsoft.OpenAPI.OData.Reader.Tests/PathItem/EntityPathItemHandlerTests.cs
+++ b/test/Microsoft.OpenAPI.OData.Reader.Tests/PathItem/EntityPathItemHandlerTests.cs
@@ -7,7 +7,7 @@
 using System.Linq;
 using System.Net.Http;
 using Microsoft.OData.Edm;
-using Microsoft.OpenApi.Any;
+using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.OData.Edm;
@@ -282,11 +282,11 @@ public void CreateEntityPathItemAddsCustomAttributeValuesToPathExtensions()
             Assert.NotNull(pathItem.Extensions);
 
             pathItem.Extensions.TryGetValue("x-ms-isHidden", out IOpenApiExtension isHiddenExtension);
-            string isHiddenValue = (isHiddenExtension as OpenApiAny).Node.GetValue<string>();
+            string isHiddenValue = Assert.IsType<JsonNodeExtension>(isHiddenExtension).Node.GetValue<string>();
             Assert.Equal("true", isHiddenValue);
 
             pathItem.Extensions.TryGetValue("x-ms-isOwner", out IOpenApiExtension isOwnerExtension);
-            string isOwnerValue = (isOwnerExtension as OpenApiAny).Node.GetValue<string>();
+            string isOwnerValue = Assert.IsType<JsonNodeExtension>(isOwnerExtension).Node.GetValue<string>();
             Assert.Equal("true", isOwnerValue);
         }
     }
diff --git a/test/Microsoft.OpenAPI.OData.Reader.Tests/PathItem/EntitySetPathItemHandlerTests.cs b/test/Microsoft.OpenAPI.OData.Reader.Tests/PathItem/EntitySetPathItemHandlerTests.cs
index 00c88fb5..0590f900 100644
--- a/test/Microsoft.OpenAPI.OData.Reader.Tests/PathItem/EntitySetPathItemHandlerTests.cs
+++ b/test/Microsoft.OpenAPI.OData.Reader.Tests/PathItem/EntitySetPathItemHandlerTests.cs
@@ -11,7 +11,7 @@
 using Microsoft.OData.Edm;
 using Microsoft.OData.Edm.Csdl;
 using Microsoft.OData.Edm.Validation;
-using Microsoft.OpenApi.Any;
+using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.OData.Edm;
 using Microsoft.OpenApi.OData.Properties;
@@ -179,7 +179,7 @@ public void CreateEntitySetPathItemAddsCustomAttributeValuesToPathExtensions()
             Assert.NotNull(pathItem.Extensions);
 
             pathItem.Extensions.TryGetValue("x-ms-isHidden", out var value);
-            string isHiddenValue = (value as OpenApiAny).Node.GetValue<string>();
+            string isHiddenValue = Assert.IsType<JsonNodeExtension>(value).Node.GetValue<string>();
             Assert.Equal("true", isHiddenValue);
         }
 
diff --git a/test/Microsoft.OpenAPI.OData.Reader.Tests/PathItem/NavigationPropertyPathItemHandlerTests.cs b/test/Microsoft.OpenAPI.OData.Reader.Tests/PathItem/NavigationPropertyPathItemHandlerTests.cs
index 8d93e6d5..032a3078 100644
--- a/test/Microsoft.OpenAPI.OData.Reader.Tests/PathItem/NavigationPropertyPathItemHandlerTests.cs
+++ b/test/Microsoft.OpenAPI.OData.Reader.Tests/PathItem/NavigationPropertyPathItemHandlerTests.cs
@@ -11,7 +11,7 @@
 using Microsoft.OData.Edm;
 using Microsoft.OData.Edm.Csdl;
 using Microsoft.OData.Edm.Validation;
-using Microsoft.OpenApi.Any;
+using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.OData.Edm;
 using Microsoft.OpenApi.OData.Properties;
@@ -600,7 +600,7 @@ public void CreateNavigationPropertyPathItemAddsCustomAttributeValuesToPathExten
             Assert.NotNull(pathItem.Extensions);
 
             pathItem.Extensions.TryGetValue("x-ms-isHidden", out var value);
-            string isHiddenValue = (value as OpenApiAny).Node.GetValue<string>();
+            string isHiddenValue = Assert.IsType<JsonNodeExtension>(value).Node.GetValue<string>();
             Assert.Equal("true", isHiddenValue);
         }
 
diff --git a/test/Microsoft.OpenAPI.OData.Reader.Tests/PathItem/ODataTypeCastPathItemHandlerTests.cs b/test/Microsoft.OpenAPI.OData.Reader.Tests/PathItem/ODataTypeCastPathItemHandlerTests.cs
index e3ccdec5..6cddfaaf 100644
--- a/test/Microsoft.OpenAPI.OData.Reader.Tests/PathItem/ODataTypeCastPathItemHandlerTests.cs
+++ b/test/Microsoft.OpenAPI.OData.Reader.Tests/PathItem/ODataTypeCastPathItemHandlerTests.cs
@@ -9,7 +9,7 @@
 using System.Linq;
 using Xunit;
 using Microsoft.OpenApi.Interfaces;
-using Microsoft.OpenApi.Any;
+using Microsoft.OpenApi.Extensions;
 
 namespace Microsoft.OpenApi.OData.PathItem.Tests
 {
@@ -54,11 +54,11 @@ public void CreateODataTypeCastPathItemAddsCustomAttributeValuesToPathExtensions
             Assert.NotNull(pathItem.Extensions);
 
             pathItem.Extensions.TryGetValue("x-ms-isHidden", out IOpenApiExtension isHiddenExtension);
-            string isHiddenValue = (isHiddenExtension as OpenApiAny).Node.GetValue<string>();
+            string isHiddenValue = Assert.IsType<JsonNodeExtension>(isHiddenExtension).Node.GetValue<string>();
             Assert.Equal("true", isHiddenValue);
 
             pathItem.Extensions.TryGetValue("x-ms-workloadName", out IOpenApiExtension isOwnerExtension);
-            string isOwnerValue = (isOwnerExtension as OpenApiAny).Node.GetValue<string>();
+            string isOwnerValue = Assert.IsType<JsonNodeExtension>(isOwnerExtension).Node.GetValue<string>();
             Assert.Equal("People", isOwnerValue);
         }
     }
diff --git a/test/Microsoft.OpenAPI.OData.Reader.Tests/PathItem/OperationImportPathItemHandlerTests.cs b/test/Microsoft.OpenAPI.OData.Reader.Tests/PathItem/OperationImportPathItemHandlerTests.cs
index 56104a83..946bc834 100644
--- a/test/Microsoft.OpenAPI.OData.Reader.Tests/PathItem/OperationImportPathItemHandlerTests.cs
+++ b/test/Microsoft.OpenAPI.OData.Reader.Tests/PathItem/OperationImportPathItemHandlerTests.cs
@@ -9,7 +9,7 @@
 using System.Xml.Linq;
 using Microsoft.OData.Edm;
 using Microsoft.OData.Edm.Csdl;
-using Microsoft.OpenApi.Any;
+using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.OData.Edm;
@@ -147,7 +147,7 @@ public void CreateOperationImportPathItemAddsCustomAttributeValuesToPathExtensio
             Assert.NotNull(pathItem.Extensions);
 
             pathItem.Extensions.TryGetValue("x-ms-isHidden", out IOpenApiExtension isHiddenExtension);
-            string isHiddenValue = (isHiddenExtension as OpenApiAny).Node.GetValue<string>();
+            string isHiddenValue = Assert.IsType<JsonNodeExtension>(isHiddenExtension).Node.GetValue<string>();
             Assert.Equal("true", isHiddenValue);
         }
 
diff --git a/test/Microsoft.OpenAPI.OData.Reader.Tests/PathItem/OperationPathItemHandlerTests.cs b/test/Microsoft.OpenAPI.OData.Reader.Tests/PathItem/OperationPathItemHandlerTests.cs
index 51a76e9a..d04a9716 100644
--- a/test/Microsoft.OpenAPI.OData.Reader.Tests/PathItem/OperationPathItemHandlerTests.cs
+++ b/test/Microsoft.OpenAPI.OData.Reader.Tests/PathItem/OperationPathItemHandlerTests.cs
@@ -7,7 +7,7 @@
 using System.Linq;
 using System.Net.Http;
 using Microsoft.OData.Edm;
-using Microsoft.OpenApi.Any;
+using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.OData.Edm;
@@ -122,11 +122,11 @@ public void CreateOperationPathItemAddsCustomAttributeValuesToPathExtensions(str
             Assert.NotNull(pathItem.Extensions);
 
             pathItem.Extensions.TryGetValue("x-ms-isHidden", out IOpenApiExtension isHiddenExtension);
-            string isHiddenValue = (isHiddenExtension as OpenApiAny).Node.GetValue<string>();
+            string isHiddenValue = Assert.IsType<JsonNodeExtension>(isHiddenExtension).Node.GetValue<string>();
             Assert.Equal("true", isHiddenValue);
 
             pathItem.Extensions.TryGetValue("x-ms-workloadName", out IOpenApiExtension isOwnerExtension);
-            string isOwnerValue = (isOwnerExtension as OpenApiAny).Node.GetValue<string>();
+            string isOwnerValue = Assert.IsType<JsonNodeExtension>(isOwnerExtension).Node.GetValue<string>();
             Assert.Equal("People", isOwnerValue);
         }
     }
diff --git a/test/Microsoft.OpenAPI.OData.Reader.Tests/PathItem/SingletonPathItemHandlerTests.cs b/test/Microsoft.OpenAPI.OData.Reader.Tests/PathItem/SingletonPathItemHandlerTests.cs
index 73125251..24b7dc43 100644
--- a/test/Microsoft.OpenAPI.OData.Reader.Tests/PathItem/SingletonPathItemHandlerTests.cs
+++ b/test/Microsoft.OpenAPI.OData.Reader.Tests/PathItem/SingletonPathItemHandlerTests.cs
@@ -11,7 +11,7 @@
 using Microsoft.OData.Edm;
 using Microsoft.OData.Edm.Csdl;
 using Microsoft.OData.Edm.Validation;
-using Microsoft.OpenApi.Any;
+using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.OData.Edm;
 using Microsoft.OpenApi.OData.Properties;
@@ -155,7 +155,7 @@ public void CreateSingletonPathItemAddsCustomAttributeValuesToPathExtensions()
             Assert.NotNull(pathItem.Extensions);
 
             pathItem.Extensions.TryGetValue("x-ms-isHidden", out var value);
-            string isHiddenValue = (value as OpenApiAny).Node.GetValue<string>();
+            string isHiddenValue = Assert.IsType<JsonNodeExtension>(value).Node.GetValue<string>();
             Assert.Equal("true", isHiddenValue);
         }
 
diff --git a/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/TripService.OpenApi.V3.1.json b/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/TripService.OpenApi.V3.1.json
index 68ec85ea..0d24d9d0 100644
--- a/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/TripService.OpenApi.V3.1.json
+++ b/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/TripService.OpenApi.V3.1.json
@@ -7566,6 +7566,7 @@
           }
         },
         "deprecated": true,
+        "security": [ ],
         "x-ms-deprecation": {
           "removalDate": "2023-03-15T00:00:00.0000000+00:00",
           "date": "2021-08-24T00:00:00.0000000+00:00",
@@ -11899,6 +11900,7 @@
           }
         },
         "deprecated": true,
+        "security": [ ],
         "x-ms-deprecation": {
           "removalDate": "2023-03-15T00:00:00.0000000+00:00",
           "date": "2021-08-24T00:00:00.0000000+00:00",
@@ -12938,6 +12940,7 @@
           }
         },
         "deprecated": true,
+        "security": [ ],
         "x-ms-deprecation": {
           "removalDate": "2023-03-15T00:00:00.0000000+00:00",
           "date": "2021-08-24T00:00:00.0000000+00:00",
@@ -17377,6 +17380,7 @@
             "$ref": "#/components/responses/error"
           }
         },
+        "security": [ ],
         "x-ms-docs-operation-type": "operation"
       }
     },
@@ -25762,6 +25766,7 @@
           }
         },
         "deprecated": true,
+        "security": [ ],
         "x-ms-deprecation": {
           "removalDate": "2023-03-15T00:00:00.0000000+00:00",
           "date": "2021-08-24T00:00:00.0000000+00:00",
@@ -30987,6 +30992,7 @@
           }
         },
         "deprecated": true,
+        "security": [ ],
         "x-ms-deprecation": {
           "removalDate": "2023-03-15T00:00:00.0000000+00:00",
           "date": "2021-08-24T00:00:00.0000000+00:00",
@@ -32229,6 +32235,7 @@
           }
         },
         "deprecated": true,
+        "security": [ ],
         "x-ms-deprecation": {
           "removalDate": "2023-03-15T00:00:00.0000000+00:00",
           "date": "2021-08-24T00:00:00.0000000+00:00",
diff --git a/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/TripService.OpenApi.V3.1.yaml b/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/TripService.OpenApi.V3.1.yaml
index ef4142e4..2d5b53a6 100644
--- a/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/TripService.OpenApi.V3.1.yaml
+++ b/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/TripService.OpenApi.V3.1.yaml
@@ -5017,6 +5017,7 @@ paths:
         default:
           $ref: '#/components/responses/error'
       deprecated: true
+      security: [ ]
       x-ms-deprecation:
         removalDate: '2023-03-15T00:00:00.0000000+00:00'
         date: '2021-08-24T00:00:00.0000000+00:00'
@@ -7925,6 +7926,7 @@ paths:
         default:
           $ref: '#/components/responses/error'
       deprecated: true
+      security: [ ]
       x-ms-deprecation:
         removalDate: '2023-03-15T00:00:00.0000000+00:00'
         date: '2021-08-24T00:00:00.0000000+00:00'
@@ -8636,6 +8638,7 @@ paths:
         default:
           $ref: '#/components/responses/error'
       deprecated: true
+      security: [ ]
       x-ms-deprecation:
         removalDate: '2023-03-15T00:00:00.0000000+00:00'
         date: '2021-08-24T00:00:00.0000000+00:00'
@@ -11569,6 +11572,7 @@ paths:
                 $ref: '#/components/schemas/Microsoft.OData.Service.Sample.TrippinInMemory.Models.Trip'
         default:
           $ref: '#/components/responses/error'
+      security: [ ]
       x-ms-docs-operation-type: operation
   '/NewComePeople/{UserName}/Trips/{TripId}':
     description: Provides operations to manage the Trips property of the Microsoft.OData.Service.Sample.TrippinInMemory.Models.Person entity.
@@ -17202,6 +17206,7 @@ paths:
         default:
           $ref: '#/components/responses/error'
       deprecated: true
+      security: [ ]
       x-ms-deprecation:
         removalDate: '2023-03-15T00:00:00.0000000+00:00'
         date: '2021-08-24T00:00:00.0000000+00:00'
@@ -20726,6 +20731,7 @@ paths:
         default:
           $ref: '#/components/responses/error'
       deprecated: true
+      security: [ ]
       x-ms-deprecation:
         removalDate: '2023-03-15T00:00:00.0000000+00:00'
         date: '2021-08-24T00:00:00.0000000+00:00'
@@ -21579,6 +21585,7 @@ paths:
         default:
           $ref: '#/components/responses/error'
       deprecated: true
+      security: [ ]
       x-ms-deprecation:
         removalDate: '2023-03-15T00:00:00.0000000+00:00'
         date: '2021-08-24T00:00:00.0000000+00:00'
diff --git a/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/TripService.OpenApi.json b/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/TripService.OpenApi.json
index dc3919de..d99c4fe6 100644
--- a/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/TripService.OpenApi.json
+++ b/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/TripService.OpenApi.json
@@ -7560,6 +7560,7 @@
           }
         },
         "deprecated": true,
+        "security": [ ],
         "x-ms-deprecation": {
           "removalDate": "2023-03-15T00:00:00.0000000+00:00",
           "date": "2021-08-24T00:00:00.0000000+00:00",
@@ -11894,6 +11895,7 @@
           }
         },
         "deprecated": true,
+        "security": [ ],
         "x-ms-deprecation": {
           "removalDate": "2023-03-15T00:00:00.0000000+00:00",
           "date": "2021-08-24T00:00:00.0000000+00:00",
@@ -12933,6 +12935,7 @@
           }
         },
         "deprecated": true,
+        "security": [ ],
         "x-ms-deprecation": {
           "removalDate": "2023-03-15T00:00:00.0000000+00:00",
           "date": "2021-08-24T00:00:00.0000000+00:00",
@@ -17373,6 +17376,7 @@
             "$ref": "#/components/responses/error"
           }
         },
+        "security": [ ],
         "x-ms-docs-operation-type": "operation"
       }
     },
@@ -25758,6 +25762,7 @@
           }
         },
         "deprecated": true,
+        "security": [ ],
         "x-ms-deprecation": {
           "removalDate": "2023-03-15T00:00:00.0000000+00:00",
           "date": "2021-08-24T00:00:00.0000000+00:00",
@@ -30984,6 +30989,7 @@
           }
         },
         "deprecated": true,
+        "security": [ ],
         "x-ms-deprecation": {
           "removalDate": "2023-03-15T00:00:00.0000000+00:00",
           "date": "2021-08-24T00:00:00.0000000+00:00",
@@ -32226,6 +32232,7 @@
           }
         },
         "deprecated": true,
+        "security": [ ],
         "x-ms-deprecation": {
           "removalDate": "2023-03-15T00:00:00.0000000+00:00",
           "date": "2021-08-24T00:00:00.0000000+00:00",
diff --git a/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/TripService.OpenApi.yaml b/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/TripService.OpenApi.yaml
index 70548358..ba04824c 100644
--- a/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/TripService.OpenApi.yaml
+++ b/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/TripService.OpenApi.yaml
@@ -5015,6 +5015,7 @@ paths:
         default:
           $ref: '#/components/responses/error'
       deprecated: true
+      security: [ ]
       x-ms-deprecation:
         removalDate: '2023-03-15T00:00:00.0000000+00:00'
         date: '2021-08-24T00:00:00.0000000+00:00'
@@ -7924,6 +7925,7 @@ paths:
         default:
           $ref: '#/components/responses/error'
       deprecated: true
+      security: [ ]
       x-ms-deprecation:
         removalDate: '2023-03-15T00:00:00.0000000+00:00'
         date: '2021-08-24T00:00:00.0000000+00:00'
@@ -8635,6 +8637,7 @@ paths:
         default:
           $ref: '#/components/responses/error'
       deprecated: true
+      security: [ ]
       x-ms-deprecation:
         removalDate: '2023-03-15T00:00:00.0000000+00:00'
         date: '2021-08-24T00:00:00.0000000+00:00'
@@ -11569,6 +11572,7 @@ paths:
                 $ref: '#/components/schemas/Microsoft.OData.Service.Sample.TrippinInMemory.Models.Trip'
         default:
           $ref: '#/components/responses/error'
+      security: [ ]
       x-ms-docs-operation-type: operation
   '/NewComePeople/{UserName}/Trips/{TripId}':
     description: Provides operations to manage the Trips property of the Microsoft.OData.Service.Sample.TrippinInMemory.Models.Person entity.
@@ -17202,6 +17206,7 @@ paths:
         default:
           $ref: '#/components/responses/error'
       deprecated: true
+      security: [ ]
       x-ms-deprecation:
         removalDate: '2023-03-15T00:00:00.0000000+00:00'
         date: '2021-08-24T00:00:00.0000000+00:00'
@@ -20727,6 +20732,7 @@ paths:
         default:
           $ref: '#/components/responses/error'
       deprecated: true
+      security: [ ]
       x-ms-deprecation:
         removalDate: '2023-03-15T00:00:00.0000000+00:00'
         date: '2021-08-24T00:00:00.0000000+00:00'
@@ -21580,6 +21586,7 @@ paths:
         default:
           $ref: '#/components/responses/error'
       deprecated: true
+      security: [ ]
       x-ms-deprecation:
         removalDate: '2023-03-15T00:00:00.0000000+00:00'
         date: '2021-08-24T00:00:00.0000000+00:00'